summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am 9916dcb6: am 0d64fcb4: Merge "Clean up some makefiles."Dan Albert2014-09-122-6/+1
|\
| * am 0d64fcb4: Merge "Clean up some makefiles."Dan Albert2014-09-122-6/+1
| |\
| | * Merge "Clean up some makefiles."Dan Albert2014-09-112-6/+1
| | |\
| | | * Clean up some makefiles.Dan Albert2014-09-112-6/+1
* | | | am fe80b7ee: am 6bf7c5cf: Merge "Clean up test makefiles."Dan Albert2014-09-123-50/+3
|\ \ \ \ | |/ / /
| * | | am 6bf7c5cf: Merge "Clean up test makefiles."Dan Albert2014-09-123-50/+3
| |\ \ \ | | |/ /
| | * | Merge "Clean up test makefiles."Dan Albert2014-09-113-50/+3
| | |\ \ | | | |/ | | |/|
| | | * Clean up test makefiles.Dan Albert2014-09-113-50/+3
* | | | am 2f875dc8: Merge "AudioPolicyManager: Use "safe" speaker for notifications ...Eric Laurent2014-09-111-0/+21
|\ \ \ \
| * \ \ \ Merge "AudioPolicyManager: Use "safe" speaker for notifications if available"...Eric Laurent2014-09-111-0/+21
| |\ \ \ \
| | * | | | AudioPolicyManager: Use "safe" speaker for notifications if availableJon Eklund2014-09-101-0/+21
* | | | | | am 97187317: Merge "stagefright: add adaptive playback support to SoftAVC dec...Ronghua Wu2014-09-115-107/+130
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "stagefright: add adaptive playback support to SoftAVC decoder." into l...Ronghua Wu2014-09-115-107/+130
| |\ \ \ \ \
| | * | | | | stagefright: add adaptive playback support to SoftAVC decoder.Ronghua Wu2014-09-105-107/+130
* | | | | | | am 951c2197: am 2b16391d: Merge "Add test for AMR-NB decoder"Glenn Kasten2014-09-112-0/+170
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | am 2b16391d: Merge "Add test for AMR-NB decoder"Glenn Kasten2014-09-112-0/+170
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | Merge "Add test for AMR-NB decoder"Glenn Kasten2014-09-112-0/+170
| | |\ \ \ \ \
| | | * | | | | Add test for AMR-NB decoderAshok Bhat2014-06-162-0/+170
* | | | | | | | am 7a006aea: am a9151741: Merge "Fix inline assembly for clang"Glenn Kasten2014-09-110-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am a9151741: Merge "Fix inline assembly for clang"Glenn Kasten2014-09-110-0/+0
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge "Fix inline assembly for clang"Glenn Kasten2014-09-110-0/+0
| | |\ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| | | * | | | | Fix inline assembly for clangBernhard Rosenkränzer2013-12-131-2/+2
* | | | | | | | am 4953f92b: am 0568cd5b: am e6b5d4c2: am 6fd1cf0c: am 86543654: am 0d83cf22:...Robert Shih2014-09-110-0/+0
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | am 0568cd5b: am e6b5d4c2: am 6fd1cf0c: am 86543654: am 0d83cf22: am 97d917bc:...Robert Shih2014-09-110-0/+0
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ am e6b5d4c2: am 6fd1cf0c: am 86543654: am 0d83cf22: am 97d917bc: am ab0b3212:...Robert Shih2014-09-111-0/+14
| | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ am 6fd1cf0c: am 86543654: am 0d83cf22: am 97d917bc: am ab0b3212: am 9b51a37f:...Robert Shih2014-09-111-0/+14
| | | |\ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ am 86543654: am 0d83cf22: am 97d917bc: am ab0b3212: am 9b51a37f: am cb5dc219:...Robert Shih2014-09-111-0/+14
| | | | |\ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ am 0d83cf22: am 97d917bc: am ab0b3212: am 9b51a37f: am cb5dc219: am 74abb1ae:...Robert Shih2014-09-101-0/+14
| | | | | |\ \ \ \ \ \ \
| | | | | | * \ \ \ \ \ \ am 97d917bc: am ab0b3212: am 9b51a37f: am cb5dc219: am 74abb1ae: am 482b18bb:...Robert Shih2014-09-101-0/+14
| | | | | | |\ \ \ \ \ \ \
| | | | | | | * \ \ \ \ \ \ am ab0b3212: am 9b51a37f: am cb5dc219: am 74abb1ae: am 482b18bb: am f106b199:...Robert Shih2014-09-101-0/+14
| | | | | | | |\ \ \ \ \ \ \
| | | | | | | | * \ \ \ \ \ \ am 9b51a37f: am cb5dc219: am 74abb1ae: am 482b18bb: am f106b199: SampleTable:...Robert Shih2014-09-101-0/+14
| | | | | | | | |\ \ \ \ \ \ \
| | | | | | | | | * \ \ \ \ \ \ am cb5dc219: am 74abb1ae: am 482b18bb: am f106b199: SampleTable: check intege...Robert Shih2014-09-101-0/+14
| | | | | | | | | |\ \ \ \ \ \ \
| | | | | | | | | | * \ \ \ \ \ \ am 74abb1ae: am 482b18bb: am f106b199: SampleTable: check integer overflow du...Robert Shih2014-09-101-0/+14
| | | | | | | | | | |\ \ \ \ \ \ \
| | | | | | | | | | | * \ \ \ \ \ \ am 482b18bb: am f106b199: SampleTable: check integer overflow during table allocRobert Shih2014-09-101-0/+14
| | | | | | | | | | | |\ \ \ \ \ \ \
| | | | | | | | | | | | * \ \ \ \ \ \ am f106b199: SampleTable: check integer overflow during table allocRobert Shih2014-09-101-0/+14
| | | | | | | | | | | | |\ \ \ \ \ \ \
| | | | | | | | | | | | | * | | | | | | SampleTable: check integer overflow during table allocRobert Shih2014-08-201-0/+14
* | | | | | | | | | | | | | | | | | | | am fd732779: Merge "stagefright: don\'t use AAtomizer in AMessage" into lmp-devLajos Molnar2014-09-112-31/+98
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | Merge "stagefright: don't use AAtomizer in AMessage" into lmp-devLajos Molnar2014-09-112-31/+98
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | stagefright: don't use AAtomizer in AMessageLajos Molnar2014-09-102-31/+98
* | | | | | | | | | | | | | | | | | | | | am b9b87fe9: mediaplayer: release MediaBuffer in stale input buffersLajos Molnar2014-09-111-0/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | mediaplayer: release MediaBuffer in stale input buffersLajos Molnar2014-09-101-0/+11
* | | | | | | | | | | | | | | | | | | | | am e4c8b32f: Merge "NuPlayerDriver: do not set to paused state when receiving...Wei Jia2014-09-101-5/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | Merge "NuPlayerDriver: do not set to paused state when receiving playback com...Wei Jia2014-09-101-5/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | NuPlayerDriver: do not set to paused state when receiving playback complete a...Wei Jia2014-09-101-5/+8
* | | | | | | | | | | | | | | | | | | | | | am 43f2e3cf: Merge "Revert "Fix AAC timestamps for multiple aac frames per in...Marco Nelissen2014-09-102-194/+128
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | Merge "Revert "Fix AAC timestamps for multiple aac frames per input buffer"" ...Marco Nelissen2014-09-102-194/+128
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | Revert "Fix AAC timestamps for multiple aac frames per input buffer"Marco Nelissen2014-09-102-194/+128
* | | | | | | | | | | | | | | | | | | | | | | am 74848665: Merge "fix failure in MediaCodecTest#testException" into lmp-devChong Zhang2014-09-101-1/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | Merge "fix failure in MediaCodecTest#testException" into lmp-devChong Zhang2014-09-101-1/+14
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | fix failure in MediaCodecTest#testExceptionChong Zhang2014-09-101-1/+14