diff options
| author | Surajit Podder <spodder@codeaurora.org> | 2015-07-22 18:58:29 +0530 |
|---|---|---|
| committer | Satish Kamuju <skamuj@codeaurora.org> | 2015-10-06 17:35:24 +0530 |
| commit | bd019775a921ae9165e924e4d37bc838a7ef5781 (patch) | |
| tree | e0ca419e9f0d1d28a9caed2d00ebcb7021284c4e /media/libstagefright/MediaCodecList.cpp | |
| parent | 61f6cfa961d22a9a54d91366fefec135f091012d (diff) | |
| download | frameworks_av-bd019775a921ae9165e924e4d37bc838a7ef5781.zip frameworks_av-bd019775a921ae9165e924e4d37bc838a7ef5781.tar.gz frameworks_av-bd019775a921ae9165e924e4d37bc838a7ef5781.tar.bz2 | |
video: Port AOSP fixes
Includes following fixes:
f510d0c libstagefright: Disable multi slice mode for video encode
ca46843 audio: Fix for failure in CTS MediaRecorderTest cases
b4d0490 libstagefright: check the audio source when adding to MPEG4Writer
89c6c3f libstagefright: Allocate cached camera buffers for sw encoders
f2c387b libstagefright: Choose target specific media_codecs.xml
f3e7122 libstagefright: Implement fallback mechanism to SW decoder
Change-Id: I90398b2fead1f4e163935bf1db342e24275f7933
Diffstat (limited to 'media/libstagefright/MediaCodecList.cpp')
| -rw-r--r-- | media/libstagefright/MediaCodecList.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/media/libstagefright/MediaCodecList.cpp b/media/libstagefright/MediaCodecList.cpp index b1dd96f..ff94314 100644 --- a/media/libstagefright/MediaCodecList.cpp +++ b/media/libstagefright/MediaCodecList.cpp @@ -40,6 +40,7 @@ #include <cutils/properties.h> #include <libexpat/expat.h> +#include <stagefright/AVExtensions.h> namespace android { @@ -174,7 +175,7 @@ MediaCodecList::MediaCodecList() : mInitCheck(NO_INIT), mUpdate(false), mGlobalSettings(new AMessage()) { - parseTopLevelXMLFile("/etc/media_codecs.xml"); + parseTopLevelXMLFile(AVUtils::get()->getCustomCodecsLocation()); parseTopLevelXMLFile("/etc/media_codecs_performance.xml", true/* ignore_errors */); parseTopLevelXMLFile(kProfilingResults, true/* ignore_errors */); } |