loliball/media3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Only apply a MediaFormat-generated ColorInfo if it's valid.

Browse Source 
Otherwise, invalid ColorInfo instances generated using faulty
MediaFormat#getInteger values could cause exceptions.

Confirmed that b/239435670 reproduces without this CL, and does not reproduce
with this CL.

PiperOrigin-RevId: 461862191
This commit is contained in:
huangdarwin 2022-07-19 13:00:02 +00:00 committed by Rohit Singh
parent e1fde5d530
commit 87198fe7f8
1 changed files with 32 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
libraries/transformer/src/main/java/androidx/media3/transformer/DefaultCodec.java
View File

@ -431,16 +431,8 @@ public final class DefaultCodec implements Codec {
if (MimeTypes.isVideo(mimeType)) { if (MimeTypes.isVideo(mimeType)) {
formatBuilder formatBuilder
.setWidth(mediaFormat.getInteger(MediaFormat.KEY_WIDTH)) .setWidth(mediaFormat.getInteger(MediaFormat.KEY_WIDTH))
.setHeight(mediaFormat.getInteger(MediaFormat.KEY_HEIGHT)); .setHeight(mediaFormat.getInteger(MediaFormat.KEY_HEIGHT))
if (SDK_INT >= 24) { .setColorInfo(getColorInfo(mediaFormat));
// TODO(b/227624622): Set hdrStaticInfo accordingly using KEY_HDR_STATIC_INFO.
formatBuilder.setColorInfo(
new ColorInfo(
mediaFormat.getInteger(MediaFormat.KEY_COLOR_STANDARD),
mediaFormat.getInteger(MediaFormat.KEY_COLOR_RANGE),
mediaFormat.getInteger(MediaFormat.KEY_COLOR_TRANSFER),
/* hdrStaticInfo= */ null));
}
} else if (MimeTypes.isAudio(mimeType)) { } else if (MimeTypes.isAudio(mimeType)) {
// TODO(b/178685617): Only set the PCM encoding for audio/raw, once we have a way to // TODO(b/178685617): Only set the PCM encoding for audio/raw, once we have a way to
// simulate more realistic codec input/output formats in tests. // simulate more realistic codec input/output formats in tests.
@ -480,4 +472,34 @@ public final class DefaultCodec implements Codec {
return SDK_INT < 29 return SDK_INT < 29
|| context.getApplicationContext().getApplicationInfo().targetSdkVersion < 29; || context.getApplicationContext().getApplicationInfo().targetSdkVersion < 29;
} }
@Nullable
private static ColorInfo getColorInfo(MediaFormat mediaFormat) {
if (SDK_INT < 29) {
return null;
}
// TODO(b/227624622): Set hdrStaticInfo accordingly using KEY_HDR_STATIC_INFO.
int colorSpace = mediaFormat.getInteger(MediaFormat.KEY_COLOR_STANDARD, Format.NO_VALUE);
int colorRange = mediaFormat.getInteger(MediaFormat.KEY_COLOR_RANGE, Format.NO_VALUE);
int colorTransfer = mediaFormat.getInteger(MediaFormat.KEY_COLOR_TRANSFER, Format.NO_VALUE);
if (colorSpace != C.COLOR_SPACE_BT709
&& colorSpace != C.COLOR_SPACE_BT601
&& colorSpace != C.COLOR_SPACE_BT2020
&& colorSpace != Format.NO_VALUE) {
return null;
}
if (colorRange != C.COLOR_RANGE_LIMITED
&& colorRange != C.COLOR_RANGE_FULL
&& colorRange != Format.NO_VALUE) {
return null;
}
if (colorTransfer != C.COLOR_TRANSFER_SDR
&& colorTransfer != C.COLOR_TRANSFER_ST2084
&& colorTransfer != C.COLOR_TRANSFER_HLG
&& colorTransfer != Format.NO_VALUE) {
return null;
}
return new ColorInfo(colorSpace, colorRange, colorTransfer, /* hdrStaticInfo= */ null);
}
} }