Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2f73c3c2 authored by Ronghua Wu's avatar Ronghua Wu Committed by Android Git Automerger
Browse files

am af13d3b0: am 826bf9b6: Merge "media: parse max-concurrent-instances." into mnc-dev 

* commit 'af13d3b0':
  media: parse max-concurrent-instances.
parents 8be96748 af13d3b0

media/java/android/media/MediaCodecInfo.java

+3 −0
Original line number Original line Diff line number Diff line
@@ -705,6 +705,9 @@ public final class MediaCodecInfo { 




            int maxInstances = Utils.parseIntSafely(

            int maxInstances = Utils.parseIntSafely(

                    map.get("max-supported-instances"), mMaxSupportedInstances);

                    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 =

            mMaxSupportedInstances =

                    Range.create(1, MAX_SUPPORTED_INSTANCES_LIMIT).clamp(maxInstances);

                    Range.create(1, MAX_SUPPORTED_INSTANCES_LIMIT).clamp(maxInstances);