diff options
| author | Ronghua Wu <ronghuawu@google.com> | 2015-06-25 22:14:57 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-25 22:15:00 +0000 |
| commit | 064b2bf712788d30928b9a8bafecd0f3308d7aa4 (patch) | |
| tree | 1562acc4281e2a01845b8b0fb97d2ae15d574273 | |
| parent | 13fe5877cf34f7da9af79e96abd78c74b861adb7 (diff) | |
| parent | 0f29c9d205ff03286da629d30fddd5dd5ca020db (diff) | |
| download | frameworks_av-064b2bf712788d30928b9a8bafecd0f3308d7aa4.zip frameworks_av-064b2bf712788d30928b9a8bafecd0f3308d7aa4.tar.gz frameworks_av-064b2bf712788d30928b9a8bafecd0f3308d7aa4.tar.bz2 | |
Merge "libstagefright: parse concurrent-instances." into mnc-dev
| -rw-r--r-- | media/libstagefright/MediaCodecList.cpp | 2 | ||||
| -rw-r--r-- | media/libstagefright/MediaCodecListOverrides.cpp | 4 |
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; } |