From c858abda5d6795a52b58bdb6f609d705ed8fa100 Mon Sep 17 00:00:00 2001 From: sheenachhabra Date: Fri, 28 Mar 2025 03:49:53 -0700 Subject: [PATCH] Remove usage of Composition.Builder#experimentalSetForceAudioTrack This CL removes all usages within media3. PiperOrigin-RevId: 741469343 --- .../demo/transformer/TransformerActivity.java | 16 +++++----- ...CompositionPlayerSpeedAdjustmentsTest.java | 2 +- .../transformer/TransformerEndToEndTest.java | 11 ++++--- .../mh/VideoTimestampConsistencyTest.java | 4 +-- .../transformer/MediaItemExportTest.java | 30 ++++++++++++------- .../ParameterizedAudioExportTest.java | 4 +-- .../ParameterizedItemExportTest.java | 4 +-- .../transformer/SequenceExportTest.java | 29 ++++++++++-------- 8 files changed, 60 insertions(+), 40 deletions(-) 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 d1cae9990c..ef5ed6560f 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 @@ -466,14 +466,16 @@ public final class TransformerActivity extends AppCompatActivity { bundle.getBoolean(ConfigurationActivity.SHOULD_FLATTEN_FOR_SLOW_MOTION)) .setEffects(new Effects(audioProcessors, videoEffects)); } - Composition.Builder compositionBuilder = - new Composition.Builder( - new EditedMediaItemSequence.Builder(editedMediaItemBuilder.build()).build()); + EditedMediaItemSequence.Builder editedMediaItemSequenceBuilder = + new EditedMediaItemSequence.Builder(editedMediaItemBuilder.build()); if (bundle != null) { - compositionBuilder - .setHdrMode(bundle.getInt(ConfigurationActivity.HDR_MODE)) - .experimentalSetForceAudioTrack( - bundle.getBoolean(ConfigurationActivity.FORCE_AUDIO_TRACK)); + editedMediaItemSequenceBuilder.setForceAudioTrack( + bundle.getBoolean(ConfigurationActivity.FORCE_AUDIO_TRACK)); + } + Composition.Builder compositionBuilder = + new Composition.Builder(editedMediaItemSequenceBuilder.build()); + if (bundle != null) { + compositionBuilder.setHdrMode(bundle.getInt(ConfigurationActivity.HDR_MODE)); } return compositionBuilder.build(); } diff --git a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/CompositionPlayerSpeedAdjustmentsTest.java b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/CompositionPlayerSpeedAdjustmentsTest.java index ea2d051889..dd6f824399 100644 --- a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/CompositionPlayerSpeedAdjustmentsTest.java +++ b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/CompositionPlayerSpeedAdjustmentsTest.java @@ -108,8 +108,8 @@ public class CompositionPlayerSpeedAdjustmentsTest { compositionPlayer.setComposition( new Composition.Builder( new EditedMediaItemSequence.Builder(timestampRecordingEditedMediaItems) + .setForceAudioTrack(true) .build()) - .experimentalSetForceAudioTrack(true) .build()); compositionPlayer.prepare(); compositionPlayer.play(); 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 97d63dc99a..25dfc8dd45 100644 --- a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/TransformerEndToEndTest.java +++ b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/TransformerEndToEndTest.java @@ -1350,8 +1350,10 @@ public class TransformerEndToEndTest { .setRemoveAudio(true) .build(); Composition composition = - new Composition.Builder(new EditedMediaItemSequence.Builder(editedMediaItem).build()) - .experimentalSetForceAudioTrack(true) + new Composition.Builder( + new EditedMediaItemSequence.Builder(editedMediaItem) + .setForceAudioTrack(true) + .build()) .build(); ExportTestResult result = new TransformerAndroidTestRunner.Builder(context, transformer) @@ -1443,8 +1445,9 @@ public class TransformerEndToEndTest { .build(); Composition composition = new Composition.Builder( - new EditedMediaItemSequence.Builder(editedMediaItem, editedMediaItem).build()) - .experimentalSetForceAudioTrack(true) + new EditedMediaItemSequence.Builder(editedMediaItem, editedMediaItem) + .setForceAudioTrack(true) + .build()) .build(); ExportTestResult result = new TransformerAndroidTestRunner.Builder(context, transformer) diff --git a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/VideoTimestampConsistencyTest.java b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/VideoTimestampConsistencyTest.java index cfbc0eb4c1..a99de65b4a 100644 --- a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/VideoTimestampConsistencyTest.java +++ b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/VideoTimestampConsistencyTest.java @@ -399,8 +399,8 @@ public class VideoTimestampConsistencyTest { /* testId= */ testName.getMethodName(), new Composition.Builder( new EditedMediaItemSequence.Builder(timestampRecordingEditedMediaItems) + .setForceAudioTrack(true) .build()) - .experimentalSetForceAudioTrack(true) .build()); return timestampRecordingShaderProgram.getInputTimestampsUs(); @@ -427,8 +427,8 @@ public class VideoTimestampConsistencyTest { compositionPlayer.setComposition( new Composition.Builder( new EditedMediaItemSequence.Builder(timestampRecordingEditedMediaItems) + .setForceAudioTrack(true) .build()) - .experimentalSetForceAudioTrack(true) .build()); compositionPlayer.prepare(); compositionPlayer.play(); 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 8e9e6338b9..f323ffee87 100644 --- a/libraries/transformer/src/test/java/androidx/media3/transformer/MediaItemExportTest.java +++ b/libraries/transformer/src/test/java/androidx/media3/transformer/MediaItemExportTest.java @@ -401,8 +401,10 @@ public final class MediaItemExportTest { MediaItem mediaItem = MediaItem.fromUri(ASSET_URI_PREFIX + FILE_AUDIO_AMR_NB); EditedMediaItem editedMediaItem = new EditedMediaItem.Builder(mediaItem).build(); Composition composition = - new Composition.Builder(new EditedMediaItemSequence.Builder(editedMediaItem).build()) - .experimentalSetForceAudioTrack(true) + new Composition.Builder( + new EditedMediaItemSequence.Builder(editedMediaItem) + .setForceAudioTrack(true) + .build()) .build(); transformer.start(composition, outputDir.newFile().getPath()); @@ -420,8 +422,10 @@ public final class MediaItemExportTest { MediaItem mediaItem = MediaItem.fromUri(ASSET_URI_PREFIX + FILE_AUDIO_VIDEO); EditedMediaItem editedMediaItem = new EditedMediaItem.Builder(mediaItem).build(); Composition composition = - new Composition.Builder(new EditedMediaItemSequence.Builder(editedMediaItem).build()) - .experimentalSetForceAudioTrack(true) + new Composition.Builder( + new EditedMediaItemSequence.Builder(editedMediaItem) + .setForceAudioTrack(true) + .build()) .build(); transformer.start(composition, outputDir.newFile().getPath()); @@ -445,8 +449,10 @@ public final class MediaItemExportTest { .setEffects(createAudioEffects(sonicAudioProcessor)) .build(); Composition composition = - new Composition.Builder(new EditedMediaItemSequence.Builder(editedMediaItem).build()) - .experimentalSetForceAudioTrack(true) + new Composition.Builder( + new EditedMediaItemSequence.Builder(editedMediaItem) + .setForceAudioTrack(true) + .build()) .build(); transformer.start(composition, outputDir.newFile().getPath()); @@ -471,8 +477,10 @@ public final class MediaItemExportTest { .setRemoveVideo(true) .build(); Composition composition = - new Composition.Builder(new EditedMediaItemSequence.Builder(editedMediaItem).build()) - .experimentalSetForceAudioTrack(true) + new Composition.Builder( + new EditedMediaItemSequence.Builder(editedMediaItem) + .setForceAudioTrack(true) + .build()) .build(); transformer.start(composition, outputDir.newFile().getPath()); @@ -492,8 +500,10 @@ public final class MediaItemExportTest { MediaItem mediaItem = MediaItem.fromUri(ASSET_URI_PREFIX + FILE_VIDEO_ONLY); EditedMediaItem editedMediaItem = new EditedMediaItem.Builder(mediaItem).build(); Composition composition = - new Composition.Builder(new EditedMediaItemSequence.Builder(editedMediaItem).build()) - .experimentalSetForceAudioTrack(true) + new Composition.Builder( + new EditedMediaItemSequence.Builder(editedMediaItem) + .setForceAudioTrack(true) + .build()) .build(); transformer.start(composition, outputDir.newFile().getPath()); diff --git a/libraries/transformer/src/test/java/androidx/media3/transformer/ParameterizedAudioExportTest.java b/libraries/transformer/src/test/java/androidx/media3/transformer/ParameterizedAudioExportTest.java index 814cfae016..810f0ea0d1 100644 --- a/libraries/transformer/src/test/java/androidx/media3/transformer/ParameterizedAudioExportTest.java +++ b/libraries/transformer/src/test/java/androidx/media3/transformer/ParameterizedAudioExportTest.java @@ -172,9 +172,9 @@ public final class ParameterizedAudioExportTest { items.add(itemConfig.asItem()); } - return new Composition.Builder(new EditedMediaItemSequence.Builder(items.build()).build()) + return new Composition.Builder( + new EditedMediaItemSequence.Builder(items.build()).setForceAudioTrack(true).build()) .setTransmuxVideo(true) - .experimentalSetForceAudioTrack(true) .build(); } diff --git a/libraries/transformer/src/test/java/androidx/media3/transformer/ParameterizedItemExportTest.java b/libraries/transformer/src/test/java/androidx/media3/transformer/ParameterizedItemExportTest.java index ca9732b7e1..48ed16e5a0 100644 --- a/libraries/transformer/src/test/java/androidx/media3/transformer/ParameterizedItemExportTest.java +++ b/libraries/transformer/src/test/java/androidx/media3/transformer/ParameterizedItemExportTest.java @@ -135,8 +135,8 @@ public final class ParameterizedItemExportTest { .setRemoveAudio(true) .build(); Composition composition = - new Composition.Builder(new EditedMediaItemSequence.Builder(item).build()) - .experimentalSetForceAudioTrack(true) + new Composition.Builder( + new EditedMediaItemSequence.Builder(item).setForceAudioTrack(true).build()) .build(); transformer.start(composition, outputDir.newFile().getPath()); diff --git a/libraries/transformer/src/test/java/androidx/media3/transformer/SequenceExportTest.java b/libraries/transformer/src/test/java/androidx/media3/transformer/SequenceExportTest.java index d82604c24e..1e83e1612b 100644 --- a/libraries/transformer/src/test/java/androidx/media3/transformer/SequenceExportTest.java +++ b/libraries/transformer/src/test/java/androidx/media3/transformer/SequenceExportTest.java @@ -255,8 +255,8 @@ public final class SequenceExportTest { Composition composition = new Composition.Builder( new EditedMediaItemSequence.Builder(audioVideoMediaItem, videoOnlyMediaItem) + .setForceAudioTrack(true) .build()) - .experimentalSetForceAudioTrack(true) .setTransmuxVideo(true) .build(); @@ -285,8 +285,8 @@ public final class SequenceExportTest { Composition composition = new Composition.Builder( new EditedMediaItemSequence.Builder(videoOnlyMediaItem, audioVideoMediaItem) + .setForceAudioTrack(true) .build()) - .experimentalSetForceAudioTrack(true) .setTransmuxVideo(true) .build(); @@ -321,8 +321,8 @@ public final class SequenceExportTest { Composition composition = new Composition.Builder( new EditedMediaItemSequence.Builder(audioEditedMediaItem, noAudioEditedMediaItem) + .setForceAudioTrack(true) .build()) - .experimentalSetForceAudioTrack(true) .setTransmuxVideo(true) .build(); @@ -357,8 +357,8 @@ public final class SequenceExportTest { Composition composition = new Composition.Builder( new EditedMediaItemSequence.Builder(silenceEditedMediaItem, audioEditedMediaItem) + .setForceAudioTrack(true) .build()) - .experimentalSetForceAudioTrack(true) .setTransmuxVideo(true) .build(); @@ -385,8 +385,9 @@ public final class SequenceExportTest { new EditedMediaItem.Builder(mediaItem).setRemoveAudio(true).build(); Composition composition = new Composition.Builder( - new EditedMediaItemSequence.Builder(videoOnlyMediaItem, videoOnlyMediaItem).build()) - .experimentalSetForceAudioTrack(true) + new EditedMediaItemSequence.Builder(videoOnlyMediaItem, videoOnlyMediaItem) + .setForceAudioTrack(true) + .build()) .setTransmuxVideo(true) .build(); @@ -418,8 +419,9 @@ public final class SequenceExportTest { new EditedMediaItem.Builder(mediaItem).setRemoveAudio(true).build(); Composition composition = new Composition.Builder( - new EditedMediaItemSequence.Builder(silenceWithEffectsItem, silenceItem).build()) - .experimentalSetForceAudioTrack(true) + new EditedMediaItemSequence.Builder(silenceWithEffectsItem, silenceItem) + .setForceAudioTrack(true) + .build()) .setTransmuxVideo(true) .build(); @@ -451,8 +453,9 @@ public final class SequenceExportTest { .build(); Composition composition = new Composition.Builder( - new EditedMediaItemSequence.Builder(silenceItem, silenceWithEffectsItem).build()) - .experimentalSetForceAudioTrack(true) + new EditedMediaItemSequence.Builder(silenceItem, silenceWithEffectsItem) + .setForceAudioTrack(true) + .build()) .setTransmuxVideo(true) .build(); @@ -486,8 +489,10 @@ public final class SequenceExportTest { .setEffects(createAudioEffects(createPitchChangingAudioProcessor(/* pitch= */ 2f))) .build(); Composition composition = - new Composition.Builder(new EditedMediaItemSequence.Builder(firstItem, secondItem).build()) - .experimentalSetForceAudioTrack(true) + new Composition.Builder( + new EditedMediaItemSequence.Builder(firstItem, secondItem) + .setForceAudioTrack(true) + .build()) .setTransmuxVideo(true) .build();