From 4f04a284ed888768b14388daf8530c47df704994 Mon Sep 17 00:00:00 2001 From: ibaker Date: Thu, 10 Nov 2022 12:24:56 +0000 Subject: [PATCH] Add missing IntDef on MediaSource.Factory.getSupportedTypes overrides Without this the annotation isn't shown in javadoc (same in Dackka) No annotation: https://exoplayer.dev/doc/reference/com/google/android/exoplayer2/source/DefaultMediaSourceFactory.html#getSupportedTypes() Annotation present: https://exoplayer.dev/doc/reference/com/google/android/exoplayer2/source/MediaSource.Factory.html#getSupportedTypes() #minor-release PiperOrigin-RevId: 487498450 --- .../media3/exoplayer/source/DefaultMediaSourceFactory.java | 2 +- .../media3/exoplayer/source/ProgressiveMediaSource.java | 2 +- .../java/androidx/media3/exoplayer/dash/DashMediaSource.java | 2 +- .../main/java/androidx/media3/exoplayer/hls/HlsMediaSource.java | 2 +- .../exoplayer/ima/ImaServerSideAdInsertionMediaSource.java | 2 +- .../java/androidx/media3/exoplayer/rtsp/RtspMediaSource.java | 2 +- .../media3/exoplayer/smoothstreaming/SsMediaSource.java | 2 +- .../java/androidx/media3/test/utils/FakeMediaSourceFactory.java | 2 +- 8 files changed, 8 insertions(+), 8 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 291fbbe340..64f849448d 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 @@ -412,7 +412,7 @@ public final class DefaultMediaSourceFactory implements MediaSourceFactory { @UnstableApi @Override - public int[] getSupportedTypes() { + public @C.ContentType int[] getSupportedTypes() { return delegateFactoryLoader.getSupportedTypes(); } 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 aef2e708a9..a97818f146 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 @@ -227,7 +227,7 @@ public final class ProgressiveMediaSource extends BaseMediaSource } @Override - public int[] getSupportedTypes() { + public @C.ContentType int[] getSupportedTypes() { return new int[] {C.CONTENT_TYPE_OTHER}; } } 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 c7706612b4..d9603d742f 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 @@ -313,7 +313,7 @@ public final class DashMediaSource extends BaseMediaSource { } @Override - public int[] getSupportedTypes() { + public @C.ContentType int[] getSupportedTypes() { return new int[] {C.CONTENT_TYPE_DASH}; } } 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 26c34e64a5..256cda9c79 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 @@ -361,7 +361,7 @@ public final class HlsMediaSource extends BaseMediaSource } @Override - public int[] getSupportedTypes() { + public @C.ContentType int[] getSupportedTypes() { return new int[] {C.CONTENT_TYPE_HLS}; } } diff --git a/libraries/exoplayer_ima/src/main/java/androidx/media3/exoplayer/ima/ImaServerSideAdInsertionMediaSource.java b/libraries/exoplayer_ima/src/main/java/androidx/media3/exoplayer/ima/ImaServerSideAdInsertionMediaSource.java index 822c8cf872..e5467d7a54 100644 --- a/libraries/exoplayer_ima/src/main/java/androidx/media3/exoplayer/ima/ImaServerSideAdInsertionMediaSource.java +++ b/libraries/exoplayer_ima/src/main/java/androidx/media3/exoplayer/ima/ImaServerSideAdInsertionMediaSource.java @@ -154,7 +154,7 @@ public final class ImaServerSideAdInsertionMediaSource extends CompositeMediaSou } @Override - public int[] getSupportedTypes() { + public @C.ContentType int[] getSupportedTypes() { return contentMediaSourceFactory.getSupportedTypes(); } 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 f0e5877a12..f2f6b52e61 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 @@ -166,7 +166,7 @@ public final class RtspMediaSource extends BaseMediaSource { } @Override - public int[] getSupportedTypes() { + public @C.ContentType int[] getSupportedTypes() { return new int[] {C.CONTENT_TYPE_RTSP}; } 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 1186cfc350..b92deea4ac 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 @@ -292,7 +292,7 @@ public final class SsMediaSource extends BaseMediaSource } @Override - public int[] getSupportedTypes() { + public @C.ContentType int[] getSupportedTypes() { return new int[] {C.CONTENT_TYPE_SS}; } } 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 bd92f38471..307ec5bbe9 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 @@ -49,7 +49,7 @@ public final class FakeMediaSourceFactory implements MediaSourceFactory { } @Override - public int[] getSupportedTypes() { + public @C.ContentType int[] getSupportedTypes() { return new int[] {C.CONTENT_TYPE_OTHER}; }