Commit 0b53c934 by huangdarwin Committed by microkatz

HDR: Update test FileUtil to handle null ColorInfo.

PiperOrigin-RevId: 486706595
parent 88445d21
...@@ -41,18 +41,25 @@ public class FileUtil { ...@@ -41,18 +41,25 @@ public class FileUtil {
new DecodeOneFrameUtil.Listener() { new DecodeOneFrameUtil.Listener() {
@Override @Override
public void onContainerExtracted(MediaFormat mediaFormat) { public void onContainerExtracted(MediaFormat mediaFormat) {
@Nullable ColorInfo extractedColor = MediaFormatUtil.getColorInfo(mediaFormat); @Nullable ColorInfo extractedColorInfo = MediaFormatUtil.getColorInfo(mediaFormat);
assertThat(checkNotNull(extractedColor).colorTransfer).isEqualTo(expectedColorTransfer); assertColorInfoHasTransfer(extractedColorInfo, expectedColorTransfer);
} }
@Override @Override
public void onFrameDecoded(MediaFormat mediaFormat) { public void onFrameDecoded(MediaFormat mediaFormat) {
@Nullable ColorInfo decodedColor = MediaFormatUtil.getColorInfo(mediaFormat); @Nullable ColorInfo decodedColorInfo = MediaFormatUtil.getColorInfo(mediaFormat);
assertThat(checkNotNull(decodedColor).colorTransfer).isEqualTo(expectedColorTransfer); assertColorInfoHasTransfer(decodedColorInfo, expectedColorTransfer);
} }
}, },
/* surface= */ null); /* surface= */ null);
} }
private static void assertColorInfoHasTransfer(
@Nullable ColorInfo colorInfo, @C.ColorTransfer int expectedColorTransfer) {
@C.ColorTransfer
int actualColorTransfer = colorInfo == null ? C.COLOR_TRANSFER_SDR : colorInfo.colorTransfer;
assertThat(actualColorTransfer).isEqualTo(expectedColorTransfer);
}
private FileUtil() {} private FileUtil() {}
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment