loliball/media3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Transformer: Make it clear that getExpectedColorInfo is input.

Browse Source 
Otherwise, it's not clear if it's the expected output.

Renaming-only change. No functional change intended.

PiperOrigin-RevId: 505103740
This commit is contained in:
huangdarwin 2023-01-27 14:35:34 +00:00 committed by christosts
parent 00436a04a4
commit 181564e026
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libraries/transformer/src/main/java/androidx/media3/transformer/CompositeAssetLoader.java
View File

@ -209,8 +209,8 @@ import java.util.concurrent.atomic.AtomicLong;
} }
@Override @Override
public ColorInfo getExpectedColorInfo() { public ColorInfo getExpectedInputColorInfo() {
return sampleConsumer.getExpectedColorInfo(); return sampleConsumer.getExpectedInputColorInfo();
} }
@Override @Override

2
libraries/transformer/src/main/java/androidx/media3/transformer/ExoAssetLoaderVideoRenderer.java
View File

@ -68,7 +68,7 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull;
protected void initDecoder(Format inputFormat) throws TransformationException { protected void initDecoder(Format inputFormat) throws TransformationException {
boolean isDecoderToneMappingRequired = boolean isDecoderToneMappingRequired =
ColorInfo.isTransferHdr(inputFormat.colorInfo) ColorInfo.isTransferHdr(inputFormat.colorInfo)
&& !ColorInfo.isTransferHdr(sampleConsumer.getExpectedColorInfo()); && !ColorInfo.isTransferHdr(sampleConsumer.getExpectedInputColorInfo());
decoder = decoder =
decoderFactory.createForVideoDecoding( decoderFactory.createForVideoDecoding(
inputFormat, inputFormat,

2
libraries/transformer/src/main/java/androidx/media3/transformer/SampleConsumer.java
View File

@ -81,7 +81,7 @@ public interface SampleConsumer {
* *
* <p>Should only be used for raw video data. * <p>Should only be used for raw video data.
*/ */
default ColorInfo getExpectedColorInfo() { default ColorInfo getExpectedInputColorInfo() {
throw new UnsupportedOperationException(); throw new UnsupportedOperationException();
} }

2
libraries/transformer/src/main/java/androidx/media3/transformer/VideoSamplePipeline.java
View File

@ -218,7 +218,7 @@ import org.checkerframework.dataflow.qual.Pure;
} }
@Override @Override
public ColorInfo getExpectedColorInfo() { public ColorInfo getExpectedInputColorInfo() {
return frameProcessorInputColor; return frameProcessorInputColor;
} }