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

Commit e0b71b4e authored by Ronghua Wu's avatar Ronghua Wu Committed by Android (Google) Code Review
Browse files

Merge "media: clean up the usage of max-supported-instances." into mnc-dev

parents 22233b51 71b5a586

media/java/android/media/MediaCodecInfo.java

+2 −5
Original line number Original line Diff line number Diff line
@@ -701,13 +701,10 @@ public final class MediaCodecInfo { 




            final Map<String, Object> global = MediaCodecList.getGlobalSettings();

            final Map<String, Object> global = MediaCodecList.getGlobalSettings();

            mMaxSupportedInstances = Utils.parseIntSafely(

            mMaxSupportedInstances = Utils.parseIntSafely(

                    global.get("max-supported-instances"), DEFAULT_MAX_SUPPORTED_INSTANCES);

                    global.get("max-concurrent-instances"), DEFAULT_MAX_SUPPORTED_INSTANCES);





            int maxInstances = Utils.parseIntSafely(

            int maxInstances = Utils.parseIntSafely(

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

                    map.get("max-concurrent-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);