From cee7e8e2dbf230041843eea14bcfc834f49f0644 Mon Sep 17 00:00:00 2001 From: ibaker Date: Tue, 21 Dec 2021 16:07:18 +0000 Subject: [PATCH] Delete deprecated methods from `MediaSourceFactory` Some have been deprecated since 2.13.0 ([commit](https://github.com/google/ExoPlayer/commit/5b9fa7d7d9d68dec060489cbb307b1be28a7575a)): * `setDrmSessionManager(DrmSessionManager)` * `setDrmHttpDataSourceFactory(HttpDataSource.Factory)` * `setDrmUserAgent(String)` And the rest have been deprecated since 2.12.0 ([commit](https://github.com/google/ExoPlayer/commit/d1bbd3507a818e14be965c300938f9d51f8b7836)): * `setStreamKeys(List)` * `createMediaSource(Uri)` PiperOrigin-RevId: 417622794 --- .../source/DefaultMediaSourceFactory.java | 87 --------------- .../exoplayer/source/MediaSourceFactory.java | 104 ------------------ .../source/ProgressiveMediaSource.java | 52 +-------- .../exoplayer/dash/DashMediaSource.java | 92 +--------------- .../exoplayer/dash/DashMediaSourceTest.java | 41 ------- .../media3/exoplayer/hls/HlsMediaSource.java | 84 +------------- .../exoplayer/hls/HlsMediaSourceTest.java | 41 ------- .../exoplayer/rtsp/RtspMediaSource.java | 39 ------- .../smoothstreaming/SsMediaSource.java | 87 ++------------- .../smoothstreaming/SsMediaSourceTest.java | 43 -------- .../test/utils/FakeMediaSourceFactory.java | 21 ---- 11 files changed, 25 insertions(+), 666 deletions(-) diff --git a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/DefaultMediaSourceFactory.java b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/DefaultMediaSourceFactory.java index 428439ec79..c8f838a2a9 100644 --- a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/DefaultMediaSourceFactory.java +++ b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/DefaultMediaSourceFactory.java @@ -26,7 +26,6 @@ import androidx.media3.common.C; import androidx.media3.common.Format; import androidx.media3.common.MediaItem; import androidx.media3.common.MimeTypes; -import androidx.media3.common.StreamKey; import androidx.media3.common.util.Assertions; import androidx.media3.common.util.Log; import androidx.media3.common.util.UnstableApi; @@ -34,8 +33,6 @@ import androidx.media3.common.util.Util; import androidx.media3.datasource.DataSource; import androidx.media3.datasource.DataSpec; import androidx.media3.datasource.DefaultDataSource; -import androidx.media3.datasource.HttpDataSource; -import androidx.media3.exoplayer.drm.DrmSessionManager; import androidx.media3.exoplayer.drm.DrmSessionManagerProvider; import androidx.media3.exoplayer.source.ads.AdsLoader; import androidx.media3.exoplayer.source.ads.AdsMediaSource; @@ -282,29 +279,6 @@ public final class DefaultMediaSourceFactory implements MediaSourceFactory { return this; } - @Deprecated - @Override - public DefaultMediaSourceFactory setDrmHttpDataSourceFactory( - @Nullable HttpDataSource.Factory drmHttpDataSourceFactory) { - delegateFactoryLoader.setDrmHttpDataSourceFactory(drmHttpDataSourceFactory); - return this; - } - - @Deprecated - @Override - public DefaultMediaSourceFactory setDrmUserAgent(@Nullable String userAgent) { - delegateFactoryLoader.setDrmUserAgent(userAgent); - return this; - } - - @Deprecated - @Override - public DefaultMediaSourceFactory setDrmSessionManager( - @Nullable DrmSessionManager drmSessionManager) { - delegateFactoryLoader.setDrmSessionManager(drmSessionManager); - return this; - } - @Override public DefaultMediaSourceFactory setDrmSessionManagerProvider( @Nullable DrmSessionManagerProvider drmSessionManagerProvider) { @@ -320,18 +294,6 @@ public final class DefaultMediaSourceFactory implements MediaSourceFactory { return this; } - /** - * @deprecated Use {@link MediaItem.Builder#setStreamKeys(List)} and {@link - * #createMediaSource(MediaItem)} instead. - */ - @SuppressWarnings("deprecation") // Calling through to the same deprecated method. - @Deprecated - @Override - public DefaultMediaSourceFactory setStreamKeys(@Nullable List streamKeys) { - delegateFactoryLoader.setStreamKeys(streamKeys); - return this; - } - @Override public int[] getSupportedTypes() { return delegateFactoryLoader.getSupportedTypes(); @@ -480,12 +442,8 @@ public final class DefaultMediaSourceFactory implements MediaSourceFactory { private final Set supportedTypes; private final Map mediaSourceFactories; - @Nullable private HttpDataSource.Factory drmHttpDataSourceFactory; - @Nullable private String userAgent; - @Nullable private DrmSessionManager drmSessionManager; @Nullable private DrmSessionManagerProvider drmSessionManagerProvider; @Nullable private LoadErrorHandlingPolicy loadErrorHandlingPolicy; - @Nullable private List streamKeys; public DelegateFactoryLoader( DataSource.Factory dataSourceFactory, ExtractorsFactory extractorsFactory) { @@ -516,53 +474,16 @@ public final class DefaultMediaSourceFactory implements MediaSourceFactory { } mediaSourceFactory = mediaSourceFactorySupplier.get(); - if (drmHttpDataSourceFactory != null) { - mediaSourceFactory.setDrmHttpDataSourceFactory(drmHttpDataSourceFactory); - } - if (userAgent != null) { - mediaSourceFactory.setDrmUserAgent(userAgent); - } - if (drmSessionManager != null) { - mediaSourceFactory.setDrmSessionManager(drmSessionManager); - } if (drmSessionManagerProvider != null) { mediaSourceFactory.setDrmSessionManagerProvider(drmSessionManagerProvider); } if (loadErrorHandlingPolicy != null) { mediaSourceFactory.setLoadErrorHandlingPolicy(loadErrorHandlingPolicy); } - if (streamKeys != null) { - mediaSourceFactory.setStreamKeys(streamKeys); - } mediaSourceFactories.put(contentType, mediaSourceFactory); return mediaSourceFactory; } - @SuppressWarnings("deprecation") // Forwarding to deprecated method. - public void setDrmHttpDataSourceFactory( - @Nullable HttpDataSource.Factory drmHttpDataSourceFactory) { - this.drmHttpDataSourceFactory = drmHttpDataSourceFactory; - for (MediaSourceFactory mediaSourceFactory : mediaSourceFactories.values()) { - mediaSourceFactory.setDrmHttpDataSourceFactory(drmHttpDataSourceFactory); - } - } - - @SuppressWarnings("deprecation") // Forwarding to deprecated method. - public void setDrmUserAgent(@Nullable String userAgent) { - this.userAgent = userAgent; - for (MediaSourceFactory mediaSourceFactory : mediaSourceFactories.values()) { - mediaSourceFactory.setDrmUserAgent(userAgent); - } - } - - @SuppressWarnings("deprecation") // Forwarding to deprecated method. - public void setDrmSessionManager(@Nullable DrmSessionManager drmSessionManager) { - this.drmSessionManager = drmSessionManager; - for (MediaSourceFactory mediaSourceFactory : mediaSourceFactories.values()) { - mediaSourceFactory.setDrmSessionManager(drmSessionManager); - } - } - public void setDrmSessionManagerProvider( @Nullable DrmSessionManagerProvider drmSessionManagerProvider) { this.drmSessionManagerProvider = drmSessionManagerProvider; @@ -579,14 +500,6 @@ public final class DefaultMediaSourceFactory implements MediaSourceFactory { } } - @SuppressWarnings("deprecation") // Forwarding to deprecated method. - public void setStreamKeys(@Nullable List streamKeys) { - this.streamKeys = streamKeys; - for (MediaSourceFactory mediaSourceFactory : mediaSourceFactories.values()) { - mediaSourceFactory.setStreamKeys(streamKeys); - } - } - private void ensureAllSuppliersAreLoaded() { maybeLoadSupplier(C.TYPE_DASH); maybeLoadSupplier(C.TYPE_SS); diff --git a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/MediaSourceFactory.java b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/MediaSourceFactory.java index ef82d96a67..b258b97393 100644 --- a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/MediaSourceFactory.java +++ b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/MediaSourceFactory.java @@ -15,22 +15,15 @@ */ package androidx.media3.exoplayer.source; -import android.net.Uri; import androidx.annotation.Nullable; import androidx.media3.common.C; import androidx.media3.common.MediaItem; -import androidx.media3.common.StreamKey; import androidx.media3.common.util.UnstableApi; -import androidx.media3.datasource.DefaultHttpDataSource; -import androidx.media3.datasource.HttpDataSource; -import androidx.media3.exoplayer.drm.DefaultDrmSessionManager; import androidx.media3.exoplayer.drm.DefaultDrmSessionManagerProvider; import androidx.media3.exoplayer.drm.DrmSessionManager; import androidx.media3.exoplayer.drm.DrmSessionManagerProvider; -import androidx.media3.exoplayer.drm.HttpMediaDrmCallback; import androidx.media3.exoplayer.upstream.DefaultLoadErrorHandlingPolicy; import androidx.media3.exoplayer.upstream.LoadErrorHandlingPolicy; -import java.util.List; /** Factory for creating {@link MediaSource MediaSources} from {@link MediaItem MediaItems}. */ @UnstableApi @@ -48,26 +41,6 @@ public interface MediaSourceFactory { return this; } - @Deprecated - @Override - public MediaSourceFactory setDrmSessionManager( - @Nullable DrmSessionManager drmSessionManager) { - return this; - } - - @Deprecated - @Override - public MediaSourceFactory setDrmHttpDataSourceFactory( - @Nullable HttpDataSource.Factory drmHttpDataSourceFactory) { - return this; - } - - @Deprecated - @Override - public MediaSourceFactory setDrmUserAgent(@Nullable String userAgent) { - return this; - } - @Override public MediaSourceFactory setLoadErrorHandlingPolicy( @Nullable LoadErrorHandlingPolicy loadErrorHandlingPolicy) { @@ -86,88 +59,17 @@ public interface MediaSourceFactory { } }; - /** @deprecated Use {@link MediaItem.LocalConfiguration#streamKeys} instead. */ - @Deprecated - default MediaSourceFactory setStreamKeys(@Nullable List streamKeys) { - return this; - } - /** * Sets the {@link DrmSessionManagerProvider} used to obtain a {@link DrmSessionManager} for a * {@link MediaItem}. * *

If not set, {@link DefaultDrmSessionManagerProvider} is used. * - *

If set, calls to the following (deprecated) methods are ignored: - * - *

    - *
  • {@link #setDrmUserAgent(String)} - *
  • {@link #setDrmHttpDataSourceFactory(HttpDataSource.Factory)} - *
- * * @return This factory, for convenience. */ MediaSourceFactory setDrmSessionManagerProvider( @Nullable DrmSessionManagerProvider drmSessionManagerProvider); - /** - * Sets the {@link DrmSessionManager} to use for all media items regardless of their {@link - * MediaItem.DrmConfiguration}. - * - *

Calling this with a non-null {@code drmSessionManager} is equivalent to calling {@code - * setDrmSessionManagerProvider(unusedMediaItem -> drmSessionManager)}. - * - * @param drmSessionManager The {@link DrmSessionManager}, or {@code null} to use the {@link - * DefaultDrmSessionManager}. - * @return This factory, for convenience. - * @deprecated Use {@link #setDrmSessionManagerProvider(DrmSessionManagerProvider)} and pass an - * implementation that always returns the same instance. - */ - @Deprecated - MediaSourceFactory setDrmSessionManager(@Nullable DrmSessionManager drmSessionManager); - - /** - * Sets the {@link HttpDataSource.Factory} to be used for creating {@link HttpMediaDrmCallback - * HttpMediaDrmCallbacks} to execute key and provisioning requests over HTTP. - * - *

Calls to this method are ignored if either a {@link - * #setDrmSessionManagerProvider(DrmSessionManagerProvider) DrmSessionManager provider} or {@link - * #setDrmSessionManager(DrmSessionManager) concrete DrmSessionManager} are provided. - * - * @param drmHttpDataSourceFactory The HTTP data source factory, or {@code null} to use {@link - * DefaultHttpDataSource.Factory}. - * @return This factory, for convenience. - * @deprecated Use {@link #setDrmSessionManagerProvider(DrmSessionManagerProvider)} and pass an - * implementation that configures the returned {@link DrmSessionManager} with the desired - * {@link HttpDataSource.Factory}. - */ - @Deprecated - MediaSourceFactory setDrmHttpDataSourceFactory( - @Nullable HttpDataSource.Factory drmHttpDataSourceFactory); - - /** - * Sets the optional user agent to be used for DRM requests. - * - *

Calls to this method are ignored if any of the following are provided: - * - *

    - *
  • A {@link #setDrmSessionManagerProvider(DrmSessionManagerProvider) DrmSessionManager - * provider}. - *
  • A {@link #setDrmSessionManager(DrmSessionManager) concrete DrmSessionManager}. - *
  • A {@link #setDrmHttpDataSourceFactory(HttpDataSource.Factory) DRM - * HttpDataSource.Factory}. - *
- * - * @param userAgent The user agent to be used for DRM requests, or {@code null} to use the - * default. - * @return This factory, for convenience. - * @deprecated Use {@link #setDrmSessionManagerProvider(DrmSessionManagerProvider)} and pass an - * implementation that configures the returned {@link DrmSessionManager} with the desired - * {@code userAgent}. - */ - @Deprecated - MediaSourceFactory setDrmUserAgent(@Nullable String userAgent); - /** * Sets an optional {@link LoadErrorHandlingPolicy}. * @@ -192,10 +94,4 @@ public interface MediaSourceFactory { * @return The new {@link MediaSource media source}. */ MediaSource createMediaSource(MediaItem mediaItem); - - /** @deprecated Use {@link #createMediaSource(MediaItem)} instead. */ - @Deprecated - default MediaSource createMediaSource(Uri uri) { - return createMediaSource(MediaItem.fromUri(uri)); - } } diff --git a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/ProgressiveMediaSource.java b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/ProgressiveMediaSource.java index 2ceb4be8c8..14b6f8e3f0 100644 --- a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/ProgressiveMediaSource.java +++ b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/ProgressiveMediaSource.java @@ -25,7 +25,6 @@ import androidx.media3.common.MediaItem; import androidx.media3.common.Timeline; import androidx.media3.common.util.UnstableApi; import androidx.media3.datasource.DataSource; -import androidx.media3.datasource.HttpDataSource; import androidx.media3.datasource.TransferListener; import androidx.media3.exoplayer.drm.DefaultDrmSessionManagerProvider; import androidx.media3.exoplayer.drm.DrmSessionManager; @@ -58,7 +57,6 @@ public final class ProgressiveMediaSource extends BaseMediaSource private final DataSource.Factory dataSourceFactory; private ProgressiveMediaExtractor.Factory progressiveMediaExtractorFactory; - private boolean usingCustomDrmSessionManagerProvider; private DrmSessionManagerProvider drmSessionManagerProvider; private LoadErrorHandlingPolicy loadErrorHandlingPolicy; private int continueLoadingCheckIntervalBytes; @@ -168,55 +166,13 @@ public final class ProgressiveMediaSource extends BaseMediaSource @Override public Factory setDrmSessionManagerProvider( @Nullable DrmSessionManagerProvider drmSessionManagerProvider) { - if (drmSessionManagerProvider != null) { - this.drmSessionManagerProvider = drmSessionManagerProvider; - this.usingCustomDrmSessionManagerProvider = true; - } else { - this.drmSessionManagerProvider = new DefaultDrmSessionManagerProvider(); - this.usingCustomDrmSessionManagerProvider = false; - } + this.drmSessionManagerProvider = + drmSessionManagerProvider != null + ? drmSessionManagerProvider + : new DefaultDrmSessionManagerProvider(); return this; } - @Deprecated - @Override - public Factory setDrmSessionManager(@Nullable DrmSessionManager drmSessionManager) { - if (drmSessionManager == null) { - setDrmSessionManagerProvider(null); - } else { - setDrmSessionManagerProvider(unusedMediaItem -> drmSessionManager); - } - return this; - } - - @Deprecated - @Override - public Factory setDrmHttpDataSourceFactory( - @Nullable HttpDataSource.Factory drmHttpDataSourceFactory) { - if (!usingCustomDrmSessionManagerProvider) { - ((DefaultDrmSessionManagerProvider) drmSessionManagerProvider) - .setDrmHttpDataSourceFactory(drmHttpDataSourceFactory); - } - return this; - } - - @Deprecated - @Override - public Factory setDrmUserAgent(@Nullable String userAgent) { - if (!usingCustomDrmSessionManagerProvider) { - ((DefaultDrmSessionManagerProvider) drmSessionManagerProvider).setDrmUserAgent(userAgent); - } - return this; - } - - /** @deprecated Use {@link #createMediaSource(MediaItem)} instead. */ - @SuppressWarnings("deprecation") - @Deprecated - @Override - public ProgressiveMediaSource createMediaSource(Uri uri) { - return createMediaSource(new MediaItem.Builder().setUri(uri).build()); - } - /** * Returns a new {@link ProgressiveMediaSource} using the current parameters. * diff --git a/libraries/exoplayer_dash/src/main/java/androidx/media3/exoplayer/dash/DashMediaSource.java b/libraries/exoplayer_dash/src/main/java/androidx/media3/exoplayer/dash/DashMediaSource.java index e58e097f2c..d404880307 100644 --- a/libraries/exoplayer_dash/src/main/java/androidx/media3/exoplayer/dash/DashMediaSource.java +++ b/libraries/exoplayer_dash/src/main/java/androidx/media3/exoplayer/dash/DashMediaSource.java @@ -42,7 +42,6 @@ import androidx.media3.common.util.Log; import androidx.media3.common.util.UnstableApi; import androidx.media3.common.util.Util; import androidx.media3.datasource.DataSource; -import androidx.media3.datasource.HttpDataSource; import androidx.media3.datasource.TransferListener; import androidx.media3.exoplayer.dash.PlayerEmsgHandler.PlayerEmsgCallback; import androidx.media3.exoplayer.dash.manifest.AdaptationSet; @@ -85,7 +84,6 @@ import java.io.InputStreamReader; import java.math.RoundingMode; import java.text.ParseException; import java.text.SimpleDateFormat; -import java.util.Collections; import java.util.List; import java.util.Locale; import java.util.TimeZone; @@ -106,14 +104,12 @@ public final class DashMediaSource extends BaseMediaSource { private final DashChunkSource.Factory chunkSourceFactory; @Nullable private final DataSource.Factory manifestDataSourceFactory; - private boolean usingCustomDrmSessionManagerProvider; private DrmSessionManagerProvider drmSessionManagerProvider; private CompositeSequenceableLoaderFactory compositeSequenceableLoaderFactory; private LoadErrorHandlingPolicy loadErrorHandlingPolicy; private long targetLiveOffsetOverrideMs; private long fallbackTargetLiveOffsetMs; @Nullable private ParsingLoadable.Parser manifestParser; - private List streamKeys; @Nullable private Object tag; /** @@ -145,7 +141,6 @@ public final class DashMediaSource extends BaseMediaSource { targetLiveOffsetOverrideMs = C.TIME_UNSET; fallbackTargetLiveOffsetMs = DEFAULT_FALLBACK_TARGET_LIVE_OFFSET_MS; compositeSequenceableLoaderFactory = new DefaultCompositeSequenceableLoaderFactory(); - streamKeys = Collections.emptyList(); } /** @@ -158,59 +153,13 @@ public final class DashMediaSource extends BaseMediaSource { return this; } - /** - * @deprecated Use {@link MediaItem.Builder#setStreamKeys(List)} and {@link - * #createMediaSource(MediaItem)} instead. - */ - @SuppressWarnings("deprecation") - @Deprecated - @Override - public Factory setStreamKeys(@Nullable List streamKeys) { - this.streamKeys = streamKeys != null ? streamKeys : Collections.emptyList(); - return this; - } - @Override public Factory setDrmSessionManagerProvider( @Nullable DrmSessionManagerProvider drmSessionManagerProvider) { - if (drmSessionManagerProvider != null) { - this.drmSessionManagerProvider = drmSessionManagerProvider; - this.usingCustomDrmSessionManagerProvider = true; - } else { - this.drmSessionManagerProvider = new DefaultDrmSessionManagerProvider(); - this.usingCustomDrmSessionManagerProvider = false; - } - return this; - } - - @Deprecated - @Override - public Factory setDrmSessionManager(@Nullable DrmSessionManager drmSessionManager) { - if (drmSessionManager == null) { - setDrmSessionManagerProvider(null); - } else { - setDrmSessionManagerProvider(unusedMediaItem -> drmSessionManager); - } - return this; - } - - @Deprecated - @Override - public Factory setDrmHttpDataSourceFactory( - @Nullable HttpDataSource.Factory drmHttpDataSourceFactory) { - if (!usingCustomDrmSessionManagerProvider) { - ((DefaultDrmSessionManagerProvider) drmSessionManagerProvider) - .setDrmHttpDataSourceFactory(drmHttpDataSourceFactory); - } - return this; - } - - @Deprecated - @Override - public Factory setDrmUserAgent(@Nullable String userAgent) { - if (!usingCustomDrmSessionManagerProvider) { - ((DefaultDrmSessionManagerProvider) drmSessionManagerProvider).setDrmUserAgent(userAgent); - } + this.drmSessionManagerProvider = + drmSessionManagerProvider != null + ? drmSessionManagerProvider + : new DefaultDrmSessionManagerProvider(); return this; } @@ -305,7 +254,6 @@ public final class DashMediaSource extends BaseMediaSource { .setUri(Uri.EMPTY) .setMediaId(DEFAULT_MEDIA_ID) .setMimeType(MimeTypes.APPLICATION_MPD) - .setStreamKeys(streamKeys) .setTag(tag) .build()); } @@ -337,14 +285,7 @@ public final class DashMediaSource extends BaseMediaSource { .setTargetOffsetMs(targetLiveOffsetOverrideMs) .build()); } - if (mediaItem.localConfiguration == null - || mediaItem.localConfiguration.streamKeys.isEmpty()) { - mediaItemBuilder.setStreamKeys(streamKeys); - } mediaItem = mediaItemBuilder.build(); - if (!checkNotNull(mediaItem.localConfiguration).streamKeys.isEmpty()) { - manifest = manifest.copy(streamKeys); - } return new DashMediaSource( mediaItem, manifest, @@ -357,19 +298,6 @@ public final class DashMediaSource extends BaseMediaSource { fallbackTargetLiveOffsetMs); } - /** @deprecated Use {@link #createMediaSource(MediaItem)} instead. */ - @SuppressWarnings("deprecation") - @Deprecated - @Override - public DashMediaSource createMediaSource(Uri uri) { - return createMediaSource( - new MediaItem.Builder() - .setUri(uri) - .setMimeType(MimeTypes.APPLICATION_MPD) - .setTag(tag) - .build()); - } - /** * Returns a new {@link DashMediaSource} using the current parameters. * @@ -384,28 +312,20 @@ public final class DashMediaSource extends BaseMediaSource { if (manifestParser == null) { manifestParser = new DashManifestParser(); } - List streamKeys = - mediaItem.localConfiguration.streamKeys.isEmpty() - ? this.streamKeys - : mediaItem.localConfiguration.streamKeys; + List streamKeys = mediaItem.localConfiguration.streamKeys; if (!streamKeys.isEmpty()) { manifestParser = new FilteringManifestParser<>(manifestParser, streamKeys); } boolean needsTag = mediaItem.localConfiguration.tag == null && tag != null; - boolean needsStreamKeys = - mediaItem.localConfiguration.streamKeys.isEmpty() && !streamKeys.isEmpty(); boolean needsTargetLiveOffset = mediaItem.liveConfiguration.targetOffsetMs == C.TIME_UNSET && targetLiveOffsetOverrideMs != C.TIME_UNSET; - if (needsTag || needsStreamKeys || needsTargetLiveOffset) { + if (needsTag || needsTargetLiveOffset) { MediaItem.Builder builder = mediaItem.buildUpon(); if (needsTag) { builder.setTag(tag); } - if (needsStreamKeys) { - builder.setStreamKeys(streamKeys); - } if (needsTargetLiveOffset) { builder.setLiveConfiguration( mediaItem diff --git a/libraries/exoplayer_dash/src/test/java/androidx/media3/exoplayer/dash/DashMediaSourceTest.java b/libraries/exoplayer_dash/src/test/java/androidx/media3/exoplayer/dash/DashMediaSourceTest.java index ef20c85225..5e97bc9aba 100644 --- a/libraries/exoplayer_dash/src/test/java/androidx/media3/exoplayer/dash/DashMediaSourceTest.java +++ b/libraries/exoplayer_dash/src/test/java/androidx/media3/exoplayer/dash/DashMediaSourceTest.java @@ -23,7 +23,6 @@ import android.net.Uri; import androidx.media3.common.C; import androidx.media3.common.MediaItem; import androidx.media3.common.ParserException; -import androidx.media3.common.StreamKey; import androidx.media3.common.Timeline; import androidx.media3.common.Timeline.Window; import androidx.media3.common.util.Util; @@ -37,7 +36,6 @@ import androidx.media3.exoplayer.upstream.ParsingLoadable; import androidx.media3.test.utils.TestUtil; import androidx.test.core.app.ApplicationProvider; import androidx.test.ext.junit.runners.AndroidJUnit4; -import com.google.common.collect.ImmutableList; import java.io.ByteArrayInputStream; import java.io.IOException; import java.util.concurrent.CountDownLatch; @@ -135,45 +133,6 @@ public final class DashMediaSourceTest { assertThat(dashMediaItem.localConfiguration.tag).isEqualTo(mediaItemTag); } - // Tests backwards compatibility - @SuppressWarnings("deprecation") - @Test - public void factorySetStreamKeys_emptyMediaItemStreamKeys_setsMediaItemStreamKeys() { - MediaItem mediaItem = MediaItem.fromUri("http://www.google.com"); - StreamKey streamKey = new StreamKey(/* groupIndex= */ 0, /* trackIndex= */ 1); - DashMediaSource.Factory factory = - new DashMediaSource.Factory(new FileDataSource.Factory()) - .setStreamKeys(ImmutableList.of(streamKey)); - - MediaItem dashMediaItem = factory.createMediaSource(mediaItem).getMediaItem(); - - assertThat(dashMediaItem.localConfiguration).isNotNull(); - assertThat(dashMediaItem.localConfiguration.uri).isEqualTo(mediaItem.localConfiguration.uri); - assertThat(dashMediaItem.localConfiguration.streamKeys).containsExactly(streamKey); - } - - // Tests backwards compatibility - @SuppressWarnings("deprecation") - @Test - public void factorySetStreamKeys_withMediaItemStreamKeys_doesNotOverrideMediaItemStreamKeys() { - StreamKey mediaItemStreamKey = new StreamKey(/* groupIndex= */ 0, /* trackIndex= */ 1); - MediaItem mediaItem = - new MediaItem.Builder() - .setUri("http://www.google.com") - .setStreamKeys(ImmutableList.of(mediaItemStreamKey)) - .build(); - DashMediaSource.Factory factory = - new DashMediaSource.Factory(new FileDataSource.Factory()) - .setStreamKeys( - ImmutableList.of(new StreamKey(/* groupIndex= */ 1, /* trackIndex= */ 0))); - - MediaItem dashMediaItem = factory.createMediaSource(mediaItem).getMediaItem(); - - assertThat(dashMediaItem.localConfiguration).isNotNull(); - assertThat(dashMediaItem.localConfiguration.uri).isEqualTo(mediaItem.localConfiguration.uri); - assertThat(dashMediaItem.localConfiguration.streamKeys).containsExactly(mediaItemStreamKey); - } - @Test public void replaceManifestUri_doesNotChangeMediaItem() { DashMediaSource.Factory factory = new DashMediaSource.Factory(new FileDataSource.Factory()); diff --git a/libraries/exoplayer_hls/src/main/java/androidx/media3/exoplayer/hls/HlsMediaSource.java b/libraries/exoplayer_hls/src/main/java/androidx/media3/exoplayer/hls/HlsMediaSource.java index b01ee2a9a5..92ab6e3e7e 100644 --- a/libraries/exoplayer_hls/src/main/java/androidx/media3/exoplayer/hls/HlsMediaSource.java +++ b/libraries/exoplayer_hls/src/main/java/androidx/media3/exoplayer/hls/HlsMediaSource.java @@ -18,7 +18,6 @@ package androidx.media3.exoplayer.hls; import static androidx.media3.common.util.Assertions.checkNotNull; import static java.lang.annotation.RetentionPolicy.SOURCE; -import android.net.Uri; import android.os.Looper; import android.os.SystemClock; import androidx.annotation.IntDef; @@ -27,12 +26,10 @@ import androidx.annotation.VisibleForTesting; import androidx.media3.common.C; import androidx.media3.common.MediaItem; import androidx.media3.common.MediaLibraryInfo; -import androidx.media3.common.MimeTypes; import androidx.media3.common.StreamKey; import androidx.media3.common.util.UnstableApi; import androidx.media3.common.util.Util; import androidx.media3.datasource.DataSource; -import androidx.media3.datasource.HttpDataSource; import androidx.media3.datasource.TransferListener; import androidx.media3.exoplayer.drm.DefaultDrmSessionManagerProvider; import androidx.media3.exoplayer.drm.DrmSessionEventListener; @@ -62,7 +59,6 @@ import java.lang.annotation.Documented; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.Target; -import java.util.Collections; import java.util.List; /** An HLS {@link MediaSource}. */ @@ -106,13 +102,11 @@ public final class HlsMediaSource extends BaseMediaSource private HlsPlaylistParserFactory playlistParserFactory; private HlsPlaylistTracker.Factory playlistTrackerFactory; private CompositeSequenceableLoaderFactory compositeSequenceableLoaderFactory; - private boolean usingCustomDrmSessionManagerProvider; private DrmSessionManagerProvider drmSessionManagerProvider; private LoadErrorHandlingPolicy loadErrorHandlingPolicy; private boolean allowChunklessPreparation; private @MetadataType int metadataType; private boolean useSessionKeys; - private List streamKeys; @Nullable private Object tag; private long elapsedRealTimeOffsetMs; @@ -142,7 +136,6 @@ public final class HlsMediaSource extends BaseMediaSource loadErrorHandlingPolicy = new DefaultLoadErrorHandlingPolicy(); compositeSequenceableLoaderFactory = new DefaultCompositeSequenceableLoaderFactory(); metadataType = METADATA_TYPE_ID3; - streamKeys = Collections.emptyList(); elapsedRealTimeOffsetMs = C.TIME_UNSET; allowChunklessPreparation = true; } @@ -292,56 +285,10 @@ public final class HlsMediaSource extends BaseMediaSource @Override public Factory setDrmSessionManagerProvider( @Nullable DrmSessionManagerProvider drmSessionManagerProvider) { - if (drmSessionManagerProvider != null) { - this.drmSessionManagerProvider = drmSessionManagerProvider; - this.usingCustomDrmSessionManagerProvider = true; - } else { - this.drmSessionManagerProvider = new DefaultDrmSessionManagerProvider(); - this.usingCustomDrmSessionManagerProvider = false; - } - return this; - } - - @Deprecated - @Override - public Factory setDrmSessionManager(@Nullable DrmSessionManager drmSessionManager) { - if (drmSessionManager == null) { - setDrmSessionManagerProvider(null); - } else { - setDrmSessionManagerProvider(unusedMediaItem -> drmSessionManager); - } - return this; - } - - @Deprecated - @Override - public Factory setDrmHttpDataSourceFactory( - @Nullable HttpDataSource.Factory drmHttpDataSourceFactory) { - if (!usingCustomDrmSessionManagerProvider) { - ((DefaultDrmSessionManagerProvider) drmSessionManagerProvider) - .setDrmHttpDataSourceFactory(drmHttpDataSourceFactory); - } - return this; - } - - @Deprecated - @Override - public Factory setDrmUserAgent(@Nullable String userAgent) { - if (!usingCustomDrmSessionManagerProvider) { - ((DefaultDrmSessionManagerProvider) drmSessionManagerProvider).setDrmUserAgent(userAgent); - } - return this; - } - - /** - * @deprecated Use {@link MediaItem.Builder#setStreamKeys(List)} and {@link - * #createMediaSource(MediaItem)} instead. - */ - @SuppressWarnings("deprecation") - @Deprecated - @Override - public Factory setStreamKeys(@Nullable List streamKeys) { - this.streamKeys = streamKeys != null ? streamKeys : Collections.emptyList(); + this.drmSessionManagerProvider = + drmSessionManagerProvider != null + ? drmSessionManagerProvider + : new DefaultDrmSessionManagerProvider(); return this; } @@ -359,15 +306,6 @@ public final class HlsMediaSource extends BaseMediaSource return this; } - /** @deprecated Use {@link #createMediaSource(MediaItem)} instead. */ - @SuppressWarnings("deprecation") - @Deprecated - @Override - public HlsMediaSource createMediaSource(Uri uri) { - return createMediaSource( - new MediaItem.Builder().setUri(uri).setMimeType(MimeTypes.APPLICATION_M3U8).build()); - } - /** * Returns a new {@link HlsMediaSource} using the current parameters. * @@ -379,24 +317,14 @@ public final class HlsMediaSource extends BaseMediaSource public HlsMediaSource createMediaSource(MediaItem mediaItem) { checkNotNull(mediaItem.localConfiguration); HlsPlaylistParserFactory playlistParserFactory = this.playlistParserFactory; - List streamKeys = - mediaItem.localConfiguration.streamKeys.isEmpty() - ? this.streamKeys - : mediaItem.localConfiguration.streamKeys; + List streamKeys = mediaItem.localConfiguration.streamKeys; if (!streamKeys.isEmpty()) { playlistParserFactory = new FilteringHlsPlaylistParserFactory(playlistParserFactory, streamKeys); } - boolean needsTag = mediaItem.localConfiguration.tag == null && tag != null; - boolean needsStreamKeys = - mediaItem.localConfiguration.streamKeys.isEmpty() && !streamKeys.isEmpty(); - if (needsTag && needsStreamKeys) { - mediaItem = mediaItem.buildUpon().setTag(tag).setStreamKeys(streamKeys).build(); - } else if (needsTag) { + if (mediaItem.localConfiguration.tag == null && tag != null) { mediaItem = mediaItem.buildUpon().setTag(tag).build(); - } else if (needsStreamKeys) { - mediaItem = mediaItem.buildUpon().setStreamKeys(streamKeys).build(); } return new HlsMediaSource( mediaItem, diff --git a/libraries/exoplayer_hls/src/test/java/androidx/media3/exoplayer/hls/HlsMediaSourceTest.java b/libraries/exoplayer_hls/src/test/java/androidx/media3/exoplayer/hls/HlsMediaSourceTest.java index 167cdc0e99..fcd9fa7546 100644 --- a/libraries/exoplayer_hls/src/test/java/androidx/media3/exoplayer/hls/HlsMediaSourceTest.java +++ b/libraries/exoplayer_hls/src/test/java/androidx/media3/exoplayer/hls/HlsMediaSourceTest.java @@ -23,7 +23,6 @@ import android.net.Uri; import android.os.SystemClock; import androidx.media3.common.MediaItem; import androidx.media3.common.ParserException; -import androidx.media3.common.StreamKey; import androidx.media3.common.Timeline; import androidx.media3.common.util.Util; import androidx.media3.datasource.DataSource; @@ -37,7 +36,6 @@ import androidx.test.ext.junit.runners.AndroidJUnit4; import java.io.ByteArrayInputStream; import java.io.IOException; import java.util.ArrayList; -import java.util.Collections; import java.util.List; import java.util.concurrent.TimeoutException; import java.util.concurrent.atomic.AtomicReference; @@ -82,45 +80,6 @@ public class HlsMediaSourceTest { assertThat(hlsMediaItem.localConfiguration.tag).isEqualTo(mediaItemTag); } - // Tests backwards compatibility - @SuppressWarnings("deprecation") - @Test - public void factorySetStreamKeys_emptyMediaItemStreamKeys_setsMediaItemStreamKeys() { - MediaItem mediaItem = MediaItem.fromUri("http://www.google.com"); - StreamKey streamKey = new StreamKey(/* groupIndex= */ 0, /* trackIndex= */ 1); - HlsMediaSource.Factory factory = - new HlsMediaSource.Factory(mock(DataSource.Factory.class)) - .setStreamKeys(Collections.singletonList(streamKey)); - - MediaItem hlsMediaItem = factory.createMediaSource(mediaItem).getMediaItem(); - - assertThat(hlsMediaItem.localConfiguration).isNotNull(); - assertThat(hlsMediaItem.localConfiguration.uri).isEqualTo(mediaItem.localConfiguration.uri); - assertThat(hlsMediaItem.localConfiguration.streamKeys).containsExactly(streamKey); - } - - // Tests backwards compatibility - @SuppressWarnings("deprecation") - @Test - public void factorySetStreamKeys_withMediaItemStreamKeys_doesNotOverrideMediaItemStreamKeys() { - StreamKey mediaItemStreamKey = new StreamKey(/* groupIndex= */ 0, /* trackIndex= */ 1); - MediaItem mediaItem = - new MediaItem.Builder() - .setUri("http://www.google.com") - .setStreamKeys(Collections.singletonList(mediaItemStreamKey)) - .build(); - HlsMediaSource.Factory factory = - new HlsMediaSource.Factory(mock(DataSource.Factory.class)) - .setStreamKeys( - Collections.singletonList(new StreamKey(/* groupIndex= */ 1, /* trackIndex= */ 0))); - - MediaItem hlsMediaItem = factory.createMediaSource(mediaItem).getMediaItem(); - - assertThat(hlsMediaItem.localConfiguration).isNotNull(); - assertThat(hlsMediaItem.localConfiguration.uri).isEqualTo(mediaItem.localConfiguration.uri); - assertThat(hlsMediaItem.localConfiguration.streamKeys).containsExactly(mediaItemStreamKey); - } - @Test public void loadLivePlaylist_noTargetLiveOffsetDefined_fallbackToThreeTargetDuration() throws TimeoutException, ParserException { diff --git a/libraries/exoplayer_rtsp/src/main/java/androidx/media3/exoplayer/rtsp/RtspMediaSource.java b/libraries/exoplayer_rtsp/src/main/java/androidx/media3/exoplayer/rtsp/RtspMediaSource.java index 2d25c29f5e..4bbcf10b11 100644 --- a/libraries/exoplayer_rtsp/src/main/java/androidx/media3/exoplayer/rtsp/RtspMediaSource.java +++ b/libraries/exoplayer_rtsp/src/main/java/androidx/media3/exoplayer/rtsp/RtspMediaSource.java @@ -29,9 +29,7 @@ import androidx.media3.common.MediaLibraryInfo; import androidx.media3.common.Timeline; import androidx.media3.common.util.UnstableApi; import androidx.media3.common.util.Util; -import androidx.media3.datasource.HttpDataSource; import androidx.media3.datasource.TransferListener; -import androidx.media3.exoplayer.drm.DrmSessionManager; import androidx.media3.exoplayer.drm.DrmSessionManagerProvider; import androidx.media3.exoplayer.source.BaseMediaSource; import androidx.media3.exoplayer.source.ForwardingTimeline; @@ -62,9 +60,6 @@ public final class RtspMediaSource extends BaseMediaSource { * *
    *
  • {@link #setDrmSessionManagerProvider(DrmSessionManagerProvider)} - *
  • {@link #setDrmSessionManager(DrmSessionManager)} - *
  • {@link #setDrmHttpDataSourceFactory(HttpDataSource.Factory)} - *
  • {@link #setDrmUserAgent(String)} *
  • {@link #setLoadErrorHandlingPolicy(LoadErrorHandlingPolicy)} *
*/ @@ -157,40 +152,6 @@ public final class RtspMediaSource extends BaseMediaSource { return this; } - /** - * Does nothing. {@link RtspMediaSource} does not support DRM. - * - * @deprecated {@link RtspMediaSource} does not support DRM. - */ - @Deprecated - @Override - public Factory setDrmSessionManager(@Nullable DrmSessionManager drmSessionManager) { - return this; - } - - /** - * Does nothing. {@link RtspMediaSource} does not support DRM. - * - * @deprecated {@link RtspMediaSource} does not support DRM. - */ - @Deprecated - @Override - public Factory setDrmHttpDataSourceFactory( - @Nullable HttpDataSource.Factory drmHttpDataSourceFactory) { - return this; - } - - /** - * Does nothing. {@link RtspMediaSource} does not support DRM. - * - * @deprecated {@link RtspMediaSource} does not support DRM. - */ - @Deprecated - @Override - public Factory setDrmUserAgent(@Nullable String userAgent) { - return this; - } - /** Does nothing. {@link RtspMediaSource} does not support error handling policies. */ @Override public Factory setLoadErrorHandlingPolicy( diff --git a/libraries/exoplayer_smoothstreaming/src/main/java/androidx/media3/exoplayer/smoothstreaming/SsMediaSource.java b/libraries/exoplayer_smoothstreaming/src/main/java/androidx/media3/exoplayer/smoothstreaming/SsMediaSource.java index 909382622f..4b8666e5d8 100644 --- a/libraries/exoplayer_smoothstreaming/src/main/java/androidx/media3/exoplayer/smoothstreaming/SsMediaSource.java +++ b/libraries/exoplayer_smoothstreaming/src/main/java/androidx/media3/exoplayer/smoothstreaming/SsMediaSource.java @@ -34,7 +34,6 @@ import androidx.media3.common.util.Assertions; import androidx.media3.common.util.UnstableApi; import androidx.media3.common.util.Util; import androidx.media3.datasource.DataSource; -import androidx.media3.datasource.HttpDataSource; import androidx.media3.datasource.TransferListener; import androidx.media3.exoplayer.drm.DefaultDrmSessionManagerProvider; import androidx.media3.exoplayer.drm.DrmSessionEventListener; @@ -64,9 +63,9 @@ import androidx.media3.exoplayer.upstream.Loader; import androidx.media3.exoplayer.upstream.Loader.LoadErrorAction; import androidx.media3.exoplayer.upstream.LoaderErrorThrower; import androidx.media3.exoplayer.upstream.ParsingLoadable; +import com.google.common.collect.ImmutableList; import java.io.IOException; import java.util.ArrayList; -import java.util.Collections; import java.util.List; /** A SmoothStreaming {@link MediaSource}. */ @@ -85,12 +84,10 @@ public final class SsMediaSource extends BaseMediaSource @Nullable private final DataSource.Factory manifestDataSourceFactory; private CompositeSequenceableLoaderFactory compositeSequenceableLoaderFactory; - private boolean usingCustomDrmSessionManagerProvider; private DrmSessionManagerProvider drmSessionManagerProvider; private LoadErrorHandlingPolicy loadErrorHandlingPolicy; private long livePresentationDelayMs; @Nullable private ParsingLoadable.Parser manifestParser; - private List streamKeys; @Nullable private Object tag; /** @@ -121,7 +118,6 @@ public final class SsMediaSource extends BaseMediaSource loadErrorHandlingPolicy = new DefaultLoadErrorHandlingPolicy(); livePresentationDelayMs = DEFAULT_LIVE_PRESENTATION_DELAY_MS; compositeSequenceableLoaderFactory = new DefaultCompositeSequenceableLoaderFactory(); - streamKeys = Collections.emptyList(); } /** @@ -198,67 +194,13 @@ public final class SsMediaSource extends BaseMediaSource @Override public Factory setDrmSessionManagerProvider( @Nullable DrmSessionManagerProvider drmSessionManagerProvider) { - if (drmSessionManagerProvider != null) { - this.drmSessionManagerProvider = drmSessionManagerProvider; - this.usingCustomDrmSessionManagerProvider = true; - } else { - this.drmSessionManagerProvider = new DefaultDrmSessionManagerProvider(); - this.usingCustomDrmSessionManagerProvider = false; - } + this.drmSessionManagerProvider = + drmSessionManagerProvider != null + ? drmSessionManagerProvider + : new DefaultDrmSessionManagerProvider(); return this; } - @Deprecated - @Override - public Factory setDrmSessionManager(@Nullable DrmSessionManager drmSessionManager) { - if (drmSessionManager == null) { - setDrmSessionManagerProvider(null); - } else { - setDrmSessionManagerProvider(unusedMediaItem -> drmSessionManager); - } - return this; - } - - @Deprecated - @Override - public Factory setDrmHttpDataSourceFactory( - @Nullable HttpDataSource.Factory drmHttpDataSourceFactory) { - if (!usingCustomDrmSessionManagerProvider) { - ((DefaultDrmSessionManagerProvider) drmSessionManagerProvider) - .setDrmHttpDataSourceFactory(drmHttpDataSourceFactory); - } - return this; - } - - @Deprecated - @Override - public Factory setDrmUserAgent(@Nullable String userAgent) { - if (!usingCustomDrmSessionManagerProvider) { - ((DefaultDrmSessionManagerProvider) drmSessionManagerProvider).setDrmUserAgent(userAgent); - } - return this; - } - - /** - * @deprecated Use {@link MediaItem.Builder#setStreamKeys(List)} and {@link - * #createMediaSource(MediaItem)} instead. - */ - @SuppressWarnings("deprecation") - @Deprecated - @Override - public Factory setStreamKeys(@Nullable List streamKeys) { - this.streamKeys = streamKeys != null ? streamKeys : Collections.emptyList(); - return this; - } - - /** @deprecated Use {@link #createMediaSource(MediaItem)} instead. */ - @SuppressWarnings("deprecation") - @Deprecated - @Override - public SsMediaSource createMediaSource(Uri uri) { - return createMediaSource(new MediaItem.Builder().setUri(uri).build()); - } - /** * Returns a new {@link SsMediaSource} using the current parameters and the specified sideloaded * manifest. @@ -283,9 +225,9 @@ public final class SsMediaSource extends BaseMediaSource public SsMediaSource createMediaSource(SsManifest manifest, MediaItem mediaItem) { Assertions.checkArgument(!manifest.isLive); List streamKeys = - mediaItem.localConfiguration != null && !mediaItem.localConfiguration.streamKeys.isEmpty() + mediaItem.localConfiguration != null ? mediaItem.localConfiguration.streamKeys - : this.streamKeys; + : ImmutableList.of(); if (!streamKeys.isEmpty()) { manifest = manifest.copy(streamKeys); } @@ -297,7 +239,6 @@ public final class SsMediaSource extends BaseMediaSource .setMimeType(MimeTypes.APPLICATION_SS) .setUri(hasUri ? mediaItem.localConfiguration.uri : Uri.EMPTY) .setTag(hasTag ? mediaItem.localConfiguration.tag : tag) - .setStreamKeys(streamKeys) .build(); return new SsMediaSource( mediaItem, @@ -325,23 +266,13 @@ public final class SsMediaSource extends BaseMediaSource if (manifestParser == null) { manifestParser = new SsManifestParser(); } - List streamKeys = - !mediaItem.localConfiguration.streamKeys.isEmpty() - ? mediaItem.localConfiguration.streamKeys - : this.streamKeys; + List streamKeys = mediaItem.localConfiguration.streamKeys; if (!streamKeys.isEmpty()) { manifestParser = new FilteringManifestParser<>(manifestParser, streamKeys); } - boolean needsTag = mediaItem.localConfiguration.tag == null && tag != null; - boolean needsStreamKeys = - mediaItem.localConfiguration.streamKeys.isEmpty() && !streamKeys.isEmpty(); - if (needsTag && needsStreamKeys) { - mediaItem = mediaItem.buildUpon().setTag(tag).setStreamKeys(streamKeys).build(); - } else if (needsTag) { + if (mediaItem.localConfiguration.tag == null && tag != null) { mediaItem = mediaItem.buildUpon().setTag(tag).build(); - } else if (needsStreamKeys) { - mediaItem = mediaItem.buildUpon().setStreamKeys(streamKeys).build(); } return new SsMediaSource( mediaItem, diff --git a/libraries/exoplayer_smoothstreaming/src/test/java/androidx/media3/exoplayer/smoothstreaming/SsMediaSourceTest.java b/libraries/exoplayer_smoothstreaming/src/test/java/androidx/media3/exoplayer/smoothstreaming/SsMediaSourceTest.java index 8d9f189016..180aac89db 100644 --- a/libraries/exoplayer_smoothstreaming/src/test/java/androidx/media3/exoplayer/smoothstreaming/SsMediaSourceTest.java +++ b/libraries/exoplayer_smoothstreaming/src/test/java/androidx/media3/exoplayer/smoothstreaming/SsMediaSourceTest.java @@ -19,10 +19,8 @@ import static androidx.media3.common.util.Util.castNonNull; import static com.google.common.truth.Truth.assertThat; import androidx.media3.common.MediaItem; -import androidx.media3.common.StreamKey; import androidx.media3.datasource.FileDataSource; import androidx.test.ext.junit.runners.AndroidJUnit4; -import java.util.Collections; import org.junit.Test; import org.junit.runner.RunWith; @@ -65,45 +63,4 @@ public class SsMediaSourceTest { .isEqualTo(castNonNull(mediaItem.localConfiguration).uri); assertThat(ssMediaItem.localConfiguration.tag).isEqualTo(mediaItemTag); } - - // Tests backwards compatibility - @SuppressWarnings("deprecation") - @Test - public void factorySetStreamKeys_emptyMediaItemStreamKeys_setsMediaItemStreamKeys() { - MediaItem mediaItem = MediaItem.fromUri("http://www.google.com"); - StreamKey streamKey = new StreamKey(/* groupIndex= */ 0, /* trackIndex= */ 1); - SsMediaSource.Factory factory = - new SsMediaSource.Factory(new FileDataSource.Factory()) - .setStreamKeys(Collections.singletonList(streamKey)); - - MediaItem ssMediaItem = factory.createMediaSource(mediaItem).getMediaItem(); - - assertThat(ssMediaItem.localConfiguration).isNotNull(); - assertThat(ssMediaItem.localConfiguration.uri) - .isEqualTo(castNonNull(mediaItem.localConfiguration).uri); - assertThat(ssMediaItem.localConfiguration.streamKeys).containsExactly(streamKey); - } - - // Tests backwards compatibility - @SuppressWarnings("deprecation") - @Test - public void factorySetStreamKeys_withMediaItemStreamKeys_doesNotOverrideMediaItemStreamKeys() { - StreamKey mediaItemStreamKey = new StreamKey(/* groupIndex= */ 0, /* trackIndex= */ 1); - MediaItem mediaItem = - new MediaItem.Builder() - .setUri("http://www.google.com") - .setStreamKeys(Collections.singletonList(mediaItemStreamKey)) - .build(); - SsMediaSource.Factory factory = - new SsMediaSource.Factory(new FileDataSource.Factory()) - .setStreamKeys( - Collections.singletonList(new StreamKey(/* groupIndex= */ 1, /* trackIndex= */ 0))); - - MediaItem ssMediaItem = factory.createMediaSource(mediaItem).getMediaItem(); - - assertThat(ssMediaItem.localConfiguration).isNotNull(); - assertThat(ssMediaItem.localConfiguration.uri) - .isEqualTo(castNonNull(mediaItem.localConfiguration).uri); - assertThat(ssMediaItem.localConfiguration.streamKeys).containsExactly(mediaItemStreamKey); - } } diff --git a/libraries/test_utils/src/main/java/androidx/media3/test/utils/FakeMediaSourceFactory.java b/libraries/test_utils/src/main/java/androidx/media3/test/utils/FakeMediaSourceFactory.java index 07c86be37a..d141b86da3 100644 --- a/libraries/test_utils/src/main/java/androidx/media3/test/utils/FakeMediaSourceFactory.java +++ b/libraries/test_utils/src/main/java/androidx/media3/test/utils/FakeMediaSourceFactory.java @@ -21,8 +21,6 @@ import androidx.media3.common.C; import androidx.media3.common.MediaItem; import androidx.media3.common.util.UnstableApi; import androidx.media3.common.util.Util; -import androidx.media3.datasource.HttpDataSource; -import androidx.media3.exoplayer.drm.DrmSessionManager; import androidx.media3.exoplayer.drm.DrmSessionManagerProvider; import androidx.media3.exoplayer.source.MediaSource; import androidx.media3.exoplayer.source.MediaSourceFactory; @@ -42,25 +40,6 @@ public class FakeMediaSourceFactory implements MediaSourceFactory { throw new UnsupportedOperationException(); } - @Deprecated - @Override - public MediaSourceFactory setDrmSessionManager(@Nullable DrmSessionManager drmSessionManager) { - throw new UnsupportedOperationException(); - } - - @Deprecated - @Override - public MediaSourceFactory setDrmHttpDataSourceFactory( - @Nullable HttpDataSource.Factory drmHttpDataSourceFactory) { - throw new UnsupportedOperationException(); - } - - @Deprecated - @Override - public MediaSourceFactory setDrmUserAgent(@Nullable String userAgent) { - throw new UnsupportedOperationException(); - } - @Override public MediaSourceFactory setLoadErrorHandlingPolicy( @Nullable LoadErrorHandlingPolicy loadErrorHandlingPolicy) {