summaryrefslogtreecommitdiffstats
path: root/media/libmediaplayerservice
Commit message (Expand)AuthorAgeFilesLines
* 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 af318e28: am 0b87c0d9: am bd08223c: Merge "Fix double close."Marco Nelissen2014-12-221-1/+0
|\ \ \ \ | |/ / /
| * | | 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
| | |/ / / /
* | | | | | Merge "Replace MidiFile player with a Midi extractor"Marco Nelissen2014-12-228-880/+0
|\ \ \ \ \ \
| * | | | | | Replace MidiFile player with a Midi extractorMarco Nelissen2014-12-188-880/+0
* | | | | | | 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
| | |/ / /
* | | | | Merge "Use callbacks for Midi I/O"Marco Nelissen2014-12-163-34/+12
|\ \ \ \ \
| * | | | | Use callbacks for Midi I/OMarco Nelissen2014-12-163-34/+12
* | | | | | 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 a2bc118c: am 2a0f484e: am a04c05ab: Merge "Truncate file before recording ...Marco Nelissen2014-12-101-0/+3
|\ \ \ \ \ | |/ / / /
| * | | | 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
* | | | | | Remove filename based writer constructorsMarco Nelissen2014-12-104-21/+0
* | | | | | am 33cc5c91: am f143b608: am d1aeff55: Merge "Fix build with clang in C++11 m...Lajos Molnar2014-12-091-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | 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 3ca2794e: am 0b672c8b: am ca7b4bc4: mediaplayerservice: add support for le...Lajos Molnar2014-12-091-3/+32
|\ \ \ \ \ \ | |/ / / / /
| * | | | | 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 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
| |\ \ \ \ \ \ | | |/ / / / /