Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
TreeHugger Robot
2016-04-30 00:36:52 +00:00
committed by Android (Google) Code Review
parent 4ba55dc462 7a2ab16b65
commit 3c6736b078
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
media/java/android/media/MediaCodecInfo.java
View File

@@ -1247,7 +1247,8 @@ public final class MediaCodecInfo {
private Range<Double> estimateFrameRatesFor(int width, int height) { private Range<Double> estimateFrameRatesFor(int width, int height) {
Size size = findClosestSize(width, height); Size size = findClosestSize(width, height);
Range<Long> range = mMeasuredFrameRates.get(size); 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); return Range.create(range.getLower() * ratio, range.getUpper() * ratio);
} }