loliball/media
1
0
Fork 0
mirror of https://github.com/androidx/media.git synced 2025-05-03 21:57:46 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update Composition structure to take List instead of ImmutableList

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

PiperOrigin-RevId: 506901645
This commit is contained in:
kimvde 2023-02-03 15:50:59 +00:00 committed by microkatz
parent e2adb567bf
commit 9cb2b6e196
3 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,6 +20,7 @@ import static androidx.media3.common.util.Assertions.checkArgument;
import androidx.media3.common.MediaItem; import androidx.media3.common.MediaItem;
import androidx.media3.common.util.UnstableApi; import androidx.media3.common.util.UnstableApi;
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.
@ -46,9 +47,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;
} }
} }

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

@ -19,6 +19,7 @@ import static androidx.media3.common.util.Assertions.checkArgument;
import androidx.media3.common.util.UnstableApi; import androidx.media3.common.util.UnstableApi;
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.
@ -40,8 +41,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);
} }
} }

16
libraries/transformer/src/main/java/androidx/media3/transformer/Effects.java
View File

@ -22,6 +22,7 @@ import androidx.media3.common.audio.AudioProcessor;
import androidx.media3.common.util.UnstableApi; import androidx.media3.common.util.UnstableApi;
import androidx.media3.effect.GlEffectsFrameProcessor; import androidx.media3.effect.GlEffectsFrameProcessor;
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}. */
@UnstableApi @UnstableApi
@ -52,11 +53,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());
} }
@ -68,11 +68,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;
} }
} }