summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* am fed1594d: am 9916dcb6: am 0d64fcb4: Merge "Clean up some makefiles."Dan Albert2014-09-122-6/+1
|\
| * 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 bd014b81: am fe80b7ee: am 6bf7c5cf: Merge "Clean up test makefiles."Dan Albert2014-09-121-14/+2
|\ \ \ \ \ | |/ / / /
| * | | | am fe80b7ee: am 6bf7c5cf: Merge "Clean up test makefiles."Dan Albert2014-09-121-14/+2
| |\ \ \ \ | | |/ / /
| | * | | am 6bf7c5cf: Merge "Clean up test makefiles."Dan Albert2014-09-121-14/+2
| | |\ \ \ | | | |/ /
| | | * | Merge "Clean up test makefiles."Dan Albert2014-09-111-14/+2
| | | |\ \ | | | | |/ | | | |/|
| | | | * Clean up test makefiles.Dan Albert2014-09-111-14/+2
* | | | | am 236688e8: am 97187317: Merge "stagefright: add adaptive playback support t...Ronghua Wu2014-09-125-107/+130
|\ \ \ \ \ | |/ / / /
| * | | | 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 75a39a7e: am 951c2197: am 2b16391d: Merge "Add test for AMR-NB decoder"Glenn Kasten2014-09-122-0/+170
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | 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
* | | | | | | Merge "stagefright: finish implementing MediaFilter flush"David Smith2014-09-111-3/+20
|\ \ \ \ \ \ \
| * | | | | | | stagefright: finish implementing MediaFilter flushDavid Smith2014-09-091-3/+20
* | | | | | | | am 87088150: am fd732779: Merge "stagefright: don\'t use AAtomizer in AMessag...Lajos Molnar2014-09-111-30/+93
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | am fd732779: Merge "stagefright: don\'t use AAtomizer in AMessage" into lmp-devLajos Molnar2014-09-111-30/+93
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | |
| | * | | | | | Merge "stagefright: don't use AAtomizer in AMessage" into lmp-devLajos Molnar2014-09-111-30/+93
| | |\ \ \ \ \ \
| | | * | | | | | stagefright: don't use AAtomizer in AMessageLajos Molnar2014-09-101-30/+93
* | | | | | | | | am ebea445f: am b9b87fe9: mediaplayer: release MediaBuffer in stale input buf...Lajos Molnar2014-09-111-0/+11
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | 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
* | | | | | | | | resolved conflicts for merge of 42db212e to masterWei Jia2014-09-111-6/+7
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | 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 3eef436c: am 43f2e3cf: Merge "Revert "Fix AAC timestamps for multiple aac ...Marco Nelissen2014-09-112-194/+128
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | 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 f2745669: am 74848665: Merge "fix failure in MediaCodecTest#testException"...Chong Zhang2014-09-111-1/+14
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | 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
* | | | | | | | | | | am 55e9e267: am b606de81: Merge "mediaplayer: limit number of outstanding buf...Lajos Molnar2014-09-111-6/+7
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | am b606de81: Merge "mediaplayer: limit number of outstanding buffer requests"...Lajos Molnar2014-09-101-6/+7
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | Merge "mediaplayer: limit number of outstanding buffer requests" into lmp-devLajos Molnar2014-09-101-6/+7
| | |\ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / | | |/| | | | | | | |
| | | * | | | | | | | mediaplayer: limit number of outstanding buffer requestsLajos Molnar2014-09-091-6/+7
| | | | |/ / / / / / | | | |/| | | | | |
* | | | | | | | | | am ef2e3619: am 83ee5564: Merge "CamcorderProfile: Add QUALITY_HIGH_SPEED_216...Zhijun He2014-09-101-0/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | am 83ee5564: Merge "CamcorderProfile: Add QUALITY_HIGH_SPEED_2160P" into lmp-devZhijun He2014-09-101-0/+1
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | Merge "CamcorderProfile: Add QUALITY_HIGH_SPEED_2160P" into lmp-devZhijun He2014-09-101-0/+1
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| | | * | | | | | | CamcorderProfile: Add QUALITY_HIGH_SPEED_2160PZhijun He2014-09-091-0/+1
* | | | | | | | | | am 59424ee1: am 8716e3f3: Merge "NuPlayer: make previous decoders obsolete wh...Wei Jia2014-09-101-0/+3
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | am 8716e3f3: Merge "NuPlayer: make previous decoders obsolete when reset is d...Wei Jia2014-09-101-0/+3
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /