diff options
| author | Ronghua Wu <ronghuawu@google.com> | 2015-06-25 14:13:04 -0700 |
|---|---|---|
| committer | Ronghua Wu <ronghuawu@google.com> | 2015-06-25 14:20:23 -0700 |
| commit | 0f29c9d205ff03286da629d30fddd5dd5ca020db (patch) | |
| tree | a9dbe86ee5a7a27ab928fa0bcc67edba6967a835 /media/libstagefright/MediaCodecListOverrides.cpp | |
| parent | 4d622375dc6c9d6b6b817cce598692ae491b2496 (diff) | |
| download | frameworks_av-0f29c9d205ff03286da629d30fddd5dd5ca020db.zip frameworks_av-0f29c9d205ff03286da629d30fddd5dd5ca020db.tar.gz frameworks_av-0f29c9d205ff03286da629d30fddd5dd5ca020db.tar.bz2 | |
libstagefright: parse concurrent-instances.
Bug: 22089269
Change-Id: I43c04e7fbc88dd1ec3fe21bcf4acf2e2e8cab25a
Diffstat (limited to 'media/libstagefright/MediaCodecListOverrides.cpp')
| -rw-r--r-- | media/libstagefright/MediaCodecListOverrides.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
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; } |