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

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

Merge "libstagefright: parse concurrent-instances." into mnc-dev

parents 13fe5877 0f29c9d2

media/libstagefright/MediaCodecList.cpp

+1 −1
Original line number Diff line number Diff line
@@ -993,7 +993,7 @@ status_t MediaCodecList::addLimit(const char **attrs) { 
            return limitFoundMissingAttr(name, "default");

        } else if (msg->contains("in")) {

            return limitFoundMissingAttr(name, "in");

        } else if ((name == "channel-count") ^

        } else if ((name == "channel-count" || name == "concurrent-instances") ^

                (found = msg->findString("max", &max))) {

            return limitFoundMissingAttr(name, "max", found);

        } else if (msg->contains("min")) {

media/libstagefright/MediaCodecListOverrides.cpp

+3 −1
Original line number Diff line number Diff line
@@ -291,7 +291,9 @@ void profileCodecs( 
        for (size_t i = 0; i < mimes.size(); ++i) {

            const sp<MediaCodecInfo::Capabilities> &caps =

                    info->getCapabilitiesFor(mimes[i].c_str());

            if (!forceToMeasure && caps->getDetails()->contains("max-supported-instances")) {

            if (!forceToMeasure &&

                (caps->getDetails()->contains("max-supported-instances") ||

                 caps->getDetails()->contains("max-concurrent-instances"))) {

                continue;

            }