diff --git a/libraries/common/src/main/java/androidx/media3/common/util/MediaFormatUtil.java b/libraries/common/src/main/java/androidx/media3/common/util/MediaFormatUtil.java index 32fe6c156a..1824b33f2d 100644 --- a/libraries/common/src/main/java/androidx/media3/common/util/MediaFormatUtil.java +++ b/libraries/common/src/main/java/androidx/media3/common/util/MediaFormatUtil.java @@ -252,7 +252,7 @@ public final class MediaFormatUtil { */ @SuppressWarnings("InlinedApi") public static void maybeSetColorInfo(MediaFormat format, @Nullable ColorInfo colorInfo) { - if (!ColorInfo.isEquivalentToAssumedSdrDefault(colorInfo)) { + if (colorInfo != null) { maybeSetInteger(format, MediaFormat.KEY_COLOR_TRANSFER, colorInfo.colorTransfer); maybeSetInteger(format, MediaFormat.KEY_COLOR_STANDARD, colorInfo.colorSpace); maybeSetInteger(format, MediaFormat.KEY_COLOR_RANGE, colorInfo.colorRange); diff --git a/libraries/common/src/test/java/androidx/media3/common/util/MediaFormatUtilTest.java b/libraries/common/src/test/java/androidx/media3/common/util/MediaFormatUtilTest.java index 9616b8dbb3..7bd10d7ff4 100644 --- a/libraries/common/src/test/java/androidx/media3/common/util/MediaFormatUtilTest.java +++ b/libraries/common/src/test/java/androidx/media3/common/util/MediaFormatUtilTest.java @@ -240,16 +240,4 @@ public class MediaFormatUtilTest { .isEqualTo(C.ENCODING_PCM_16BIT_BIG_ENDIAN); assertThat(mediaFormat.containsKey(MediaFormat.KEY_PCM_ENCODING)).isFalse(); } - - @Test - public void createMediaFormatFromFormat_withSdrColorInfo_omitsMediaFormatColorInfoKeys() { - Format format = new Format.Builder().setColorInfo(ColorInfo.SDR_BT709_LIMITED).build(); - - MediaFormat mediaFormat = MediaFormatUtil.createMediaFormatFromFormat(format); - - assertThat(mediaFormat.containsKey(MediaFormat.KEY_COLOR_TRANSFER)).isFalse(); - assertThat(mediaFormat.containsKey(MediaFormat.KEY_COLOR_RANGE)).isFalse(); - assertThat(mediaFormat.containsKey(MediaFormat.KEY_COLOR_STANDARD)).isFalse(); - assertThat(mediaFormat.containsKey(MediaFormat.KEY_HDR_STATIC_INFO)).isFalse(); - } }