summaryrefslogtreecommitdiffstats
path: root/media/libstagefright
Commit message (Collapse)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
| | | | | | | | | | | | | | | | | | Check allocations when the size is read from a file and might therefore be invalid. b/14388161 Change-Id: Ia08cc0a6107f275a70e793ef3b50c0ce16ceeee0
* | Merge "Fix logging"Marco Nelissen2014-06-161-4/+4
|\ \ | |/
| * Fix loggingMarco Nelissen2014-06-131-4/+4
| | | | | | | | | | | | | | Make the log message specify whether it was an encoder or a decoder that failed to instantiate. Change-Id: Ie357775114c8dea722d87381c13affdfb19dcde4
* | Merge "support for CEA-608 closed caption"Chong Zhang2014-06-142-0/+7
|\ \
| * | support for CEA-608 closed captionChong Zhang2014-06-132-0/+7
| | | | | | | | | | | | | | | | | | Bug: 15470448 Change-Id: Ic6a527f5c35a8ee0a08a5b043336e4d193216083
* | | Merge "refactor getTrackInfo()"Chong Zhang2014-06-125-35/+57
|\ \ \ | |/ / | | / | |/ |/|
| * refactor getTrackInfo()Chong Zhang2014-06-135-35/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | (this is in preparation for supporting other cc source) - split into two methods: getTrackCount() and getTrackInfo() - move track info parcelling to NuPlayer - parcel in the mime type of the subtitle format Bug: 15470448 Change-Id: If00724d8c3a2b2319cb9c5f29d3fe76347bfe947
* | am 2a8270e6: am c323737d: Merge "Offer a type-safe album art interface."Elliott Hughes2014-06-122-17/+5
|\ \ | | | | | | | | | | | | * commit '2a8270e6944fb3addfcba87f6885aaad196b8b88': Offer a type-safe album art interface.
| * \ am c323737d: Merge "Offer a type-safe album art interface."Elliott Hughes2014-06-122-17/+5
| |\ \ | | | | | | | | | | | | | | | | * commit 'c323737dd46d724b4c1ec230b283f26ae2a22b4f': Offer a type-safe album art interface.
| | * \ 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
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 15514223 Change-Id: Iddfc33a00e6cd3779ca09c01a55f62b151f6ec95
* | | | | am ca44dc79: am 8d6d8f54: Merge "Add libcrypto for users of libstagefright."Christopher Ferris2014-06-111-3/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit 'ca44dc79b5a163030ab0963f80aa771871de092d': Add libcrypto for users of libstagefright.
| * | | | am 8d6d8f54: Merge "Add libcrypto for users of libstagefright."Christopher Ferris2014-06-101-3/+0
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit '8d6d8f546c1d6c55b79b454c720c03a80c738444': Add libcrypto for users of libstagefright.
| | * | | Add libcrypto for users of libstagefright.Christopher Ferris2014-06-101-3/+0
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | libstagefright_rtsp uses some MD5 functions that used to be in bionic, but it was removed recently. As an initial fix, I statically linked in libcrypto_static to the libstagefright_rtsp library. However, I think it's better to modify the single user of this library to link against the shared libcrypto library. Change-Id: Iaf2e1aeea32fd8af038f6e77bf58ea7df50d807a
* | | | resolved conflicts for merge of 281b884c to masterChristopher Ferris2014-06-111-0/+7
|\ \ \ \ | |/ / / | | | / | |_|/ |/| | Change-Id: If8924939bdf54d3a9e6a4876a05d0672c27cf8ef
| * | am d3af4265: Merge "Link libcrypto for MD5_* functions."Christopher Ferris2014-06-101-0/+7
| |\ \ | | |/ | | | | | | | | | * commit 'd3af4265dca4c8ebcead5376f1c73a5dafc34778': Link libcrypto for MD5_* functions.
| | * Link libcrypto for MD5_* functions.Christopher Ferris2014-06-091-0/+7
| | | | | | | | | | | | Change-Id: I5dce8f041b9faf035161b82d5e46bd46166bd05c
| * | am 17a6dd60: DO NOT MERGE: MediaCodecList: remove force-added codecs for ↵Lajos Molnar2014-06-051-9/+0
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | videoeditor * commit '17a6dd60f5f8a28af1db451bcbf44805648c844a': DO NOT MERGE: MediaCodecList: remove force-added codecs for videoeditor
| | * | DO NOT MERGE: MediaCodecList: remove force-added codecs for videoeditorLajos Molnar2014-05-291-9/+0
| | | | | | | | | | | | | | | | | | | | Bug: 15320804 Change-Id: I1c2f0f75aeaabc20cb94e79e47b70f7faefe0a9e
* | | | Merge "Remove unneeded code"Marco Nelissen2014-06-101-6/+0
|\ \ \ \
| * | | | Remove unneeded codeMarco Nelissen2014-06-101-6/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I33c7424f1858e9f3f7f7ab5fb46db09c2714e02e
* | | | | add back HEVC SoftOMX decoderLajos Molnar2014-06-063-0/+853
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 14571712 Change-Id: Iea399e0cfec1f78584c74089f01821d8552ced40
* | | | | Remove SoftOMX HEVC decoderLajos Molnar2014-06-063-849/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 14571712 Change-Id: Ie3fb3743ec27a0cfdea612052ba15a06f2c891db
* | | | | am 8a454611: Merge "stagefright: added support, and SoftOMX decoder, for ↵Lajos Molnar2014-06-069-8/+1023
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | HEVC" into lmp-preview-dev * commit '8a45461198c69e9e15f133c2e11ded47fc4c708b': stagefright: added support, and SoftOMX decoder, for HEVC
| * \ \ \ \ Merge "stagefright: added support, and SoftOMX decoder, for HEVC" into ↵Lajos Molnar2014-06-069-8/+1023
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | lmp-preview-dev
| | * | | | | stagefright: added support, and SoftOMX decoder, for HEVCHarish Mahendrakar2014-06-069-8/+1023
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | also fixed QuerySupportedProfileLevels in SoftVideoDecoderOMXComponent.cpp Bug: 14571712 Change-Id: Ifa3793f7c1b18ac5e8c0a096848c998cabd9e777
* | | | | | | Merge "Guard against malformed files"Marco Nelissen2014-06-061-4/+28
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | Guard against malformed filesMarco Nelissen2014-06-061-4/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b/15433074 Change-Id: I35363def42d38eba49dd5aece566fd345743937e
* | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 15470543 Change-Id: Ia96a295fbc7e9f1b1d5c0d9091ac62184d44dcfa
* | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Timestamps don't start at zero, but at least they're consistent. Change-Id: I2ce9cd60655a4ece787802902b679fda01cb6182
* | | | | | | am 270facca: We still need the raw codecMarco Nelissen2014-06-051-0/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| / / / / / | |/ / / / / | | | | | | * commit '270facca297275a4889d1cc49ec4d2768ed38bb7': We still need the raw codec
| * | | | | We still need the raw codecMarco Nelissen2014-06-051-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's used for FLAC and PCM Wav, which output PCM data. b/15320804 Change-Id: I67921a45dd4a3a175fce412e055728859e2309ba
* | | | | | am 9042b116: Merge "MediaCodecList: remove force-added codecs for ↵Lajos Molnar2014-06-051-5/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | videoeditor" into lmp-preview-dev * commit '9042b116b62a287bb86a18af6b428c7a2b7720aa': MediaCodecList: remove force-added codecs for videoeditor
| * | | | | MediaCodecList: remove force-added codecs for videoeditorLajos Molnar2014-05-291-5/+0
| |/ / / / | | | | | | | | | | | | | | | | | | | | Bug: 15320804 Change-Id: I1c2f0f75aeaabc20cb94e79e47b70f7faefe0a9e
| * | | | DO NOT MERGE: libstagefright: Add Opus support to ACodec::getPortFormatVignesh Venkatasubramanian2014-05-291-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 15114855 Change-Id: Idb184ae15986450423fc8cf116cf077600b3ea67 (cherry picked from commit 8c6693b73cb4aed9d1dcb8d5d0828a77b7471a55)
* | | | | am b6af7c63: am 05eaf105: Merge "Mp3decoder: Remove unused arm assembly files"Narayan Kamath2014-06-035-1413/+0
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | * commit 'b6af7c635113d288d16a4f549679beffd86822d8': Mp3decoder: Remove unused arm assembly files
| * | | | am 05eaf105: Merge "Mp3decoder: Remove unused arm assembly files"Narayan Kamath2014-06-035-1413/+0
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | * commit '05eaf105a2a1445c2c13801ee4533ded47f1df1b': Mp3decoder: Remove unused arm assembly files
| | * | | Merge "Mp3decoder: Remove unused arm assembly files"Narayan Kamath2014-06-035-1413/+0
| | |\ \ \
| | | * | | Mp3decoder: Remove unused arm assembly filesAshok Bhat2014-05-275-1413/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The unused ARM assembly files were written for legacy proprietary ARM compilers. They are not needed when gcc or clang compiler is used. Change-Id: I8dfe9ad458efbb34922094e943ad334cc34f59a3 Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
* | | | | | Merge "MPEG4Extractor: guard against missing stbl."Robert Shih2014-06-021-1/+2
|\ \ \ \ \ \
| * | | | | | MPEG4Extractor: guard against missing stbl.Robert Shih2014-05-191-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 14320131 Change-Id: I33f65117c9c5365bddd96bb41cc4379a0c7ebcbd
* | | | | | | Merge "AAC decoder: compensate limiter delay"Jean-Michel Trivi2014-05-295-218/+973
|\ \ \ \ \ \ \
| * | | | | | | AAC decoder: compensate limiter delayJean-Michel Trivi2014-05-295-218/+973
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add decoder limiter delay compensation to decoder wrapper Includes a wrapper function for SoftAAC2.cpp which selects DRC-related decoder parameters according to information in the bitstream and desired DRC characteristics for different playback modes. Bug 9428126 Change-Id: I5041b68760e95cf54073c3addf2b6026b9cfe8c5
* | | | | | | | libstagefright: Add Opus support to ACodec::getPortFormatVignesh Venkatasubramanian2014-05-291-0/+18
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | Bug: 15114855 Change-Id: Idb184ae15986450423fc8cf116cf077600b3ea67
* | | | | | | am 79262cfc: am 5b756bfd: am 8b187f4a: Merge "Move frameworks/av off ↵Elliott Hughes2014-05-231-3/+2
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | / / | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | <sys/atomics.h>." * commit '79262cfc14a9d8b5aa29d43e84ea91eedb9492ba': Move frameworks/av off <sys/atomics.h>.
| * | | | | am 5b756bfd: am 8b187f4a: Merge "Move frameworks/av off <sys/atomics.h>."Elliott Hughes2014-05-221-3/+2
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | * commit '5b756bfdaa27c8b606720544bf507213cf47376d': Move frameworks/av off <sys/atomics.h>.
| | * | | | am 8b187f4a: Merge "Move frameworks/av off <sys/atomics.h>."Elliott Hughes2014-05-221-3/+2
| | |\ \ \ \ | | | | |/ / | | | |/| | | | | | | | | | | | | | * commit '8b187f4acea8d7e517ff9ced32fc7368bdbaa6e0': Move frameworks/av off <sys/atomics.h>.
generated by cgit v1.1 at 2024-06-05 18:12:29 +0000