From 68613e6a1a9aa33bb2f6f8a494cfd788eed42c13 Mon Sep 17 00:00:00 2001 From: hschlueter Date: Thu, 6 Jan 2022 15:27:56 +0000 Subject: [PATCH] Misc small fixes in Transformer. PiperOrigin-RevId: 420056876 --- .../src/main/java/androidx/media3/transformer/Transformer.java | 1 - .../androidx/media3/transformer/TransformerVideoRenderer.java | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/Transformer.java b/libraries/transformer/src/main/java/androidx/media3/transformer/Transformer.java index c46956b722..6e7ee9a9fc 100644 --- a/libraries/transformer/src/main/java/androidx/media3/transformer/Transformer.java +++ b/libraries/transformer/src/main/java/androidx/media3/transformer/Transformer.java @@ -99,7 +99,6 @@ public final class Transformer { private boolean removeAudio; private boolean removeVideo; private String containerMimeType; - // TODO(b/204869912): Make final once deprecated setters are removed. private TransformationRequest transformationRequest; private Transformer.Listener listener; private DebugViewProvider debugViewProvider; diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/TransformerVideoRenderer.java b/libraries/transformer/src/main/java/androidx/media3/transformer/TransformerVideoRenderer.java index f991c0222f..f351cad24a 100644 --- a/libraries/transformer/src/main/java/androidx/media3/transformer/TransformerVideoRenderer.java +++ b/libraries/transformer/src/main/java/androidx/media3/transformer/TransformerVideoRenderer.java @@ -77,7 +77,7 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull; } Format inputFormat = checkNotNull(formatHolder.format); String sampleMimeType = checkNotNull(inputFormat.sampleMimeType); - if (transformationRequest.audioMimeType == null + if (transformationRequest.videoMimeType == null && !muxerWrapper.supportsSampleMimeType(sampleMimeType)) { throw TransformationException.createForMuxer( new IllegalArgumentException(