Commit 9ad56508 by huangdarwin Committed by microkatz

HDR: Update test FileUtil to handle null ColorInfo.

PiperOrigin-RevId: 486706595
(cherry picked from commit 0b53c934)
parent fe473936
......@@ -41,18 +41,25 @@ public class FileUtil {
new DecodeOneFrameUtil.Listener() {
@Override
public void onContainerExtracted(MediaFormat mediaFormat) {
@Nullable ColorInfo extractedColor = MediaFormatUtil.getColorInfo(mediaFormat);
assertThat(checkNotNull(extractedColor).colorTransfer).isEqualTo(expectedColorTransfer);
@Nullable ColorInfo extractedColorInfo = MediaFormatUtil.getColorInfo(mediaFormat);
assertColorInfoHasTransfer(extractedColorInfo, expectedColorTransfer);
}
@Override
public void onFrameDecoded(MediaFormat mediaFormat) {
@Nullable ColorInfo decodedColor = MediaFormatUtil.getColorInfo(mediaFormat);
assertThat(checkNotNull(decodedColor).colorTransfer).isEqualTo(expectedColorTransfer);
@Nullable ColorInfo decodedColorInfo = MediaFormatUtil.getColorInfo(mediaFormat);
assertColorInfoHasTransfer(decodedColorInfo, expectedColorTransfer);
}
},
/* 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() {}
}
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