diff options
| author | Ronghua Wu <ronghuawu@google.com> | 2015-07-01 14:27:36 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-07-01 14:27:37 +0000 |
| commit | b848dbb05b6a03dbe439298e6f9de7ce072c965f (patch) | |
| tree | d1a72152966068d3d39d3ed01b80b462fcd3f3d4 /media/libstagefright/MediaCodecList.cpp | |
| parent | 0852646a7bfb2a43a0d24d3d42bd101065e684f4 (diff) | |
| parent | 77aea92c9e29110a008b9e7f5d517b4451c26617 (diff) | |
| download | frameworks_av-b848dbb05b6a03dbe439298e6f9de7ce072c965f.zip frameworks_av-b848dbb05b6a03dbe439298e6f9de7ce072c965f.tar.gz frameworks_av-b848dbb05b6a03dbe439298e6f9de7ce072c965f.tar.bz2 | |
Merge "libstagefright: parse /etc/media_codecs_performance.xml for performance data." into mnc-dev
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 ab49c11..7ea5cbd 100644 --- a/media/libstagefright/MediaCodecList.cpp +++ b/media/libstagefright/MediaCodecList.cpp @@ -175,6 +175,7 @@ MediaCodecList::MediaCodecList() mUpdate(false), mGlobalSettings(new AMessage()) { parseTopLevelXMLFile("/etc/media_codecs.xml"); + parseTopLevelXMLFile("/etc/media_codecs_performance.xml", true/* ignore_errors */); parseTopLevelXMLFile(kProfilingResults, true/* ignore_errors */); } @@ -935,7 +936,7 @@ status_t MediaCodecList::addLimit(const char **attrs) { 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 == "measured-frame-rate") { + || name == "measured-blocks-per-second" || name.startsWith("measured-frame-rate-")) { AString min, max; if (msg->findString("min", &min) && msg->findString("max", &max)) { min.append("-"); |