From 77fb6525b1233f62104db3a28d37542fce460aa5 Mon Sep 17 00:00:00 2001 From: rohks Date: Thu, 13 Jul 2023 16:55:49 +0100 Subject: [PATCH] Replace `Dummy` with `Placeholder` `Dummy` is a non inclusive language. PiperOrigin-RevId: 547815680 (cherry picked from commit ca10204b2df316c9524e1986cba272b8c855867e) --- .../media3/exoplayer/upstream/LoaderErrorThrower.java | 2 +- .../androidx/media3/exoplayer/dash/DashMediaSource.java | 2 +- .../media3/exoplayer/dash/DefaultDashChunkSourceTest.java | 6 +++--- .../media3/exoplayer/smoothstreaming/SsMediaSource.java | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/upstream/LoaderErrorThrower.java b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/upstream/LoaderErrorThrower.java index 3a376b9c53..b3187072b3 100644 --- a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/upstream/LoaderErrorThrower.java +++ b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/upstream/LoaderErrorThrower.java @@ -44,7 +44,7 @@ public interface LoaderErrorThrower { void maybeThrowError(int minRetryCount) throws IOException; /** A {@link LoaderErrorThrower} that never throws. */ - final class Dummy implements LoaderErrorThrower { + final class Placeholder implements LoaderErrorThrower { @Override public void maybeThrowError() { 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 fede790776..b39694da13 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 @@ -470,7 +470,7 @@ public final class DashMediaSource extends BaseMediaSource { manifestCallback = null; refreshManifestRunnable = null; simulateManifestRefreshRunnable = null; - manifestLoadErrorThrower = new LoaderErrorThrower.Dummy(); + manifestLoadErrorThrower = new LoaderErrorThrower.Placeholder(); } else { manifestCallback = new ManifestCallback(); manifestLoadErrorThrower = new ManifestLoadErrorThrower(); diff --git a/libraries/exoplayer_dash/src/test/java/androidx/media3/exoplayer/dash/DefaultDashChunkSourceTest.java b/libraries/exoplayer_dash/src/test/java/androidx/media3/exoplayer/dash/DefaultDashChunkSourceTest.java index ad85683a3c..c1d17cad6a 100644 --- a/libraries/exoplayer_dash/src/test/java/androidx/media3/exoplayer/dash/DefaultDashChunkSourceTest.java +++ b/libraries/exoplayer_dash/src/test/java/androidx/media3/exoplayer/dash/DefaultDashChunkSourceTest.java @@ -86,7 +86,7 @@ public class DefaultDashChunkSourceTest { DefaultDashChunkSource chunkSource = new DefaultDashChunkSource( BundledChunkExtractor.FACTORY, - new LoaderErrorThrower.Dummy(), + new LoaderErrorThrower.Placeholder(), manifest, new BaseUrlExclusionList(), /* periodIndex= */ 0, @@ -136,7 +136,7 @@ public class DefaultDashChunkSourceTest { DefaultDashChunkSource chunkSource = new DefaultDashChunkSource( BundledChunkExtractor.FACTORY, - new LoaderErrorThrower.Dummy(), + new LoaderErrorThrower.Placeholder(), manifest, new BaseUrlExclusionList(), /* periodIndex= */ 0, @@ -444,7 +444,7 @@ public class DefaultDashChunkSourceTest { new DefaultBandwidthMeter.Builder(ApplicationProvider.getApplicationContext()).build()); return new DefaultDashChunkSource( BundledChunkExtractor.FACTORY, - new LoaderErrorThrower.Dummy(), + new LoaderErrorThrower.Placeholder(), manifest, new BaseUrlExclusionList(new Random(/* seed= */ 1234)), /* periodIndex= */ 0, 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 7b81f7e50f..2976cf9bfa 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 @@ -401,7 +401,7 @@ public final class SsMediaSource extends BaseMediaSource drmSessionManager.setPlayer(/* playbackLooper= */ Looper.myLooper(), getPlayerId()); drmSessionManager.prepare(); if (sideloadedManifest) { - manifestLoaderErrorThrower = new LoaderErrorThrower.Dummy(); + manifestLoaderErrorThrower = new LoaderErrorThrower.Placeholder(); processManifest(); } else { manifestDataSource = manifestDataSourceFactory.createDataSource();