diff options
| author | Ronghua Wu <ronghuawu@google.com> | 2015-06-10 11:34:59 -0700 |
|---|---|---|
| committer | Ronghua Wu <ronghuawu@google.com> | 2015-06-12 17:04:55 -0700 |
| commit | 77aea92c9e29110a008b9e7f5d517b4451c26617 (patch) | |
| tree | 757a6f01f8033057c5c96f88c24b902e407edfbe /media | |
| parent | 2f3406517d1fd4486b8b90eb2635d784fad17a48 (diff) | |
| download | frameworks_av-77aea92c9e29110a008b9e7f5d517b4451c26617.zip frameworks_av-77aea92c9e29110a008b9e7f5d517b4451c26617.tar.gz frameworks_av-77aea92c9e29110a008b9e7f5d517b4451c26617.tar.bz2 | |
libstagefright: parse /etc/media_codecs_performance.xml for performance data.
Bug: 20507129
Change-Id: I138df61ba3b4e6c73d3e1bd83f1fb22321f58c73
Diffstat (limited to 'media')
| -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 d48ede9..44e9ea9 100644 --- a/media/libstagefright/MediaCodecList.cpp +++ b/media/libstagefright/MediaCodecList.cpp @@ -167,6 +167,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 */); } @@ -926,7 +927,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("-"); |