2 files changed, 4 insertions, 2 deletions
diff --git a/media/libstagefright/MediaCodecList.cpp b/media/libstagefright/MediaCodecList.cpp
index a47bfc7..8993403 100644
--- a/media/libstagefright/MediaCodecList.cpp
+++ b/media/libstagefright/MediaCodecList.cpp
@@ -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")) {
diff --git a/media/libstagefright/MediaCodecListOverrides.cpp b/media/libstagefright/MediaCodecListOverrides.cpp
index a928163..4ec36b5 100644
--- a/media/libstagefright/MediaCodecListOverrides.cpp
+++ b/media/libstagefright/MediaCodecListOverrides.cpp
@@ -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;
             }