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

Commit c093de1f authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "MediaCodecInfo: do not alter performance points for 32-bit processes... 

Merge "MediaCodecInfo: do not alter performance points for 32-bit processes (2)" am: a78fa61b am: 41bf6fa7 am: f4271d9a am: 14f94ae5 am: 8365914a

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1787047

Change-Id: Id069048c3bb64e020935e3a68cf21588ca226924
parents 122caec0 8365914a

media/java/android/media/MediaCodecInfo.java

+0 −6
Original line number Diff line number Diff line
@@ -2281,12 +2281,6 @@ public final class MediaCodecInfo { 
                if (size == null || size.getWidth() * size.getHeight() <= 0) {

                    continue;

                }

                if (size.getWidth() > SIZE_RANGE.getUpper()

                        || size.getHeight() > SIZE_RANGE.getUpper()) {

                    size = new Size(

                            Math.min(size.getWidth(), SIZE_RANGE.getUpper()),

                            Math.min(size.getHeight(), SIZE_RANGE.getUpper()));

                }

                Range<Long> range = Utils.parseLongRange(map.get(key), null);

                if (range == null || range.getLower() < 0 || range.getUpper() < 0) {

                    continue;