summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
* | Merge "Fix SIGABRT when playing mp4 file"Marco Nelissen2013-11-261-0/+6
|\ \
| * | Fix SIGABRT when playing mp4 fileMarco Nelissen2013-11-251-0/+6
|/ /
* | Merge "Fixed data offset at parsing IPMP Descriptors"Marco Nelissen2013-11-251-1/+2
|\ \
| * | Fixed data offset at parsing IPMP DescriptorsIchitaro Kohara2013-11-251-1/+2
|/ /
* | Merge commit 'b2059ff384eee8ffb70a7ec8fc5570405201c734' into HEADThe Android Open Source Project2013-11-22355-6227/+22264
|\ \
| * \ am f8f15b05: Merge "Fix race condition in AudioTrack::pause followed by start...Glenn Kasten2013-10-162-7/+9
| |\ \
| | * \ Merge "Fix race condition in AudioTrack::pause followed by start" into klp-devGlenn Kasten2013-10-172-7/+9
| | |\ \
| | | * | Fix race condition in AudioTrack::pause followed by startGlenn Kasten2013-10-162-7/+9
| * | | | am 787c0d04: merge in klp-release (no-op)Ed Heyl2013-10-160-0/+0
| |\ \ \ \ | | |/ / /
| | * | | merge in klp-release (no-op)Ed Heyl2013-10-160-0/+0
| | |\ \ \
| | | * \ \ merge in klp-release history after reset to klp-devThe Android Automerger2013-10-150-0/+0
| | | |\ \ \ | | | | |/ / | | | |/| |
| | | | * | merge in klp-release history after reset to klp-devThe Android Automerger2013-10-130-0/+0
| | | | |\ \
| | | | | * \ merge in klp-release history after reset to klp-devThe Android Automerger2013-10-130-0/+0
| | | | | |\ \
| | | | | | * | Camera: Skip AE precapture when possibleZhijun He2013-10-111-0/+12
| | | | | | * | merge in klp-release history after reset to klp-devThe Android Automerger2013-10-100-0/+0
| | | | | | |\ \
| | | | | | | * \ merge in klp-release history after reset to klp-devThe Android Automerger2013-10-090-0/+0
| | | | | | | |\ \
| | | | | | | | * | Cleanup openRecord error handlingGlenn Kasten2013-10-075-3/+29
| | | | | | | | * | merge in klp-release history after reset to klp-devThe Android Automerger2013-10-060-0/+0
| | | | | | | | |\ \
| | | | | | | | | * | TimedEventQueue takes a wake lockEric Laurent2013-10-043-3/+99
| | | | | | | | | * | fix offload audio effect proxy implementation uuidEric Laurent2013-10-041-1/+2
| | | | | | | | | * | merge in klp-release history after reset to klp-devThe Android Automerger2013-10-020-0/+0
| | | | | | | | | |\ \
| | | | | | | | | | * | MediaCodecInfo: report supported color formats for non-native-window modeLajos Molnar2013-10-011-6/+6
| | | | | | | | | | * | merge in klp-release history after reset to klp-devThe Android Automerger2013-10-010-0/+0
| | | | | | | | | | |\ \
| | | | | | | | | | | * \ merge in klp-release history after reset to klp-devThe Android Automerger2013-09-290-0/+0
| | | | | | | | | | | |\ \
| | | | | | | | | | | | * | Camera2 API: Hack: Always use async mode with GLConsumerEino-Ville Talvala2013-09-261-1/+18
| | | | | | | | | | | | * | merge in klp-release history after reset to klp-devThe Android Automerger2013-09-260-0/+0
| | | | | | | | | | | | |\ \
| | | | | | | | | | | | | * \ merge in klp-release history after reset to klp-devThe Android Automerger2013-09-250-0/+0
| | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | * \ merge in klp-release history after reset to klp-devThe Android Automerger2013-09-240-0/+0
| | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | * | AudioTrack: fix music resumeEric Laurent2013-09-232-4/+6
| | | | | | | | | | | | | | | * | merge in klp-release history after reset to klp-devThe Android Automerger2013-09-220-0/+0
| | | | | | | | | | | | | | | |\ \
| * | | | | | | | | | | | | | | \ \ am 3defdab8: Merge "Camera: don\'t do hw support check for ZSL" into klp-devZhijun He2013-10-161-13/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | Merge "Camera: don't do hw support check for ZSL" into klp-devZhijun He2013-10-161-13/+5
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | Camera: don't do hw support check for ZSLZhijun He2013-10-161-13/+5
| | | |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | am 120a8847: Merge "AudioTrack: fix head position after restore" into klp-devEric Laurent2013-10-163-1/+26
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | Merge "AudioTrack: fix head position after restore" into klp-devEric Laurent2013-10-163-1/+26
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | AudioTrack: fix head position after restoreEric Laurent2013-10-163-1/+26
| | | |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | 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 014e7fa2: Make Audio wakelock names less unique.Narayan Kamath2013-10-142-2/+23
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | Make Audio wakelock names less unique.Narayan Kamath2013-10-142-2/+23
| | |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | 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 15ad2470: Camera: Fix deadlock in Camera3OutputStreamZhijun He2013-10-111-1/+16
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / /
| | * | | | | | | | | | | | | Camera: Fix deadlock in Camera3OutputStreamZhijun He2013-10-111-1/+16
| * | | | | | | | | | | | | | am d5ed2263: Merge "Camera: Skip AE precapture when possible" into klp-devZhijun He2013-10-111-0/+12
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / /
| | * | | | | | | | | | | | | Merge "Camera: Skip AE precapture when possible" into klp-devZhijun He2013-10-111-0/+12
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | Camera: Skip AE precapture when possibleZhijun He2013-10-111-0/+12
| | | |/ / / / / / / / / / / /
| * | | | | | | | | | | | | | am 1dd08b30: Merge "Camera2/3: Add more tracing for API1" into klp-devEino-Ville Talvala2013-10-117-2/+56
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / /