From 7078ce312d3650ef70dcd8ed236af88dc07b5333 Mon Sep 17 00:00:00 2001 From: huangdarwin Date: Wed, 6 Jul 2022 18:11:11 +0000 Subject: [PATCH] HDR: Remove ColorInfo.SDR constant The SDR constant also specified a color space and range, in addition to C.COLOR_TRANSFER_SDR. However, it turns out that SDR videos may use different color space and range values, so following prior ExoPlayer conventions to have `null` mean "generic SDR" is preferable here. PiperOrigin-RevId: 459296746 --- .../src/main/java/androidx/media3/common/ColorInfo.java | 8 -------- .../transformer/VideoTranscodingSamplePipeline.java | 2 +- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/libraries/common/src/main/java/androidx/media3/common/ColorInfo.java b/libraries/common/src/main/java/androidx/media3/common/ColorInfo.java index 71b15c053f..7021acfff0 100644 --- a/libraries/common/src/main/java/androidx/media3/common/ColorInfo.java +++ b/libraries/common/src/main/java/androidx/media3/common/ColorInfo.java @@ -31,14 +31,6 @@ import org.checkerframework.dataflow.qual.Pure; /** Stores color info. */ @UnstableApi public final class ColorInfo implements Bundleable { - /** Standard Dynamic Range (SDR). */ - public static final ColorInfo SDR = - new ColorInfo( - C.COLOR_SPACE_BT709, - C.COLOR_RANGE_LIMITED, - C.COLOR_TRANSFER_SDR, - /* hdrStaticInfo= */ null); - /** * Returns the {@link C.ColorSpace} corresponding to the given ISO color primary code, as per * table A.7.21.1 in Rec. ITU-T T.832 (03/2009), or {@link Format#NO_VALUE} if no mapping can be diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/VideoTranscodingSamplePipeline.java b/libraries/transformer/src/main/java/androidx/media3/transformer/VideoTranscodingSamplePipeline.java index 8ad1a1ba8c..8b3ebe6bb2 100644 --- a/libraries/transformer/src/main/java/androidx/media3/transformer/VideoTranscodingSamplePipeline.java +++ b/libraries/transformer/src/main/java/androidx/media3/transformer/VideoTranscodingSamplePipeline.java @@ -387,7 +387,7 @@ import org.checkerframework.dataflow.qual.Pure; transformationRequest.videoMimeType != null ? transformationRequest.videoMimeType : inputFormat.sampleMimeType) - .setColorInfo(fallbackToSdr ? ColorInfo.SDR : inputFormat.colorInfo) + .setColorInfo(fallbackToSdr ? null : inputFormat.colorInfo) .build(); encoder =