From d4a84b88b5a418593db943dcee2d74a41217aa7a Mon Sep 17 00:00:00 2001 From: christosts Date: Fri, 15 Jan 2021 15:54:22 +0000 Subject: [PATCH] Remove deprecated method setMinLoadableRetryCount(). Remove setMinLoadableRetryCount() from SingleSampleMediaSource, DashMediaSource, HlsMediaSource and SsMediaSource factories. PiperOrigin-RevId: 352008657 --- RELEASENOTES.md | 16 ++++++++++++++-- .../source/SingleSampleMediaSource.java | 19 ------------------- .../source/dash/DashMediaSource.java | 8 -------- .../exoplayer2/source/hls/HlsMediaSource.java | 9 --------- .../source/smoothstreaming/SsMediaSource.java | 8 -------- 5 files changed, 14 insertions(+), 46 deletions(-) diff --git a/RELEASENOTES.md b/RELEASENOTES.md index 5fe3577574..43841a708c 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -6,17 +6,23 @@ * Remove long deprecated symbols: * `AdaptiveMediaSourceEventListener`. Use `MediaSourceEventListener` instead. + * `DashMediaSource.Factory.setMinLoadableRetryCount(int)`. Use + `DashMediaSource.Factory.setLoadErrorHandlingPolicy(LoadErrorHandlingPolicy)` + instead. * `DefaultAnalyticsListener`. Use `AnalyticsListener` directly instead. * `DefaultLoadControl` constructors. Use `DefaultLoadControl.Builder` instead. * `DrmInitData.get(UUID)`. Use `DrmInitData.get(int)` and `DrmInitData.SchemeData.matches(UUID)` instead. + * `ExtractorsMediaSource.Factory.setMinLoadableRetryCount(int)`. Use + `ExtractorsMediaSource.Factory.setLoadErrorHandlingPolicy(LoadErrorHandlingPolicy)` + instead. * `FixedTrackSelection.Factory`. If you need to disable adaptive selection in `DefaultTrackSelector`, enable the `DefaultTrackSelector.Parameters.forceHighestSupportedBitrate` flag. - * `ExtractorsMediaSource.Factory.setMinLoadableRetryCount(int)`. Use - `ExtractorsMediaSource.Factory.setLoadErrorHandlingPolicy(LoadErrorHandlingPolicy)` + * `HlsMediaSource.Factory.setMinLoadableRetryCount(int)`. Use + `HlsMediaSource.Factory.setLoadErrorHandlingPolicy(LoadErrorHandlingPolicy)` instead. * `MappedTrackInfo.getTrackFormatSupport(int, int, int)`. Use `MappedTrackInfo.getTrackSupport(int, int, int)`. @@ -80,6 +86,12 @@ `SimpleExoPlayer.removeAnalyticsListener` instead. * `AdaptiveMediaSourceEventListener`. Use `MediaSourceEventListener` instead. + * `SingleSampleMediaSource.Factory.setMinLoadableRetryCount(int)`. Use + `SingleSampleMediaSource.Factory.setLoadErrorHandlingPolicy(LoadErrorHandlingPolicy)` + instead. + * `SsMediaSource.Factory.setMinLoadableRetryCount(int)`. Use + `SsMediaSource.Factory.setLoadErrorHandlingPolicy(LoadErrorHandlingPolicy)` + instead. * Add a `LivePlaybackSpeedControl` component to control the playback speed during live playbacks. This allows the player to stay close to the configured live offset. A configurable default implementation 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 627a9da0c4..3d557cf17d 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 @@ -82,29 +82,10 @@ public final class SingleSampleMediaSource extends BaseMediaSource { return this; } - /** - * Sets the minimum number of times to retry if a loading error occurs. See {@link - * #setLoadErrorHandlingPolicy} for the default value. - * - *

Calling this method is equivalent to calling {@link #setLoadErrorHandlingPolicy} with - * {@link DefaultLoadErrorHandlingPolicy#DefaultLoadErrorHandlingPolicy(int) - * DefaultLoadErrorHandlingPolicy(minLoadableRetryCount)} - * - * @param minLoadableRetryCount The minimum number of times to retry if a loading error occurs. - * @return This factory, for convenience. - * @deprecated Use {@link #setLoadErrorHandlingPolicy(LoadErrorHandlingPolicy)} instead. - */ - @Deprecated - public Factory setMinLoadableRetryCount(int minLoadableRetryCount) { - return setLoadErrorHandlingPolicy(new DefaultLoadErrorHandlingPolicy(minLoadableRetryCount)); - } - /** * Sets the {@link LoadErrorHandlingPolicy}. The default value is created by calling {@link * DefaultLoadErrorHandlingPolicy#DefaultLoadErrorHandlingPolicy()}. * - *

Calling this method overrides any calls to {@link #setMinLoadableRetryCount(int)}. - * * @param loadErrorHandlingPolicy A {@link LoadErrorHandlingPolicy}. * @return This factory, for convenience. */ 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 8c4aaaa66e..fb576fcd63 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 @@ -184,18 +184,10 @@ public final class DashMediaSource extends BaseMediaSource { return this; } - /** @deprecated Use {@link #setLoadErrorHandlingPolicy(LoadErrorHandlingPolicy)} instead. */ - @Deprecated - public Factory setMinLoadableRetryCount(int minLoadableRetryCount) { - return setLoadErrorHandlingPolicy(new DefaultLoadErrorHandlingPolicy(minLoadableRetryCount)); - } - /** * Sets the {@link LoadErrorHandlingPolicy}. The default value is created by calling {@link * DefaultLoadErrorHandlingPolicy#DefaultLoadErrorHandlingPolicy()}. * - *

Calling this method overrides any calls to {@link #setMinLoadableRetryCount(int)}. - * * @param loadErrorHandlingPolicy A {@link LoadErrorHandlingPolicy}. * @return This factory, for convenience. */ 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 0033fd6aee..331e8232cb 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 @@ -167,8 +167,6 @@ public final class HlsMediaSource extends BaseMediaSource * Sets the {@link LoadErrorHandlingPolicy}. The default value is created by calling {@link * DefaultLoadErrorHandlingPolicy#DefaultLoadErrorHandlingPolicy()}. * - *

Calling this method overrides any calls to {@link #setMinLoadableRetryCount(int)}. - * * @param loadErrorHandlingPolicy A {@link LoadErrorHandlingPolicy}. * @return This factory, for convenience. */ @@ -181,13 +179,6 @@ public final class HlsMediaSource extends BaseMediaSource return this; } - /** @deprecated Use {@link #setLoadErrorHandlingPolicy(LoadErrorHandlingPolicy)} instead. */ - @Deprecated - public Factory setMinLoadableRetryCount(int minLoadableRetryCount) { - this.loadErrorHandlingPolicy = new DefaultLoadErrorHandlingPolicy(minLoadableRetryCount); - return this; - } - /** * Sets the factory from which playlist parsers will be obtained. The default value is a {@link * DefaultHlsPlaylistParserFactory}. 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 3297bc0311..af128d848a 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 @@ -130,18 +130,10 @@ public final class SsMediaSource extends BaseMediaSource return this; } - /** @deprecated Use {@link #setLoadErrorHandlingPolicy(LoadErrorHandlingPolicy)} instead. */ - @Deprecated - public Factory setMinLoadableRetryCount(int minLoadableRetryCount) { - return setLoadErrorHandlingPolicy(new DefaultLoadErrorHandlingPolicy(minLoadableRetryCount)); - } - /** * Sets the {@link LoadErrorHandlingPolicy}. The default value is created by calling {@link * DefaultLoadErrorHandlingPolicy#DefaultLoadErrorHandlingPolicy()}. * - *

Calling this method overrides any calls to {@link #setMinLoadableRetryCount(int)}. - * * @param loadErrorHandlingPolicy A {@link LoadErrorHandlingPolicy}. * @return This factory, for convenience. */