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 am: 3c6736b078

Browse Source 
am: a8499e4558

* commit 'a8499e455801ef4106d519ba3087085fb9343b60':
  VideoCapabilities: account for block size for getAchievableRates

Change-Id: I227f9a0d85acd8321845698cecda293e5c0b2685
This commit is contained in:
Lajos Molnar
2016-04-30 00:42:56 +00:00
committed by android-build-merger
parent 260ea63b9a a8499e4558
commit 7c4ccabc18
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) {
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);
}