summaryrefslogtreecommitdiffstats
path: root/media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp
Commit message (Collapse)AuthorAgeFilesLines
...
* | am d996c469: am fc55783d: Merge "NuPlayer will notify SeekComplete only when ↵Wei Jia2014-09-241-4/+2
|\ \ | |/ | | | | | | | | | | requested so." into lmp-dev * commit 'd996c4698bda072866d77bac9e9a7685a2c9349b': NuPlayer will notify SeekComplete only when requested so.
| * NuPlayer will notify SeekComplete only when requested so.Wei Jia2014-09-231-4/+2
| | | | | | | | | | Bug: 17596535 Change-Id: I6b744fdcf80f11d521d26c7c8b45f7de70aa0dc3
* | am a9612acf: am 21a1d72b: Merge "NuPlayer: update timestamp handling" into ↵Andy Hung2014-09-171-2/+30
|\ \ | |/ | | | | | | | | | | lmp-dev * commit 'a9612acf7fd699536ce026297c1b34d877bdbe16': NuPlayer: update timestamp handling
| * Merge "NuPlayer: update timestamp handling" into lmp-devAndy Hung2014-09-171-2/+30
| |\
| | * NuPlayer: update timestamp handlingAndy Hung2014-09-171-2/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use getTimestamp WOULD_BLOCK error return code to clean up initial playback/start timestamp handling. Account for pause time and seeks. Only send notification from driver when the media time changes. Bug: 14659809 Bug: 17428188 Change-Id: I051bb5e2dd4fd5990474f8fb635615ad8d18eb2c
* | | am d2fc5dac: am 866e028b: Merge "Add support for ANDROID_LOOP to NuPlayer" ↵Marco Nelissen2014-09-171-1/+11
|\ \ \ | |/ / | | | | | | | | | | | | | | | into lmp-dev * commit 'd2fc5dac3c0a15f012b1e72d80c795d5f425616a': Add support for ANDROID_LOOP to NuPlayer
| * | Merge "Add support for ANDROID_LOOP to NuPlayer" into lmp-devMarco Nelissen2014-09-171-1/+11
| |\ \ | | |/ | |/|
| | * Add support for ANDROID_LOOP to NuPlayerMarco Nelissen2014-09-171-1/+11
| | | | | | | | | | | | | | | Bug: 17518139 Change-Id: I9355ddd4c998d967013dd8bd32d670a9a83dea31
* | | resolved conflicts for merge of a7efc1af to masterRobert Shih2014-09-161-2/+6
|\ \ \ | |/ / | | | | | | Change-Id: I8b26b71845dc96e770060ae58dae60001f8f589e
| * | NuPlayerDriver: restart after eos pauseRobert Shih2014-09-161-2/+9
| |/ | | | | | | | | Bug: 17512187 Change-Id: I204ce83790bf98bc7ffebcb76d5df1e56a6a3f66
* | resolved conflicts for merge of 42db212e to masterWei Jia2014-09-111-6/+7
|\ \ | |/ | | | | Change-Id: I1d8fe79a591b0e2a9e279f6c2c70d9e13c72924b
| * NuPlayerDriver: do not set to paused state when receiving playback complete ↵Wei Jia2014-09-101-5/+8
| | | | | | | | | | | | | | and reset is in progress. Bug: 17453240 Change-Id: If243e2232779681fc84dc767feaed00f23d8fdb1
* | am e2b2e5fb: am 43cbe059: Merge "NuPlayerDriver: put player in paused state ↵Wei Jia2014-09-081-2/+2
|\ \ | |/ | | | | | | | | | | when reaching EOS." into lmp-dev * commit 'e2b2e5fb735a2cdd93e44982539470fbec2ab36b': NuPlayerDriver: put player in paused state when reaching EOS.
| * NuPlayerDriver: put player in paused state when reaching EOS.Wei Jia2014-09-051-2/+2
| | | | | | | | | | Bug: 17352759 Change-Id: I19b183e0a86b712524f79ec7c35e32b5a5b47bc6
* | am 6a857f52: am 767fc12e: Merge "NuPlayer: Discard seeks when source and ↵Andy Hung2014-09-051-1/+1
|\ \ | |/ | | | | | | | | | | decoders are NULL" into lmp-dev * commit '6a857f5263a82eae4f48eb15f62febf10b971cf9': NuPlayer: Discard seeks when source and decoders are NULL
| * NuPlayer: Discard seeks when source and decoders are NULLAndy Hung2014-09-041-1/+1
| | | | | | | | | | | | | | | | Problem occurs when loop mode asynchronously seeks to the start of the source after a MediaPlayer::reset(). Bug: 17379148 Change-Id: I50bfe65a753afffb1d478db54c76067a9c61a0ae
* | am 18e24608: am e7494680: Merge "NuPlayerRenderer: stop feeding AudioSink ↵Wei Jia2014-09-021-2/+4
|\ \ | |/ | | | | | | | | | | when paused." into lmp-dev * commit '18e24608d92a204191101a374ded26498caf02d9': NuPlayerRenderer: stop feeding AudioSink when paused.
| * NuPlayerRenderer: stop feeding AudioSink when paused.Wei Jia2014-08-291-2/+4
| | | | | | | | | | | | | | NuPlayerDriver: current position is updated only in running state. Bug: 17141882 Change-Id: Ia88551cc29ef8f0e7ef0600a214feb5633389b6e
* | am faf71460: am 355286ee: Merge "Fix SoundPool lockup" into lmp-devMarco Nelissen2014-08-261-6/+8
|\ \ | |/ | | | | | | * commit 'faf7146006ea8b44a745f4f61d3c9de14e88e2b4': Fix SoundPool lockup
| * Fix SoundPool lockupMarco Nelissen2014-08-261-6/+8
| | | | | | | | | | | | | | | | | | NuPlayerDriver needs to update its internal state before calling its listener, so that when the listener calls back into NuPlayerDriver, NuPlayerDriver has the right state. Bug: 14057920 Change-Id: I224882c427f5e3c9d4bf96c5d68075e235062401
* | am 008cee91: am 052efa49: Merge "wait for flush to finish before returning ↵Chong Zhang2014-08-251-0/+20
|\ \ | |/ | | | | | | | | | | setSurface" into lmp-dev * commit '008cee913577839d2377ff79bf4f26655c3a2c7d': wait for flush to finish before returning setSurface
| * wait for flush to finish before returning setSurfaceChong Zhang2014-08-221-0/+20
| | | | | | | | | | Bug: 17187598 Change-Id: I091219e57158a4532044ca49342b57277d6ecb15
* | am 3672da6f: am 7992a5d0: Merge "NuPlayerDriver: fix current position for ↵Wei Jia2014-08-221-17/+42
|\ \ | |/ | | | | | | | | | | stop and pause." into lmp-dev * commit '3672da6f03db75f7d7c86dd1e994e7758ba82670': NuPlayerDriver: fix current position for stop and pause.
| * NuPlayerDriver: fix current position for stop and pause.Wei Jia2014-08-221-17/+42
| | | | | | | | | | | | | | | | | | | | When start() is called after EOS, it means restarting from the beginning of the stream. Fix racing conditon on accessing some members. Report seekTo position before any notifyPosition is called. Bug: 17031731 Bug: 17178928 Change-Id: I008b827288cf28d39e2a943373fe1e5d7d6c2595
* | am 5bf363ae: am 01047680: Merge "NuPlayerDriver: include lapsed time when ↵Wei Jia2014-08-211-1/+10
|\ \ | |/ | | | | | | | | | | reporting current position." into lmp-dev * commit '5bf363ae3c4782ed5ad0bdb8a0b41a8ad23ac210': NuPlayerDriver: include lapsed time when reporting current position.
| * NuPlayerDriver: include lapsed time when reporting current position.Wei Jia2014-08-201-1/+10
| | | | | | | | | | Bug: 17031731 Change-Id: I01962ee9194bdaa9e8ed1a51abbf365733be3c85
* | am 472ff73c: am e0b5cf7e: Merge "Fix typo in comment" into lmp-devMarco Nelissen2014-08-211-1/+1
|\ \ | |/ | | | | | | * commit '472ff73c795b5046d702f1ec555cbc377f94210f': Fix typo in comment
| * Fix typo in commentMarco Nelissen2014-08-201-1/+1
| | | | | | | | | | Bug: 14057920 Change-Id: I51c4d47b9e175ef789ed3c51d59c9eda77edc1e0
* | am d05795e5: am 4deb606b: Merge "Fix NuPlayer deadlock" into lmp-devMarco Nelissen2014-08-211-14/+19
|\ \ | |/ | | | | | | * commit 'd05795e583a668c97be55359215fdd51297e3273': Fix NuPlayer deadlock
| * Fix NuPlayer deadlockMarco Nelissen2014-08-201-14/+19
| | | | | | | | | | | | | | | | Mutexes can't be locked recursively. This would cause a seek in the prepared state to deadlock Bug: 14057920 Change-Id: Ifb5e25f24450b7e5f71611a8ee2bdba45dba70a7
* | am c2a02f95: am af11287b: Merge "NuPlayer: add support for proper stop" into ↵Lajos Molnar2014-08-191-3/+61
|\ \ | |/ | | | | | | | | | | lmp-dev * commit 'c2a02f95083537b81320cde5671587bc2daeb0d8': NuPlayer: add support for proper stop
| * Merge "NuPlayer: add support for proper stop" into lmp-devLajos Molnar2014-08-191-3/+61
| |\
| | * NuPlayer: add support for proper stopLajos Molnar2014-08-081-3/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | MediaPlayer.stop() should move to the Stopped state which is semantically identical to the Initialized state. Bug: 13138230 Change-Id: I5d7b4a22533f545c24a18e2cd9f7cb2685d42c84 Signed-off-by: Lajos Molnar <lajos@google.com>
* | | am 28928517: am 426c719a: Merge "use dedicated looper for GenericSource" ↵Chong Zhang2014-08-151-20/+0
|\ \ \ | |/ / | | | | | | | | | | | | | | | into lmp-dev * commit '28928517f84ac4259a65f0ea783c9769ab554718': use dedicated looper for GenericSource
| * | use dedicated looper for GenericSourceChong Zhang2014-08-141-20/+0
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - handle setVideoSurface in deferred action, and return to client immediately - handle GenericSource's prepareAsync on its own looper, instead of sharing looper with NuPlayer - let HTTPLiveSource share looper with LiveSession, instead of NuPlayer - remove reflector in RTSPSource Bug: 16892748 Change-Id: I1aed557320052012065f5a90adbcb03c238da988
* | am f2bd67bc: am f7999047: Merge "NuPlayer: getSelectedTrack" into lmp-devRobert Shih2014-08-091-0/+6
|\ \ | |/ | | | | | | * commit 'f2bd67bcc34f7963df9c9f2a8ce8ee1ae35de8e0': NuPlayer: getSelectedTrack
| * NuPlayer: getSelectedTrackRobert Shih2014-08-081-0/+6
| | | | | | | | Change-Id: If5251f89b881e7f268e11a06cd3685d794c958b6
* | resolved conflicts for merge of e1009a0f to masterLajos Molnar2014-08-011-6/+27
|\ \ | |/
| * mediaplayer: add looping support to NuPlayerLajos Molnar2014-07-311-4/+26
| | | | | | | | | | Bug: 16641557 Change-Id: I433158e6e585b4714cfd6d89562ecd0587a07ae2
* | Fix deadlock in NuPlayerMarco Nelissen2014-07-021-0/+14
|/ | | | | | | | also fix start/resume at EOF. b/15323063 Change-Id: I798882bab0c5f9a18b47dddc041054a5679be383
* Fix some NuPlayer issues.Marco Nelissen2014-05-281-0/+4
| | | | | | | Fixes OnSeekCompleted callback and calling getDuration immediately after prepare(). Change-Id: Ie58c509005cded278a0e50c87240b0a2d920b7d7
* warnings be gone.Andreas Huber2014-02-111-5/+7
| | | | Change-Id: Ie3bae3f037730e316d7fca12e7a3527973f752ef
* resolved conflicts for merge of 566be7c3 to masterNarayan Kamath2014-02-111-1/+2
|\ | | | | | | Change-Id: I7b1cc71057b2bd4f771e7bcf508a8c3abd6017ce
| * Make frameworks/av 64-bit compatibleKévin PETIT2014-02-111-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | Contains the necessary changes to make frameworks/av build and work on a 64-bit machine. Signed-off-by: Craig Barber <craig.barber@arm.com> Signed-off-by: Kévin PETIT <kevin.petit@arm.com> Signed-off-by: Ashok Bhat <ashok.bhat@arm.com> Signed-off-by: Marcus Oakland <marcus.oakland@arm.com> Change-Id: I725feaae50ed8eee25ca2c947cf15aee1f395c43
* | FINAL ATTEMPT: HTTP services are now provided from JAVA and made available ↵Andreas Huber2014-02-041-2/+4
|/ | | | | | to media code Change-Id: I9f74a86e70422187c9cf0ca1318a29019700192d
* MediaPlayer: add listener for raw track dataChong Zhang2013-08-191-2/+20
| | | | | | Bug: 10326117 Change-Id: I2c0bdf8adc67b11f8dc633423bee66897548f181
* Add MEDIA_STARTED/PAUSED/STOPPED events to media playersLajos Molnar2013-08-151-0/+5
| | | | | | | | | | | | This is needed for the MediaTimeProvider java interface, so it does not continually poll for current media time. Note: NuPlayer and AwesomePlayer do not correctly handle stop (pause instead), so for those we will signal PAUSED. Signed-off-by: Lajos Molnar <lajos@google.com> Change-Id: I3c61e1bda475f131323f475c18a42e3ec66c9ae1 Bug: 10326117
* Handle the case where an asynchronous prepare was initiated and thenAndreas Huber2013-04-251-0/+16
| | | | | | | the mediaplayer was reset. Change-Id: Ib241747c5dc002b88a3854569c1f8340b2a8ef41 related-to-bug: 8688986
* Instead of returning an error, return an invalid duration (-1 ms)Andreas Huber2013-04-111-3/+3
| | | | | | | | if no duration information was available. This prevents us from entering ERROR state, effectively rendering the player instance useless. Change-Id: I602d2661ae8b8633360306c0ea9208fb11e2bf17 related-to-bug: 8596285
* Squashed commit of the following:Andreas Huber2013-03-121-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit f4edf442741886cdbe071e2d15f6e6247269f7c5 Author: Andreas Huber <andih@google.com> Date: Tue Mar 12 09:09:18 2013 -0700 Pass additional flags to the sink, use TCP by default in wolfiecast mode. Change-Id: I41e11a2375d4199656e45c4f149d8441d0016092 commit 6302602ed280a38287f507159abfb40a1da38c5a Author: Andreas Huber <andih@google.com> Date: Tue Mar 12 08:51:58 2013 -0700 tweaks Change-Id: Ie29e422d7258be522f4bb1f6c5afcf74c937e547 commit a38a860e4979ba563cadbaafa21b084439449d26 Author: Andreas Huber <andih@google.com> Date: Mon Mar 11 16:57:43 2013 -0700 Report average lateness all the way from NuPlayerRenderer... Change-Id: I2e7700703ae656515e44b9c25610d26c75778111 commit a7d49b11675ea88be4029dd8451d1649db94571d Author: Andreas Huber <andih@google.com> Date: Mon Mar 11 14:54:19 2013 -0700 Make TimeSyncer smarter, enable TunnelRenderer Change-Id: I27377a60cd8feb01589da456967fddd34532c20e commit 0f214c8ef68179f7b61512c37040939554013151 Author: Andreas Huber <andih@google.com> Date: Thu Mar 7 15:57:56 2013 -0800 convert source timestamps to sink timestamps, report lateness. Change-Id: I051a60fbbceca2f7b508ae3dac6e01e402bae39e commit 04a4f8e16bad09157b5615a5fa45310438955832 Author: Andreas Huber <andih@google.com> Date: Thu Mar 7 09:00:28 2013 -0800 Sync time between sink and source. Change-Id: Ie8b4d75c957aa48310e7c81d1279761b9f821efe commit aebe20e6184e3636a99082f8ece08e708015cb8d Author: Andreas Huber <andih@google.com> Date: Wed Mar 6 09:03:12 2013 -0800 play with back pressure Change-Id: I51eb69257e6a79e76f5f9c75ff99d8adbd083947 Change-Id: Ifdf57228667fed7fc71c5090a2c3f7cea1037c5c
generated by cgit v1.1 at 2024-06-04 00:05:32 +0000