From 9ad5650876b8094494b182ffc0f7d27f2af17f95 Mon Sep 17 00:00:00 2001 From: huangdarwin Date: Mon, 7 Nov 2022 18:49:14 +0000 Subject: [PATCH] HDR: Update test FileUtil to handle null ColorInfo. PiperOrigin-RevId: 486706595 (cherry picked from commit 0b53c934d8f391000c72a0a9d6ced9c2bdb77a95) --- .../transformer/mh/analysis/FileUtil.java | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/library/transformer/src/androidTest/java/com/google/android/exoplayer2/transformer/mh/analysis/FileUtil.java b/library/transformer/src/androidTest/java/com/google/android/exoplayer2/transformer/mh/analysis/FileUtil.java index e428fa1b5c..8cb28731d6 100644 --- a/library/transformer/src/androidTest/java/com/google/android/exoplayer2/transformer/mh/analysis/FileUtil.java +++ b/library/transformer/src/androidTest/java/com/google/android/exoplayer2/transformer/mh/analysis/FileUtil.java @@ -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() {} }