loliball/media3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add @Deprecated to MediaSourceFactory deprecated overrides

Browse Source 
This is needed to ensure the deprecation warning appears on usages in
Android Studio and in javadoc.

#minor-release

PiperOrigin-RevId: 408319182
This commit is contained in:
ibaker 2021-11-08 13:53:17 +00:00 committed by tonihei
parent 364239ac8c
commit d06e8136ee
5 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
library/core/src/main/java/com/google/android/exoplayer2/source/DefaultMediaSourceFactory.java
View File

@ -294,6 +294,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) {
@ -301,12 +302,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) {

4
library/core/src/main/java/com/google/android/exoplayer2/source/ProgressiveMediaSource.java
View File

@ -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
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
return this; return this;
} }
@Deprecated
@Override @Override
public Factory setDrmUserAgent(@Nullable String userAgent) { public Factory setDrmUserAgent(@Nullable String userAgent) {
if (!usingCustomDrmSessionManagerProvider) { if (!usingCustomDrmSessionManagerProvider) {

3
library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaSource.java
View File

@ -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 {
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 {
return this; return this;
} }
@Deprecated
@Override @Override
public Factory setDrmUserAgent(@Nullable String userAgent) { public Factory setDrmUserAgent(@Nullable String userAgent) {
if (!usingCustomDrmSessionManagerProvider) { if (!usingCustomDrmSessionManagerProvider) {

3
library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaSource.java
View File

@ -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
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
return this; return this;
} }
@Deprecated
@Override @Override
public Factory setDrmUserAgent(@Nullable String userAgent) { public Factory setDrmUserAgent(@Nullable String userAgent) {
if (!usingCustomDrmSessionManagerProvider) { if (!usingCustomDrmSessionManagerProvider) {

3
library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/SsMediaSource.java
View File

@ -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
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
return this; return this;
} }
@Deprecated
@Override @Override
public Factory setDrmUserAgent(@Nullable String userAgent) { public Factory setDrmUserAgent(@Nullable String userAgent) {
if (!usingCustomDrmSessionManagerProvider) { if (!usingCustomDrmSessionManagerProvider) {