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

Add pixelWidthHeightRatio to MediaParser

Browse Source 
Bug: 132153067
Test: CTS.
Change-Id: I6603fdba0eff9a37016678e57345cf5763747fa2
This commit is contained in:
Santiago Seifert
2020-02-13 11:50:21 +00:00
parent 4ea6fce129
commit 111048ad8f
1 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
apex/media/framework/java/android/media/MediaParser.java
View File

@@ -858,11 +858,21 @@ public final class MediaParser {
setOptionalMediaFormatInt(result, MediaFormat.KEY_ENCODER_DELAY, format.encoderDelay);
setOptionalMediaFormatInt(result, MediaFormat.KEY_ENCODER_PADDING, format.encoderPadding);
// TODO: Implement float to fraction conversion.
// if (format.pixelWidthHeightRatio != Format.NO_VALUE) {
// result.setInteger(MediaFormat.KEY_PIXEL_ASPECT_RATIO_WIDTH, );
// result.setInteger(MediaFormat.KEY_PIXEL_ASPECT_RATIO_HEIGHT, );
// }
if (format.pixelWidthHeightRatio != Format.NO_VALUE && format.pixelWidthHeightRatio != 0) {
int parWidth = 1;
int parHeight = 1;
if (format.pixelWidthHeightRatio < 1.0f) {
parHeight = 1 << 30;
parWidth = (int) (format.pixelWidthHeightRatio * parHeight);
} else if (format.pixelWidthHeightRatio > 1.0f) {
parWidth = 1 << 30;
parHeight = (int) (parWidth / format.pixelWidthHeightRatio);
}
result.setInteger(MediaFormat.KEY_PIXEL_ASPECT_RATIO_WIDTH, parWidth);
result.setInteger(MediaFormat.KEY_PIXEL_ASPECT_RATIO_HEIGHT, parHeight);
result.setFloat("pixel-width-height-ratio-float", format.pixelWidthHeightRatio);
}
// LACK OF SUPPORT FOR:
// format.accessibilityChannel;