From 6cff4a2638fc008ad7abd0a1c735e6e08f19eadc Mon Sep 17 00:00:00 2001 From: tonihei Date: Fri, 8 Sep 2023 04:31:57 -0700 Subject: [PATCH] Deprecate ConcatenatingMediaSource There is no known use case left that needs to be solved by this class. All other use cases are better solved by alternative approaches (Player playlist methods or ConcatenatingMediaSource2). PiperOrigin-RevId: 563713384 --- .../exoplayer/source/ConcatenatingMediaSource.java | 12 +++++++++--- .../media3/exoplayer/source/LoopingMediaSource.java | 4 ++-- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/ConcatenatingMediaSource.java b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/ConcatenatingMediaSource.java index 8ad14b9cda..01a6efca14 100644 --- a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/ConcatenatingMediaSource.java +++ b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/ConcatenatingMediaSource.java @@ -47,10 +47,16 @@ import java.util.Map; import java.util.Set; /** - * Concatenates multiple {@link MediaSource}s. The list of {@link MediaSource}s can be modified - * during playback. It is valid for the same {@link MediaSource} instance to be present more than - * once in the concatenation. Access to this class is thread-safe. + * Concatenates multiple {@link MediaSource} instances. The list of {@link MediaSource} instances + * can be modified during playback. It is valid for the same {@link MediaSource} instance to be + * present more than once in the concatenation. Access to this class is thread-safe. + * + * @deprecated Use playlist modification methods like {@link + * androidx.media3.common.Player#addMediaItem} instead. To combine multiple sources together as + * one item or for further wrapping in other {@link MediaSource} instances, use {@link + * ConcatenatingMediaSource2} instead. */ +@Deprecated @UnstableApi public final class ConcatenatingMediaSource extends CompositeMediaSource { diff --git a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/LoopingMediaSource.java b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/LoopingMediaSource.java index 4a9142f925..a47ac558a2 100644 --- a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/LoopingMediaSource.java +++ b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/LoopingMediaSource.java @@ -35,8 +35,8 @@ import java.util.Map; * instead of this class. To add a {@link MediaSource} a specific number of times to the * playlist, use {@link ExoPlayer#addMediaSource} in a loop with the same {@link MediaSource}. * To combine repeated {@link MediaSource} instances into one {@link MediaSource}, for example - * to further wrap it in another {@link MediaSource}, use {@link ConcatenatingMediaSource} with - * the same {@link MediaSource} {@link ConcatenatingMediaSource#addMediaSource added} multiple + * to further wrap it in another {@link MediaSource}, use {@link ConcatenatingMediaSource2} with + * the same {@link MediaSource} {@link ConcatenatingMediaSource2.Builder#add added} multiple * times. */ @Deprecated