Skip to content

SDK / exoplayer

Go to a project
Commit 942bfdb1 by ibaker Committed by tonihei
Options

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
parent e674a43f
Inline Side-by-side
Showing with 16 additions and 0 deletions
library/core/src/main/java/com/google/android/exoplayer2/source/DefaultMediaSourceFactory.java
...@@ -279,6 +279,7 @@ public final class DefaultMediaSourceFactory implements MediaSourceFactory { ...@@ -279,6 +279,7 @@ public final class DefaultMediaSourceFactory implements MediaSourceFactory {
return this; return this;
} }
@Deprecated
@Override @Override
public DefaultMediaSourceFactory setDrmHttpDataSourceFactory( public DefaultMediaSourceFactory setDrmHttpDataSourceFactory(
@Nullable HttpDataSource.Factory drmHttpDataSourceFactory) { @Nullable HttpDataSource.Factory drmHttpDataSourceFactory) {
...@@ -286,12 +287,14 @@ public final class DefaultMediaSourceFactory implements MediaSourceFactory { ...@@ -286,12 +287,14 @@ public final class DefaultMediaSourceFactory implements MediaSourceFactory {
return this; return this;
} }
@Deprecated
@Override @Override
public DefaultMediaSourceFactory setDrmUserAgent(@Nullable String userAgent) { public DefaultMediaSourceFactory setDrmUserAgent(@Nullable String userAgent) {
delegateFactoryLoader.setDrmUserAgent(userAgent); delegateFactoryLoader.setDrmUserAgent(userAgent);
return this; return this;
} }
@Deprecated
@Override @Override
public DefaultMediaSourceFactory setDrmSessionManager( public DefaultMediaSourceFactory setDrmSessionManager(
@Nullable DrmSessionManager drmSessionManager) { @Nullable DrmSessionManager drmSessionManager) {
......
library/core/src/main/java/com/google/android/exoplayer2/source/ProgressiveMediaSource.java
...@@ -175,6 +175,8 @@ public final class ProgressiveMediaSource extends BaseMediaSource ...@@ -175,6 +175,8 @@ public final class ProgressiveMediaSource extends BaseMediaSource
return this; return this;
} }
@Deprecated
@Override
public Factory setDrmSessionManager(@Nullable DrmSessionManager drmSessionManager) { public Factory setDrmSessionManager(@Nullable DrmSessionManager drmSessionManager) {
if (drmSessionManager == null) { if (drmSessionManager == null) {
setDrmSessionManagerProvider(null); setDrmSessionManagerProvider(null);
...@@ -184,6 +186,7 @@ public final class ProgressiveMediaSource extends BaseMediaSource ...@@ -184,6 +186,7 @@ public final class ProgressiveMediaSource extends BaseMediaSource
return this; return this;
} }
@Deprecated
@Override @Override
public Factory setDrmHttpDataSourceFactory( public Factory setDrmHttpDataSourceFactory(
@Nullable HttpDataSource.Factory drmHttpDataSourceFactory) { @Nullable HttpDataSource.Factory drmHttpDataSourceFactory) {
...@@ -194,6 +197,7 @@ public final class ProgressiveMediaSource extends BaseMediaSource ...@@ -194,6 +197,7 @@ public final class ProgressiveMediaSource extends BaseMediaSource
return this; return this;
} }
@Deprecated
@Override @Override
public Factory setDrmUserAgent(@Nullable String userAgent) { public Factory setDrmUserAgent(@Nullable String userAgent) {
if (!usingCustomDrmSessionManagerProvider) { if (!usingCustomDrmSessionManagerProvider) {
......
library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaSource.java
...@@ -178,6 +178,7 @@ public final class DashMediaSource extends BaseMediaSource { ...@@ -178,6 +178,7 @@ public final class DashMediaSource extends BaseMediaSource {
return this; return this;
} }
@Deprecated
@Override @Override
public Factory setDrmSessionManager(@Nullable DrmSessionManager drmSessionManager) { public Factory setDrmSessionManager(@Nullable DrmSessionManager drmSessionManager) {
if (drmSessionManager == null) { if (drmSessionManager == null) {
...@@ -188,6 +189,7 @@ public final class DashMediaSource extends BaseMediaSource { ...@@ -188,6 +189,7 @@ public final class DashMediaSource extends BaseMediaSource {
return this; return this;
} }
@Deprecated
@Override @Override
public Factory setDrmHttpDataSourceFactory( public Factory setDrmHttpDataSourceFactory(
@Nullable HttpDataSource.Factory drmHttpDataSourceFactory) { @Nullable HttpDataSource.Factory drmHttpDataSourceFactory) {
...@@ -198,6 +200,7 @@ public final class DashMediaSource extends BaseMediaSource { ...@@ -198,6 +200,7 @@ public final class DashMediaSource extends BaseMediaSource {
return this; return this;
} }
@Deprecated
@Override @Override
public Factory setDrmUserAgent(@Nullable String userAgent) { public Factory setDrmUserAgent(@Nullable String userAgent) {
if (!usingCustomDrmSessionManagerProvider) { if (!usingCustomDrmSessionManagerProvider) {
......
library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaSource.java
...@@ -297,6 +297,7 @@ public final class HlsMediaSource extends BaseMediaSource ...@@ -297,6 +297,7 @@ public final class HlsMediaSource extends BaseMediaSource
return this; return this;
} }
@Deprecated
@Override @Override
public Factory setDrmSessionManager(@Nullable DrmSessionManager drmSessionManager) { public Factory setDrmSessionManager(@Nullable DrmSessionManager drmSessionManager) {
if (drmSessionManager == null) { if (drmSessionManager == null) {
...@@ -307,6 +308,7 @@ public final class HlsMediaSource extends BaseMediaSource ...@@ -307,6 +308,7 @@ public final class HlsMediaSource extends BaseMediaSource
return this; return this;
} }
@Deprecated
@Override @Override
public Factory setDrmHttpDataSourceFactory( public Factory setDrmHttpDataSourceFactory(
@Nullable HttpDataSource.Factory drmHttpDataSourceFactory) { @Nullable HttpDataSource.Factory drmHttpDataSourceFactory) {
...@@ -317,6 +319,7 @@ public final class HlsMediaSource extends BaseMediaSource ...@@ -317,6 +319,7 @@ public final class HlsMediaSource extends BaseMediaSource
return this; return this;
} }
@Deprecated
@Override @Override
public Factory setDrmUserAgent(@Nullable String userAgent) { public Factory setDrmUserAgent(@Nullable String userAgent) {
if (!usingCustomDrmSessionManagerProvider) { if (!usingCustomDrmSessionManagerProvider) {
......
library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/SsMediaSource.java
...@@ -205,6 +205,7 @@ public final class SsMediaSource extends BaseMediaSource ...@@ -205,6 +205,7 @@ public final class SsMediaSource extends BaseMediaSource
return this; return this;
} }
@Deprecated
@Override @Override
public Factory setDrmSessionManager(@Nullable DrmSessionManager drmSessionManager) { public Factory setDrmSessionManager(@Nullable DrmSessionManager drmSessionManager) {
if (drmSessionManager == null) { if (drmSessionManager == null) {
...@@ -215,6 +216,7 @@ public final class SsMediaSource extends BaseMediaSource ...@@ -215,6 +216,7 @@ public final class SsMediaSource extends BaseMediaSource
return this; return this;
} }
@Deprecated
@Override @Override
public Factory setDrmHttpDataSourceFactory( public Factory setDrmHttpDataSourceFactory(
@Nullable HttpDataSource.Factory drmHttpDataSourceFactory) { @Nullable HttpDataSource.Factory drmHttpDataSourceFactory) {
...@@ -225,6 +227,7 @@ public final class SsMediaSource extends BaseMediaSource ...@@ -225,6 +227,7 @@ public final class SsMediaSource extends BaseMediaSource
return this; return this;
} }
@Deprecated
@Override @Override
public Factory setDrmUserAgent(@Nullable String userAgent) { public Factory setDrmUserAgent(@Nullable String userAgent) {
if (!usingCustomDrmSessionManagerProvider) { if (!usingCustomDrmSessionManagerProvider) {
......
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