Commit 2e2e5e9f by samrobinson Committed by bachinger

Remove the ExoPlayerImpl implementation of ExoPlayer.

PiperOrigin-RevId: 391498621
parent 061d8ee1
...@@ -30,6 +30,7 @@ import android.view.SurfaceHolder; ...@@ -30,6 +30,7 @@ import android.view.SurfaceHolder;
import android.view.SurfaceView; import android.view.SurfaceView;
import android.view.TextureView; import android.view.TextureView;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import com.google.android.exoplayer2.ExoPlayer.AudioOffloadListener;
import com.google.android.exoplayer2.PlayerMessage.Target; import com.google.android.exoplayer2.PlayerMessage.Target;
import com.google.android.exoplayer2.analytics.AnalyticsCollector; import com.google.android.exoplayer2.analytics.AnalyticsCollector;
import com.google.android.exoplayer2.audio.AudioAttributes; import com.google.android.exoplayer2.audio.AudioAttributes;
...@@ -59,7 +60,7 @@ import java.util.List; ...@@ -59,7 +60,7 @@ import java.util.List;
import java.util.concurrent.CopyOnWriteArraySet; import java.util.concurrent.CopyOnWriteArraySet;
/** An {@link ExoPlayer} implementation. */ /** An {@link ExoPlayer} implementation. */
/* package */ final class ExoPlayerImpl extends BasePlayer implements ExoPlayer { /* package */ final class ExoPlayerImpl extends BasePlayer {
private static final String TAG = "ExoPlayerImpl"; private static final String TAG = "ExoPlayerImpl";
...@@ -263,41 +264,14 @@ import java.util.concurrent.CopyOnWriteArraySet; ...@@ -263,41 +264,14 @@ import java.util.concurrent.CopyOnWriteArraySet;
internalPlayer.experimentalSetForegroundModeTimeoutMs(timeoutMs); internalPlayer.experimentalSetForegroundModeTimeoutMs(timeoutMs);
} }
@Override
public void experimentalSetOffloadSchedulingEnabled(boolean offloadSchedulingEnabled) { public void experimentalSetOffloadSchedulingEnabled(boolean offloadSchedulingEnabled) {
internalPlayer.experimentalSetOffloadSchedulingEnabled(offloadSchedulingEnabled); internalPlayer.experimentalSetOffloadSchedulingEnabled(offloadSchedulingEnabled);
} }
@Override
public boolean experimentalIsSleepingForOffload() { public boolean experimentalIsSleepingForOffload() {
return playbackInfo.sleepingForOffload; return playbackInfo.sleepingForOffload;
} }
@Override
@Nullable
public AudioComponent getAudioComponent() {
return null;
}
@Override
@Nullable
public VideoComponent getVideoComponent() {
return null;
}
@Override
@Nullable
public TextComponent getTextComponent() {
return null;
}
@Override
@Nullable
public DeviceComponent getDeviceComponent() {
return null;
}
@Override
public Looper getPlaybackLooper() { public Looper getPlaybackLooper() {
return internalPlayer.getPlaybackLooper(); return internalPlayer.getPlaybackLooper();
} }
...@@ -307,7 +281,6 @@ import java.util.concurrent.CopyOnWriteArraySet; ...@@ -307,7 +281,6 @@ import java.util.concurrent.CopyOnWriteArraySet;
return applicationLooper; return applicationLooper;
} }
@Override
public Clock getClock() { public Clock getClock() {
return clock; return clock;
} }
...@@ -334,12 +307,10 @@ import java.util.concurrent.CopyOnWriteArraySet; ...@@ -334,12 +307,10 @@ import java.util.concurrent.CopyOnWriteArraySet;
listeners.remove(listener); listeners.remove(listener);
} }
@Override
public void addAudioOffloadListener(AudioOffloadListener listener) { public void addAudioOffloadListener(AudioOffloadListener listener) {
audioOffloadListeners.add(listener); audioOffloadListeners.add(listener);
} }
@Override
public void removeAudioOffloadListener(AudioOffloadListener listener) { public void removeAudioOffloadListener(AudioOffloadListener listener) {
audioOffloadListeners.remove(listener); audioOffloadListeners.remove(listener);
} }
...@@ -369,7 +340,6 @@ import java.util.concurrent.CopyOnWriteArraySet; ...@@ -369,7 +340,6 @@ import java.util.concurrent.CopyOnWriteArraySet;
/** @deprecated Use {@link #prepare()} instead. */ /** @deprecated Use {@link #prepare()} instead. */
@Deprecated @Deprecated
@Override
public void retry() { public void retry() {
prepare(); prepare();
} }
...@@ -404,7 +374,6 @@ import java.util.concurrent.CopyOnWriteArraySet; ...@@ -404,7 +374,6 @@ import java.util.concurrent.CopyOnWriteArraySet;
* @deprecated Use {@link #setMediaSource(MediaSource)} and {@link ExoPlayer#prepare()} instead. * @deprecated Use {@link #setMediaSource(MediaSource)} and {@link ExoPlayer#prepare()} instead.
*/ */
@Deprecated @Deprecated
@Override
public void prepare(MediaSource mediaSource) { public void prepare(MediaSource mediaSource) {
setMediaSource(mediaSource); setMediaSource(mediaSource);
prepare(); prepare();
...@@ -415,7 +384,6 @@ import java.util.concurrent.CopyOnWriteArraySet; ...@@ -415,7 +384,6 @@ import java.util.concurrent.CopyOnWriteArraySet;
* instead. * instead.
*/ */
@Deprecated @Deprecated
@Override
public void prepare(MediaSource mediaSource, boolean resetPosition, boolean resetState) { public void prepare(MediaSource mediaSource, boolean resetPosition, boolean resetState) {
setMediaSource(mediaSource, resetPosition); setMediaSource(mediaSource, resetPosition);
prepare(); prepare();
...@@ -432,28 +400,23 @@ import java.util.concurrent.CopyOnWriteArraySet; ...@@ -432,28 +400,23 @@ import java.util.concurrent.CopyOnWriteArraySet;
setMediaSources(createMediaSources(mediaItems), startWindowIndex, startPositionMs); setMediaSources(createMediaSources(mediaItems), startWindowIndex, startPositionMs);
} }
@Override
public void setMediaSource(MediaSource mediaSource) { public void setMediaSource(MediaSource mediaSource) {
setMediaSources(Collections.singletonList(mediaSource)); setMediaSources(Collections.singletonList(mediaSource));
} }
@Override
public void setMediaSource(MediaSource mediaSource, long startPositionMs) { public void setMediaSource(MediaSource mediaSource, long startPositionMs) {
setMediaSources( setMediaSources(
Collections.singletonList(mediaSource), /* startWindowIndex= */ 0, startPositionMs); Collections.singletonList(mediaSource), /* startWindowIndex= */ 0, startPositionMs);
} }
@Override
public void setMediaSource(MediaSource mediaSource, boolean resetPosition) { public void setMediaSource(MediaSource mediaSource, boolean resetPosition) {
setMediaSources(Collections.singletonList(mediaSource), resetPosition); setMediaSources(Collections.singletonList(mediaSource), resetPosition);
} }
@Override
public void setMediaSources(List<MediaSource> mediaSources) { public void setMediaSources(List<MediaSource> mediaSources) {
setMediaSources(mediaSources, /* resetPosition= */ true); setMediaSources(mediaSources, /* resetPosition= */ true);
} }
@Override
public void setMediaSources(List<MediaSource> mediaSources, boolean resetPosition) { public void setMediaSources(List<MediaSource> mediaSources, boolean resetPosition) {
setMediaSourcesInternal( setMediaSourcesInternal(
mediaSources, mediaSources,
...@@ -462,7 +425,6 @@ import java.util.concurrent.CopyOnWriteArraySet; ...@@ -462,7 +425,6 @@ import java.util.concurrent.CopyOnWriteArraySet;
/* resetToDefaultPosition= */ resetPosition); /* resetToDefaultPosition= */ resetPosition);
} }
@Override
public void setMediaSources( public void setMediaSources(
List<MediaSource> mediaSources, int startWindowIndex, long startPositionMs) { List<MediaSource> mediaSources, int startWindowIndex, long startPositionMs) {
setMediaSourcesInternal( setMediaSourcesInternal(
...@@ -475,22 +437,18 @@ import java.util.concurrent.CopyOnWriteArraySet; ...@@ -475,22 +437,18 @@ import java.util.concurrent.CopyOnWriteArraySet;
addMediaSources(index, createMediaSources(mediaItems)); addMediaSources(index, createMediaSources(mediaItems));
} }
@Override
public void addMediaSource(MediaSource mediaSource) { public void addMediaSource(MediaSource mediaSource) {
addMediaSources(Collections.singletonList(mediaSource)); addMediaSources(Collections.singletonList(mediaSource));
} }
@Override
public void addMediaSource(int index, MediaSource mediaSource) { public void addMediaSource(int index, MediaSource mediaSource) {
addMediaSources(index, Collections.singletonList(mediaSource)); addMediaSources(index, Collections.singletonList(mediaSource));
} }
@Override
public void addMediaSources(List<MediaSource> mediaSources) { public void addMediaSources(List<MediaSource> mediaSources) {
addMediaSources(/* index= */ mediaSourceHolderSnapshots.size(), mediaSources); addMediaSources(/* index= */ mediaSourceHolderSnapshots.size(), mediaSources);
} }
@Override
public void addMediaSources(int index, List<MediaSource> mediaSources) { public void addMediaSources(int index, List<MediaSource> mediaSources) {
Assertions.checkArgument(index >= 0); Assertions.checkArgument(index >= 0);
Timeline oldTimeline = getCurrentTimeline(); Timeline oldTimeline = getCurrentTimeline();
...@@ -560,7 +518,6 @@ import java.util.concurrent.CopyOnWriteArraySet; ...@@ -560,7 +518,6 @@ import java.util.concurrent.CopyOnWriteArraySet;
/* ignored */ C.INDEX_UNSET); /* ignored */ C.INDEX_UNSET);
} }
@Override
public void setShuffleOrder(ShuffleOrder shuffleOrder) { public void setShuffleOrder(ShuffleOrder shuffleOrder) {
Timeline timeline = createMaskingTimeline(); Timeline timeline = createMaskingTimeline();
PlaybackInfo newPlaybackInfo = PlaybackInfo newPlaybackInfo =
...@@ -591,7 +548,6 @@ import java.util.concurrent.CopyOnWriteArraySet; ...@@ -591,7 +548,6 @@ import java.util.concurrent.CopyOnWriteArraySet;
PLAY_WHEN_READY_CHANGE_REASON_USER_REQUEST); PLAY_WHEN_READY_CHANGE_REASON_USER_REQUEST);
} }
@Override
public void setPauseAtEndOfMediaItems(boolean pauseAtEndOfMediaItems) { public void setPauseAtEndOfMediaItems(boolean pauseAtEndOfMediaItems) {
if (this.pauseAtEndOfMediaItems == pauseAtEndOfMediaItems) { if (this.pauseAtEndOfMediaItems == pauseAtEndOfMediaItems) {
return; return;
...@@ -600,7 +556,6 @@ import java.util.concurrent.CopyOnWriteArraySet; ...@@ -600,7 +556,6 @@ import java.util.concurrent.CopyOnWriteArraySet;
internalPlayer.setPauseAtEndOfWindow(pauseAtEndOfMediaItems); internalPlayer.setPauseAtEndOfWindow(pauseAtEndOfMediaItems);
} }
@Override
public boolean getPauseAtEndOfMediaItems() { public boolean getPauseAtEndOfMediaItems() {
return pauseAtEndOfMediaItems; return pauseAtEndOfMediaItems;
} }
...@@ -755,7 +710,6 @@ import java.util.concurrent.CopyOnWriteArraySet; ...@@ -755,7 +710,6 @@ import java.util.concurrent.CopyOnWriteArraySet;
return playbackInfo.playbackParameters; return playbackInfo.playbackParameters;
} }
@Override
public void setSeekParameters(@Nullable SeekParameters seekParameters) { public void setSeekParameters(@Nullable SeekParameters seekParameters) {
if (seekParameters == null) { if (seekParameters == null) {
seekParameters = SeekParameters.DEFAULT; seekParameters = SeekParameters.DEFAULT;
...@@ -766,12 +720,10 @@ import java.util.concurrent.CopyOnWriteArraySet; ...@@ -766,12 +720,10 @@ import java.util.concurrent.CopyOnWriteArraySet;
} }
} }
@Override
public SeekParameters getSeekParameters() { public SeekParameters getSeekParameters() {
return seekParameters; return seekParameters;
} }
@Override
public void setForegroundMode(boolean foregroundMode) { public void setForegroundMode(boolean foregroundMode) {
if (this.foregroundMode != foregroundMode) { if (this.foregroundMode != foregroundMode) {
this.foregroundMode = foregroundMode; this.foregroundMode = foregroundMode;
...@@ -863,7 +815,6 @@ import java.util.concurrent.CopyOnWriteArraySet; ...@@ -863,7 +815,6 @@ import java.util.concurrent.CopyOnWriteArraySet;
playbackInfo.totalBufferedDurationUs = 0; playbackInfo.totalBufferedDurationUs = 0;
} }
@Override
public PlayerMessage createMessage(Target target) { public PlayerMessage createMessage(Target target) {
return new PlayerMessage( return new PlayerMessage(
internalPlayer, internalPlayer,
...@@ -971,17 +922,14 @@ import java.util.concurrent.CopyOnWriteArraySet; ...@@ -971,17 +922,14 @@ import java.util.concurrent.CopyOnWriteArraySet;
playbackInfo.timeline, playbackInfo.loadingMediaPeriodId, contentBufferedPositionUs)); playbackInfo.timeline, playbackInfo.loadingMediaPeriodId, contentBufferedPositionUs));
} }
@Override
public int getRendererCount() { public int getRendererCount() {
return renderers.length; return renderers.length;
} }
@Override
public int getRendererType(int index) { public int getRendererType(int index) {
return renderers[index].getTrackType(); return renderers[index].getTrackType();
} }
@Override
@Nullable @Nullable
public TrackSelector getTrackSelector() { public TrackSelector getTrackSelector() {
return trackSelector; return trackSelector;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment