diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/CompositeAssetLoader.java b/libraries/transformer/src/main/java/androidx/media3/transformer/CompositeAssetLoader.java index aece474f1d..608f650d3d 100644 --- a/libraries/transformer/src/main/java/androidx/media3/transformer/CompositeAssetLoader.java +++ b/libraries/transformer/src/main/java/androidx/media3/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/libraries/transformer/src/main/java/androidx/media3/transformer/ExoAssetLoaderVideoRenderer.java b/libraries/transformer/src/main/java/androidx/media3/transformer/ExoAssetLoaderVideoRenderer.java index e99ac3b43e..ad17b01bd3 100644 --- a/libraries/transformer/src/main/java/androidx/media3/transformer/ExoAssetLoaderVideoRenderer.java +++ b/libraries/transformer/src/main/java/androidx/media3/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/libraries/transformer/src/main/java/androidx/media3/transformer/SampleConsumer.java b/libraries/transformer/src/main/java/androidx/media3/transformer/SampleConsumer.java index 138130b4fd..9aa404af1a 100644 --- a/libraries/transformer/src/main/java/androidx/media3/transformer/SampleConsumer.java +++ b/libraries/transformer/src/main/java/androidx/media3/transformer/SampleConsumer.java @@ -81,7 +81,7 @@ public interface SampleConsumer { * *

Should only be used for raw video data. */ - default ColorInfo getExpectedColorInfo() { + default ColorInfo getExpectedInputColorInfo() { throw new UnsupportedOperationException(); } diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/VideoSamplePipeline.java b/libraries/transformer/src/main/java/androidx/media3/transformer/VideoSamplePipeline.java index 1476dda3f5..e454a942ee 100644 --- a/libraries/transformer/src/main/java/androidx/media3/transformer/VideoSamplePipeline.java +++ b/libraries/transformer/src/main/java/androidx/media3/transformer/VideoSamplePipeline.java @@ -218,7 +218,7 @@ import org.checkerframework.dataflow.qual.Pure; } @Override - public ColorInfo getExpectedColorInfo() { + public ColorInfo getExpectedInputColorInfo() { return frameProcessorInputColor; }