summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | am c76b9f52: Merge "AwesomePlayer: ensure STARTED message works after reset" ...Lajos Molnar2013-10-301-0/+5
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "AwesomePlayer: ensure STARTED message works after reset" into klp-devLajos Molnar2013-10-301-0/+5
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | AwesomePlayer: ensure STARTED message works after resetLajos Molnar2013-10-281-0/+5
| * | | | | am eb76f318: am 96aed4fb: Merge "avcenc: Prepend startcodes to output buffers"Lajos Molnar2013-10-291-0/+6
| |\ \ \ \ \
| * \ \ \ \ \ am 9cae2170: Assign blame for playback wakelocks.Marco Nelissen2013-10-264-14/+33
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | Assign blame for playback wakelocks.Marco Nelissen2013-10-254-14/+33
| * | | | | | am be567be3: Merge "Check for NULL buffer in repeat-latest" into klp-devAndy McFadden2013-10-241-0/+17
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge "Check for NULL buffer in repeat-latest" into klp-devAndy McFadden2013-10-241-0/+17
| | |\ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | | * | | | Check for NULL buffer in repeat-latestAndy McFadden2013-10-231-0/+17
| * | | | | | am f3a6234b: Merge "Fix kAutoRampDurationUs overflow issue" into klp-devVineeta Srivastava2013-10-231-2/+2
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge "Fix kAutoRampDurationUs overflow issue" into klp-devVineeta Srivastava2013-10-231-2/+2
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | Fix kAutoRampDurationUs overflow issueVineeta Srivastava2013-10-181-2/+2
| * | | | | | am e7329bd5: am d5255d1d: Merge "If dlopen("libwvm.so") fails, log the reason...Elliott Hughes2013-10-231-1/+1
| |\ \ \ \ \ \
| * \ \ \ \ \ \ am 9857473f: am 0f4b0d23: Merge "libeffects: do not use GNU old-style field d...Nick Kralevich2013-10-205-35/+35
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ am 95c03858: Merge "Allow releaseBuffer after flush" into klp-devGlenn Kasten2013-10-181-3/+7
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | |
| | * | | | | | | Allow releaseBuffer after flushGlenn Kasten2013-10-181-3/+7
| | | |_|/ / / / | | |/| | | | |
| * | | | | | | am 6fa20187: Make sure we get to discover that the cache is sufficiently full...Andreas Huber2013-10-171-1/+1
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Make sure we get to discover that the cache is sufficiently full againAndreas Huber2013-10-171-1/+1
* | | | | | | | Merge "NuPlayer: Use a software renderer when using software codecs"Marco Nelissen2013-11-284-2/+42
|\ \ \ \ \ \ \ \
| * | | | | | | | NuPlayer: Use a software renderer when using software codecsMartin Storsjo2013-09-254-2/+42
* | | | | | | | | Fix SIGABRT when playing mp4 fileMarco Nelissen2013-11-251-0/+6
* | | | | | | | | Fixed data offset at parsing IPMP DescriptorsIchitaro Kohara2013-11-251-1/+2
* | | | | | | | | Merge commit 'b2059ff384eee8ffb70a7ec8fc5570405201c734' into HEADThe Android Open Source Project2013-11-22178-4065/+13126
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | / / / | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | am f8f15b05: Merge "Fix race condition in AudioTrack::pause followed by start...Glenn Kasten2013-10-161-7/+8
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | * | | | | | Merge "Fix race condition in AudioTrack::pause followed by start" into klp-devGlenn Kasten2013-10-171-7/+8
| | |\ \ \ \ \ \
| | | * | | | | | Fix race condition in AudioTrack::pause followed by startGlenn Kasten2013-10-161-7/+8
| * | | | | | | | am 120a8847: Merge "AudioTrack: fix head position after restore" into klp-devEric Laurent2013-10-162-1/+24
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Merge "AudioTrack: fix head position after restore" into klp-devEric Laurent2013-10-162-1/+24
| | |\ \ \ \ \ \ \
| | | * | | | | | | AudioTrack: fix head position after restoreEric Laurent2013-10-162-1/+24
| | | |/ / / / / /
| * | | | | | | | am d5766875: AwesomePlayer: fix concurrent pause and teardownEric Laurent2013-10-161-0/+6
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | AwesomePlayer: fix concurrent pause and teardownEric Laurent2013-10-151-0/+6
| | |/ / / / / /
| * | | | | | | am b3cb72a1: SoundPool: handle new audio track eventEric Laurent2013-10-131-2/+7
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | SoundPool: handle new audio track eventEric Laurent2013-10-121-2/+7
| * | | | | | | am aab5b08c: AwesomePlayer: do not send events when paused.Eric Laurent2013-10-082-1/+13
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | AwesomePlayer: do not send events when paused.Eric Laurent2013-10-082-1/+13
| * | | | | | | am fee4ce33: Merge "Cleanup openRecord error handling" into klp-devGlenn Kasten2013-10-072-2/+19
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge "Cleanup openRecord error handling" into klp-devGlenn Kasten2013-10-072-2/+19
| | |\ \ \ \ \ \
| | | * | | | | | Cleanup openRecord error handlingGlenn Kasten2013-09-242-2/+19
| * | | | | | | | am da0926af: Merge "TimedEventQueue takes a wake lock" into klp-devEric Laurent2013-10-043-3/+99
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Merge "TimedEventQueue takes a wake lock" into klp-devEric Laurent2013-10-043-3/+99
| | |\ \ \ \ \ \ \
| | | * | | | | | | TimedEventQueue takes a wake lockEric Laurent2013-10-043-3/+99
| * | | | | | | | | am 385e7509: fix offload audio effect proxy implementation uuidEric Laurent2013-10-041-1/+2
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | fix offload audio effect proxy implementation uuidEric Laurent2013-10-041-1/+2
| * | | | | | | | | am 7bab0248: Merge "MediaCodec: avoid codec EOS if flushing during port recon...Lajos Molnar2013-10-041-4/+3
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | Merge "MediaCodec: avoid codec EOS if flushing during port reconfiguration" i...Lajos Molnar2013-10-041-4/+3
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| | | * | | | | | | MediaCodec: avoid codec EOS if flushing during port reconfigurationLajos Molnar2013-10-021-4/+3
| * | | | | | | | | am 580ed263: Merge "stagefright: enable adaptive playback based on codec form...Lajos Molnar2013-10-032-5/+49
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | stagefright: enable adaptive playback based on codec format keyLajos Molnar2013-10-032-5/+49
| * | | | | | | | | am 56ce7260: IOMX: Add prepareForAdaptivePlayback methodLajos Molnar2013-10-036-0/+94
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | IOMX: Add prepareForAdaptivePlayback methodLajos Molnar2013-10-036-0/+94