From dba30ff86322465e2af59f5b26ab6120a909984f Mon Sep 17 00:00:00 2001 From: ibaker Date: Mon, 8 Nov 2021 13:53:17 +0000 Subject: [PATCH] Add @Deprecated to MediaSourceFactory deprecated overrides This is needed to ensure the deprecation warning appears on usages in Android Studio and in javadoc. #minor-release PiperOrigin-RevId: 408319182 --- .../media3/exoplayer/source/DefaultMediaSourceFactory.java | 3 +++ .../media3/exoplayer/source/ProgressiveMediaSource.java | 4 ++++ .../java/androidx/media3/exoplayer/dash/DashMediaSource.java | 3 +++ .../java/androidx/media3/exoplayer/hls/HlsMediaSource.java | 3 +++ .../exoplayer/ima/ImaServerSideDaiMediaSourceFactory.java | 3 +++ .../media3/exoplayer/smoothstreaming/SsMediaSource.java | 3 +++ 6 files changed, 19 insertions(+) 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 0b15269f50..23025de53a 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 @@ -296,6 +296,7 @@ public final class DefaultMediaSourceFactory implements MediaSourceFactory { return this; } + @Deprecated @Override public DefaultMediaSourceFactory setDrmHttpDataSourceFactory( @Nullable HttpDataSource.Factory drmHttpDataSourceFactory) { @@ -303,12 +304,14 @@ public final class DefaultMediaSourceFactory implements MediaSourceFactory { return this; } + @Deprecated @Override public DefaultMediaSourceFactory setDrmUserAgent(@Nullable String userAgent) { delegateFactoryLoader.setDrmUserAgent(userAgent); return this; } + @Deprecated @Override public DefaultMediaSourceFactory setDrmSessionManager( @Nullable DrmSessionManager drmSessionManager) { 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 b9b11a3df5..eab17a9ed3 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 @@ -177,6 +177,8 @@ public final class ProgressiveMediaSource extends BaseMediaSource return this; } + @Deprecated + @Override public Factory setDrmSessionManager(@Nullable DrmSessionManager drmSessionManager) { if (drmSessionManager == null) { setDrmSessionManagerProvider(null); @@ -186,6 +188,7 @@ public final class ProgressiveMediaSource extends BaseMediaSource return this; } + @Deprecated @Override public Factory setDrmHttpDataSourceFactory( @Nullable HttpDataSource.Factory drmHttpDataSourceFactory) { @@ -196,6 +199,7 @@ public final class ProgressiveMediaSource extends BaseMediaSource return this; } + @Deprecated @Override public Factory setDrmUserAgent(@Nullable String userAgent) { if (!usingCustomDrmSessionManagerProvider) { 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 298abf6267..3cf5b51ade 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 @@ -180,6 +180,7 @@ public final class DashMediaSource extends BaseMediaSource { return this; } + @Deprecated @Override public Factory setDrmSessionManager(@Nullable DrmSessionManager drmSessionManager) { if (drmSessionManager == null) { @@ -190,6 +191,7 @@ public final class DashMediaSource extends BaseMediaSource { return this; } + @Deprecated @Override public Factory setDrmHttpDataSourceFactory( @Nullable HttpDataSource.Factory drmHttpDataSourceFactory) { @@ -200,6 +202,7 @@ public final class DashMediaSource extends BaseMediaSource { return this; } + @Deprecated @Override public Factory setDrmUserAgent(@Nullable String userAgent) { if (!usingCustomDrmSessionManagerProvider) { 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 3f71b8eeee..f76757a511 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 @@ -299,6 +299,7 @@ public final class HlsMediaSource extends BaseMediaSource return this; } + @Deprecated @Override public Factory setDrmSessionManager(@Nullable DrmSessionManager drmSessionManager) { if (drmSessionManager == null) { @@ -309,6 +310,7 @@ public final class HlsMediaSource extends BaseMediaSource return this; } + @Deprecated @Override public Factory setDrmHttpDataSourceFactory( @Nullable HttpDataSource.Factory drmHttpDataSourceFactory) { @@ -319,6 +321,7 @@ public final class HlsMediaSource extends BaseMediaSource return this; } + @Deprecated @Override public Factory setDrmUserAgent(@Nullable String userAgent) { if (!usingCustomDrmSessionManagerProvider) { diff --git a/libraries/exoplayer_ima/src/main/java/androidx/media3/exoplayer/ima/ImaServerSideDaiMediaSourceFactory.java b/libraries/exoplayer_ima/src/main/java/androidx/media3/exoplayer/ima/ImaServerSideDaiMediaSourceFactory.java index 40ab52d54a..47899bcf22 100644 --- a/libraries/exoplayer_ima/src/main/java/androidx/media3/exoplayer/ima/ImaServerSideDaiMediaSourceFactory.java +++ b/libraries/exoplayer_ima/src/main/java/androidx/media3/exoplayer/ima/ImaServerSideDaiMediaSourceFactory.java @@ -323,17 +323,20 @@ public final class ImaServerSideDaiMediaSourceFactory implements MediaSourceFact 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; 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 dfb5aa28d6..df5588a6bb 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 @@ -207,6 +207,7 @@ public final class SsMediaSource extends BaseMediaSource return this; } + @Deprecated @Override public Factory setDrmSessionManager(@Nullable DrmSessionManager drmSessionManager) { if (drmSessionManager == null) { @@ -217,6 +218,7 @@ public final class SsMediaSource extends BaseMediaSource return this; } + @Deprecated @Override public Factory setDrmHttpDataSourceFactory( @Nullable HttpDataSource.Factory drmHttpDataSourceFactory) { @@ -227,6 +229,7 @@ public final class SsMediaSource extends BaseMediaSource return this; } + @Deprecated @Override public Factory setDrmUserAgent(@Nullable String userAgent) { if (!usingCustomDrmSessionManagerProvider) {