From 4230ea94e956bacc1bb3b6737686a845bc077dd9 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 --- .../com/google/android/exoplayer2/video/ColorInfo.java | 8 -------- .../transformer/VideoTranscodingSamplePipeline.java | 2 +- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/library/common/src/main/java/com/google/android/exoplayer2/video/ColorInfo.java b/library/common/src/main/java/com/google/android/exoplayer2/video/ColorInfo.java index 2bb3e207d4..bd7baf7fd9 100644 --- a/library/common/src/main/java/com/google/android/exoplayer2/video/ColorInfo.java +++ b/library/common/src/main/java/com/google/android/exoplayer2/video/ColorInfo.java @@ -32,14 +32,6 @@ import org.checkerframework.dataflow.qual.Pure; /** Stores color info. */ 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/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/VideoTranscodingSamplePipeline.java b/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/VideoTranscodingSamplePipeline.java index abcc6e6474..0152778764 100644 --- a/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/VideoTranscodingSamplePipeline.java +++ b/library/transformer/src/main/java/com/google/android/exoplayer2/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 =