Skip to content

Commit c858abd

Browse files
SheenaChhabracopybara-github
SheenaChhabra
authored and
copybara-github
committed
Remove usage of Composition.Builder#experimentalSetForceAudioTrack
This CL removes all usages within media3. PiperOrigin-RevId: 741469343
1 parent a4f5f67 commit c858abd

File tree

8 files changed

+59
-39
lines changed

8 files changed

+59
-39
lines changed

‎demos/transformer/src/main/java/androidx/media3/demo/transformer/TransformerActivity.java

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -466,14 +466,16 @@ private Composition createComposition(MediaItem mediaItem, @Nullable Bundle bund
466466
bundle.getBoolean(ConfigurationActivity.SHOULD_FLATTEN_FOR_SLOW_MOTION))
467467
.setEffects(new Effects(audioProcessors, videoEffects));
468468
}
469+
EditedMediaItemSequence.Builder editedMediaItemSequenceBuilder =
470+
new EditedMediaItemSequence.Builder(editedMediaItemBuilder.build());
471+
if (bundle != null) {
472+
editedMediaItemSequenceBuilder.setForceAudioTrack(
473+
bundle.getBoolean(ConfigurationActivity.FORCE_AUDIO_TRACK));
474+
}
469475
Composition.Builder compositionBuilder =
470-
new Composition.Builder(
471-
new EditedMediaItemSequence.Builder(editedMediaItemBuilder.build()).build());
476+
new Composition.Builder(editedMediaItemSequenceBuilder.build());
472477
if (bundle != null) {
473-
compositionBuilder
474-
.setHdrMode(bundle.getInt(ConfigurationActivity.HDR_MODE))
475-
.experimentalSetForceAudioTrack(
476-
bundle.getBoolean(ConfigurationActivity.FORCE_AUDIO_TRACK));
478+
compositionBuilder.setHdrMode(bundle.getInt(ConfigurationActivity.HDR_MODE));
477479
}
478480
return compositionBuilder.build();
479481
}

‎libraries/transformer/src/androidTest/java/androidx/media3/transformer/CompositionPlayerSpeedAdjustmentsTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,8 +108,8 @@ private ImmutableList<Long> getTimestampsFromCompositionPlayer(EditedMediaItem i
108108
compositionPlayer.setComposition(
109109
new Composition.Builder(
110110
new EditedMediaItemSequence.Builder(timestampRecordingEditedMediaItems)
111+
.setForceAudioTrack(true)
111112
.build())
112-
.experimentalSetForceAudioTrack(true)
113113
.build());
114114
compositionPlayer.prepare();
115115
compositionPlayer.play();

‎libraries/transformer/src/androidTest/java/androidx/media3/transformer/TransformerEndToEndTest.java

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1350,8 +1350,10 @@ public void speedAdjustedMedia_removingAudioAndForcingAudioTrack_completesWithCo
13501350
.setRemoveAudio(true)
13511351
.build();
13521352
Composition composition =
1353-
new Composition.Builder(new EditedMediaItemSequence.Builder(editedMediaItem).build())
1354-
.experimentalSetForceAudioTrack(true)
1353+
new Composition.Builder(
1354+
new EditedMediaItemSequence.Builder(editedMediaItem)
1355+
.setForceAudioTrack(true)
1356+
.build())
13551357
.build();
13561358
ExportTestResult result =
13571359
new TransformerAndroidTestRunner.Builder(context, transformer)
@@ -1443,8 +1445,9 @@ public void durationAdjustedSequence_withForcedAudioTrack_completesWithCorrectDu
14431445
.build();
14441446
Composition composition =
14451447
new Composition.Builder(
1446-
new EditedMediaItemSequence.Builder(editedMediaItem, editedMediaItem).build())
1447-
.experimentalSetForceAudioTrack(true)
1448+
new EditedMediaItemSequence.Builder(editedMediaItem, editedMediaItem)
1449+
.setForceAudioTrack(true)
1450+
.build())
14481451
.build();
14491452
ExportTestResult result =
14501453
new TransformerAndroidTestRunner.Builder(context, transformer)

‎libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/VideoTimestampConsistencyTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -399,8 +399,8 @@ private ImmutableList<Long> getTimestampsFromTransformer(List<EditedMediaItem> e
399399
/* testId= */ testName.getMethodName(),
400400
new Composition.Builder(
401401
new EditedMediaItemSequence.Builder(timestampRecordingEditedMediaItems)
402+
.setForceAudioTrack(true)
402403
.build())
403-
.experimentalSetForceAudioTrack(true)
404404
.build());
405405

406406
return timestampRecordingShaderProgram.getInputTimestampsUs();
@@ -427,8 +427,8 @@ private ImmutableList<Long> getTimestampsFromCompositionPlayer(
427427
compositionPlayer.setComposition(
428428
new Composition.Builder(
429429
new EditedMediaItemSequence.Builder(timestampRecordingEditedMediaItems)
430+
.setForceAudioTrack(true)
430431
.build())
431-
.experimentalSetForceAudioTrack(true)
432432
.build());
433433
compositionPlayer.prepare();
434434
compositionPlayer.play();

‎libraries/transformer/src/test/java/androidx/media3/transformer/MediaItemExportTest.java

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -401,8 +401,10 @@ public void start_forceAudioTrackOnAudioOnly_isIgnored() throws Exception {
401401
MediaItem mediaItem = MediaItem.fromUri(ASSET_URI_PREFIX + FILE_AUDIO_AMR_NB);
402402
EditedMediaItem editedMediaItem = new EditedMediaItem.Builder(mediaItem).build();
403403
Composition composition =
404-
new Composition.Builder(new EditedMediaItemSequence.Builder(editedMediaItem).build())
405-
.experimentalSetForceAudioTrack(true)
404+
new Composition.Builder(
405+
new EditedMediaItemSequence.Builder(editedMediaItem)
406+
.setForceAudioTrack(true)
407+
.build())
406408
.build();
407409

408410
transformer.start(composition, outputDir.newFile().getPath());
@@ -420,8 +422,10 @@ public void start_forceAudioTrackOnAudioVideo_isIgnored() throws Exception {
420422
MediaItem mediaItem = MediaItem.fromUri(ASSET_URI_PREFIX + FILE_AUDIO_VIDEO);
421423
EditedMediaItem editedMediaItem = new EditedMediaItem.Builder(mediaItem).build();
422424
Composition composition =
423-
new Composition.Builder(new EditedMediaItemSequence.Builder(editedMediaItem).build())
424-
.experimentalSetForceAudioTrack(true)
425+
new Composition.Builder(
426+
new EditedMediaItemSequence.Builder(editedMediaItem)
427+
.setForceAudioTrack(true)
428+
.build())
425429
.build();
426430

427431
transformer.start(composition, outputDir.newFile().getPath());
@@ -445,8 +449,10 @@ public void start_forceAudioTrackAndRemoveAudioWithEffects_generatesSilentAudio(
445449
.setEffects(createAudioEffects(sonicAudioProcessor))
446450
.build();
447451
Composition composition =
448-
new Composition.Builder(new EditedMediaItemSequence.Builder(editedMediaItem).build())
449-
.experimentalSetForceAudioTrack(true)
452+
new Composition.Builder(
453+
new EditedMediaItemSequence.Builder(editedMediaItem)
454+
.setForceAudioTrack(true)
455+
.build())
450456
.build();
451457

452458
transformer.start(composition, outputDir.newFile().getPath());
@@ -471,8 +477,10 @@ public void start_forceAudioTrackAndRemoveVideo_isIgnored() throws Exception {
471477
.setRemoveVideo(true)
472478
.build();
473479
Composition composition =
474-
new Composition.Builder(new EditedMediaItemSequence.Builder(editedMediaItem).build())
475-
.experimentalSetForceAudioTrack(true)
480+
new Composition.Builder(
481+
new EditedMediaItemSequence.Builder(editedMediaItem)
482+
.setForceAudioTrack(true)
483+
.build())
476484
.build();
477485

478486
transformer.start(composition, outputDir.newFile().getPath());
@@ -492,8 +500,10 @@ public void start_forceAudioTrackOnVideoOnly_generatesSilentAudio() throws Excep
492500
MediaItem mediaItem = MediaItem.fromUri(ASSET_URI_PREFIX + FILE_VIDEO_ONLY);
493501
EditedMediaItem editedMediaItem = new EditedMediaItem.Builder(mediaItem).build();
494502
Composition composition =
495-
new Composition.Builder(new EditedMediaItemSequence.Builder(editedMediaItem).build())
496-
.experimentalSetForceAudioTrack(true)
503+
new Composition.Builder(
504+
new EditedMediaItemSequence.Builder(editedMediaItem)
505+
.setForceAudioTrack(true)
506+
.build())
497507
.build();
498508

499509
transformer.start(composition, outputDir.newFile().getPath());

‎libraries/transformer/src/test/java/androidx/media3/transformer/ParameterizedAudioExportTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -172,9 +172,9 @@ public Composition asComposition() {
172172
items.add(itemConfig.asItem());
173173
}
174174

175-
return new Composition.Builder(new EditedMediaItemSequence.Builder(items.build()).build())
175+
return new Composition.Builder(
176+
new EditedMediaItemSequence.Builder(items.build()).setForceAudioTrack(true).build())
176177
.setTransmuxVideo(true)
177-
.experimentalSetForceAudioTrack(true)
178178
.build();
179179
}
180180

‎libraries/transformer/src/test/java/androidx/media3/transformer/ParameterizedItemExportTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,8 +135,8 @@ public void generateSilence() throws Exception {
135135
.setRemoveAudio(true)
136136
.build();
137137
Composition composition =
138-
new Composition.Builder(new EditedMediaItemSequence.Builder(item).build())
139-
.experimentalSetForceAudioTrack(true)
138+
new Composition.Builder(
139+
new EditedMediaItemSequence.Builder(item).setForceAudioTrack(true).build())
140140
.build();
141141

142142
transformer.start(composition, outputDir.newFile().getPath());

‎libraries/transformer/src/test/java/androidx/media3/transformer/SequenceExportTest.java

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -255,8 +255,8 @@ public void concatenateAudioAndSilence_withTransmuxVideo_completesSuccessfully()
255255
Composition composition =
256256
new Composition.Builder(
257257
new EditedMediaItemSequence.Builder(audioVideoMediaItem, videoOnlyMediaItem)
258+
.setForceAudioTrack(true)
258259
.build())
259-
.experimentalSetForceAudioTrack(true)
260260
.setTransmuxVideo(true)
261261
.build();
262262

@@ -285,8 +285,8 @@ public void concatenateSilenceAndAudio_withTransmuxVideo_completesSuccessfully()
285285
Composition composition =
286286
new Composition.Builder(
287287
new EditedMediaItemSequence.Builder(videoOnlyMediaItem, audioVideoMediaItem)
288+
.setForceAudioTrack(true)
288289
.build())
289-
.experimentalSetForceAudioTrack(true)
290290
.setTransmuxVideo(true)
291291
.build();
292292

@@ -321,8 +321,8 @@ public void concatenateAudioAndSilence_withEffectsAndTransmuxVideo_completesSucc
321321
Composition composition =
322322
new Composition.Builder(
323323
new EditedMediaItemSequence.Builder(audioEditedMediaItem, noAudioEditedMediaItem)
324+
.setForceAudioTrack(true)
324325
.build())
325-
.experimentalSetForceAudioTrack(true)
326326
.setTransmuxVideo(true)
327327
.build();
328328

@@ -357,8 +357,8 @@ public void concatenateSilenceAndAudio_withEffectsAndTransmuxVideo_completesSucc
357357
Composition composition =
358358
new Composition.Builder(
359359
new EditedMediaItemSequence.Builder(silenceEditedMediaItem, audioEditedMediaItem)
360+
.setForceAudioTrack(true)
360361
.build())
361-
.experimentalSetForceAudioTrack(true)
362362
.setTransmuxVideo(true)
363363
.build();
364364

@@ -385,8 +385,9 @@ public void concatenateSilenceAndSilence_withTransmuxVideo_completesSuccessfully
385385
new EditedMediaItem.Builder(mediaItem).setRemoveAudio(true).build();
386386
Composition composition =
387387
new Composition.Builder(
388-
new EditedMediaItemSequence.Builder(videoOnlyMediaItem, videoOnlyMediaItem).build())
389-
.experimentalSetForceAudioTrack(true)
388+
new EditedMediaItemSequence.Builder(videoOnlyMediaItem, videoOnlyMediaItem)
389+
.setForceAudioTrack(true)
390+
.build())
390391
.setTransmuxVideo(true)
391392
.build();
392393

@@ -418,8 +419,9 @@ public void concatenateEditedSilenceAndSilence_withTransmuxVideo_completesSucces
418419
new EditedMediaItem.Builder(mediaItem).setRemoveAudio(true).build();
419420
Composition composition =
420421
new Composition.Builder(
421-
new EditedMediaItemSequence.Builder(silenceWithEffectsItem, silenceItem).build())
422-
.experimentalSetForceAudioTrack(true)
422+
new EditedMediaItemSequence.Builder(silenceWithEffectsItem, silenceItem)
423+
.setForceAudioTrack(true)
424+
.build())
423425
.setTransmuxVideo(true)
424426
.build();
425427

@@ -451,8 +453,9 @@ public void concatenateSilenceAndEditedSilence_withTransmuxVideo_completesSucces
451453
.build();
452454
Composition composition =
453455
new Composition.Builder(
454-
new EditedMediaItemSequence.Builder(silenceItem, silenceWithEffectsItem).build())
455-
.experimentalSetForceAudioTrack(true)
456+
new EditedMediaItemSequence.Builder(silenceItem, silenceWithEffectsItem)
457+
.setForceAudioTrack(true)
458+
.build())
456459
.setTransmuxVideo(true)
457460
.build();
458461

@@ -486,8 +489,10 @@ public void concatenateSilenceAndSilence_withEffectsAndTransmuxVideo_completesSu
486489
.setEffects(createAudioEffects(createPitchChangingAudioProcessor(/* pitch= */ 2f)))
487490
.build();
488491
Composition composition =
489-
new Composition.Builder(new EditedMediaItemSequence.Builder(firstItem, secondItem).build())
490-
.experimentalSetForceAudioTrack(true)
492+
new Composition.Builder(
493+
new EditedMediaItemSequence.Builder(firstItem, secondItem)
494+
.setForceAudioTrack(true)
495+
.build())
491496
.setTransmuxVideo(true)
492497
.build();
493498

0 commit comments

Comments
 (0)