loliball/media
1
0
Fork 0
mirror of https://github.com/androidx/media.git synced 2025-04-30 06:46:50 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove usage of Composition.Builder#experimentalSetForceAudioTrack

Browse Source 
This CL removes all usages within media3.

PiperOrigin-RevId: 741469343
This commit is contained in:
sheenachhabra 2025-03-28 03:49:53 -07:00 committed by Copybara-Service
parent a4f5f67d7e
commit c858abda5d
8 changed files with 60 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
demos/transformer/src/main/java/androidx/media3/demo/transformer/TransformerActivity.java
View File

@ -466,15 +466,17 @@ public final class TransformerActivity extends AppCompatActivity {
bundle.getBoolean(ConfigurationActivity.SHOULD_FLATTEN_FOR_SLOW_MOTION)) bundle.getBoolean(ConfigurationActivity.SHOULD_FLATTEN_FOR_SLOW_MOTION))
.setEffects(new Effects(audioProcessors, videoEffects)); .setEffects(new Effects(audioProcessors, videoEffects));
} }
Composition.Builder compositionBuilder = EditedMediaItemSequence.Builder editedMediaItemSequenceBuilder =
new Composition.Builder( new EditedMediaItemSequence.Builder(editedMediaItemBuilder.build());
new EditedMediaItemSequence.Builder(editedMediaItemBuilder.build()).build());
if (bundle != null) { if (bundle != null) {
compositionBuilder editedMediaItemSequenceBuilder.setForceAudioTrack(
.setHdrMode(bundle.getInt(ConfigurationActivity.HDR_MODE))
.experimentalSetForceAudioTrack(
bundle.getBoolean(ConfigurationActivity.FORCE_AUDIO_TRACK)); 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(); return compositionBuilder.build();
} }

2
libraries/transformer/src/androidTest/java/androidx/media3/transformer/CompositionPlayerSpeedAdjustmentsTest.java
View File

@ -108,8 +108,8 @@ public class CompositionPlayerSpeedAdjustmentsTest {
compositionPlayer.setComposition( compositionPlayer.setComposition(
new Composition.Builder( new Composition.Builder(
new EditedMediaItemSequence.Builder(timestampRecordingEditedMediaItems) new EditedMediaItemSequence.Builder(timestampRecordingEditedMediaItems)
.setForceAudioTrack(true)
.build()) .build())
.experimentalSetForceAudioTrack(true)
.build()); .build());
compositionPlayer.prepare(); compositionPlayer.prepare();
compositionPlayer.play(); compositionPlayer.play();

11
libraries/transformer/src/androidTest/java/androidx/media3/transformer/TransformerEndToEndTest.java
View File

@ -1350,8 +1350,10 @@ public class TransformerEndToEndTest {
.setRemoveAudio(true) .setRemoveAudio(true)
.build(); .build();
Composition composition = Composition composition =
new Composition.Builder(new EditedMediaItemSequence.Builder(editedMediaItem).build()) new Composition.Builder(
.experimentalSetForceAudioTrack(true) new EditedMediaItemSequence.Builder(editedMediaItem)
.setForceAudioTrack(true)
.build())
.build(); .build();
ExportTestResult result = ExportTestResult result =
new TransformerAndroidTestRunner.Builder(context, transformer) new TransformerAndroidTestRunner.Builder(context, transformer)
@ -1443,8 +1445,9 @@ public class TransformerEndToEndTest {
.build(); .build();
Composition composition = Composition composition =
new Composition.Builder( new Composition.Builder(
new EditedMediaItemSequence.Builder(editedMediaItem, editedMediaItem).build()) new EditedMediaItemSequence.Builder(editedMediaItem, editedMediaItem)
.experimentalSetForceAudioTrack(true) .setForceAudioTrack(true)
.build())
.build(); .build();
ExportTestResult result = ExportTestResult result =
new TransformerAndroidTestRunner.Builder(context, transformer) new TransformerAndroidTestRunner.Builder(context, transformer)

4
libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/VideoTimestampConsistencyTest.java
View File

@ -399,8 +399,8 @@ public class VideoTimestampConsistencyTest {
/* testId= */ testName.getMethodName(), /* testId= */ testName.getMethodName(),
new Composition.Builder( new Composition.Builder(
new EditedMediaItemSequence.Builder(timestampRecordingEditedMediaItems) new EditedMediaItemSequence.Builder(timestampRecordingEditedMediaItems)
.setForceAudioTrack(true)
.build()) .build())
.experimentalSetForceAudioTrack(true)
.build()); .build());
return timestampRecordingShaderProgram.getInputTimestampsUs(); return timestampRecordingShaderProgram.getInputTimestampsUs();
@ -427,8 +427,8 @@ public class VideoTimestampConsistencyTest {
compositionPlayer.setComposition( compositionPlayer.setComposition(
new Composition.Builder( new Composition.Builder(
new EditedMediaItemSequence.Builder(timestampRecordingEditedMediaItems) new EditedMediaItemSequence.Builder(timestampRecordingEditedMediaItems)
.setForceAudioTrack(true)
.build()) .build())
.experimentalSetForceAudioTrack(true)
.build()); .build());
compositionPlayer.prepare(); compositionPlayer.prepare();
compositionPlayer.play(); compositionPlayer.play();

30
libraries/transformer/src/test/java/androidx/media3/transformer/MediaItemExportTest.java
View File

@ -401,8 +401,10 @@ public final class MediaItemExportTest {
MediaItem mediaItem = MediaItem.fromUri(ASSET_URI_PREFIX + FILE_AUDIO_AMR_NB); MediaItem mediaItem = MediaItem.fromUri(ASSET_URI_PREFIX + FILE_AUDIO_AMR_NB);
EditedMediaItem editedMediaItem = new EditedMediaItem.Builder(mediaItem).build(); EditedMediaItem editedMediaItem = new EditedMediaItem.Builder(mediaItem).build();
Composition composition = Composition composition =
new Composition.Builder(new EditedMediaItemSequence.Builder(editedMediaItem).build()) new Composition.Builder(
.experimentalSetForceAudioTrack(true) new EditedMediaItemSequence.Builder(editedMediaItem)
.setForceAudioTrack(true)
.build())
.build(); .build();
transformer.start(composition, outputDir.newFile().getPath()); transformer.start(composition, outputDir.newFile().getPath());
@ -420,8 +422,10 @@ public final class MediaItemExportTest {
MediaItem mediaItem = MediaItem.fromUri(ASSET_URI_PREFIX + FILE_AUDIO_VIDEO); MediaItem mediaItem = MediaItem.fromUri(ASSET_URI_PREFIX + FILE_AUDIO_VIDEO);
EditedMediaItem editedMediaItem = new EditedMediaItem.Builder(mediaItem).build(); EditedMediaItem editedMediaItem = new EditedMediaItem.Builder(mediaItem).build();
Composition composition = Composition composition =
new Composition.Builder(new EditedMediaItemSequence.Builder(editedMediaItem).build()) new Composition.Builder(
.experimentalSetForceAudioTrack(true) new EditedMediaItemSequence.Builder(editedMediaItem)
.setForceAudioTrack(true)
.build())
.build(); .build();
transformer.start(composition, outputDir.newFile().getPath()); transformer.start(composition, outputDir.newFile().getPath());
@ -445,8 +449,10 @@ public final class MediaItemExportTest {
.setEffects(createAudioEffects(sonicAudioProcessor)) .setEffects(createAudioEffects(sonicAudioProcessor))
.build(); .build();
Composition composition = Composition composition =
new Composition.Builder(new EditedMediaItemSequence.Builder(editedMediaItem).build()) new Composition.Builder(
.experimentalSetForceAudioTrack(true) new EditedMediaItemSequence.Builder(editedMediaItem)
.setForceAudioTrack(true)
.build())
.build(); .build();
transformer.start(composition, outputDir.newFile().getPath()); transformer.start(composition, outputDir.newFile().getPath());
@ -471,8 +477,10 @@ public final class MediaItemExportTest {
.setRemoveVideo(true) .setRemoveVideo(true)
.build(); .build();
Composition composition = Composition composition =
new Composition.Builder(new EditedMediaItemSequence.Builder(editedMediaItem).build()) new Composition.Builder(
.experimentalSetForceAudioTrack(true) new EditedMediaItemSequence.Builder(editedMediaItem)
.setForceAudioTrack(true)
.build())
.build(); .build();
transformer.start(composition, outputDir.newFile().getPath()); transformer.start(composition, outputDir.newFile().getPath());
@ -492,8 +500,10 @@ public final class MediaItemExportTest {
MediaItem mediaItem = MediaItem.fromUri(ASSET_URI_PREFIX + FILE_VIDEO_ONLY); MediaItem mediaItem = MediaItem.fromUri(ASSET_URI_PREFIX + FILE_VIDEO_ONLY);
EditedMediaItem editedMediaItem = new EditedMediaItem.Builder(mediaItem).build(); EditedMediaItem editedMediaItem = new EditedMediaItem.Builder(mediaItem).build();
Composition composition = Composition composition =
new Composition.Builder(new EditedMediaItemSequence.Builder(editedMediaItem).build()) new Composition.Builder(
.experimentalSetForceAudioTrack(true) new EditedMediaItemSequence.Builder(editedMediaItem)
.setForceAudioTrack(true)
.build())
.build(); .build();
transformer.start(composition, outputDir.newFile().getPath()); transformer.start(composition, outputDir.newFile().getPath());

4
libraries/transformer/src/test/java/androidx/media3/transformer/ParameterizedAudioExportTest.java
View File

@ -172,9 +172,9 @@ public final class ParameterizedAudioExportTest {
items.add(itemConfig.asItem()); 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) .setTransmuxVideo(true)
.experimentalSetForceAudioTrack(true)
.build(); .build();
} }

4
libraries/transformer/src/test/java/androidx/media3/transformer/ParameterizedItemExportTest.java
View File

@ -135,8 +135,8 @@ public final class ParameterizedItemExportTest {
.setRemoveAudio(true) .setRemoveAudio(true)
.build(); .build();
Composition composition = Composition composition =
new Composition.Builder(new EditedMediaItemSequence.Builder(item).build()) new Composition.Builder(
.experimentalSetForceAudioTrack(true) new EditedMediaItemSequence.Builder(item).setForceAudioTrack(true).build())
.build(); .build();
transformer.start(composition, outputDir.newFile().getPath()); transformer.start(composition, outputDir.newFile().getPath());

29
libraries/transformer/src/test/java/androidx/media3/transformer/SequenceExportTest.java
View File

@ -255,8 +255,8 @@ public final class SequenceExportTest {
Composition composition = Composition composition =
new Composition.Builder( new Composition.Builder(
new EditedMediaItemSequence.Builder(audioVideoMediaItem, videoOnlyMediaItem) new EditedMediaItemSequence.Builder(audioVideoMediaItem, videoOnlyMediaItem)
.setForceAudioTrack(true)
.build()) .build())
.experimentalSetForceAudioTrack(true)
.setTransmuxVideo(true) .setTransmuxVideo(true)
.build(); .build();
@ -285,8 +285,8 @@ public final class SequenceExportTest {
Composition composition = Composition composition =
new Composition.Builder( new Composition.Builder(
new EditedMediaItemSequence.Builder(videoOnlyMediaItem, audioVideoMediaItem) new EditedMediaItemSequence.Builder(videoOnlyMediaItem, audioVideoMediaItem)
.setForceAudioTrack(true)
.build()) .build())
.experimentalSetForceAudioTrack(true)
.setTransmuxVideo(true) .setTransmuxVideo(true)
.build(); .build();
@ -321,8 +321,8 @@ public final class SequenceExportTest {
Composition composition = Composition composition =
new Composition.Builder( new Composition.Builder(
new EditedMediaItemSequence.Builder(audioEditedMediaItem, noAudioEditedMediaItem) new EditedMediaItemSequence.Builder(audioEditedMediaItem, noAudioEditedMediaItem)
.setForceAudioTrack(true)
.build()) .build())
.experimentalSetForceAudioTrack(true)
.setTransmuxVideo(true) .setTransmuxVideo(true)
.build(); .build();
@ -357,8 +357,8 @@ public final class SequenceExportTest {
Composition composition = Composition composition =
new Composition.Builder( new Composition.Builder(
new EditedMediaItemSequence.Builder(silenceEditedMediaItem, audioEditedMediaItem) new EditedMediaItemSequence.Builder(silenceEditedMediaItem, audioEditedMediaItem)
.setForceAudioTrack(true)
.build()) .build())
.experimentalSetForceAudioTrack(true)
.setTransmuxVideo(true) .setTransmuxVideo(true)
.build(); .build();
@ -385,8 +385,9 @@ public final class SequenceExportTest {
new EditedMediaItem.Builder(mediaItem).setRemoveAudio(true).build(); new EditedMediaItem.Builder(mediaItem).setRemoveAudio(true).build();
Composition composition = Composition composition =
new Composition.Builder( new Composition.Builder(
new EditedMediaItemSequence.Builder(videoOnlyMediaItem, videoOnlyMediaItem).build()) new EditedMediaItemSequence.Builder(videoOnlyMediaItem, videoOnlyMediaItem)
.experimentalSetForceAudioTrack(true) .setForceAudioTrack(true)
.build())
.setTransmuxVideo(true) .setTransmuxVideo(true)
.build(); .build();
@ -418,8 +419,9 @@ public final class SequenceExportTest {
new EditedMediaItem.Builder(mediaItem).setRemoveAudio(true).build(); new EditedMediaItem.Builder(mediaItem).setRemoveAudio(true).build();
Composition composition = Composition composition =
new Composition.Builder( new Composition.Builder(
new EditedMediaItemSequence.Builder(silenceWithEffectsItem, silenceItem).build()) new EditedMediaItemSequence.Builder(silenceWithEffectsItem, silenceItem)
.experimentalSetForceAudioTrack(true) .setForceAudioTrack(true)
.build())
.setTransmuxVideo(true) .setTransmuxVideo(true)
.build(); .build();
@ -451,8 +453,9 @@ public final class SequenceExportTest {
.build(); .build();
Composition composition = Composition composition =
new Composition.Builder( new Composition.Builder(
new EditedMediaItemSequence.Builder(silenceItem, silenceWithEffectsItem).build()) new EditedMediaItemSequence.Builder(silenceItem, silenceWithEffectsItem)
.experimentalSetForceAudioTrack(true) .setForceAudioTrack(true)
.build())
.setTransmuxVideo(true) .setTransmuxVideo(true)
.build(); .build();
@ -486,8 +489,10 @@ public final class SequenceExportTest {
.setEffects(createAudioEffects(createPitchChangingAudioProcessor(/* pitch= */ 2f))) .setEffects(createAudioEffects(createPitchChangingAudioProcessor(/* pitch= */ 2f)))
.build(); .build();
Composition composition = Composition composition =
new Composition.Builder(new EditedMediaItemSequence.Builder(firstItem, secondItem).build()) new Composition.Builder(
.experimentalSetForceAudioTrack(true) new EditedMediaItemSequence.Builder(firstItem, secondItem)
.setForceAudioTrack(true)
.build())
.setTransmuxVideo(true) .setTransmuxVideo(true)
.build(); .build();