Commit 87ff3157 by kimvde Committed by microkatz

Update Composition structure to take List instead of ImmutableList

This is more flexible for apps and more consitent with the Player API.

PiperOrigin-RevId: 506901645
parent 73d4b67e
...@@ -19,6 +19,7 @@ import static com.google.android.exoplayer2.util.Assertions.checkArgument; ...@@ -19,6 +19,7 @@ import static com.google.android.exoplayer2.util.Assertions.checkArgument;
import com.google.android.exoplayer2.MediaItem; import com.google.android.exoplayer2.MediaItem;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import java.util.List;
/** /**
* A composition of {@link MediaItem} instances, with transformations to apply to them. * A composition of {@link MediaItem} instances, with transformations to apply to them.
...@@ -44,9 +45,9 @@ public final class Composition { ...@@ -44,9 +45,9 @@ public final class Composition {
* @param sequences The {@link #sequences}. * @param sequences The {@link #sequences}.
* @param effects The {@link #effects}. * @param effects The {@link #effects}.
*/ */
public Composition(ImmutableList<EditedMediaItemSequence> sequences, Effects effects) { public Composition(List<EditedMediaItemSequence> sequences, Effects effects) {
checkArgument(!sequences.isEmpty()); checkArgument(!sequences.isEmpty());
this.sequences = sequences; this.sequences = ImmutableList.copyOf(sequences);
this.effects = effects; this.effects = effects;
} }
} }
...@@ -18,6 +18,7 @@ package com.google.android.exoplayer2.transformer; ...@@ -18,6 +18,7 @@ package com.google.android.exoplayer2.transformer;
import static com.google.android.exoplayer2.util.Assertions.checkArgument; import static com.google.android.exoplayer2.util.Assertions.checkArgument;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import java.util.List;
/** /**
* A sequence of {@link EditedMediaItem} instances. * A sequence of {@link EditedMediaItem} instances.
...@@ -38,8 +39,8 @@ public final class EditedMediaItemSequence { ...@@ -38,8 +39,8 @@ public final class EditedMediaItemSequence {
* *
* @param editedMediaItems The {@link #editedMediaItems}. * @param editedMediaItems The {@link #editedMediaItems}.
*/ */
public EditedMediaItemSequence(ImmutableList<EditedMediaItem> editedMediaItems) { public EditedMediaItemSequence(List<EditedMediaItem> editedMediaItems) {
checkArgument(!editedMediaItems.isEmpty()); checkArgument(!editedMediaItems.isEmpty());
this.editedMediaItems = editedMediaItems; this.editedMediaItems = ImmutableList.copyOf(editedMediaItems);
} }
} }
...@@ -21,6 +21,7 @@ import com.google.android.exoplayer2.effect.GlEffectsFrameProcessor; ...@@ -21,6 +21,7 @@ import com.google.android.exoplayer2.effect.GlEffectsFrameProcessor;
import com.google.android.exoplayer2.util.Effect; import com.google.android.exoplayer2.util.Effect;
import com.google.android.exoplayer2.util.FrameProcessor; import com.google.android.exoplayer2.util.FrameProcessor;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import java.util.List;
/** Effects to apply to a {@link MediaItem}. */ /** Effects to apply to a {@link MediaItem}. */
public final class Effects { public final class Effects {
...@@ -50,11 +51,10 @@ public final class Effects { ...@@ -50,11 +51,10 @@ public final class Effects {
/** /**
* Creates an instance using a {@link GlEffectsFrameProcessor.Factory}. * Creates an instance using a {@link GlEffectsFrameProcessor.Factory}.
* *
* <p>This is equivalent to calling {@link Effects#Effects(ImmutableList, ImmutableList, * <p>This is equivalent to calling {@link Effects#Effects(List, List, FrameProcessor.Factory)}
* FrameProcessor.Factory)} with a {@link GlEffectsFrameProcessor.Factory}. * with a {@link GlEffectsFrameProcessor.Factory}.
*/ */
public Effects( public Effects(List<AudioProcessor> audioProcessors, List<Effect> videoEffects) {
ImmutableList<AudioProcessor> audioProcessors, ImmutableList<Effect> videoEffects) {
this(audioProcessors, videoEffects, new GlEffectsFrameProcessor.Factory()); this(audioProcessors, videoEffects, new GlEffectsFrameProcessor.Factory());
} }
...@@ -66,11 +66,11 @@ public final class Effects { ...@@ -66,11 +66,11 @@ public final class Effects {
* @param frameProcessorFactory The {@link #frameProcessorFactory}. * @param frameProcessorFactory The {@link #frameProcessorFactory}.
*/ */
public Effects( public Effects(
ImmutableList<AudioProcessor> audioProcessors, List<AudioProcessor> audioProcessors,
ImmutableList<Effect> videoEffects, List<Effect> videoEffects,
FrameProcessor.Factory frameProcessorFactory) { FrameProcessor.Factory frameProcessorFactory) {
this.audioProcessors = audioProcessors; this.audioProcessors = ImmutableList.copyOf(audioProcessors);
this.videoEffects = videoEffects; this.videoEffects = ImmutableList.copyOf(videoEffects);
this.frameProcessorFactory = frameProcessorFactory; this.frameProcessorFactory = frameProcessorFactory;
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment