summaryrefslogtreecommitdiffstats
path: root/media/libmediaplayerservice
Commit message (Collapse)AuthorAgeFilesLines
...
* | | 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
* | | | | Merge "Split CEA-608 Closed caption into 4 tracks CC1~CC4" into lmp-devChong Zhang2014-09-053-67/+134
|\ \ \ \ \
| * | | | | Split CEA-608 Closed caption into 4 tracks CC1~CC4Chong Zhang2014-09-033-67/+134
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 16463078 Change-Id: Ib3073090934232016e535fbb8fa56cdf9d7ab6eb
* | | | | Merge "Fix to parse audio_source_t member of audio_attributes_t" into lmp-devEric Laurent2014-09-051-0/+3
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix to parse audio_source_t member of audio_attributes_tHyejin Kim2014-09-051-0/+3
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | When unmarshalling audio_attributes_t typed data, it didn't parse the audio_source_t member between content_type and flags. Bug: 16906307 Change-Id: Ia0d8df9b5c31441d34dc82678bceccd8ce31423d
* | | | Merge "NuPlayer: add seek operation when change video texture surface." into ↵Wei Jia2014-09-032-0/+5
|\ \ \ \ | |_|_|/ |/| | | | | | | lmp-dev
| * | | NuPlayer: add seek operation when change video texture surface.Wei Jia2014-09-032-0/+5
| |/ / | | | | | | | | | | | | | | | Bug: 17278770 Change-Id: I9fd5207e1eccb91e64644d2d1da4183d4bf7ac2c
* | | Merge "render one video frame after flush even when we're paused" into lmp-devChong Zhang2014-09-032-15/+29
|\ \ \ | |/ / |/| |
| * | render one video frame after flush even when we're pausedChong Zhang2014-09-032-15/+29
| | | | | | | | | | | | | | | | | | | | | | | | allows the video to get some update when user seeks while paused. Bug: 17140448 Change-Id: I064806bfd566585eeb4150a508422c9775e08f99
* | | Merge "NuPlayerRenderer: stop feeding AudioSink when paused." into lmp-devWei Jia2014-09-022-6/+7
|\ \ \
| * | | NuPlayerRenderer: stop feeding AudioSink when paused.Wei Jia2014-08-292-6/+7
| |/ / | | | | | | | | | | | | | | | | | | NuPlayerDriver: current position is updated only in running state. Bug: 17141882 Change-Id: Ia88551cc29ef8f0e7ef0600a214feb5633389b6e
* | | Merge "GenericSource: set DRM playback status." into lmp-devRonghua Wu2014-08-305-0/+94
|\ \ \
| * | | GenericSource: set DRM playback status.Ronghua Wu2014-08-295-0/+94
| | | | | | | | | | | | | | | | | | | | Bug: 17307158 Change-Id: I36b801a9b67831b618930cf1241756bb9644b4fd
* | | | MediaCodec: set state to UNINITIALIZED when receiving fatal error.Wei Jia2014-08-291-0/+2
| |/ / |/| | | | | | | | | | | | | | | | | NuPlayerDecoder: release MediaCodec when handling an error. Bug: 16661923 Change-Id: I1b6fd7ee5cc1136b3f289135e5360cd3d98f9799
* | | Merge "AudioPlayback: delay the post of EOS based on pending playout." into ↵Ronghua Wu2014-08-272-22/+19
|\ \ \ | | | | | | | | | | | | lmp-dev
| * | | AudioPlayback: delay the post of EOS based on pending playout.Ronghua Wu2014-08-272-22/+19
| |/ / | | | | | | | | | | | | Bug: 16840522 Change-Id: Icdc8888f5a8a77e2e5ebeb8a6934c7d79bd9e71a
* | | Merge "NuPlayer: set controlledByApp to true when creating Surface." into ↵Wei Jia2014-08-271-1/+1
|\ \ \ | | | | | | | | | | | | lmp-dev
| * | | NuPlayer: set controlledByApp to true when creating Surface.Wei Jia2014-08-261-1/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | This fixes hang when trying to dequeue buffer from native window followed by a flush. Bug: 16303659 Bug: 17250931 Change-Id: Ib87ae558b020f5ce82b4192ec63339c93a72a2e9
* | | Merge "Fix SoundPool lockup" into lmp-devMarco Nelissen2014-08-261-6/+8
|\ \ \
| * | | 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
* | | Merge "do string compare with mime immediately after we get the value" into ↵Chong Zhang2014-08-261-2/+6
|\ \ \ | |/ / |/| | | | | lmp-dev
| * | do string compare with mime immediately after we get the valueChong Zhang2014-08-261-2/+6
| | | | | | | | | | | | | | | Bug: 17210803 Change-Id: I4d20dd4b95d18251c18a371bd8f89b1320b38879
* | | Merge "Revert "disable AwesomePlayer for Ogg vorbis"" into lmp-devRachad Alao2014-08-252-14/+12
|\ \ \ | | |/ | |/|
| * | Revert "disable AwesomePlayer for Ogg vorbis"Rachad Alao2014-08-252-14/+12
| | | | | | | | | | | | | | | | | | | | | Temporarily revert commit 9b48f5d780757ffb81709df3633d06b62edaf39f as a workaround for b/17173673 Bug: 17173673 Change-Id: Iec52289e77485a58ce28cc515d6a5b8e7b2d328a
* | | NuPlayer: remember and resubmit CSDs after flushLajos Molnar2014-08-234-21/+117
| | | | | | | | | | | | | | | Bug: 17118001 Change-Id: I09bbefd4c05de0db1c593e8d6d38859358a20ebb
* | | Merge "wait for flush to finish before returning setSurface" into lmp-devChong Zhang2014-08-233-0/+29
|\ \ \