diff options
Diffstat (limited to 'media/libstagefright/MediaCodecList.cpp')
| -rw-r--r-- | media/libstagefright/MediaCodecList.cpp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/media/libstagefright/MediaCodecList.cpp b/media/libstagefright/MediaCodecList.cpp index 5edc04c..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 */); } @@ -939,7 +940,13 @@ status_t MediaCodecList::addLimit(const char **attrs) { // complexity: range + default bool found; - if (name == "aspect-ratio" || name == "bitrate" || name == "block-count" + // VT specific limits + if (name.find("vt-") == 0) { + AString value; + if (msg->findString("value", &value) && value.size()) { + mCurrentInfo->addDetail(name, value); + } + } else if (name == "aspect-ratio" || name == "bitrate" || name == "block-count" || name == "blocks-per-second" || name == "complexity" || name == "frame-rate" || name == "quality" || name == "size" || name == "measured-blocks-per-second" || name.startsWith("measured-frame-rate-")) { |