summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* am d7f77cd7: Merge "MediaCodec: Fix deallocated pointer reference when callin...Andy Hung2014-09-221-3/+3
|\
| * Merge "MediaCodec: Fix deallocated pointer reference when calling reset()" in...Andy Hung2014-09-221-3/+3
| |\
| | * MediaCodec: Fix deallocated pointer reference when calling reset()Andy Hung2014-09-221-3/+3
* | | am 0079b331: Merge "MediaBuffer: ABuffer will release MediaBuffer when it\'s ...Wei Jia2014-09-228-96/+48
|\ \ \ | |/ /
| * | Merge "MediaBuffer: ABuffer will release MediaBuffer when it's destructed." i...Wei Jia2014-09-228-96/+48
| |\ \
| | * | MediaBuffer: ABuffer will release MediaBuffer when it's destructed.Wei Jia2014-09-198-96/+48
* | | | am 39e07162: Merge "NuPlayer HLS: better subtitle toggling" into lmp-devRobert Shih2014-09-224-3/+43
|\ \ \ \ | |/ / /
| * | | Merge "NuPlayer HLS: better subtitle toggling" into lmp-devRobert Shih2014-09-224-3/+43
| |\ \ \
| | * | | NuPlayer HLS: better subtitle togglingRobert Shih2014-09-194-3/+43
* | | | | am 8d6ae6d9: Merge "mediaplayer: smooth out videoplayback based on framerate"...Lajos Molnar2014-09-205-3/+446
|\ \ \ \ \ | |/ / / /
| * | | | mediaplayer: smooth out videoplayback based on framerateLajos Molnar2014-09-195-3/+446
* | | | | am 3bde6b1c: Merge "Make prepare properly report failure again" into lmp-devMarco Nelissen2014-09-201-1/+6
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Make prepare properly report failure again" into lmp-devMarco Nelissen2014-09-201-1/+6
| |\ \ \ \
| | * | | | Make prepare properly report failure againMarco Nelissen2014-09-191-1/+6
* | | | | | am dc43dfa1: mediaplayer: schedule video frames in VSYNC valleysLajos Molnar2014-09-207-14/+224
|\ \ \ \ \ \ | |/ / / / /
| * | | | | mediaplayer: schedule video frames in VSYNC valleysLajos Molnar2014-09-197-14/+224
| |/ / / /
* | | | | am 4409ba46: Merge "Fix ringbuffer handling" into lmp-devMarco Nelissen2014-09-192-24/+19
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Fix ringbuffer handling" into lmp-devMarco Nelissen2014-09-192-24/+19
| |\ \ \ \
| | * | | | Fix ringbuffer handlingMarco Nelissen2014-09-192-24/+19
| | |/ / /
* | | | | am dfc34dab: Reduce log spam from getTimestamp errorsGlenn Kasten2014-09-191-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | Reduce log spam from getTimestamp errorsGlenn Kasten2014-09-191-1/+1
| |/ / /
* | | | am b0ed4e3e: Merge "Always consider first buffer to be config" into lmp-devMarco Nelissen2014-09-191-0/+8
|\ \ \ \ | |/ / /
| * | | Merge "Always consider first buffer to be config" into lmp-devMarco Nelissen2014-09-191-0/+8
| |\ \ \
| | * | | Always consider first buffer to be configMarco Nelissen2014-09-181-0/+8
* | | | | am c0651e85: Merge "mediaplayer: fix buffer aggregation when video has offloa...Phil Burk2014-09-191-5/+5
|\ \ \ \ \ | |/ / / /
| * | | | Merge "mediaplayer: fix buffer aggregation when video has offloaded audio" in...Phil Burk2014-09-181-5/+5
| |\ \ \ \
| | * | | | mediaplayer: fix buffer aggregation when video has offloaded audioPhil Burk2014-09-171-5/+5
* | | | | | am 6aadfce1: Merge "AudioEffect acquires session" into lmp-devJean-Michel Trivi2014-09-181-3/+10
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "AudioEffect acquires session" into lmp-devJean-Michel Trivi2014-09-181-3/+10
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | AudioEffect acquires sessionJean-Michel Trivi2014-09-181-3/+10
* | | | | | am 2973994a: Merge "PlaylistFetcher:don\'t signal a/v eos on subttitle eos" i...Robert Shih2014-09-181-0/+17
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "PlaylistFetcher:don't signal a/v eos on subttitle eos" into lmp-devRobert Shih2014-09-181-0/+17
| |\ \ \ \ \
| | * | | | | PlaylistFetcher:don't signal a/v eos on subttitle eosRobert Shih2014-09-171-0/+17
* | | | | | | am 21a1d72b: Merge "NuPlayer: update timestamp handling" into lmp-devAndy Hung2014-09-183-33/+117
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "NuPlayer: update timestamp handling" into lmp-devAndy Hung2014-09-173-33/+117
| |\ \ \ \ \ \
| | * | | | | | NuPlayer: update timestamp handlingAndy Hung2014-09-173-33/+117
* | | | | | | | am 83266677: Merge "NuPlayer: use getTimestamp instead of getPosition" into l...Lajos Molnar2014-09-174-23/+58
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge "NuPlayer: use getTimestamp instead of getPosition" into lmp-devLajos Molnar2014-09-174-23/+58
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | NuPlayer: use getTimestamp instead of getPositionLajos Molnar2014-09-174-23/+58
* | | | | | | | am a87be62b: Merge "Fix AudioTrack offloaded timestamp handling." into lmp-devLajos Molnar2014-09-171-5/+93
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge "Fix AudioTrack offloaded timestamp handling." into lmp-devLajos Molnar2014-09-171-5/+93
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| | * | | | | | Fix AudioTrack offloaded timestamp handling.Andy Hung2014-09-171-5/+93
| | | |/ / / / | | |/| | | |
* | | | | | | am 866e028b: Merge "Add support for ANDROID_LOOP to NuPlayer" into lmp-devMarco Nelissen2014-09-177-4/+30
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "Add support for ANDROID_LOOP to NuPlayer" into lmp-devMarco Nelissen2014-09-177-4/+30
| |\ \ \ \ \ \
| | * | | | | | Add support for ANDROID_LOOP to NuPlayerMarco Nelissen2014-09-177-4/+30
| | | |_|_|_|/ | | |/| | | |
* | | | | | | am 999b888f: Merge "Fix null pointer dereference" into lmp-devMarco Nelissen2014-09-171-2/+4
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "Fix null pointer dereference" into lmp-devMarco Nelissen2014-09-171-2/+4
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | * | | | | Fix null pointer dereferenceMarco Nelissen2014-09-171-2/+4
| | |/ / / /
* | | | | | am 3a6a0f9d: Merge "mediaplayer: reset flags when pre-reading multiple buffer...Lajos Molnar2014-09-171-0/+2
|\ \ \ \ \ \ | |/ / / / /
| * | | | | mediaplayer: reset flags when pre-reading multiple buffersMarco Nelissen2014-09-161-0/+2
| | |/ / / | |/| | |