Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b848dbb0 authored by Ronghua Wu's avatar Ronghua Wu Committed by Android (Google) Code Review
Browse files

Merge "libstagefright: parse /etc/media_codecs_performance.xml for performance data." into mnc-dev

parents 0852646a 77aea92c

media/libstagefright/MediaCodecList.cpp

+2 −1
Original line number Diff line number Diff line
@@ -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("-");