summaryrefslogtreecommitdiffstats
path: root/media/libstagefright
Commit message (Expand)AuthorAgeFilesLines
* Merge "Fail more gracefully on allocation failure"Marco Nelissen2014-06-171-7/+26
|\
| * Fail more gracefully on allocation failureMarco Nelissen2014-06-171-7/+26
* | Merge "Fix logging"Marco Nelissen2014-06-161-4/+4
|\ \ | |/
| * Fix loggingMarco Nelissen2014-06-131-4/+4
* | Merge "support for CEA-608 closed caption"Chong Zhang2014-06-142-0/+7
|\ \
| * | support for CEA-608 closed captionChong Zhang2014-06-132-0/+7
* | | Merge "refactor getTrackInfo()"Chong Zhang2014-06-125-35/+57
|\ \ \ | |/ / | | / | |/ |/|
| * refactor getTrackInfo()Chong Zhang2014-06-135-35/+57
* | am 2a8270e6: am c323737d: Merge "Offer a type-safe album art interface."Elliott Hughes2014-06-122-17/+5
|\ \
| * \ am c323737d: Merge "Offer a type-safe album art interface."Elliott Hughes2014-06-122-17/+5
| |\ \
| | * \ Merge "Offer a type-safe album art interface."Elliott Hughes2014-06-112-17/+5
| | |\ \
| | | * | Offer a type-safe album art interface.Elliott Hughes2014-06-112-17/+5
* | | | | am ca44dc79: am 8d6d8f54: Merge "Add libcrypto for users of libstagefright."Christopher Ferris2014-06-111-3/+0
|\ \ \ \ \ | |/ / / /
| * | | | am 8d6d8f54: Merge "Add libcrypto for users of libstagefright."Christopher Ferris2014-06-101-3/+0
| |\ \ \ \ | | |/ / /
| | * | | Add libcrypto for users of libstagefright.Christopher Ferris2014-06-101-3/+0
| | |/ /
* | | | resolved conflicts for merge of 281b884c to masterChristopher Ferris2014-06-111-0/+7
|\ \ \ \ | |/ / / | | | / | |_|/ |/| |
| * | am d3af4265: Merge "Link libcrypto for MD5_* functions."Christopher Ferris2014-06-101-0/+7
| |\ \ | | |/
| | * Link libcrypto for MD5_* functions.Christopher Ferris2014-06-091-0/+7
| * | am 17a6dd60: DO NOT MERGE: MediaCodecList: remove force-added codecs for vide...Lajos Molnar2014-06-051-9/+0
| |\ \
| | * | DO NOT MERGE: MediaCodecList: remove force-added codecs for videoeditorLajos Molnar2014-05-291-9/+0
* | | | Merge "Remove unneeded code"Marco Nelissen2014-06-101-6/+0
|\ \ \ \
| * | | | Remove unneeded codeMarco Nelissen2014-06-101-6/+0
* | | | | add back HEVC SoftOMX decoderLajos Molnar2014-06-063-0/+853
* | | | | Remove SoftOMX HEVC decoderLajos Molnar2014-06-063-849/+0
* | | | | am 8a454611: Merge "stagefright: added support, and SoftOMX decoder, for HEVC...Lajos Molnar2014-06-069-8/+1023
|\ \ \ \ \
| * \ \ \ \ Merge "stagefright: added support, and SoftOMX decoder, for HEVC" into lmp-pr...Lajos Molnar2014-06-069-8/+1023
| |\ \ \ \ \
| | * | | | | stagefright: added support, and SoftOMX decoder, for HEVCHarish Mahendrakar2014-06-069-8/+1023
* | | | | | | Merge "Guard against malformed files"Marco Nelissen2014-06-061-4/+28
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | Guard against malformed filesMarco Nelissen2014-06-061-4/+28
* | | | | | | Merge "do not drop TS packet on discontinuity at payload start"Chong Zhang2014-06-061-1/+3
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | do not drop TS packet on discontinuity at payload startChong Zhang2014-06-061-1/+3
* | | | | | | Merge "Make AAC decoder behavior after flush consistent with non-flush"Marco Nelissen2014-06-061-0/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Make AAC decoder behavior after flush consistent with non-flushMarco Nelissen2014-06-051-0/+1
* | | | | | | am 270facca: We still need the raw codecMarco Nelissen2014-06-051-0/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| / / / / / | |/ / / / /
| * | | | | We still need the raw codecMarco Nelissen2014-06-051-0/+1
* | | | | | am 9042b116: Merge "MediaCodecList: remove force-added codecs for videoeditor...Lajos Molnar2014-06-051-5/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | MediaCodecList: remove force-added codecs for videoeditorLajos Molnar2014-05-291-5/+0
| |/ / / /
| * | | | DO NOT MERGE: libstagefright: Add Opus support to ACodec::getPortFormatVignesh Venkatasubramanian2014-05-291-0/+18
* | | | | am b6af7c63: am 05eaf105: Merge "Mp3decoder: Remove unused arm assembly files"Narayan Kamath2014-06-035-1413/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | am 05eaf105: Merge "Mp3decoder: Remove unused arm assembly files"Narayan Kamath2014-06-035-1413/+0
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Merge "Mp3decoder: Remove unused arm assembly files"Narayan Kamath2014-06-035-1413/+0
| | |\ \ \
| | | * | | Mp3decoder: Remove unused arm assembly filesAshok Bhat2014-05-275-1413/+0
* | | | | | Merge "MPEG4Extractor: guard against missing stbl."Robert Shih2014-06-021-1/+2
|\ \ \ \ \ \
| * | | | | | MPEG4Extractor: guard against missing stbl.Robert Shih2014-05-191-1/+2
* | | | | | | Merge "AAC decoder: compensate limiter delay"Jean-Michel Trivi2014-05-295-218/+973
|\ \ \ \ \ \ \
| * | | | | | | AAC decoder: compensate limiter delayJean-Michel Trivi2014-05-295-218/+973
* | | | | | | | libstagefright: Add Opus support to ACodec::getPortFormatVignesh Venkatasubramanian2014-05-291-0/+18
|/ / / / / / /
* | | | | | | am 79262cfc: am 5b756bfd: am 8b187f4a: Merge "Move frameworks/av off <sys/ato...Elliott Hughes2014-05-231-3/+2
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | / / | |_|_|_|/ / |/| | | | |
| * | | | | am 5b756bfd: am 8b187f4a: Merge "Move frameworks/av off <sys/atomics.h>."Elliott Hughes2014-05-221-3/+2
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | am 8b187f4a: Merge "Move frameworks/av off <sys/atomics.h>."Elliott Hughes2014-05-221-3/+2
| | |\ \ \ \ | | | | |/ / | | | |/| |