diff options
| author | 2015-07-29 00:53:12 +0000 | |
|---|---|---|
| committer | 2015-07-29 00:53:12 +0000 | |
| commit | 02022b70bef7d6964bc8043385531d1aa97fb15b (patch) | |
| tree | 04c9a4a0b278722f69ec832c78376ac0ce5be716 | |
| parent | b310c8945330a0a94abae34451e0bdc227f52035 (diff) | |
| parent | 4ef977c08fbef97219c4e6c436ad6a02e994e3d4 (diff) | |
Merge "media: fix estimateFrameRatesFor to use correct ratio" into mnc-dev
| -rw-r--r-- | media/java/android/media/MediaCodecInfo.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/java/android/media/MediaCodecInfo.java b/media/java/android/media/MediaCodecInfo.java index 76d36a09b592..65d04507db67 100644 --- a/media/java/android/media/MediaCodecInfo.java +++ b/media/java/android/media/MediaCodecInfo.java @@ -1216,7 +1216,7 @@ 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)(width * height) / (size.getWidth() * size.getHeight()); + Double ratio = (double)(size.getWidth() * size.getHeight()) / (width * height); return Range.create(range.getLower() * ratio, range.getUpper() * ratio); } |