From 0c969bb73ddc8a629bdcd5959c8ac8965ce7c37b Mon Sep 17 00:00:00 2001 From: kimvde Date: Wed, 8 Sep 2021 19:25:01 +0100 Subject: [PATCH] Remove deprecated SingleSampleMediaSource.createMediaSource #exofixit PiperOrigin-RevId: 395518824 --- RELEASENOTES.md | 3 +++ .../exoplayer2/source/SingleSampleMediaSource.java | 14 -------------- 2 files changed, 3 insertions(+), 14 deletions(-) diff --git a/RELEASENOTES.md b/RELEASENOTES.md index bbf9a87e30..705dec2e59 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -69,6 +69,9 @@ `VideoListener`. Use `Player.addListener` and `Player.Listener` instead. * Remove `DefaultHttpDataSourceFactory`. Use `DefaultHttpDataSource.Factory` instead. + * Remove `SingleSampleMediaSource.createMediaSource(Uri, Format, long)`. + Use `SingleSampleMediaSource.createMediaSource(MediaItem.Subtitle, + long)` instead. * Remove `GvrAudioProcessor` and the GVR extension, which has been deprecated since 2.11.0. * Cast extension: diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/SingleSampleMediaSource.java b/library/core/src/main/java/com/google/android/exoplayer2/source/SingleSampleMediaSource.java index 45f33c39c9..c0d34d0ff3 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/source/SingleSampleMediaSource.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/source/SingleSampleMediaSource.java @@ -128,20 +128,6 @@ public final class SingleSampleMediaSource extends BaseMediaSource { treatLoadErrorsAsEndOfStream, tag); } - - /** @deprecated Use {@link #createMediaSource(MediaItem.Subtitle, long)} instead. */ - @Deprecated - public SingleSampleMediaSource createMediaSource(Uri uri, Format format, long durationUs) { - return new SingleSampleMediaSource( - format.id == null ? trackId : format.id, - new MediaItem.Subtitle( - uri, checkNotNull(format.sampleMimeType), format.language, format.selectionFlags), - dataSourceFactory, - durationUs, - loadErrorHandlingPolicy, - treatLoadErrorsAsEndOfStream, - tag); - } } private final DataSpec dataSpec;