summaryrefslogtreecommitdiffstats
path: root/media/libmediaplayerservice
Commit message (Collapse)AuthorAgeFilesLines
* NuPlayer: Fix failure to stop audio playbackAndy Hung2014-12-181-4/+7
| | | | | | | | | Don't stop audio sink if gapless - it's not necessary and has a side effect of resetting the AudioTrack frames written without resetting the AudioSink frames written. Bug: 18787619 Change-Id: I71063b9e3aad9a6dfd7d46ea614e107c815e4c57
* Merge "Fix for apps that forget to use widevine:// urls" into lmp-mr1-devJeff Tinker2014-12-151-0/+8
|\
| * Fix for apps that forget to use widevine:// urlsJeff Tinker2014-12-151-0/+8
| | | | | | | | | | bug: 18554455 Change-Id: I8ff08e7270c65c375205169eb068f361f2a4a727
* | Merge "NuPlayer: send NOT_SEEKABLE media info to client when the source is ↵Wei Jia2014-12-151-0/+4
|\ \ | |/ |/| | | not seekable." into lmp-mr1-dev
| * NuPlayer: send NOT_SEEKABLE media info to client when the source is not ↵Wei Jia2014-12-121-0/+4
| | | | | | | | | | | | | | | | | | seekable. LiveSession: return -1 for duration when it's not available. Bug: 18599325 Change-Id: Iecd040f48750806f98d1799e2aaab2f90c6f3887
* | mediaplayer: allow setVideoSurface before setDataSourceLajos Molnar2014-12-101-1/+1
|/ | | | | Bug: 18709604 Change-Id: I41e4734faed48b5583feb29896cd5783b8cd7e33
* mediaplayerservice: add support for legacy DRMLajos Molnar2014-12-051-3/+32
| | | | | | | Legacy DRM uses AwesomePlayer for widevine content. Bug: 18006370 Change-Id: I1de9e33de51b60352a9c79c2dcedec330160abe4
* Merge "NuPlayerRenderer: Update mAnchorMaxMediaUs when anchor time is ↵Wei Jia2014-12-064-1/+16
|\ | | | | | | changed to fix pause-seek-getCurrentPosition." into lmp-mr1-dev
| * NuPlayerRenderer: Update mAnchorMaxMediaUs when anchor time is changed to ↵Wei Jia2014-12-054-1/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | fix pause-seek-getCurrentPosition. NuPlayerDecoder: Notify resume is done when EOS is reached. GenericSource: add code to signal pre-roll for seek so that it will seek to the requested position, not only I-frame. This code is disabled temporarily till we have a full solution to handle both single seek and continous seek gracefully. Bug: 18625723 Change-Id: I99a54d4d549e0d805e3abcc227fbf96c16405af0
* | fixes for non-secure widevine playbackChong Zhang2014-12-052-13/+32
|/ | | | | | | | | | | - separate secure decoding from widevine - use non-blocking mode when reading from widevine source - schedule buffer read when packet source is empty bug: 18536934 Change-Id: I65a8e5e819975ca6900ed8e887a442940f2d5d38
* Merge "Fix NuPlayer assertion on failure to create AudioTrack" into lmp-mr1-devAndy Hung2014-12-0510-82/+88
|\
| * Fix NuPlayer assertion on failure to create AudioTrackAndy Hung2014-12-0310-82/+88
| | | | | | | | | | | | | | | | | | | | Under heavy media load or monkey/stress testing, more than 32 AudioTracks may be created or memory resources may be scarce. Remove the assertion on failure to create AudioTrack and signal MEDIA_ERROR. Bug: 17319843 Change-Id: I5d4e200b5f50d800046851a33e035cdc6ff10075
* | fix threading in RTSPSource and StreamingSourceChong Zhang2014-12-034-39/+172
|/ | | | | | Bug: 18532335 Change-Id: I9c34401a928dc0ddbd0923aa5f127dc628efbb92
* StreamingSource: check mTSParser before dereferencing it.Wei Jia2014-12-021-0/+4
| | | | | Bug: 18532335 Change-Id: I7819d8d359fe75ea4c827138e9aaa2454ccfe3b1
* nuplayer: clear pending audio access unit on flush.Ronghua Wu2014-12-012-6/+14
| | | | | | | Also add flag to avoid reading on flush. Bug: 18540219 Change-Id: I2fc351c32c87db9a8c8c2aad12ee2bd56a0370ab
* notify seek complete upon first video output frameChong Zhang2014-12-018-28/+107
| | | | | Bug: 18541814 Change-Id: Ie4e0976885f26eb253460eab371cb181ea85f2db
* Merge "tunnel NuPlayer source and decoder input" into lmp-mr1-devChong Zhang2014-11-2113-1296/+1505
|\
| * tunnel NuPlayer source and decoder inputChong Zhang2014-11-2013-1296/+1505
| | | | | | | | | | | | Bug: 18342383 Change-Id: Ieff1cd3bad2b39d46f127ddd5d5139b919992461
* | Merge "NuPlayer: invalid anchor time when render is flushed." into lmp-mr1-devRonghua Wu2014-11-202-0/+8
|\ \ | |/ |/|
| * NuPlayer: invalid anchor time when render is flushed.Ronghua Wu2014-11-192-0/+8
| | | | | | | | | | | | | | Also rememeber the pause time in NuPlayerDriver. Bug: 18436336 Change-Id: If09f680a0d0f9137bd55c5f94201eb3aa783278a
* | Merge "close fd if data source is reset without prepare" into lmp-mr1-devChong Zhang2014-11-201-1/+7
|\ \
| * | close fd if data source is reset without prepareChong Zhang2014-11-191-1/+7
| | | | | | | | | | | | | | | bug: 18434887 Change-Id: I70dff721710b7299d1ca1f8520278f82d355141d
* | | Merge "When aggregating buffers, make sure we don't lose data" into lmp-mr1-devMarco Nelissen2014-11-201-0/+6
|\ \ \
| * | | When aggregating buffers, make sure we don't lose dataMarco Nelissen2014-11-191-0/+6
| | |/ | |/| | | | | | | | | | Bug: 18277034 Change-Id: Ia8c35791eea88545a873cad339eb6b5fc25d1d97
* | | mediaplayer: request auto-frc for high quality avsyncLajos Molnar2014-11-191-0/+13
| | | | | | | | | | | | | | | Bug: 17383204 Change-Id: I7209305b4ff3c2386019d7a09d6a0536e9f21522
* | | Merge "NuPlayer: open audio sink in offload mode when resuming from timeout ↵Ronghua Wu2014-11-193-5/+36
|\ \ \ | | | | | | | | | | | | teardown." into lmp-mr1-dev
| * | | NuPlayer: open audio sink in offload mode when resuming from timeout teardown.Ronghua Wu2014-11-183-5/+36
| |/ / | | | | | | | | | | | | | | | | | | Also always recheck if a new stream can do offload. Bug: 18154425 Change-Id: I121877834bd963eeeba91a2b951fd30d5dc36a8b
* | | Merge "Don't autoloop notifications" into lmp-mr1-devMarco Nelissen2014-11-191-0/+10
|\ \ \
| * | | Don't autoloop notificationsMarco Nelissen2014-11-181-0/+10
| |/ / | | | | | | | | | | | | | | | | | | | | | Some apps think it's cool to use ringtones as notification sounds, but ringtones often loop, which is not appropriate for notifications. Bug: 15929273 Change-Id: I77c4277801cb2561743f8c676ef76ab4d1668b08
* | | NuPlayer: pass media time to selectTrack for responsivenessRobert Shih2014-11-198-13/+39
|/ / | | | | | | Bug: 18020001 Change-Id: Id50f8473992f39d8c0aa86a1fabb2601093d2572
* | Merge "Fix missing mutex lock in Drm::binderDied" into lmp-mr1-devJeff Tinker2014-11-181-1/+5
|\ \
| * | Fix missing mutex lock in Drm::binderDiedJeff Tinker2014-11-161-1/+5
| | | | | | | | | | | | | | | bug: 18194977 Change-Id: Ie6107a34237577c3b9cc6507d507f5c51f49fcf6
* | | Merge "Fix race condition in signaling completion for decode." into lmp-mr1-devAndy Hung2014-11-171-0/+1
|\ \ \
| * | | Fix race condition in signaling completion for decode.Andy Hung2014-11-171-0/+1
| | | | | | | | | | | | | | | | | | | | Bug: 18048775 Change-Id: I2207eb2cf30cf205d9bf414edbb1d3e709185f67
* | | | Merge "NuPlayer HTTPLiveSource: impl getSelectedTrack" into lmp-mr1-devRobert Shih2014-11-172-0/+9
|\ \ \ \ | |_|_|/ |/| | |
| * | | NuPlayer HTTPLiveSource: impl getSelectedTrackRobert Shih2014-11-062-0/+9
| | | | | | | | | | | | | | | | | | | | Bug: 17514665 Change-Id: I81c62553f2c5acb4d2436a9d8f04c10fdbe315d0
* | | | NuPlayer: tunnel decoder with renderer for data buffer passing.Wei Jia2014-11-146-123/+204
| |/ / |/| | | | | | | | | | | | | | Bug: 18342383 Change-Id: I182928007814c146c01a86196c4fda1d46e74ea4
* | | Merge "Revert "mediaplayer: make frame-accurate avsync configurable"" into ↵Lajos Molnar2014-11-131-20/+0
|\ \ \ | | | | | | | | | | | | lmp-mr1-dev
| * | | Revert "mediaplayer: make frame-accurate avsync configurable"Lajos Molnar2014-11-071-20/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reenable PTS scheduling for all playback. This reverts commit 274084f7bfd3f6bdf5a55cf16ceefed345aa0060. Bug: 18111837 Change-Id: Ia734ad304c1f85d2ac302261866be82b8f2a30d4
* | | | Fix looping sound playbackMarco Nelissen2014-11-111-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The renderer stops the audio sink at the end in order to play out the last little bit of audio. When the sound is looping, the sink needs to be restarted. Bug: 18326137 Change-Id: I3bc3629597fc43cce33bdf5691d29cc4c2285926
* | | | Merge "Fix short sound playback" into lmp-mr1-devMarco Nelissen2014-11-101-0/+4
|\ \ \ \
| * | | | Fix short sound playbackMarco Nelissen2014-11-051-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AudioTrack needs to be stopped, not paused, at the end of the file, since otherwise the last bit of queued up audio will not be played. Bug: 18188921 Change-Id: I038aad74a105e163963929c7002b55f377de1442
* | | | | Merge "GenericSource: add mVideoLastDequeueTimeUs/mAudioLastDequeueTimeUs" ↵Robert Shih2014-11-102-11/+18
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | into lmp-mr1-dev
| * | | | GenericSource: add mVideoLastDequeueTimeUs/mAudioLastDequeueTimeUsRobert Shih2014-11-102-11/+18
| | | | | | | | | | | | | | | | | | | | Bug: 18296874 Change-Id: I9608523b4cc37e6cf8b91fb1407035aac087796b
* | | | | Merge "HTTPLiveSource: NULL check in getFormat" into lmp-mr1-devRobert Shih2014-11-101-0/+4
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | HTTPLiveSource: NULL check in getFormatRobert Shih2014-11-081-0/+4
| |/ / / | | | | | | | | | | | | Bug: 18297916 Change-Id: I14c5de8d28202ee1b68e369d33e01bd26dbe968d
* | | | Merge "AnotherPacketSource.cpp: Do not queue discontinity signal buffer ↵Wei Jia2014-11-065-53/+49
|\ \ \ \ | |_|_|/ |/| | | | | | | resulted from seek." into lmp-mr1-dev
| * | | AnotherPacketSource.cpp: Do not queue discontinity signal buffer resulted ↵Wei Jia2014-11-065-53/+49
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | from seek. This will remove the unnecessary flush for seek. Bug: 17511837 Change-Id: I4b7acfc71a410372f5c630afb94b6a95d09d8974
* | | Merge "Pass resolution to Crypto plugin on format change" into lmp-mr1-devJeff Tinker2014-11-062-0/+10
|\ \ \
| * | | Pass resolution to Crypto plugin on format changeJeff Tinker2014-11-032-0/+10
| | | | | | | | | | | | | | | | | | | | Change-Id: I56cd557ce3525fe625db8c312d2557d3c8b51101 related-to-bug: 16034599