media: fix estimateFrameRatesFor to use correct ratio

Ronghua Wu · Ronghua Wu · commit 4ef977c08fbe · 2015-07-28T15:08:08.000-07:00
Bug: 22504214
Change-Id: I5a325ae495b76aadd3fcbb8932d865c2f6322b2a
diff --git a/media/java/android/media/MediaCodecInfo.java b/media/java/android/media/MediaCodecInfo.java
@@ -1216,7 +1216,7 @@ private Size findClosestSize(int width, int height) {
         private Range<Double> estimateFrameRatesFor(int width, int height) {
             Size size = findClosestSize(width, height);
             Range<Long> range = mMeasuredFrameRates.get(size);
-            Double ratio = (double)(width * height) / (size.getWidth() * size.getHeight());
+            Double ratio = (double)(size.getWidth() * size.getHeight()) / (width * height);
             return Range.create(range.getLower() * ratio, range.getUpper() * ratio);
         }
 

Original file line number	Diff line number	Diff line change
`@@ -1216,7 +1216,7 @@ private Size findClosestSize(int width, int height) {`
`1216`	`1216`	`private Range<Double> estimateFrameRatesFor(int width, int height) {`
`1217`	`1217`	`Size size = findClosestSize(width, height);`
`1218`	`1218`	`Range<Long> range = mMeasuredFrameRates.get(size);`
`1219`		`- Double ratio = (double)(width * height) / (size.getWidth() * size.getHeight());`
	`1219`	`+ Double ratio = (double)(size.getWidth() * size.getHeight()) / (width * height);`
`1220`	`1220`	`return Range.create(range.getLower() * ratio, range.getUpper() * ratio);`
`1221`	`1221`	`}`
`1222`	`1222`