summaryrefslogtreecommitdiffstats
path: root/media/libstagefright
Commit message (Expand)AuthorAgeFilesLines
* 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 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 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 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
* | | | | | | am 8270e1d1: Merge "Fix AAC timestamps for multiple aac frames per input buff...Marco Nelissen2014-09-092-128/+194
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "Fix AAC timestamps for multiple aac frames per input buffer" into lmp-devMarco Nelissen2014-09-092-128/+194
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Fix AAC timestamps for multiple aac frames per input bufferMarco Nelissen2014-09-072-128/+194
* | | | | | | am 62ce2072: Merge "Make IPowerManager native conform to .aidl for oneway" in...Glenn Kasten2014-09-081-2/+2
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "Make IPowerManager native conform to .aidl for oneway" into lmp-devGlenn Kasten2014-09-081-2/+2
| |\ \ \ \ \ \
| | * | | | | | Make IPowerManager native conform to .aidl for onewayGlenn Kasten2014-09-051-2/+2
* | | | | | | | am ea477eff: Merge "DO NOT MERGE - MPEG4Extractor: parse csd correctly; worka...Robert Shih2014-09-061-3/+23
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge "DO NOT MERGE - MPEG4Extractor: parse csd correctly; workaround malform...Robert Shih2014-09-061-3/+23
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | DO NOT MERGE - MPEG4Extractor: parse csd correctly; workaround malformed csdRobert Shih2014-09-061-3/+23
| | |/ / / / /
* | | | | | | am 52c6a355: Merge "stagefright: allow P-frames spacing of 0 and 1" into lmp-devLajos Molnar2014-09-052-2/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "stagefright: allow P-frames spacing of 0 and 1" into lmp-devLajos Molnar2014-09-052-2/+0
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | stagefright: allow P-frames spacing of 0 and 1Lajos Molnar2014-09-042-2/+0
| | | |_|_|/ | | |/| | |
* | | | | | am 6a548e91: Merge "PlaylistFetcher: do not reset mStartTimeUs if we are resu...Robert Shih2014-09-041-2/+2
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "PlaylistFetcher: do not reset mStartTimeUs if we are resuming" into lm...Robert Shih2014-09-041-2/+2
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | PlaylistFetcher: do not reset mStartTimeUs if we are resumingRobert Shih2014-09-031-2/+2
* | | | | | am 13006b9d: am 032ecb7f: Merge "Fix in SoftAVCEncoder plugin"Narayan Kamath2014-09-041-3/+4
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | am 032ecb7f: Merge "Fix in SoftAVCEncoder plugin"Narayan Kamath2014-09-041-3/+4
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | Merge "Fix in SoftAVCEncoder plugin"Narayan Kamath2014-09-041-3/+4
| | |\ \ \ \
| | | * | | | Fix in SoftAVCEncoder pluginAshok Bhat2014-07-091-3/+4
| * | | | | | am 45d2c7e1: Merge "Move chromium_http/support.cpp off androidGetTid."Elliott Hughes2014-08-181-1/+1
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Move chromium_http/support.cpp off androidGetTid.Elliott Hughes2014-08-181-1/+1
* | | | | | | am 90073050: Merge "Fix the bug that same video frame has been decoded twice ...hkuang2014-09-032-32/+38
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | Merge "Fix the bug that same video frame has been decoded twice during port r...hkuang2014-09-032-32/+38
| |\ \ \ \ \ \
| | * | | | | | Fix the bug that same video frame has been decoded twice during port reconfig.hkuang2014-09-032-32/+38
* | | | | | | | am d71233a8: Merge "Use CharacterEncodingDetector in metadataretriever" into ...Marco Nelissen2014-09-032-16/+46
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge "Use CharacterEncodingDetector in metadataretriever" into lmp-devMarco Nelissen2014-09-032-16/+46
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| | * | | | | | Use CharacterEncodingDetector in metadataretrieverMarco Nelissen2014-09-022-16/+46
* | | | | | | | am acdae5d7: Merge "Move stale handler cleanup to constructor" into lmp-devMarco Nelissen2014-09-031-4/+4
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge "Move stale handler cleanup to constructor" into lmp-devMarco Nelissen2014-09-031-4/+4
| |\ \ \ \ \ \ \
| | * | | | | | | Move stale handler cleanup to constructorMarco Nelissen2014-08-281-4/+4