diff --git a/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/CompositeAssetLoader.java b/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/CompositeAssetLoader.java index 685c255870..34043b947a 100644 --- a/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/CompositeAssetLoader.java +++ b/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/CompositeAssetLoader.java @@ -209,8 +209,8 @@ import java.util.concurrent.atomic.AtomicLong; } @Override - public ColorInfo getExpectedColorInfo() { - return sampleConsumer.getExpectedColorInfo(); + public ColorInfo getExpectedInputColorInfo() { + return sampleConsumer.getExpectedInputColorInfo(); } @Override diff --git a/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/ExoAssetLoaderVideoRenderer.java b/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/ExoAssetLoaderVideoRenderer.java index 5065262124..82dd259be6 100644 --- a/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/ExoAssetLoaderVideoRenderer.java +++ b/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/ExoAssetLoaderVideoRenderer.java @@ -68,7 +68,7 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull; protected void initDecoder(Format inputFormat) throws TransformationException { boolean isDecoderToneMappingRequired = ColorInfo.isTransferHdr(inputFormat.colorInfo) - && !ColorInfo.isTransferHdr(sampleConsumer.getExpectedColorInfo()); + && !ColorInfo.isTransferHdr(sampleConsumer.getExpectedInputColorInfo()); decoder = decoderFactory.createForVideoDecoding( inputFormat, diff --git a/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/SampleConsumer.java b/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/SampleConsumer.java index e0ebac2310..eba9467427 100644 --- a/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/SampleConsumer.java +++ b/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/SampleConsumer.java @@ -79,7 +79,7 @@ public interface SampleConsumer { * *

Should only be used for raw video data. */ - default ColorInfo getExpectedColorInfo() { + default ColorInfo getExpectedInputColorInfo() { throw new UnsupportedOperationException(); } diff --git a/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/VideoSamplePipeline.java b/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/VideoSamplePipeline.java index bd071d617f..1ce95b7276 100644 --- a/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/VideoSamplePipeline.java +++ b/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/VideoSamplePipeline.java @@ -218,7 +218,7 @@ import org.checkerframework.dataflow.qual.Pure; } @Override - public ColorInfo getExpectedColorInfo() { + public ColorInfo getExpectedInputColorInfo() { return frameProcessorInputColor; }