summaryrefslogtreecommitdiffstats
path: root/media/libmediaplayerservice/nuplayer
Commit message (Expand)AuthorAgeFilesLines
...
| | * | NuPlayerRenderer: return current real time as render time for video frame whe...Wei Jia2015-01-272-15/+18
| | |/
* | | resolved conflicts for merge of 9391844d to masterMarco Nelissen2015-01-271-2/+1
|\ \ \ | |/ /
| * | resolved conflicts for merge of b955b722 to lmp-mr1-dev-plus-aospMarco Nelissen2015-01-271-2/+1
| |\ \
| | * \ am 47deb15e: Merge "Remove MediaPlayerService::decode()"Marco Nelissen2015-01-271-2/+11
| | |\ \
| | | * | Remove MediaPlayerService::decode()Marco Nelissen2015-01-261-2/+11
| | | * | DO NOT MERGE - NuPlayer: open audio sink in offload mode when resuming from t...Ronghua Wu2014-12-183-5/+36
| | | * | DO NOT MERGE - NuPlayer: invalid anchor time when render is flushed.Ronghua Wu2014-12-182-0/+8
| | |/ /
* | | | am 4beddcf5: am 9e308de9: am 4d4ea7f7: Merge "do not use paused postition if ...Chong Zhang2015-01-161-2/+8
|\ \ \ \ | |/ / /
| * | | am 9e308de9: am 4d4ea7f7: Merge "do not use paused postition if it\'s not ava...Chong Zhang2015-01-161-2/+8
| |\ \ \ | | | |/ | | |/|
| | * | Merge "do not use paused postition if it's not available" into lmp-mr1-devChong Zhang2015-01-161-2/+8
| | |\ \
| | | * | do not use paused postition if it's not availableChong Zhang2015-01-151-2/+8
* | | | | am 7993d6b3: am e0344754: am 468977f0: Merge "mark any copyrighted content as...Chong Zhang2015-01-083-0/+6
|\ \ \ \ \ | |/ / / /
| * | | | am e0344754: am 468977f0: Merge "mark any copyrighted content as protected to...Chong Zhang2015-01-083-0/+6
| |\ \ \ \ | | |/ / /
| | * | | mark any copyrighted content as protected to disable captureChong Zhang2015-01-073-0/+6
* | | | | am 545d5c41: am 69bdf92f: am 0d19abb4: Merge "NuPlayer: Do not recreate Audio...Andy Hung2014-12-292-0/+39
|\ \ \ \ \ | |/ / / /
| * | | | am 69bdf92f: am 0d19abb4: Merge "NuPlayer: Do not recreate AudioTrack if not ...Andy Hung2014-12-292-0/+39
| |\ \ \ \ | | |/ / /
| | * | | Merge "NuPlayer: Do not recreate AudioTrack if not needed" into lmp-mr1-devAndy Hung2014-12-232-0/+39
| | |\ \ \ | | | |/ / | | |/| |
| | | * | NuPlayer: Do not recreate AudioTrack if not neededAndy Hung2014-12-192-0/+39
* | | | | am bae511e3: am 4af263bd: am ad019236: Merge "NuPlayer: reports paused positi...Wei Jia2014-12-193-7/+67
|\ \ \ \ \ | |/ / / /
| * | | | am 4af263bd: am ad019236: Merge "NuPlayer: reports paused position in paused ...Wei Jia2014-12-193-7/+67
| |\ \ \ \ | | |/ / /
| | * | | Merge "NuPlayer: reports paused position in paused state." into lmp-mr1-devWei Jia2014-12-193-7/+67
| | |\ \ \
| | | * | | NuPlayer: reports paused position in paused state.Wei Jia2014-12-193-7/+67
| | | |/ /
* | | | | am 01a7aaf2: am 823ee706: am d4b056da: Merge "NuPlayer: Fix failure to stop a...Andy Hung2014-12-191-4/+7
|\ \ \ \ \ | |/ / / /
| * | | | am 823ee706: am d4b056da: Merge "NuPlayer: Fix failure to stop audio playback...Andy Hung2014-12-191-4/+7
| |\ \ \ \ | | |/ / /
| | * | | NuPlayer: Fix failure to stop audio playbackAndy Hung2014-12-181-4/+7
| | |/ /
* | | | am d1f0f143: am 42818cca: am 9f932418: Merge "Fix for apps that forget to use...Jeff Tinker2014-12-151-0/+8
|\ \ \ \ | |/ / /
| * | | am 42818cca: am 9f932418: Merge "Fix for apps that forget to use widevine:// ...Jeff Tinker2014-12-151-0/+8
| |\ \ \ | | |/ /
| | * | 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
* | | | | am dc039672: am a0b3a0a4: am 6e430fbd: Merge "NuPlayer: send NOT_SEEKABLE med...Wei Jia2014-12-151-0/+4
|\ \ \ \ \ | |/ / / /
| * | | | am a0b3a0a4: am 6e430fbd: Merge "NuPlayer: send NOT_SEEKABLE media info to cl...Wei Jia2014-12-151-0/+4
| |\ \ \ \ | | |/ / /
| | * | | Merge "NuPlayer: send NOT_SEEKABLE media info to client when the source is no...Wei Jia2014-12-151-0/+4
| | |\ \ \ | | | |/ / | | |/| |
| | | * | NuPlayer: send NOT_SEEKABLE media info to client when the source is not seeka...Wei Jia2014-12-121-0/+4
* | | | | am b6ac4d49: am 2253b3c5: am f484952e: mediaplayer: allow setVideoSurface bef...Lajos Molnar2014-12-111-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | am 2253b3c5: am f484952e: mediaplayer: allow setVideoSurface before setDataSo...Lajos Molnar2014-12-111-1/+1
| |\ \ \ \ | | |/ / /
| | * | | mediaplayer: allow setVideoSurface before setDataSourceLajos Molnar2014-12-101-1/+1
| | |/ /
* | | | am 1ed99f0c: am 2b02f140: am 80c57d57: Merge "NuPlayerRenderer: Update mAncho...Wei Jia2014-12-094-1/+16
|\ \ \ \ | |/ / /
| * | | am 2b02f140: am 80c57d57: Merge "NuPlayerRenderer: Update mAnchorMaxMediaUs w...Wei Jia2014-12-084-1/+16
| |\ \ \ | | |/ /
| | * | Merge "NuPlayerRenderer: Update mAnchorMaxMediaUs when anchor time is changed...Wei Jia2014-12-064-1/+16
| | |\ \
| | | * | NuPlayerRenderer: Update mAnchorMaxMediaUs when anchor time is changed to fix...Wei Jia2014-12-054-1/+16
* | | | | am e4fe1b62: am 876c21b1: am a147c17a: Merge "fixes for non-secure widevine p...Chong Zhang2014-12-092-13/+32
|\ \ \ \ \ | |/ / / /
| * | | | am 876c21b1: am a147c17a: Merge "fixes for non-secure widevine playback" into...Chong Zhang2014-12-082-13/+32
| |\ \ \ \ | | |/ / /
| | * | | fixes for non-secure widevine playbackChong Zhang2014-12-052-13/+32
| | |/ /
* | | | am 5f480891: am 4c56f8e0: am b65842dd: Merge "Fix NuPlayer assertion on failu...Andy Hung2014-12-0910-82/+88
|\ \ \ \ | |/ / /
| * | | am 4c56f8e0: am b65842dd: Merge "Fix NuPlayer assertion on failure to create ...Andy Hung2014-12-0810-82/+88
| |\ \ \ | | |/ /
| | * | 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
* | | | | am 3202a2dc: am 7cc9a1c5: am 76c156f7: Merge "fix threading in RTSPSource and...Chong Zhang2014-12-094-39/+172
|\ \ \ \ \ | |/ / / /
| * | | | am 7cc9a1c5: am 76c156f7: Merge "fix threading in RTSPSource and StreamingSou...Chong Zhang2014-12-084-39/+172
| |\ \ \ \ | | |/ / /
| | * | | fix threading in RTSPSource and StreamingSourceChong Zhang2014-12-034-39/+172
| | |/ /