loliball/media
1
0
Fork 0
mirror of https://github.com/androidx/media.git synced 2025-04-30 06:46:50 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Replace Dummy with Placeholder

Browse Source 
`Dummy` is a non inclusive language.

PiperOrigin-RevId: 547815680
(cherry picked from commit ca10204b2df316c9524e1986cba272b8c855867e)
This commit is contained in:
rohks 2023-07-13 16:55:49 +01:00 committed by Tianyi Feng
parent 272c844abd
commit 77fb6525b1
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/exoplayer/src/main/java/androidx/media3/exoplayer/upstream/LoaderErrorThrower.java
View File

@ -44,7 +44,7 @@ public interface LoaderErrorThrower {
void maybeThrowError(int minRetryCount) throws IOException; void maybeThrowError(int minRetryCount) throws IOException;
/** A {@link LoaderErrorThrower} that never throws. */ /** A {@link LoaderErrorThrower} that never throws. */
final class Dummy implements LoaderErrorThrower { final class Placeholder implements LoaderErrorThrower {
@Override @Override
public void maybeThrowError() { public void maybeThrowError() {

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

@ -470,7 +470,7 @@ public final class DashMediaSource extends BaseMediaSource {
manifestCallback = null; manifestCallback = null;
refreshManifestRunnable = null; refreshManifestRunnable = null;
simulateManifestRefreshRunnable = null; simulateManifestRefreshRunnable = null;
manifestLoadErrorThrower = new LoaderErrorThrower.Dummy(); manifestLoadErrorThrower = new LoaderErrorThrower.Placeholder();
} else { } else {
manifestCallback = new ManifestCallback(); manifestCallback = new ManifestCallback();
manifestLoadErrorThrower = new ManifestLoadErrorThrower(); manifestLoadErrorThrower = new ManifestLoadErrorThrower();

6
libraries/exoplayer_dash/src/test/java/androidx/media3/exoplayer/dash/DefaultDashChunkSourceTest.java
View File

@ -86,7 +86,7 @@ public class DefaultDashChunkSourceTest {
DefaultDashChunkSource chunkSource = DefaultDashChunkSource chunkSource =
new DefaultDashChunkSource( new DefaultDashChunkSource(
BundledChunkExtractor.FACTORY, BundledChunkExtractor.FACTORY,
new LoaderErrorThrower.Dummy(), new LoaderErrorThrower.Placeholder(),
manifest, manifest,
new BaseUrlExclusionList(), new BaseUrlExclusionList(),
/* periodIndex= */ 0, /* periodIndex= */ 0,
@ -136,7 +136,7 @@ public class DefaultDashChunkSourceTest {
DefaultDashChunkSource chunkSource = DefaultDashChunkSource chunkSource =
new DefaultDashChunkSource( new DefaultDashChunkSource(
BundledChunkExtractor.FACTORY, BundledChunkExtractor.FACTORY,
new LoaderErrorThrower.Dummy(), new LoaderErrorThrower.Placeholder(),
manifest, manifest,
new BaseUrlExclusionList(), new BaseUrlExclusionList(),
/* periodIndex= */ 0, /* periodIndex= */ 0,
@ -444,7 +444,7 @@ public class DefaultDashChunkSourceTest {
new DefaultBandwidthMeter.Builder(ApplicationProvider.getApplicationContext()).build()); new DefaultBandwidthMeter.Builder(ApplicationProvider.getApplicationContext()).build());
return new DefaultDashChunkSource( return new DefaultDashChunkSource(
BundledChunkExtractor.FACTORY, BundledChunkExtractor.FACTORY,
new LoaderErrorThrower.Dummy(), new LoaderErrorThrower.Placeholder(),
manifest, manifest,
new BaseUrlExclusionList(new Random(/* seed= */ 1234)), new BaseUrlExclusionList(new Random(/* seed= */ 1234)),
/* periodIndex= */ 0, /* periodIndex= */ 0,

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

@ -401,7 +401,7 @@ public final class SsMediaSource extends BaseMediaSource
drmSessionManager.setPlayer(/* playbackLooper= */ Looper.myLooper(), getPlayerId()); drmSessionManager.setPlayer(/* playbackLooper= */ Looper.myLooper(), getPlayerId());
drmSessionManager.prepare(); drmSessionManager.prepare();
if (sideloadedManifest) { if (sideloadedManifest) {
manifestLoaderErrorThrower = new LoaderErrorThrower.Dummy(); manifestLoaderErrorThrower = new LoaderErrorThrower.Placeholder();
processManifest(); processManifest();
} else { } else {
manifestDataSource = manifestDataSourceFactory.createDataSource(); manifestDataSource = manifestDataSourceFactory.createDataSource();