summaryrefslogtreecommitdiffstats
path: root/media/libmediaplayerservice
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | MidiFile: report correct state during transient period when start() is called...Wei Jia2015-01-141-1/+1
* | | am cec272df: am 724b9ea5: Merge "Replace MidiFile player with a Midi extractor"Marco Nelissen2015-01-138-880/+0
|\ \ \
| * \ \ am 724b9ea5: Merge "Replace MidiFile player with a Midi extractor"Marco Nelissen2015-01-138-880/+0
| |\ \ \
| | * | | Replace MidiFile player with a Midi extractorMarco Nelissen2015-01-088-880/+0
* | | | | resolved conflicts for merge of 2702d5a0 to lmp-mr1-dev-plus-aospMarco Nelissen2015-01-083-34/+12
|\ \ \ \ \ | |/ / / /
| * | | | am c52af00b: Merge "Use callbacks for Midi I/O"Marco Nelissen2015-01-083-34/+14
| |\ \ \ \ | | |/ / /
| | * | | Use callbacks for Midi I/OMarco Nelissen2015-01-083-34/+14
* | | | | 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 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 0b87c0d9: am bd08223c: Merge "Fix double close."Marco Nelissen2014-12-221-1/+0
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | am bd08223c: Merge "Fix double close."Marco Nelissen2014-12-221-1/+0
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Merge "Fix double close."Marco Nelissen2014-12-221-1/+0
| | |\ \ \
| | | * | | Fix double close.Bao Haojun2014-05-171-1/+0
| | * | | | 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 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 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 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 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 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 2a0f484e: am a04c05ab: Merge "Truncate file before recording into it."Marco Nelissen2014-12-101-0/+3
|\ \ \ \ | | |/ / | |/| |
| * | | Merge "Truncate file before recording into it."Marco Nelissen2014-12-101-0/+3
| |\ \ \
| | * | | Truncate file before recording into it.Marco Nelissen2014-12-101-0/+3
* | | | | am f143b608: am d1aeff55: Merge "Fix build with clang in C++11 mode"Lajos Molnar2014-12-091-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | Fix build with clang in C++11 modeBernhard Rosenkränzer2014-11-271-1/+1
* | | | | am 0b672c8b: am ca7b4bc4: mediaplayerservice: add support for legacy DRMLajos Molnar2014-12-081-3/+32
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | mediaplayerservice: add support for legacy DRMLajos Molnar2014-12-051-3/+32
* | | | | 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 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 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 7cc9a1c5: am 76c156f7: Merge "fix threading in RTSPSource and StreamingSou...Chong Zhang2014-12-084-39/+172
|\ \ \ \ \ \ | |/ / / / /
generated by cgit v1.1 at 2024-09-22 11:17:22 +0000