diff --git a/demos/transformer/src/main/java/androidx/media3/demo/transformer/TransformerActivity.java b/demos/transformer/src/main/java/androidx/media3/demo/transformer/TransformerActivity.java index 82bd471fec..f2d29deefa 100644 --- a/demos/transformer/src/main/java/androidx/media3/demo/transformer/TransformerActivity.java +++ b/demos/transformer/src/main/java/androidx/media3/demo/transformer/TransformerActivity.java @@ -87,7 +87,6 @@ import androidx.media3.transformer.Effects; import androidx.media3.transformer.ExportException; import androidx.media3.transformer.ExportResult; import androidx.media3.transformer.ProgressHolder; -import androidx.media3.transformer.TransformationRequest; import androidx.media3.transformer.Transformer; import androidx.media3.ui.AspectRatioFrameLayout; import androidx.media3.ui.PlayerView; @@ -100,7 +99,6 @@ import com.google.common.util.concurrent.ListenableFuture; import java.io.File; import java.io.IOException; import java.lang.reflect.Constructor; -import java.util.ArrayList; import java.util.List; import java.util.concurrent.CountDownLatch; import java.util.concurrent.ExecutionException; @@ -299,17 +297,14 @@ public final class TransformerActivity extends AppCompatActivity { private Transformer createTransformer(@Nullable Bundle bundle, Uri inputUri, String filePath) { Transformer.Builder transformerBuilder = new Transformer.Builder(/* context= */ this); if (bundle != null) { - TransformationRequest.Builder requestBuilder = new TransformationRequest.Builder(); @Nullable String audioMimeType = bundle.getString(ConfigurationActivity.AUDIO_MIME_TYPE); if (audioMimeType != null) { - requestBuilder.setAudioMimeType(audioMimeType); + transformerBuilder.setAudioMimeType(audioMimeType); } @Nullable String videoMimeType = bundle.getString(ConfigurationActivity.VIDEO_MIME_TYPE); if (videoMimeType != null) { - requestBuilder.setVideoMimeType(videoMimeType); + transformerBuilder.setVideoMimeType(videoMimeType); } - requestBuilder.setHdrMode(bundle.getInt(ConfigurationActivity.HDR_MODE)); - transformerBuilder.setTransformationRequest(requestBuilder.build()); transformerBuilder.setEncoderFactory( new DefaultEncoderFactory.Builder(this.getApplicationContext()) @@ -368,7 +363,6 @@ public final class TransformerActivity extends AppCompatActivity { EditedMediaItem.Builder editedMediaItemBuilder = new EditedMediaItem.Builder(mediaItem); // For image inputs. Automatically ignored if input is audio/video. editedMediaItemBuilder.setDurationUs(5_000_000).setFrameRate(30); - boolean forceAudioTrack = false; if (bundle != null) { ImmutableList audioProcessors = createAudioProcessorsFromBundle(bundle); ImmutableList videoEffects = createVideoEffectsFromBundle(bundle); @@ -378,15 +372,18 @@ public final class TransformerActivity extends AppCompatActivity { .setFlattenForSlowMotion( bundle.getBoolean(ConfigurationActivity.SHOULD_FLATTEN_FOR_SLOW_MOTION)) .setEffects(new Effects(audioProcessors, videoEffects)); - forceAudioTrack = bundle.getBoolean(ConfigurationActivity.FORCE_AUDIO_TRACK); } - List editedMediaItems = new ArrayList<>(); - editedMediaItems.add(editedMediaItemBuilder.build()); - List sequences = new ArrayList<>(); - sequences.add(new EditedMediaItemSequence(editedMediaItems)); - return new Composition.Builder(sequences) - .experimentalSetForceAudioTrack(forceAudioTrack) - .build(); + List editedMediaItems = ImmutableList.of(editedMediaItemBuilder.build()); + List sequences = + ImmutableList.of(new EditedMediaItemSequence(editedMediaItems)); + Composition.Builder compositionBuilder = new Composition.Builder(sequences); + if (bundle != null) { + compositionBuilder + .setHdrMode(bundle.getInt(ConfigurationActivity.HDR_MODE)) + .experimentalSetForceAudioTrack( + bundle.getBoolean(ConfigurationActivity.FORCE_AUDIO_TRACK)); + } + return compositionBuilder.build(); } private ImmutableList createAudioProcessorsFromBundle(Bundle bundle) { diff --git a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/ForceInterpretHdrVideoAsSdrTest.java b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/ForceInterpretHdrVideoAsSdrTest.java index 49c41b9a64..14ea44a229 100644 --- a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/ForceInterpretHdrVideoAsSdrTest.java +++ b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/ForceInterpretHdrVideoAsSdrTest.java @@ -30,18 +30,21 @@ import androidx.media3.common.C; import androidx.media3.common.ColorInfo; import androidx.media3.common.Format; import androidx.media3.common.MediaItem; +import androidx.media3.transformer.Composition; +import androidx.media3.transformer.EditedMediaItem; +import androidx.media3.transformer.EditedMediaItemSequence; import androidx.media3.transformer.ExportTestResult; -import androidx.media3.transformer.TransformationRequest; import androidx.media3.transformer.Transformer; import androidx.media3.transformer.TransformerAndroidTestRunner; import androidx.test.core.app.ApplicationProvider; import androidx.test.ext.junit.runners.AndroidJUnit4; +import com.google.common.collect.ImmutableList; import org.junit.Test; import org.junit.runner.RunWith; /** * {@link Transformer} instrumentation test for {@linkplain - * TransformationRequest#HDR_MODE_EXPERIMENTAL_FORCE_INTERPRET_HDR_AS_SDR forcing HDR contents to be + * Composition#HDR_MODE_EXPERIMENTAL_FORCE_INTERPRET_HDR_AS_SDR forcing HDR contents to be * interpreted as SDR}. */ @RunWith(AndroidJUnit4.class) @@ -70,19 +73,19 @@ public class ForceInterpretHdrVideoAsSdrTest { return; } - Transformer transformer = - new Transformer.Builder(context) - .setTransformationRequest( - new TransformationRequest.Builder() - .setHdrMode( - TransformationRequest.HDR_MODE_EXPERIMENTAL_FORCE_INTERPRET_HDR_AS_SDR) - .build()) - .build(); + Transformer transformer = new Transformer.Builder(context).build(); MediaItem mediaItem = MediaItem.fromUri(Uri.parse(MP4_ASSET_720P_4_SECOND_HDR10)); + EditedMediaItem editedMediaItem = new EditedMediaItem.Builder(mediaItem).build(); + EditedMediaItemSequence sequence = + new EditedMediaItemSequence(ImmutableList.of(editedMediaItem)); + Composition composition = + new Composition.Builder(ImmutableList.of(sequence)) + .setHdrMode(Composition.HDR_MODE_EXPERIMENTAL_FORCE_INTERPRET_HDR_AS_SDR) + .build(); ExportTestResult exportTestResult = new TransformerAndroidTestRunner.Builder(context, transformer) .build() - .run(testId, mediaItem); + .run(testId, composition); assertFileHasColorTransfer(context, exportTestResult.filePath, C.COLOR_TRANSFER_SDR); } @@ -110,19 +113,19 @@ public class ForceInterpretHdrVideoAsSdrTest { return; } - Transformer transformer = - new Transformer.Builder(context) - .setTransformationRequest( - new TransformationRequest.Builder() - .setHdrMode( - TransformationRequest.HDR_MODE_EXPERIMENTAL_FORCE_INTERPRET_HDR_AS_SDR) - .build()) - .build(); + Transformer transformer = new Transformer.Builder(context).build(); MediaItem mediaItem = MediaItem.fromUri(Uri.parse(MP4_ASSET_1080P_5_SECOND_HLG10)); + EditedMediaItem editedMediaItem = new EditedMediaItem.Builder(mediaItem).build(); + EditedMediaItemSequence sequence = + new EditedMediaItemSequence(ImmutableList.of(editedMediaItem)); + Composition composition = + new Composition.Builder(ImmutableList.of(sequence)) + .setHdrMode(Composition.HDR_MODE_EXPERIMENTAL_FORCE_INTERPRET_HDR_AS_SDR) + .build(); ExportTestResult exportTestResult = new TransformerAndroidTestRunner.Builder(context, transformer) .build() - .run(testId, mediaItem); + .run(testId, composition); assertFileHasColorTransfer(context, exportTestResult.filePath, C.COLOR_TRANSFER_SDR); } diff --git a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/ToneMapHdrToSdrUsingMediaCodecTest.java b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/ToneMapHdrToSdrUsingMediaCodecTest.java index a07d08d514..059d866745 100644 --- a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/ToneMapHdrToSdrUsingMediaCodecTest.java +++ b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/ToneMapHdrToSdrUsingMediaCodecTest.java @@ -29,7 +29,9 @@ import androidx.media3.common.C; import androidx.media3.common.ColorInfo; import androidx.media3.common.MediaItem; import androidx.media3.transformer.AndroidTestUtil; +import androidx.media3.transformer.Composition; import androidx.media3.transformer.EditedMediaItem; +import androidx.media3.transformer.EditedMediaItemSequence; import androidx.media3.transformer.ExportException; import androidx.media3.transformer.ExportTestResult; import androidx.media3.transformer.TransformationRequest; @@ -37,14 +39,14 @@ import androidx.media3.transformer.Transformer; import androidx.media3.transformer.TransformerAndroidTestRunner; import androidx.test.core.app.ApplicationProvider; import androidx.test.ext.junit.runners.AndroidJUnit4; +import com.google.common.collect.ImmutableList; import java.util.Objects; import org.junit.Test; import org.junit.runner.RunWith; /** * {@link Transformer} instrumentation test for applying an {@linkplain - * TransformationRequest#HDR_MODE_TONE_MAP_HDR_TO_SDR_USING_MEDIACODEC HDR to SDR tone mapping - * edit}. + * Composition#HDR_MODE_TONE_MAP_HDR_TO_SDR_USING_MEDIACODEC HDR to SDR tone mapping edit}. */ @RunWith(AndroidJUnit4.class) public class ToneMapHdrToSdrUsingMediaCodecTest { @@ -67,10 +69,6 @@ public class ToneMapHdrToSdrUsingMediaCodecTest { Transformer transformer = new Transformer.Builder(context) - .setTransformationRequest( - new TransformationRequest.Builder() - .setHdrMode(TransformationRequest.HDR_MODE_TONE_MAP_HDR_TO_SDR_USING_MEDIACODEC) - .build()) .addListener( new Transformer.Listener() { @Override @@ -86,12 +84,19 @@ public class ToneMapHdrToSdrUsingMediaCodecTest { }) .build(); MediaItem mediaItem = MediaItem.fromUri(Uri.parse(MP4_ASSET_720P_4_SECOND_HDR10)); + EditedMediaItem editedMediaItem = new EditedMediaItem.Builder(mediaItem).build(); + EditedMediaItemSequence sequence = + new EditedMediaItemSequence(ImmutableList.of(editedMediaItem)); + Composition composition = + new Composition.Builder(ImmutableList.of(sequence)) + .setHdrMode(Composition.HDR_MODE_TONE_MAP_HDR_TO_SDR_USING_MEDIACODEC) + .build(); try { ExportTestResult exportTestResult = new TransformerAndroidTestRunner.Builder(context, transformer) .build() - .run(testId, mediaItem); + .run(testId, composition); assertFileHasColorTransfer(context, exportTestResult.filePath, C.COLOR_TRANSFER_SDR); } catch (ExportException exception) { if (exception.getCause() != null @@ -126,10 +131,6 @@ public class ToneMapHdrToSdrUsingMediaCodecTest { Transformer transformer = new Transformer.Builder(context) - .setTransformationRequest( - new TransformationRequest.Builder() - .setHdrMode(TransformationRequest.HDR_MODE_TONE_MAP_HDR_TO_SDR_USING_MEDIACODEC) - .build()) .addListener( new Transformer.Listener() { @Override @@ -145,12 +146,19 @@ public class ToneMapHdrToSdrUsingMediaCodecTest { }) .build(); MediaItem mediaItem = MediaItem.fromUri(Uri.parse(MP4_ASSET_1080P_5_SECOND_HLG10)); + EditedMediaItem editedMediaItem = new EditedMediaItem.Builder(mediaItem).build(); + EditedMediaItemSequence sequence = + new EditedMediaItemSequence(ImmutableList.of(editedMediaItem)); + Composition composition = + new Composition.Builder(ImmutableList.of(sequence)) + .setHdrMode(Composition.HDR_MODE_TONE_MAP_HDR_TO_SDR_USING_MEDIACODEC) + .build(); try { ExportTestResult exportTestResult = new TransformerAndroidTestRunner.Builder(context, transformer) .build() - .run(testId, mediaItem); + .run(testId, composition); assertFileHasColorTransfer(context, exportTestResult.filePath, C.COLOR_TRANSFER_SDR); } catch (ExportException exception) { if (exception.getCause() != null @@ -185,10 +193,6 @@ public class ToneMapHdrToSdrUsingMediaCodecTest { Transformer transformer = new Transformer.Builder(context) - .setTransformationRequest( - new TransformationRequest.Builder() - .setHdrMode(TransformationRequest.HDR_MODE_TONE_MAP_HDR_TO_SDR_USING_MEDIACODEC) - .build()) .addListener( new Transformer.Listener() { @Override @@ -206,12 +210,18 @@ public class ToneMapHdrToSdrUsingMediaCodecTest { MediaItem mediaItem = MediaItem.fromUri(Uri.parse(MP4_ASSET_720P_4_SECOND_HDR10)); EditedMediaItem editedMediaItem = new EditedMediaItem.Builder(mediaItem).setEffects(FORCE_TRANSCODE_VIDEO_EFFECTS).build(); + EditedMediaItemSequence sequence = + new EditedMediaItemSequence(ImmutableList.of(editedMediaItem)); + Composition composition = + new Composition.Builder(ImmutableList.of(sequence)) + .setHdrMode(Composition.HDR_MODE_TONE_MAP_HDR_TO_SDR_USING_MEDIACODEC) + .build(); try { ExportTestResult exportTestResult = new TransformerAndroidTestRunner.Builder(context, transformer) .build() - .run(testId, editedMediaItem); + .run(testId, composition); assertFileHasColorTransfer(context, exportTestResult.filePath, C.COLOR_TRANSFER_SDR); } catch (ExportException exception) { if (exception.getCause() != null @@ -246,10 +256,6 @@ public class ToneMapHdrToSdrUsingMediaCodecTest { Transformer transformer = new Transformer.Builder(context) - .setTransformationRequest( - new TransformationRequest.Builder() - .setHdrMode(TransformationRequest.HDR_MODE_TONE_MAP_HDR_TO_SDR_USING_MEDIACODEC) - .build()) .addListener( new Transformer.Listener() { @Override @@ -267,12 +273,18 @@ public class ToneMapHdrToSdrUsingMediaCodecTest { MediaItem mediaItem = MediaItem.fromUri(Uri.parse(MP4_ASSET_1080P_5_SECOND_HLG10)); EditedMediaItem editedMediaItem = new EditedMediaItem.Builder(mediaItem).setEffects(FORCE_TRANSCODE_VIDEO_EFFECTS).build(); + EditedMediaItemSequence sequence = + new EditedMediaItemSequence(ImmutableList.of(editedMediaItem)); + Composition composition = + new Composition.Builder(ImmutableList.of(sequence)) + .setHdrMode(Composition.HDR_MODE_TONE_MAP_HDR_TO_SDR_USING_MEDIACODEC) + .build(); try { ExportTestResult exportTestResult = new TransformerAndroidTestRunner.Builder(context, transformer) .build() - .run(testId, editedMediaItem); + .run(testId, composition); assertFileHasColorTransfer(context, exportTestResult.filePath, C.COLOR_TRANSFER_SDR); } catch (ExportException exception) { if (exception.getCause() != null diff --git a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/ToneMapHdrToSdrUsingOpenGlTest.java b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/ToneMapHdrToSdrUsingOpenGlTest.java index bce9d556d8..0382df5605 100644 --- a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/ToneMapHdrToSdrUsingOpenGlTest.java +++ b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/ToneMapHdrToSdrUsingOpenGlTest.java @@ -34,12 +34,15 @@ import androidx.media3.common.util.GlUtil; import androidx.media3.common.util.Util; import androidx.media3.exoplayer.mediacodec.MediaCodecUtil; import androidx.media3.transformer.AndroidTestUtil; +import androidx.media3.transformer.Composition; +import androidx.media3.transformer.EditedMediaItem; +import androidx.media3.transformer.EditedMediaItemSequence; import androidx.media3.transformer.ExportTestResult; -import androidx.media3.transformer.TransformationRequest; import androidx.media3.transformer.Transformer; import androidx.media3.transformer.TransformerAndroidTestRunner; import androidx.test.core.app.ApplicationProvider; import androidx.test.ext.junit.runners.AndroidJUnit4; +import com.google.common.collect.ImmutableList; import java.io.IOException; import org.json.JSONException; import org.junit.Test; @@ -47,7 +50,7 @@ import org.junit.runner.RunWith; /** * {@link Transformer} instrumentation test for applying an {@linkplain - * TransformationRequest#HDR_MODE_TONE_MAP_HDR_TO_SDR_USING_OPEN_GL HDR to SDR tone mapping edit}. + * Composition#HDR_MODE_TONE_MAP_HDR_TO_SDR_USING_OPEN_GL HDR to SDR tone mapping edit}. */ @RunWith(AndroidJUnit4.class) public class ToneMapHdrToSdrUsingOpenGlTest { @@ -88,17 +91,19 @@ public class ToneMapHdrToSdrUsingOpenGlTest { } private void runTransformerWithOpenGlToneMapping(String testId, String fileUri) throws Exception { - Transformer transformer = - new Transformer.Builder(context) - .setTransformationRequest( - new TransformationRequest.Builder() - .setHdrMode(TransformationRequest.HDR_MODE_TONE_MAP_HDR_TO_SDR_USING_OPEN_GL) - .build()) + Transformer transformer = new Transformer.Builder(context).build(); + MediaItem mediaItem = MediaItem.fromUri(fileUri); + EditedMediaItem editedMediaItem = new EditedMediaItem.Builder(mediaItem).build(); + EditedMediaItemSequence sequence = + new EditedMediaItemSequence(ImmutableList.of(editedMediaItem)); + Composition composition = + new Composition.Builder(ImmutableList.of(sequence)) + .setHdrMode(Composition.HDR_MODE_TONE_MAP_HDR_TO_SDR_USING_OPEN_GL) .build(); ExportTestResult exportTestResult = new TransformerAndroidTestRunner.Builder(context, transformer) .build() - .run(testId, MediaItem.fromUri(fileUri)); + .run(testId, composition); assertFileHasColorTransfer(context, exportTestResult.filePath, C.COLOR_TRANSFER_SDR); } diff --git a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/TranscodeQualityTest.java b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/TranscodeQualityTest.java index 76d6d2ada3..0712c162a4 100644 --- a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/TranscodeQualityTest.java +++ b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/TranscodeQualityTest.java @@ -28,7 +28,6 @@ import androidx.media3.transformer.AndroidTestUtil; import androidx.media3.transformer.DefaultEncoderFactory; import androidx.media3.transformer.EditedMediaItem; import androidx.media3.transformer.ExportTestResult; -import androidx.media3.transformer.TransformationRequest; import androidx.media3.transformer.Transformer; import androidx.media3.transformer.TransformerAndroidTestRunner; import androidx.media3.transformer.VideoEncoderSettings; @@ -58,8 +57,7 @@ public final class TranscodeQualityTest { Transformer transformer = new Transformer.Builder(context) - .setTransformationRequest( - new TransformationRequest.Builder().setVideoMimeType(MimeTypes.VIDEO_H264).build()) + .setVideoMimeType(MimeTypes.VIDEO_H264) .setEncoderFactory( new DefaultEncoderFactory.Builder(context) .setRequestedVideoEncoderSettings( @@ -104,10 +102,7 @@ public final class TranscodeQualityTest { assumeTrue(!Util.MODEL.equals("SM-F711U1") && !Util.MODEL.equals("SM-F926U1")); Transformer transformer = - new Transformer.Builder(context) - .setTransformationRequest( - new TransformationRequest.Builder().setVideoMimeType(MimeTypes.VIDEO_H265).build()) - .build(); + new Transformer.Builder(context).setVideoMimeType(MimeTypes.VIDEO_H265).build(); MediaItem mediaItem = MediaItem.fromUri( Uri.parse(AndroidTestUtil.MP4_ASSET_WITH_INCREASING_TIMESTAMPS_URI_STRING)); @@ -135,8 +130,7 @@ public final class TranscodeQualityTest { Transformer transformer = new Transformer.Builder(context) - .setTransformationRequest( - new TransformationRequest.Builder().setVideoMimeType(MimeTypes.VIDEO_H264).build()) + .setVideoMimeType(MimeTypes.VIDEO_H264) .setEncoderFactory(new AndroidTestUtil.ForceEncodeEncoderFactory(context)) .build(); MediaItem mediaItem = diff --git a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/analysis/RepeatedTranscodeTest.java b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/analysis/RepeatedTranscodeTest.java index 95dc9effa9..85c4b0dee3 100644 --- a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/analysis/RepeatedTranscodeTest.java +++ b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/analysis/RepeatedTranscodeTest.java @@ -25,7 +25,6 @@ import androidx.media3.common.MediaItem; import androidx.media3.transformer.AndroidTestUtil; import androidx.media3.transformer.EditedMediaItem; import androidx.media3.transformer.ExportTestResult; -import androidx.media3.transformer.TransformationRequest; import androidx.media3.transformer.Transformer; import androidx.media3.transformer.TransformerAndroidTestRunner; import androidx.test.core.app.ApplicationProvider; @@ -116,7 +115,6 @@ public final class RepeatedTranscodeTest { new TransformerAndroidTestRunner.Builder( context, new Transformer.Builder(context) - .setTransformationRequest(new TransformationRequest.Builder().build()) .setEncoderFactory(new AndroidTestUtil.ForceEncodeEncoderFactory(context)) .build()) .build(); diff --git a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/analysis/SsimMapperTest.java b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/analysis/SsimMapperTest.java index 4d538bb52b..b3fe7afb10 100644 --- a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/analysis/SsimMapperTest.java +++ b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/analysis/SsimMapperTest.java @@ -56,7 +56,6 @@ import androidx.media3.common.util.Util; import androidx.media3.transformer.AndroidTestUtil; import androidx.media3.transformer.DefaultEncoderFactory; import androidx.media3.transformer.EditedMediaItem; -import androidx.media3.transformer.TransformationRequest; import androidx.media3.transformer.Transformer; import androidx.media3.transformer.TransformerAndroidTestRunner; import androidx.media3.transformer.VideoEncoderSettings; @@ -183,7 +182,7 @@ public class SsimMapperTest { * @param testIdPrefix The test ID prefix. * @param videoUri The URI of the video to transform. * @param outputMimeType The video sample MIME type to output, see {@link - * TransformationRequest.Builder#setVideoMimeType}. + * Transformer.Builder#setVideoMimeType}. */ public SsimBinarySearcher( Context context, String testIdPrefix, String videoUri, String outputMimeType) { @@ -291,8 +290,7 @@ public class SsimMapperTest { Transformer transformer = new Transformer.Builder(context) - .setTransformationRequest( - new TransformationRequest.Builder().setVideoMimeType(outputMimeType).build()) + .setVideoMimeType(outputMimeType) .setEncoderFactory( new DefaultEncoderFactory.Builder(context) .setRequestedVideoEncoderSettings( diff --git a/libraries/transformer/src/test/java/androidx/media3/transformer/MediaItemExportTest.java b/libraries/transformer/src/test/java/androidx/media3/transformer/MediaItemExportTest.java index 91a88c9fea..87efa46b54 100644 --- a/libraries/transformer/src/test/java/androidx/media3/transformer/MediaItemExportTest.java +++ b/libraries/transformer/src/test/java/androidx/media3/transformer/MediaItemExportTest.java @@ -157,10 +157,7 @@ public final class MediaItemExportTest { public void start_audioOnlyTranscoding_completesSuccessfully() throws Exception { Transformer transformer = createTransformerBuilder(testMuxerHolder, /* enableFallback= */ false) - .setTransformationRequest( - new TransformationRequest.Builder() - .setAudioMimeType(MimeTypes.AUDIO_AAC) // supported by encoder and muxer - .build()) + .setAudioMimeType(MimeTypes.AUDIO_AAC) // supported by encoder and muxer .build(); MediaItem mediaItem = MediaItem.fromUri(ASSET_URI_PREFIX + FILE_AUDIO_RAW); @@ -213,8 +210,7 @@ public final class MediaItemExportTest { public void start_withSubtitles_completesSuccessfully() throws Exception { Transformer transformer = createTransformerBuilder(testMuxerHolder, /* enableFallback= */ false) - .setTransformationRequest( - new TransformationRequest.Builder().setAudioMimeType(MimeTypes.AUDIO_AAC).build()) + .setAudioMimeType(MimeTypes.AUDIO_AAC) .build(); MediaItem mediaItem = MediaItem.fromUri(ASSET_URI_PREFIX + FILE_WITH_SUBTITLES); @@ -482,8 +478,7 @@ public final class MediaItemExportTest { .addListener(mockListener1) .addListener(mockListener2) .addListener(mockListener3) - .setTransformationRequest( // Request transcoding so that decoder is used. - new TransformationRequest.Builder().setAudioMimeType(MimeTypes.AUDIO_AAC).build()) + .setAudioMimeType(MimeTypes.AUDIO_AAC) // Request transcoding so that decoder is used. .build(); MediaItem mediaItem = MediaItem.fromUri(ASSET_URI_PREFIX + FILE_AUDIO_UNSUPPORTED_BY_DECODER); @@ -691,11 +686,7 @@ public final class MediaItemExportTest { public void start_withAudioEncoderFormatUnsupported_completesWithError() { Transformer transformer = createTransformerBuilder(testMuxerHolder, /* enableFallback= */ false) - .setTransformationRequest( - new TransformationRequest.Builder() - .setAudioMimeType( - MimeTypes.AUDIO_AMR_NB) // unsupported by encoder, supported by muxer - .build()) + .setAudioMimeType(MimeTypes.AUDIO_AMR_NB) // unsupported by encoder, supported by muxer .build(); MediaItem mediaItem = MediaItem.fromUri(ASSET_URI_PREFIX + FILE_AUDIO_UNSUPPORTED_BY_MUXER); @@ -711,10 +702,7 @@ public final class MediaItemExportTest { public void start_withAudioDecoderFormatUnsupported_completesWithError() { Transformer transformer = createTransformerBuilder(testMuxerHolder, /* enableFallback= */ false) - .setTransformationRequest( - new TransformationRequest.Builder() - .setAudioMimeType(MimeTypes.AUDIO_AAC) // supported by encoder and muxer - .build()) + .setAudioMimeType(MimeTypes.AUDIO_AAC) // supported by encoder and muxer .build(); MediaItem mediaItem = MediaItem.fromUri(ASSET_URI_PREFIX + FILE_AUDIO_UNSUPPORTED_BY_DECODER); diff --git a/libraries/transformer/src/test/java/androidx/media3/transformer/TransformerBuilderTest.java b/libraries/transformer/src/test/java/androidx/media3/transformer/TransformerBuilderTest.java index 55a8a92e4f..64d0919a87 100644 --- a/libraries/transformer/src/test/java/androidx/media3/transformer/TransformerBuilderTest.java +++ b/libraries/transformer/src/test/java/androidx/media3/transformer/TransformerBuilderTest.java @@ -32,28 +32,18 @@ public class TransformerBuilderTest { @Test public void build_withUnsupportedAudioMimeType_throws() { Context context = ApplicationProvider.getApplicationContext(); - TransformationRequest transformationRequest = - new TransformationRequest.Builder().setAudioMimeType(MimeTypes.AUDIO_UNKNOWN).build(); assertThrows( IllegalStateException.class, - () -> - new Transformer.Builder(context) - .setTransformationRequest(transformationRequest) - .build()); + () -> new Transformer.Builder(context).setAudioMimeType(MimeTypes.AUDIO_UNKNOWN).build()); } @Test public void build_withUnsupportedVideoMimeType_throws() { Context context = ApplicationProvider.getApplicationContext(); - TransformationRequest transformationRequest = - new TransformationRequest.Builder().setVideoMimeType(MimeTypes.VIDEO_UNKNOWN).build(); assertThrows( IllegalStateException.class, - () -> - new Transformer.Builder(context) - .setTransformationRequest(transformationRequest) - .build()); + () -> new Transformer.Builder(context).setVideoMimeType(MimeTypes.VIDEO_UNKNOWN).build()); } }