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

Commit 83244980 authored by Lajos Molnar's avatar Lajos Molnar Committed by android-build-merger
Browse files

Merge "VideoCapabilities: account for block size for getAchievableRates" into nyc-dev 

am: 3c6736b0

* commit '3c6736b0':
  VideoCapabilities: account for block size for getAchievableRates

Change-Id: I69018ca03558a0dded94cf49508c3db042b4f12f
parents e04dbdfc 3c6736b0

media/java/android/media/MediaCodecInfo.java

+2 −1
Original line number Diff line number Diff line
@@ -1247,7 +1247,8 @@ public final class MediaCodecInfo { 
        private Range<Double> estimateFrameRatesFor(int width, int height) {

            Size size = findClosestSize(width, height);

            Range<Long> range = mMeasuredFrameRates.get(size);

            Double ratio = (double)(size.getWidth() * size.getHeight()) / (width * height);

            Double ratio = getBlockCount(size.getWidth(), size.getHeight())

                    / (double)Math.max(getBlockCount(width, height), 1);

            return Range.create(range.getLower() * ratio, range.getUpper() * ratio);

        }