summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Ronghua Wu <ronghuawu@google.com> 2015-06-25 14:13:40 -0700
committer Ronghua Wu <ronghuawu@google.com> 2015-06-25 14:13:40 -0700
commitcf6a4ba5a4aed486b61b87597aa6572d41213ba2 (patch)
treede046e8c17774a80a0ca734e87652fbaa01fb0d7
parent616f035bc9a2d9855feb2348d2b732a18ebdbffb (diff)
media: parse max-concurrent-instances.
Bug: 22089269 Change-Id: I2b0af7c5c6a309c8396b595ea54b899451239b18
-rw-r--r--media/java/android/media/MediaCodecInfo.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/media/java/android/media/MediaCodecInfo.java b/media/java/android/media/MediaCodecInfo.java
index 6c2622065954..28d0713940dc 100644
--- a/media/java/android/media/MediaCodecInfo.java
+++ b/media/java/android/media/MediaCodecInfo.java
@@ -705,6 +705,9 @@ public final class MediaCodecInfo {
int maxInstances = Utils.parseIntSafely(
map.get("max-supported-instances"), mMaxSupportedInstances);
+ // TODO: replace all max-supported-instances with max-concurrent-instances.
+ maxInstances = Utils.parseIntSafely(
+ map.get("max-concurrent-instances"), maxInstances);
mMaxSupportedInstances =
Range.create(1, MAX_SUPPORTED_INSTANCES_LIMIT).clamp(maxInstances);