From d97604138e93aef44b4616cd148bd1c53d10d033 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 (cherry picked from commit 4949fbe5edc9dbbf1a713b152907cc3a175956d5) --- .../exoplayer2/ext/ima/ImaServerSideAdInsertionMediaSource.java | 2 +- .../android/exoplayer2/source/DefaultMediaSourceFactory.java | 2 +- .../android/exoplayer2/source/ProgressiveMediaSource.java | 2 +- .../google/android/exoplayer2/source/dash/DashMediaSource.java | 2 +- .../google/android/exoplayer2/source/hls/HlsMediaSource.java | 2 +- .../google/android/exoplayer2/source/rtsp/RtspMediaSource.java | 2 +- .../exoplayer2/source/smoothstreaming/SsMediaSource.java | 2 +- .../android/exoplayer2/testutil/FakeMediaSourceFactory.java | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/ImaServerSideAdInsertionMediaSource.java b/extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/ImaServerSideAdInsertionMediaSource.java index 467dd58c35..9a94c53edf 100644 --- a/extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/ImaServerSideAdInsertionMediaSource.java +++ b/extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/ImaServerSideAdInsertionMediaSource.java @@ -152,7 +152,7 @@ public final class ImaServerSideAdInsertionMediaSource extends CompositeMediaSou } @Override - public int[] getSupportedTypes() { + public @C.ContentType int[] getSupportedTypes() { return contentMediaSourceFactory.getSupportedTypes(); } diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/DefaultMediaSourceFactory.java b/library/core/src/main/java/com/google/android/exoplayer2/source/DefaultMediaSourceFactory.java index b7e04482cc..275f98db7a 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/source/DefaultMediaSourceFactory.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/source/DefaultMediaSourceFactory.java @@ -395,7 +395,7 @@ public final class DefaultMediaSourceFactory implements MediaSourceFactory { } @Override - public int[] getSupportedTypes() { + public @C.ContentType int[] getSupportedTypes() { return delegateFactoryLoader.getSupportedTypes(); } diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/ProgressiveMediaSource.java b/library/core/src/main/java/com/google/android/exoplayer2/source/ProgressiveMediaSource.java index f8cf9fae5c..07aa3309c0 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/source/ProgressiveMediaSource.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/source/ProgressiveMediaSource.java @@ -225,7 +225,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/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaSource.java b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaSource.java index 1675dde09a..853f76b4a4 100644 --- a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaSource.java +++ b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaSource.java @@ -311,7 +311,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/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaSource.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaSource.java index 9d1a9f7a2f..830b9fefd3 100644 --- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaSource.java +++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaSource.java @@ -359,7 +359,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/library/rtsp/src/main/java/com/google/android/exoplayer2/source/rtsp/RtspMediaSource.java b/library/rtsp/src/main/java/com/google/android/exoplayer2/source/rtsp/RtspMediaSource.java index 5011eb4fcd..747bb36daa 100644 --- a/library/rtsp/src/main/java/com/google/android/exoplayer2/source/rtsp/RtspMediaSource.java +++ b/library/rtsp/src/main/java/com/google/android/exoplayer2/source/rtsp/RtspMediaSource.java @@ -164,7 +164,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/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/SsMediaSource.java b/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/SsMediaSource.java index f2035c3a12..eebab34190 100644 --- a/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/SsMediaSource.java +++ b/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/SsMediaSource.java @@ -290,7 +290,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/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeMediaSourceFactory.java b/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeMediaSourceFactory.java index 047a4d7cab..bdf6717808 100644 --- a/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeMediaSourceFactory.java +++ b/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeMediaSourceFactory.java @@ -47,7 +47,7 @@ public final class FakeMediaSourceFactory implements MediaSourceFactory { } @Override - public int[] getSupportedTypes() { + public @C.ContentType int[] getSupportedTypes() { return new int[] {C.CONTENT_TYPE_OTHER}; }