Skip to content

Commit e05e319

Browse files
icbakermicrokatz
authored andcommitted
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 4f04a28)
1 parent d0d6cbd commit e05e319

File tree

8 files changed

+8
-8
lines changed

8 files changed

+8
-8
lines changed

libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/DefaultMediaSourceFactory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -412,7 +412,7 @@ public DefaultMediaSourceFactory setLoadErrorHandlingPolicy(
412412

413413
@UnstableApi
414414
@Override
415-
public int[] getSupportedTypes() {
415+
public @C.ContentType int[] getSupportedTypes() {
416416
return delegateFactoryLoader.getSupportedTypes();
417417
}
418418

libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/ProgressiveMediaSource.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ public ProgressiveMediaSource createMediaSource(MediaItem mediaItem) {
227227
}
228228

229229
@Override
230-
public int[] getSupportedTypes() {
230+
public @C.ContentType int[] getSupportedTypes() {
231231
return new int[] {C.CONTENT_TYPE_OTHER};
232232
}
233233
}

libraries/exoplayer_dash/src/main/java/androidx/media3/exoplayer/dash/DashMediaSource.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,7 @@ public DashMediaSource createMediaSource(MediaItem mediaItem) {
313313
}
314314

315315
@Override
316-
public int[] getSupportedTypes() {
316+
public @C.ContentType int[] getSupportedTypes() {
317317
return new int[] {C.CONTENT_TYPE_DASH};
318318
}
319319
}

libraries/exoplayer_hls/src/main/java/androidx/media3/exoplayer/hls/HlsMediaSource.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -361,7 +361,7 @@ public HlsMediaSource createMediaSource(MediaItem mediaItem) {
361361
}
362362

363363
@Override
364-
public int[] getSupportedTypes() {
364+
public @C.ContentType int[] getSupportedTypes() {
365365
return new int[] {C.CONTENT_TYPE_HLS};
366366
}
367367
}

libraries/exoplayer_ima/src/main/java/androidx/media3/exoplayer/ima/ImaServerSideAdInsertionMediaSource.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ public MediaSource.Factory setDrmSessionManagerProvider(
154154
}
155155

156156
@Override
157-
public int[] getSupportedTypes() {
157+
public @C.ContentType int[] getSupportedTypes() {
158158
return contentMediaSourceFactory.getSupportedTypes();
159159
}
160160

libraries/exoplayer_rtsp/src/main/java/androidx/media3/exoplayer/rtsp/RtspMediaSource.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ public Factory setLoadErrorHandlingPolicy(LoadErrorHandlingPolicy loadErrorHandl
166166
}
167167

168168
@Override
169-
public int[] getSupportedTypes() {
169+
public @C.ContentType int[] getSupportedTypes() {
170170
return new int[] {C.CONTENT_TYPE_RTSP};
171171
}
172172

libraries/exoplayer_smoothstreaming/src/main/java/androidx/media3/exoplayer/smoothstreaming/SsMediaSource.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@ public SsMediaSource createMediaSource(MediaItem mediaItem) {
292292
}
293293

294294
@Override
295-
public int[] getSupportedTypes() {
295+
public @C.ContentType int[] getSupportedTypes() {
296296
return new int[] {C.CONTENT_TYPE_SS};
297297
}
298298
}

libraries/test_utils/src/main/java/androidx/media3/test/utils/FakeMediaSourceFactory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public MediaSourceFactory setLoadErrorHandlingPolicy(
4949
}
5050

5151
@Override
52-
public int[] getSupportedTypes() {
52+
public @C.ContentType int[] getSupportedTypes() {
5353
return new int[] {C.CONTENT_TYPE_OTHER};
5454
}
5555

0 commit comments

Comments
 (0)