loliball/media
1
0
Fork 0
mirror of https://github.com/androidx/media.git synced 2025-05-07 15:40:37 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Misc small fixes in Transformer.

Browse Source 
PiperOrigin-RevId: 420056876
This commit is contained in:
hschlueter 2022-01-06 15:27:56 +00:00 committed by bachinger
parent be99b97a46
commit 68613e6a1a
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -99,7 +99,6 @@ public final class Transformer {
private boolean removeAudio; private boolean removeAudio;
private boolean removeVideo; private boolean removeVideo;
private String containerMimeType; private String containerMimeType;
// TODO(b/204869912): Make final once deprecated setters are removed.
private TransformationRequest transformationRequest; private TransformationRequest transformationRequest;
private Transformer.Listener listener; private Transformer.Listener listener;
private DebugViewProvider debugViewProvider; private DebugViewProvider debugViewProvider;

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

@ -77,7 +77,7 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull;
} }
Format inputFormat = checkNotNull(formatHolder.format); Format inputFormat = checkNotNull(formatHolder.format);
String sampleMimeType = checkNotNull(inputFormat.sampleMimeType); String sampleMimeType = checkNotNull(inputFormat.sampleMimeType);
if (transformationRequest.audioMimeType == null if (transformationRequest.videoMimeType == null
&& !muxerWrapper.supportsSampleMimeType(sampleMimeType)) { && !muxerWrapper.supportsSampleMimeType(sampleMimeType)) {
throw TransformationException.createForMuxer( throw TransformationException.createForMuxer(
new IllegalArgumentException( new IllegalArgumentException(