From 0ea229d795d180d9685628e94d4e53976823296f Mon Sep 17 00:00:00 2001 From: kimvde Date: Tue, 17 Sep 2024 03:17:17 -0700 Subject: [PATCH] Remove limit of 2 sequences in CompositionPlayer The player supports more than 2 audio sequences PiperOrigin-RevId: 675493637 --- .../media3/transformer/CompositionPlayer.java | 5 +---- .../transformer/CompositionPlayerTest.java | 19 ------------------- 2 files changed, 1 insertion(+), 23 deletions(-) diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/CompositionPlayer.java b/libraries/transformer/src/main/java/androidx/media3/transformer/CompositionPlayer.java index 27009c1450..599266f0d9 100644 --- a/libraries/transformer/src/main/java/androidx/media3/transformer/CompositionPlayer.java +++ b/libraries/transformer/src/main/java/androidx/media3/transformer/CompositionPlayer.java @@ -280,7 +280,6 @@ public final class CompositionPlayer extends SimpleBasePlayer EVENT_MEDIA_ITEM_TRANSITION, }; - private static final int MAX_SUPPORTED_SEQUENCES = 2; private static final String TAG = "CompositionPlayer"; private final Context context; @@ -337,9 +336,7 @@ public final class CompositionPlayer extends SimpleBasePlayer */ public void setComposition(Composition composition) { verifyApplicationThread(); - checkArgument( - !composition.sequences.isEmpty() - && composition.sequences.size() <= MAX_SUPPORTED_SEQUENCES); + checkArgument(!composition.sequences.isEmpty()); checkState(this.composition == null); composition = deactivateSpeedAdjustingVideoEffects(composition); diff --git a/libraries/transformer/src/test/java/androidx/media3/transformer/CompositionPlayerTest.java b/libraries/transformer/src/test/java/androidx/media3/transformer/CompositionPlayerTest.java index 216591d504..f6051aa173 100644 --- a/libraries/transformer/src/test/java/androidx/media3/transformer/CompositionPlayerTest.java +++ b/libraries/transformer/src/test/java/androidx/media3/transformer/CompositionPlayerTest.java @@ -262,25 +262,6 @@ public class CompositionPlayerTest { player.release(); } - @Test - public void setComposition_threeSequences_throws() { - CompositionPlayer player = buildCompositionPlayer(); - - EditedMediaItem editedMediaItem = - new EditedMediaItem.Builder(MediaItem.EMPTY).setDurationUs(1_000).build(); - Composition composition = - new Composition.Builder( - ImmutableList.of( - new EditedMediaItemSequence(editedMediaItem), - new EditedMediaItemSequence(editedMediaItem), - new EditedMediaItemSequence(editedMediaItem))) - .build(); - - assertThrows(IllegalArgumentException.class, () -> player.setComposition(composition)); - - player.release(); - } - @Test public void prepare_withoutCompositionSet_throws() { CompositionPlayer player = buildCompositionPlayer();