Merge "media: parse max-concurrent-instances." into mnc-dev

2015-06-25 22:14:57 +00:00
parent f97497db5a cf6a4ba5a4
commit 826bf9b63f
1 changed files with 3 additions and 0 deletions
--- 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);