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/MediaCodecList.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/MediaCodecList.cpp')
| -rw-r--r-- | media/libstagefright/MediaCodecList.cpp | 2 |
1 files changed, 1 insertions, 1 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")) { |