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

Fix forceInterpretHdrAsSdr not being set in DefaultAssetLoaderFactory

Browse Source 
PiperOrigin-RevId: 544296301
This commit is contained in:
kimvde 2023-06-29 09:39:04 +00:00 committed by Tianyi Feng
parent 98eb339333
commit 32bd5dd718
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
libraries/transformer/src/main/java/androidx/media3/transformer/Transformer.java
View File

@ -452,15 +452,6 @@ public final class Transformer {
if (transformationRequest.videoMimeType != null) { if (transformationRequest.videoMimeType != null) {
checkSampleMimeType(transformationRequest.videoMimeType); checkSampleMimeType(transformationRequest.videoMimeType);
} }
if (assetLoaderFactory == null) {
assetLoaderFactory =
new DefaultAssetLoaderFactory(
context,
new DefaultDecoderFactory(context),
/* forceInterpretHdrAsSdr= */ transformationRequest.hdrMode
== TransformationRequest.HDR_MODE_EXPERIMENTAL_FORCE_INTERPRET_HDR_AS_SDR,
clock);
}
return new Transformer( return new Transformer(
context, context,
transformationRequest, transformationRequest,
@ -639,7 +630,7 @@ public final class Transformer {
private final boolean removeVideo; private final boolean removeVideo;
private final boolean flattenForSlowMotion; private final boolean flattenForSlowMotion;
private final ListenerSet<Transformer.Listener> listeners; private final ListenerSet<Transformer.Listener> listeners;
private final AssetLoader.Factory assetLoaderFactory; @Nullable private final AssetLoader.Factory assetLoaderFactory;
private final VideoFrameProcessor.Factory videoFrameProcessorFactory; private final VideoFrameProcessor.Factory videoFrameProcessorFactory;
private final Codec.EncoderFactory encoderFactory; private final Codec.EncoderFactory encoderFactory;
private final Muxer.Factory muxerFactory; private final Muxer.Factory muxerFactory;
@ -658,7 +649,7 @@ public final class Transformer {
boolean removeVideo, boolean removeVideo,
boolean flattenForSlowMotion, boolean flattenForSlowMotion,
ListenerSet<Listener> listeners, ListenerSet<Listener> listeners,
AssetLoader.Factory assetLoaderFactory, @Nullable AssetLoader.Factory assetLoaderFactory,
VideoFrameProcessor.Factory videoFrameProcessorFactory, VideoFrameProcessor.Factory videoFrameProcessorFactory,
Codec.EncoderFactory encoderFactory, Codec.EncoderFactory encoderFactory,
Muxer.Factory muxerFactory, Muxer.Factory muxerFactory,
@ -797,6 +788,16 @@ public final class Transformer {
} }
FallbackListener fallbackListener = FallbackListener fallbackListener =
new FallbackListener(composition, listeners, applicationHandler, transformationRequest); new FallbackListener(composition, listeners, applicationHandler, transformationRequest);
AssetLoader.Factory assetLoaderFactory = this.assetLoaderFactory;
if (assetLoaderFactory == null) {
assetLoaderFactory =
new DefaultAssetLoaderFactory(
context,
new DefaultDecoderFactory(context),
/* forceInterpretHdrAsSdr= */ transformationRequest.hdrMode
== TransformationRequest.HDR_MODE_EXPERIMENTAL_FORCE_INTERPRET_HDR_AS_SDR,
clock);
}
DebugTraceUtil.reset(); DebugTraceUtil.reset();
transformerInternal = transformerInternal =
new TransformerInternal( new TransformerInternal(