commit 832449800e2e5068ab0eb986bb359906ddf6efdc
author Lajos Molnar <lajos@google.com> Sat Apr 30 00:40:46 2016 +0000
committer android-build-merger <android-build-merger@google.com> Sat Apr 30 00:40:46 2016 +0000
tree 2b7b2438822455bcf6c0479158f5bbb26af35c64
parent e04dbdfcbe665bde0cfdfd0cc6114004739f314a
parent 3c6736b0785d3cf6c7a8cd687b9c63f9c7dea542

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

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

Change-Id: I69018ca03558a0dded94cf49508c3db042b4f12f

media/java/android/media/MediaCodecInfo.java

diff --git a/media/java/android/media/MediaCodecInfo.java b/media/java/android/media/MediaCodecInfo.java
index a8c2652..6257238 100644
--- a/media/java/android/media/MediaCodecInfo.java
+++ b/media/java/android/media/MediaCodecInfo.java
@@ -1247,7 +1247,8 @@
         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);
         }