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 limit of 2 sequences in CompositionPlayer

Browse Source 
The player supports more than 2 audio sequences

PiperOrigin-RevId: 675493637
This commit is contained in:
kimvde 2024-09-17 03:17:17 -07:00 committed by Copybara-Service
parent 6632e64007
commit 0ea229d795
2 changed files with 1 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libraries/transformer/src/main/java/androidx/media3/transformer/CompositionPlayer.java
View File

@ -280,7 +280,6 @@ public final class CompositionPlayer extends SimpleBasePlayer
EVENT_MEDIA_ITEM_TRANSITION, EVENT_MEDIA_ITEM_TRANSITION,
}; };
private static final int MAX_SUPPORTED_SEQUENCES = 2;
private static final String TAG = "CompositionPlayer"; private static final String TAG = "CompositionPlayer";
private final Context context; private final Context context;
@ -337,9 +336,7 @@ public final class CompositionPlayer extends SimpleBasePlayer
*/ */
public void setComposition(Composition composition) { public void setComposition(Composition composition) {
verifyApplicationThread(); verifyApplicationThread();
checkArgument( checkArgument(!composition.sequences.isEmpty());
!composition.sequences.isEmpty()
&& composition.sequences.size() <= MAX_SUPPORTED_SEQUENCES);
checkState(this.composition == null); checkState(this.composition == null);
composition = deactivateSpeedAdjustingVideoEffects(composition); composition = deactivateSpeedAdjustingVideoEffects(composition);

19
libraries/transformer/src/test/java/androidx/media3/transformer/CompositionPlayerTest.java
View File

@ -262,25 +262,6 @@ public class CompositionPlayerTest {
player.release(); 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 @Test
public void prepare_withoutCompositionSet_throws() { public void prepare_withoutCompositionSet_throws() {
CompositionPlayer player = buildCompositionPlayer(); CompositionPlayer player = buildCompositionPlayer();