diff --git a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/TransformerEndToEndTest.java b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/TransformerEndToEndTest.java index a03e78550d..d7be5c8d52 100644 --- a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/TransformerEndToEndTest.java +++ b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/TransformerEndToEndTest.java @@ -2356,11 +2356,10 @@ public class TransformerEndToEndTest { Transformer transformer = new Transformer.Builder(context) .setEncoderFactory( - new AndroidTestUtil.ForceEncodeEncoderFactory( - new DefaultEncoderFactory.Builder(context) - .setRequestedAudioEncoderSettings( - new AudioEncoderSettings.Builder().setProfile(AACObjectHE).build()) - .build())) + new DefaultEncoderFactory.Builder(context) + .setRequestedAudioEncoderSettings( + new AudioEncoderSettings.Builder().setProfile(AACObjectHE).build()) + .build()) .build(); MediaItem mediaItem = new MediaItem.Builder().setUri(MP4_ASSET.uri).build(); EditedMediaItem editedMediaItem = @@ -2392,11 +2391,10 @@ public class TransformerEndToEndTest { new Transformer.Builder(context) .setMuxerFactory(new InAppMuxer.Factory.Builder().build()) .setEncoderFactory( - new AndroidTestUtil.ForceEncodeEncoderFactory( - new DefaultEncoderFactory.Builder(context) - .setRequestedAudioEncoderSettings( - new AudioEncoderSettings.Builder().setBitrate(requestedBitrate).build()) - .build())) + new DefaultEncoderFactory.Builder(context) + .setRequestedAudioEncoderSettings( + new AudioEncoderSettings.Builder().setBitrate(requestedBitrate).build()) + .build()) .build(); MediaItem mediaItem = new MediaItem.Builder().setUri(MP4_ASSET.uri).build(); EditedMediaItem editedMediaItem = diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/DefaultEncoderFactory.java b/libraries/transformer/src/main/java/androidx/media3/transformer/DefaultEncoderFactory.java index 3b26bff9f2..35b3165937 100644 --- a/libraries/transformer/src/main/java/androidx/media3/transformer/DefaultEncoderFactory.java +++ b/libraries/transformer/src/main/java/androidx/media3/transformer/DefaultEncoderFactory.java @@ -391,6 +391,11 @@ public final class DefaultEncoderFactory implements Codec.EncoderFactory { /* outputSurface= */ null); } + @Override + public boolean audioNeedsEncoding() { + return !requestedAudioEncoderSettings.equals(AudioEncoderSettings.DEFAULT); + } + @Override public boolean videoNeedsEncoding() { return !requestedVideoEncoderSettings.equals(VideoEncoderSettings.DEFAULT);