summaryrefslogtreecommitdiffstats
path: root/media/libmediaplayerservice
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Make prepare properly report failure again" into lmp-devMarco Nelissen2014-09-201-1/+6
|\
| * Make prepare properly report failure againMarco Nelissen2014-09-191-1/+6
| | | | | | | | | | | | Bug: 17583084 Bug: 17548451 Change-Id: I759d28eaafb520c206d54740c2c0a857b534d23c
* | mediaplayer: schedule video frames in VSYNC valleysLajos Molnar2014-09-197-14/+224
|/ | | | | Bug: 14659809 Change-Id: Ic340ac61ad4778b493625c79c2cb4f747ff54ede
* Merge "mediaplayer: fix buffer aggregation when video has offloaded audio" ↵Phil Burk2014-09-181-5/+5
|\ | | | | | | into lmp-dev
| * mediaplayer: fix buffer aggregation when video has offloaded audioPhil Burk2014-09-171-5/+5
| | | | | | | | | | | | | | | | | | Change conditional test so we don't accidentally do buffer aggregation on video buffers. Bug: 17553847 Change-Id: I746452b2e62db664315732a38f982ce7faf26212 Signed-off-by: Phil Burk <philburk@google.com>
* | Merge "NuPlayer: update timestamp handling" into lmp-devAndy Hung2014-09-173-33/+117
|\ \
| * | NuPlayer: update timestamp handlingAndy Hung2014-09-173-33/+117
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Merge "NuPlayer: use getTimestamp instead of getPosition" into lmp-devLajos Molnar2014-09-174-23/+58
|\ \ \ | |/ /
| * | NuPlayer: use getTimestamp instead of getPositionLajos Molnar2014-09-174-23/+58
| | | | | | | | | | | | | | | Bug: 14659809 Bug: 16985287 Change-Id: I59ec72fbd40a9b8d28fe548ddad082c03000c045
* | | Merge "Add support for ANDROID_LOOP to NuPlayer" into lmp-devMarco Nelissen2014-09-177-4/+30
|\ \ \
| * | | Add support for ANDROID_LOOP to NuPlayerMarco Nelissen2014-09-177-4/+30
| | | | | | | | | | | | | | | | | | | | Bug: 17518139 Change-Id: I9355ddd4c998d967013dd8bd32d670a9a83dea31
* | | | mediaplayer: reset flags when pre-reading multiple buffersMarco Nelissen2014-09-161-0/+2
| |/ / |/| | | | | | | | | | | Bug: 17521470 Change-Id: I15ee9b1d3dd4ad29f4961a642f7fadafd9fe5b24
* | | Merge "NuPlayerDriver: restart after eos pause" into lmp-devRobert Shih2014-09-171-2/+9
|\ \ \
| * | | NuPlayerDriver: restart after eos pauseRobert Shih2014-09-161-2/+9
| |/ / | | | | | | | | | | | | Bug: 17512187 Change-Id: I204ce83790bf98bc7ffebcb76d5df1e56a6a3f66
* | | Merge "Disconnect HTTP-based data source upon reset" into lmp-devChong Zhang2014-09-164-0/+24
|\ \ \
| * | | Disconnect HTTP-based data source upon resetChong Zhang2014-09-164-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 17425250 Change-Id: Ieb4c93fd9848489f9dbf35a36474376924fd8eb9
* | | | GenericSource: fix selectTrack parameterRobert Shih2014-09-161-1/+1
| |/ / |/| | | | | | | | | | | Bug: 17512187 Change-Id: I19a0915fb0fb1b1ae036bf5df85b9c9e7657a7ea
* | | Merge "mediaplayer: handle surface dis/connection errors" into lmp-devLajos Molnar2014-09-151-5/+8
|\ \ \ | |_|/ |/| |
| * | mediaplayer: handle surface dis/connection errorsLajos Molnar2014-09-151-5/+8
| |/ | | | | | | | | Bug: 17408008 Change-Id: I752d5372086772b79b1300a2d3fabbc4985954a8
* | Merge "mediaplayer: optimize buffer queue management" into lmp-devPhil Burk2014-09-155-65/+93
|\ \ | |/ |/|
| * mediaplayer: optimize buffer queue managementPhil Burk2014-09-125-65/+93
| | | | | | | | | | | | | | | | | | | | Various changes for power consumption including: Restrict the number of messages in flight. Buffer more frames in the GenericSource so reads occur in a burst. Bug: 15094301 Change-Id: I783481fd91f3fdd445b95e88ab82178f649f1a38 Signed-off-by: Phil Burk <philburk@google.com>
* | Merge "GenericSource: move track packet init from start to prepare" into lmp-devRobert Shih2014-09-121-4/+4
|\ \ | |/ |/|
| * GenericSource: move track packet init from start to prepareRobert Shih2014-09-111-4/+4
| | | | | | | | | | Bug: 17244704 Change-Id: I15eba0e4d2a178cc0ba46bbc17be0e6d95e76935
* | Merge "StagefrightRecorder: default to codec and fps from camcorder low ↵Chong Zhang2014-09-112-6/+33
|\ \ | | | | | | | | | profile" into lmp-dev
| * | StagefrightRecorder: default to codec and fps from camcorder low profileChong Zhang2014-09-112-6/+33
| | | | | | | | | | | | | | | Bug: 16870964 Change-Id: I18425af630d3f041a3bcf77fbae3f07856fe8af2
* | | avoid kWhatReadBuffer message spam in GenericSourceLajos Molnar2014-09-112-4/+19
| |/ |/| | | | | | | | | | | | | When playig WVM video, an extra readBuffer is posted for each dequeueAccessUnit, resulting in an unbounded number of messages. Bug: 17472979 Change-Id: Ice92ccf2454bf7a70856a4a8b535cefffc9e61ac
* | mediaplayer: release MediaBuffer in stale input buffersLajos Molnar2014-09-101-0/+11
|/ | | | | Bug: 17454455 Change-Id: If63a6e42f96851d6c10fdec11360f0dabae9bf50
* Merge "NuPlayerDriver: do not set to paused state when receiving playback ↵Wei Jia2014-09-101-5/+8
|\ | | | | | | complete and reset is in progress." into lmp-dev
| * 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
* | mediaplayer: limit number of outstanding buffer requestsLajos Molnar2014-09-091-6/+7
|/ | | | | Bug: 14679336 Change-Id: I94a20ada30a9a25065329a85fc884d32d154d029
* Merge "NuPlayer: make previous decoders obsolete when reset is done." into ↵Wei Jia2014-09-091-0/+3
|\ | | | | | | lmp-dev
| * NuPlayer: make previous decoders obsolete when reset is done.Wei Jia2014-09-091-0/+3
| | | | | | | | | | Bug: 17428608 Change-Id: I724174d65f8e00bfecb51e6f690ae709ed2cf442
* | Merge "[media][nuplayer] Remove debug message EWOULDBLOCK" into lmp-devPhil Burk2014-09-091-1/+0
|\ \
| * | [media][nuplayer] Remove debug message EWOULDBLOCKPhil Burk2014-09-091-1/+0
| |/ | | | | | | | | | | | | | | | | A debug message that was silent during testing is now spewing messages. It was removed. Bug: 17438882 Change-Id: I9c61409cac77c7bc1fd1088815823207094606f2 Signed-off-by: Phil Burk <philburk@google.com>
* | Merge " NuPlayer::Renderer::onPause() - Converted CHECK(!mPaused) to a ↵Rachad2014-09-091-2/+4
|\ \ | |/ |/| | | warning." into lmp-dev
| * NuPlayer::Renderer::onPause() - Converted CHECK(!mPaused) to a warning.Rachad2014-09-091-2/+4
| | | | | | | | | | | | Bug: 17436451 Change-Id: I7e9e0c48bbdd8ab65c5f4a587699a28435bd03f4
* | Merge "NuPlayer: check mSource before deferencing it." into lmp-devWei Jia2014-09-091-1/+2
|\ \ | |/ |/|
| * NuPlayer: check mSource before deferencing it.Wei Jia2014-09-091-1/+2
| | | | | | | | | | Bug: 17428608 Change-Id: I7b264d1288ed3c495434aedeeeef2fbfc3ca2f16
* | Merge "[audio][nuplayer] Aggregate buffers to reduce power." into lmp-devPhil Burk2014-09-082-4/+94
|\ \
| * | [audio][nuplayer] Aggregate buffers to reduce power.Phil Burk2014-09-082-4/+94
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Combine audio data from multiple buffers into one. This reduces churn between threads and saves battery power. Only use buffer aggregation when offloading the decoder. Pend buffer if it won't fit in the bigger buffer. Bug: 15094301 Change-Id: Iad3dac90b5d6b0fa43432b0e6776652ee2eafaa1 Signed-off-by: Phil Burk <philburk@google.com>
* | | Merge "NuPlayerDriver: put player in paused state when reaching EOS." into ↵Wei Jia2014-09-081-2/+2
|\ \ \ | |_|/ |/| | | | | lmp-dev
| * | NuPlayerDriver: put player in paused state when reaching EOS.Wei Jia2014-09-051-2/+2
| | | | | | | | | | | | | | | Bug: 17352759 Change-Id: I19b183e0a86b712524f79ec7c35e32b5a5b47bc6
* | | Merge "Revert "Revert "disable AwesomePlayer for Ogg vorbis""" into lmp-devAndy Hung2014-09-082-12/+14
|\ \ \
| * | | Revert "Revert "disable AwesomePlayer for Ogg vorbis""Andy Hung2014-09-032-12/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit da65048e8e6f65ed9b3f23cda3f4554025c76fc4. Deadlock audio issues for NuPlayer have been resolved. Change-Id: I1853d367dc771a9396a9b2d48ff34e50c78c112c
* | | | Merge "GenericSource: refactor track selection for dedicated looper" into ↵Robert Shih2014-09-052-16/+189
|\ \ \ \ | |_|/ / |/| | | | | | | lmp-dev
| * | | GenericSource: refactor track selection for dedicated looperRobert Shih2014-09-032-16/+189
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - move getFormatMeta, getSelectedTrack, selectTrack, and seekTo to dedicated looper - start & dequeueAccessUnit posts readBuffer requests instead of reading directly - call internal doGetFormatMeta in onPrepareAsync Bug: 16892748 Change-Id: I5d5e34381f1dfceca655c52a201627b53454ad22
* | | | Merge "NuPlayer: Restrict seek on video texture changes" into lmp-devAndy Hung2014-09-051-1/+7
|\ \ \ \
| * | | | NuPlayer: Restrict seek on video texture changesAndy Hung2014-09-051-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MediaPlayer::setVideoSurfaceTexture() should generate seek to refresh display only if player is started and has video. Bug: 17379148 Bug: 17404923 Change-Id: I5f55dc40943e4419d08be6fdab964b8a2c5ee519
* | | | | Merge "NuPlayer: Discard seeks when source and decoders are NULL" into lmp-devAndy Hung2014-09-052-1/+9
|\ \ \ \ \ | |/ / / /
| * | | | NuPlayer: Discard seeks when source and decoders are NULLAndy Hung2014-09-042-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Problem occurs when loop mode asynchronously seeks to the start of the source after a MediaPlayer::reset(). Bug: 17379148 Change-Id: I50bfe65a753afffb1d478db54c76067a9c61a0ae