Skip to content

SDK / exoplayer

Go to a project
Commit 3c19850e by samrobinson Committed by Oliver Woodman
Options

Migrate library usages of SimpleExoPlayer to ExoPlayer. 

PiperOrigin-RevId: 402853522
parent 3b8eba2d
Expand all
Inline Side-by-side
Showing with 155 additions and 189 deletions
demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/MainActivity.java
...@@ -37,8 +37,8 @@ import androidx.recyclerview.widget.LinearLayoutManager; ...@@ -37,8 +37,8 @@ import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.RecyclerView;
import androidx.recyclerview.widget.RecyclerView.ViewHolder; import androidx.recyclerview.widget.RecyclerView.ViewHolder;
import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.ExoPlayer;
import com.google.android.exoplayer2.MediaItem; import com.google.android.exoplayer2.MediaItem;
import com.google.android.exoplayer2.SimpleExoPlayer;
import com.google.android.exoplayer2.ui.PlayerControlView; import com.google.android.exoplayer2.ui.PlayerControlView;
import com.google.android.exoplayer2.ui.PlayerView; import com.google.android.exoplayer2.ui.PlayerView;
import com.google.android.exoplayer2.util.Assertions; import com.google.android.exoplayer2.util.Assertions;
...@@ -48,8 +48,8 @@ import com.google.android.gms.cast.framework.CastContext; ...@@ -48,8 +48,8 @@ import com.google.android.gms.cast.framework.CastContext;
import com.google.android.gms.dynamite.DynamiteModule; import com.google.android.gms.dynamite.DynamiteModule;
/** /**
* An activity that plays video using {@link SimpleExoPlayer} and supports casting using ExoPlayer's * An activity that plays video using {@link ExoPlayer} and supports casting using ExoPlayer's Cast
* Cast extension. * extension.
*/ */
public class MainActivity extends AppCompatActivity public class MainActivity extends AppCompatActivity
implements OnClickListener, PlayerManager.Listener { implements OnClickListener, PlayerManager.Listener {
......
demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/PlayerManager.java
...@@ -25,7 +25,6 @@ import com.google.android.exoplayer2.MediaItem; ...@@ -25,7 +25,6 @@ import com.google.android.exoplayer2.MediaItem;
import com.google.android.exoplayer2.Player; import com.google.android.exoplayer2.Player;
import com.google.android.exoplayer2.Player.DiscontinuityReason; import com.google.android.exoplayer2.Player.DiscontinuityReason;
import com.google.android.exoplayer2.Player.TimelineChangeReason; import com.google.android.exoplayer2.Player.TimelineChangeReason;
import com.google.android.exoplayer2.SimpleExoPlayer;
import com.google.android.exoplayer2.Timeline; import com.google.android.exoplayer2.Timeline;
import com.google.android.exoplayer2.TracksInfo; import com.google.android.exoplayer2.TracksInfo;
import com.google.android.exoplayer2.ext.cast.CastPlayer; import com.google.android.exoplayer2.ext.cast.CastPlayer;
...@@ -64,7 +63,7 @@ import java.util.ArrayList; ...@@ -64,7 +63,7 @@ import java.util.ArrayList;
private Player currentPlayer; private Player currentPlayer;
/** /**
* Creates a new manager for {@link SimpleExoPlayer} and {@link CastPlayer}. * Creates a new manager for {@link ExoPlayer} and {@link CastPlayer}.
* *
* @param listener A {@link Listener} for queue position changes. * @param listener A {@link Listener} for queue position changes.
* @param localPlayerView The {@link PlayerView} for local playback. * @param localPlayerView The {@link PlayerView} for local playback.
......
demos/gl/src/main/java/com/google/android/exoplayer2/gldemo/MainActivity.java
...@@ -27,7 +27,6 @@ import com.google.android.exoplayer2.C; ...@@ -27,7 +27,6 @@ import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.ExoPlayer; import com.google.android.exoplayer2.ExoPlayer;
import com.google.android.exoplayer2.MediaItem; import com.google.android.exoplayer2.MediaItem;
import com.google.android.exoplayer2.Player; import com.google.android.exoplayer2.Player;
import com.google.android.exoplayer2.SimpleExoPlayer;
import com.google.android.exoplayer2.drm.DefaultDrmSessionManager; import com.google.android.exoplayer2.drm.DefaultDrmSessionManager;
import com.google.android.exoplayer2.drm.DrmSessionManager; import com.google.android.exoplayer2.drm.DrmSessionManager;
import com.google.android.exoplayer2.drm.FrameworkMediaDrm; import com.google.android.exoplayer2.drm.FrameworkMediaDrm;
...@@ -65,7 +64,7 @@ public final class MainActivity extends Activity { ...@@ -65,7 +64,7 @@ public final class MainActivity extends Activity {
@Nullable private PlayerView playerView; @Nullable private PlayerView playerView;
@Nullable private VideoProcessingGLSurfaceView videoProcessingGLSurfaceView; @Nullable private VideoProcessingGLSurfaceView videoProcessingGLSurfaceView;
@Nullable private SimpleExoPlayer player; @Nullable private ExoPlayer player;
@Override @Override
protected void onCreate(@Nullable Bundle savedInstanceState) { protected void onCreate(@Nullable Bundle savedInstanceState) {
...@@ -173,7 +172,7 @@ public final class MainActivity extends Activity { ...@@ -173,7 +172,7 @@ public final class MainActivity extends Activity {
throw new IllegalStateException(); throw new IllegalStateException();
} }
SimpleExoPlayer player = new ExoPlayer.Builder(getApplicationContext()).build(); ExoPlayer player = new ExoPlayer.Builder(getApplicationContext()).build();
player.setRepeatMode(Player.REPEAT_MODE_ALL); player.setRepeatMode(Player.REPEAT_MODE_ALL);
player.setMediaSource(mediaSource); player.setMediaSource(mediaSource);
player.prepare(); player.prepare();
......
demos/main/src/main/java/com/google/android/exoplayer2/demo/PlayerActivity.java
...@@ -37,7 +37,6 @@ import com.google.android.exoplayer2.MediaItem; ...@@ -37,7 +37,6 @@ import com.google.android.exoplayer2.MediaItem;
import com.google.android.exoplayer2.PlaybackException; import com.google.android.exoplayer2.PlaybackException;
import com.google.android.exoplayer2.Player; import com.google.android.exoplayer2.Player;
import com.google.android.exoplayer2.RenderersFactory; import com.google.android.exoplayer2.RenderersFactory;
import com.google.android.exoplayer2.SimpleExoPlayer;
import com.google.android.exoplayer2.TracksInfo; import com.google.android.exoplayer2.TracksInfo;
import com.google.android.exoplayer2.audio.AudioAttributes; import com.google.android.exoplayer2.audio.AudioAttributes;
import com.google.android.exoplayer2.drm.FrameworkMediaDrm; import com.google.android.exoplayer2.drm.FrameworkMediaDrm;
...@@ -61,7 +60,7 @@ import java.util.Collections; ...@@ -61,7 +60,7 @@ import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
/** An activity that plays media using {@link SimpleExoPlayer}. */ /** An activity that plays media using {@link ExoPlayer}. */
public class PlayerActivity extends AppCompatActivity public class PlayerActivity extends AppCompatActivity
implements OnClickListener, StyledPlayerControlView.VisibilityListener { implements OnClickListener, StyledPlayerControlView.VisibilityListener {
...@@ -75,7 +74,7 @@ public class PlayerActivity extends AppCompatActivity ...@@ -75,7 +74,7 @@ public class PlayerActivity extends AppCompatActivity
protected StyledPlayerView playerView; protected StyledPlayerView playerView;
protected LinearLayout debugRootView; protected LinearLayout debugRootView;
protected TextView debugTextView; protected TextView debugTextView;
protected @Nullable SimpleExoPlayer player; protected @Nullable ExoPlayer player;
private boolean isShowingTrackSelectionDialog; private boolean isShowingTrackSelectionDialog;
private Button selectTracksButton; private Button selectTracksButton;
......
demos/surface/src/main/java/com/google/android/exoplayer2/surfacedemo/MainActivity.java
...@@ -31,7 +31,6 @@ import com.google.android.exoplayer2.C; ...@@ -31,7 +31,6 @@ import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.ExoPlayer; import com.google.android.exoplayer2.ExoPlayer;
import com.google.android.exoplayer2.MediaItem; import com.google.android.exoplayer2.MediaItem;
import com.google.android.exoplayer2.Player; import com.google.android.exoplayer2.Player;
import com.google.android.exoplayer2.SimpleExoPlayer;
import com.google.android.exoplayer2.drm.DefaultDrmSessionManager; import com.google.android.exoplayer2.drm.DefaultDrmSessionManager;
import com.google.android.exoplayer2.drm.DrmSessionManager; import com.google.android.exoplayer2.drm.DrmSessionManager;
import com.google.android.exoplayer2.drm.FrameworkMediaDrm; import com.google.android.exoplayer2.drm.FrameworkMediaDrm;
...@@ -67,7 +66,7 @@ public final class MainActivity extends Activity { ...@@ -67,7 +66,7 @@ public final class MainActivity extends Activity {
@Nullable private SurfaceView nonFullScreenView; @Nullable private SurfaceView nonFullScreenView;
@Nullable private SurfaceView currentOutputView; @Nullable private SurfaceView currentOutputView;
@Nullable private static SimpleExoPlayer player; @Nullable private static ExoPlayer player;
@Nullable private static SurfaceControl surfaceControl; @Nullable private static SurfaceControl surfaceControl;
@Nullable private static Surface videoSurface; @Nullable private static Surface videoSurface;
...@@ -217,7 +216,7 @@ public final class MainActivity extends Activity { ...@@ -217,7 +216,7 @@ public final class MainActivity extends Activity {
} else { } else {
throw new IllegalStateException(); throw new IllegalStateException();
} }
SimpleExoPlayer player = new ExoPlayer.Builder(getApplicationContext()).build(); ExoPlayer player = new ExoPlayer.Builder(getApplicationContext()).build();
player.setMediaSource(mediaSource); player.setMediaSource(mediaSource);
player.prepare(); player.prepare();
player.play(); player.play();
......
docs/ad-insertion.md
...@@ -53,7 +53,7 @@ MediaSourceFactory mediaSourceFactory = ...@@ -53,7 +53,7 @@ MediaSourceFactory mediaSourceFactory =
new DefaultMediaSourceFactory(context) new DefaultMediaSourceFactory(context)
.setAdsLoaderProvider(adsLoaderProvider) .setAdsLoaderProvider(adsLoaderProvider)
.setAdViewProvider(playerView); .setAdViewProvider(playerView);
SimpleExoPlayer player = new ExoPlayer.Builder(context) ExoPlayer player = new ExoPlayer.Builder(context)
.setMediaSourceFactory(mediaSourceFactory) .setMediaSourceFactory(mediaSourceFactory)
.build(); .build();
~~~ ~~~
...@@ -209,7 +209,7 @@ events to an ad SDK or ad server. For example, the media stream may include ...@@ -209,7 +209,7 @@ events to an ad SDK or ad server. For example, the media stream may include
timed events that need to be reported by the client (see [supported formats][] timed events that need to be reported by the client (see [supported formats][]
for information on what timed metadata formats are supported by ExoPlayer). Apps for information on what timed metadata formats are supported by ExoPlayer). Apps
can listen for timed metadata events from the player, e.g., via can listen for timed metadata events from the player, e.g., via
`SimpleExoPlayer.addMetadataOutput`. `ExoPlayer.addMetadataOutput`.
The IMA extension currently only handles client-side ad insertion. It does not The IMA extension currently only handles client-side ad insertion. It does not
provide any integration with the DAI part of the IMA SDK. provide any integration with the DAI part of the IMA SDK.
......
docs/analytics.md
...@@ -44,7 +44,7 @@ implementations. You can easily add your own listener and override only the ...@@ -44,7 +44,7 @@ implementations. You can easily add your own listener and override only the
methods you are interested in: methods you are interested in:
~~~ ~~~
simpleExoPlayer.addAnalyticsListener(new AnalyticsListener() { exoPlayer.addAnalyticsListener(new AnalyticsListener() {
@Override @Override
public void onPlaybackStateChanged( public void onPlaybackStateChanged(
EventTime eventTime, @Player.State int state) { EventTime eventTime, @Player.State int state) {
...@@ -98,7 +98,7 @@ current playback session at any time using ...@@ -98,7 +98,7 @@ current playback session at any time using
`PlaybackStatsListener.getPlaybackStats()`. `PlaybackStatsListener.getPlaybackStats()`.
~~~ ~~~
simpleExoPlayer.addAnalyticsListener( exoPlayer.addAnalyticsListener(
new PlaybackStatsListener( new PlaybackStatsListener(
/* keepHistory= */ true, (eventTime, playbackStats) -> { /* keepHistory= */ true, (eventTime, playbackStats) -> {
// Analytics data for the session started at `eventTime` is ready. // Analytics data for the session started at `eventTime` is ready.
...@@ -246,7 +246,7 @@ class ExtendedCollector extends AnalyticsCollector { ...@@ -246,7 +246,7 @@ class ExtendedCollector extends AnalyticsCollector {
} }
// Usage - Setup and listener registration. // Usage - Setup and listener registration.
SimpleExoPlayer player = new ExoPlayer.Builder(context) ExoPlayer player = new ExoPlayer.Builder(context)
.setAnalyticsCollector(new ExtendedCollector()) .setAnalyticsCollector(new ExtendedCollector())
.build(); .build();
player.addAnalyticsListener(new ExtendedListener() { player.addAnalyticsListener(new ExtendedListener() {
......
docs/customization.md
...@@ -4,13 +4,13 @@ title: Customization ...@@ -4,13 +4,13 @@ title: Customization
At the core of the ExoPlayer library is the `Player` interface. A `Player` At the core of the ExoPlayer library is the `Player` interface. A `Player`
exposes traditional high-level media player functionality such as the ability to exposes traditional high-level media player functionality such as the ability to
buffer media, play, pause and seek. The default implementations `ExoPlayer` and buffer media, play, pause and seek. The default implementation `ExoPlayer` is
`SimpleExoPlayer` are designed to make few assumptions about (and hence impose designed to make few assumptions about (and hence impose few restrictions on)
few restrictions on) the type of media being played, how and where it is stored, the type of media being played, how and where it is stored, and how it is
and how it is rendered. Rather than implementing the loading and rendering of rendered. Rather than implementing the loading and rendering of media directly,
media directly, `ExoPlayer` implementations delegate this work to components `ExoPlayer` implementations delegate this work to components that are injected
that are injected when a player is created or when new media sources are passed when a player is created or when new media sources are passed to the player.
to the player. Components common to all `ExoPlayer` implementations are: Components common to all `ExoPlayer` implementations are:
* `MediaSource` instances that define media to be played, load the media, and * `MediaSource` instances that define media to be played, load the media, and
from which the loaded media can be read. `MediaSource` instances are created from which the loaded media can be read. `MediaSource` instances are created
...@@ -59,7 +59,7 @@ DefaultDataSource.Factory dataSourceFactory = ...@@ -59,7 +59,7 @@ DefaultDataSource.Factory dataSourceFactory =
new DefaultDataSource.Factory(context, httpDataSourceFactory); new DefaultDataSource.Factory(context, httpDataSourceFactory);
// Inject the DefaultDataSourceFactory when creating the player. // Inject the DefaultDataSourceFactory when creating the player.
SimpleExoPlayer player = ExoPlayer player =
new ExoPlayer.Builder(context) new ExoPlayer.Builder(context)
.setMediaSourceFactory(new DefaultMediaSourceFactory(dataSourceFactory)) .setMediaSourceFactory(new DefaultMediaSourceFactory(dataSourceFactory))
.build(); .build();
...@@ -82,7 +82,7 @@ DataSource.Factory cacheDataSourceFactory = ...@@ -82,7 +82,7 @@ DataSource.Factory cacheDataSourceFactory =
.setCache(simpleCache) .setCache(simpleCache)
.setUpstreamDataSourceFactory(httpDataSourceFactory); .setUpstreamDataSourceFactory(httpDataSourceFactory);
SimpleExoPlayer player = new ExoPlayer.Builder(context) ExoPlayer player = new ExoPlayer.Builder(context)
.setMediaSourceFactory( .setMediaSourceFactory(
new DefaultMediaSourceFactory(cacheDataSourceFactory)) new DefaultMediaSourceFactory(cacheDataSourceFactory))
.build(); .build();
...@@ -107,7 +107,7 @@ DataSource.Factory dataSourceFactory = () -> { ...@@ -107,7 +107,7 @@ DataSource.Factory dataSourceFactory = () -> {
return dataSource; return dataSource;
}; };
SimpleExoPlayer player = new ExoPlayer.Builder(context) ExoPlayer player = new ExoPlayer.Builder(context)
.setMediaSourceFactory(new DefaultMediaSourceFactory(dataSourceFactory)) .setMediaSourceFactory(new DefaultMediaSourceFactory(dataSourceFactory))
.build(); .build();
~~~ ~~~
...@@ -157,7 +157,7 @@ LoadErrorHandlingPolicy loadErrorHandlingPolicy = ...@@ -157,7 +157,7 @@ LoadErrorHandlingPolicy loadErrorHandlingPolicy =
} }
}; };
SimpleExoPlayer player = ExoPlayer player =
new ExoPlayer.Builder(context) new ExoPlayer.Builder(context)
.setMediaSourceFactory( .setMediaSourceFactory(
new DefaultMediaSourceFactory(context) new DefaultMediaSourceFactory(context)
...@@ -181,7 +181,7 @@ DefaultExtractorsFactory extractorsFactory = ...@@ -181,7 +181,7 @@ DefaultExtractorsFactory extractorsFactory =
new DefaultExtractorsFactory() new DefaultExtractorsFactory()
.setMp3ExtractorFlags(Mp3Extractor.FLAG_ENABLE_INDEX_SEEKING); .setMp3ExtractorFlags(Mp3Extractor.FLAG_ENABLE_INDEX_SEEKING);
SimpleExoPlayer player = new ExoPlayer.Builder(context) ExoPlayer player = new ExoPlayer.Builder(context)
.setMediaSourceFactory( .setMediaSourceFactory(
new DefaultMediaSourceFactory(context, extractorsFactory)) new DefaultMediaSourceFactory(context, extractorsFactory))
.build(); .build();
......
docs/dash.md
...@@ -17,7 +17,7 @@ You can then create a `MediaItem` for a DASH MPD URI and pass it to the player. ...@@ -17,7 +17,7 @@ You can then create a `MediaItem` for a DASH MPD URI and pass it to the player.
~~~ ~~~
// Create a player instance. // Create a player instance.
SimpleExoPlayer player = new ExoPlayer.Builder(context).build(); ExoPlayer player = new ExoPlayer.Builder(context).build();
// Set the media item to be played. // Set the media item to be played.
player.setMediaItem(MediaItem.fromUri(dashUri)); player.setMediaItem(MediaItem.fromUri(dashUri));
// Prepare the player. // Prepare the player.
...@@ -45,7 +45,7 @@ MediaSource mediaSource = ...@@ -45,7 +45,7 @@ MediaSource mediaSource =
new DashMediaSource.Factory(dataSourceFactory) new DashMediaSource.Factory(dataSourceFactory)
.createMediaSource(MediaItem.fromUri(dashUri)); .createMediaSource(MediaItem.fromUri(dashUri));
// Create a player instance. // Create a player instance.
SimpleExoPlayer player = new ExoPlayer.Builder(context).build(); ExoPlayer player = new ExoPlayer.Builder(context).build();
// Set the media source to be played. // Set the media source to be played.
player.setMediaSource(mediaSource); player.setMediaSource(mediaSource);
// Prepare the player. // Prepare the player.
......
docs/debug-logging.md
...@@ -6,7 +6,7 @@ By default ExoPlayer only logs errors. To log player events, the `EventLogger` ...@@ -6,7 +6,7 @@ By default ExoPlayer only logs errors. To log player events, the `EventLogger`
class can be used. The additional logging it provides can be helpful for class can be used. The additional logging it provides can be helpful for
understanding what the player is doing, as well as for debugging playback understanding what the player is doing, as well as for debugging playback
issues. `EventLogger` implements `AnalyticsListener`, so registering an instance issues. `EventLogger` implements `AnalyticsListener`, so registering an instance
with a `SimpleExoPlayer` is easy: with an `ExoPlayer` is easy:
``` ```
player.addAnalyticsListener(new EventLogger(trackSelector)); player.addAnalyticsListener(new EventLogger(trackSelector));
......
docs/downloading-media.md
...@@ -322,7 +322,7 @@ DataSource.Factory cacheDataSourceFactory = ...@@ -322,7 +322,7 @@ DataSource.Factory cacheDataSourceFactory =
.setUpstreamDataSourceFactory(httpDataSourceFactory) .setUpstreamDataSourceFactory(httpDataSourceFactory)
.setCacheWriteDataSinkFactory(null); // Disable writing. .setCacheWriteDataSinkFactory(null); // Disable writing.
SimpleExoPlayer player = new ExoPlayer.Builder(context) ExoPlayer player = new ExoPlayer.Builder(context)
.setMediaSourceFactory( .setMediaSourceFactory(
new DefaultMediaSourceFactory(cacheDataSourceFactory)) new DefaultMediaSourceFactory(cacheDataSourceFactory))
.build(); .build();
......
docs/hello-world.md
...@@ -14,7 +14,7 @@ For simple use cases, getting started with `ExoPlayer` consists of implementing ...@@ -14,7 +14,7 @@ For simple use cases, getting started with `ExoPlayer` consists of implementing
the following steps: the following steps:
1. Add ExoPlayer as a dependency to your project. 1. Add ExoPlayer as a dependency to your project.
1. Create a `SimpleExoPlayer` instance. 1. Create an `ExoPlayer` instance.
1. Attach the player to a view (for video output and user input). 1. Attach the player to a view (for video output and user input).
1. Prepare the player with a `MediaItem` to play. 1. Prepare the player with a `MediaItem` to play.
1. Release the player when done. 1. Release the player when done.
...@@ -97,7 +97,7 @@ a range of customization options. The code below is the simplest example of ...@@ -97,7 +97,7 @@ a range of customization options. The code below is the simplest example of
creating an instance. creating an instance.
~~~ ~~~
SimpleExoPlayer player = new ExoPlayer.Builder(context).build(); ExoPlayer player = new ExoPlayer.Builder(context).build();
~~~ ~~~
{: .language-java} {: .language-java}
...@@ -117,12 +117,12 @@ which the player must be accessed can be queried using ...@@ -117,12 +117,12 @@ which the player must be accessed can be queried using
`Player.getApplicationLooper`. `Player.getApplicationLooper`.
If you see `IllegalStateException` being thrown with the message "Player is If you see `IllegalStateException` being thrown with the message "Player is
accessed on the wrong thread", then some code in your app is accessing a accessed on the wrong thread", then some code in your app is accessing an
`SimpleExoPlayer` instance on the wrong thread (the exception's stack trace `ExoPlayer` instance on the wrong thread (the exception's stack trace shows you
shows you where). You can temporarily opt out from these exceptions being thrown where). You can temporarily opt out from these exceptions being thrown by
by calling `SimpleExoPlayer.setThrowsWhenUsingWrongThread(false)`, in which case calling `ExoPlayer.setThrowsWhenUsingWrongThread(false)`, in which case the
the issue will be logged as a warning instead. Using this opt out is not safe issue will be logged as a warning instead. Using this opt out is not safe and
and may result in unexpected or obscure errors. It will be removed in ExoPlayer may result in unexpected or obscure errors. It will be removed in ExoPlayer
2.16. 2.16.
{:.info} {:.info}
...@@ -148,10 +148,10 @@ useful for audio only use cases. ...@@ -148,10 +148,10 @@ useful for audio only use cases.
Use of ExoPlayer's pre-built UI components is optional. For video applications Use of ExoPlayer's pre-built UI components is optional. For video applications
that implement their own UI, the target `SurfaceView`, `TextureView`, that implement their own UI, the target `SurfaceView`, `TextureView`,
`SurfaceHolder` or `Surface` can be set using `SimpleExoPlayer`'s `SurfaceHolder` or `Surface` can be set using `ExoPlayer`'s
`setVideoSurfaceView`, `setVideoTextureView`, `setVideoSurfaceHolder` and `setVideoSurfaceView`, `setVideoTextureView`, `setVideoSurfaceHolder` and
`setVideoSurface` methods respectively. `SimpleExoPlayer`'s `addTextOutput` `setVideoSurface` methods respectively. `ExoPlayer`'s `addTextOutput` method can
method can be used to receive captions that should be rendered during playback. be used to receive captions that should be rendered during playback.
## Populating the playlist and preparing the player ## ## Populating the playlist and preparing the player ##
......
docs/hls.md
...@@ -18,7 +18,7 @@ player. ...@@ -18,7 +18,7 @@ player.
~~~ ~~~
// Create a player instance. // Create a player instance.
SimpleExoPlayer player = new ExoPlayer.Builder(context).build(); ExoPlayer player = new ExoPlayer.Builder(context).build();
// Set the media item to be played. // Set the media item to be played.
player.setMediaItem(MediaItem.fromUri(hlsUri)); player.setMediaItem(MediaItem.fromUri(hlsUri));
// Prepare the player. // Prepare the player.
...@@ -48,7 +48,7 @@ HlsMediaSource hlsMediaSource = ...@@ -48,7 +48,7 @@ HlsMediaSource hlsMediaSource =
new HlsMediaSource.Factory(dataSourceFactory) new HlsMediaSource.Factory(dataSourceFactory)
.createMediaSource(MediaItem.fromUri(hlsUri)); .createMediaSource(MediaItem.fromUri(hlsUri));
// Create a player instance. // Create a player instance.
SimpleExoPlayer player = new ExoPlayer.Builder(context).build(); ExoPlayer player = new ExoPlayer.Builder(context).build();
// Set the media source to be played. // Set the media source to be played.
player.setMediaSource(hlsMediaSource); player.setMediaSource(hlsMediaSource);
// Prepare the player. // Prepare the player.
......
docs/listening-to-player-events.md
...@@ -180,15 +180,15 @@ together in `onEvents`. ...@@ -180,15 +180,15 @@ together in `onEvents`.
## Using AnalyticsListener ## ## Using AnalyticsListener ##
When using `SimpleExoPlayer`, an `AnalyticsListener` can be registered with the When using `ExoPlayer`, an `AnalyticsListener` can be registered with the player
player by calling `addAnalyticsListener`. `AnalyticsListener` implementations by calling `addAnalyticsListener`. `AnalyticsListener` implementations are able
are able to listen to detailed events that may be useful for analytics and to listen to detailed events that may be useful for analytics and logging
logging purposes. Please refer to the [analytics page][] for more details. purposes. Please refer to the [analytics page][] for more details.
### Using EventLogger ### ### Using EventLogger ###
`EventLogger` is an `AnalyticsListener` provided directly by the library for `EventLogger` is an `AnalyticsListener` provided directly by the library for
logging purposes. It can be added to a `SimpleExoPlayer` to enable useful logging purposes. It can be added to an `ExoPlayer` to enable useful
additional logging with a single line. additional logging with a single line.
``` ```
......
docs/live-streaming.md
...@@ -96,7 +96,7 @@ values will override parameters defined by the media. ...@@ -96,7 +96,7 @@ values will override parameters defined by the media.
~~~ ~~~
// Global settings. // Global settings.
SimpleExoPlayer player = ExoPlayer player =
new ExoPlayer.Builder(context) new ExoPlayer.Builder(context)
.setMediaSourceFactory( .setMediaSourceFactory(
new DefaultMediaSourceFactory(context).setLiveTargetOffsetMs(5000)) new DefaultMediaSourceFactory(context).setLiveTargetOffsetMs(5000))
...@@ -166,7 +166,7 @@ implementation, which is `DefaultLivePlaybackSpeedControl`. In both cases an ...@@ -166,7 +166,7 @@ implementation, which is `DefaultLivePlaybackSpeedControl`. In both cases an
instance can be set when building the player: instance can be set when building the player:
~~~ ~~~
SimpleExoPlayer player = ExoPlayer player =
new ExoPlayer.Builder(context) new ExoPlayer.Builder(context)
.setLivePlaybackSpeedControl( .setLivePlaybackSpeedControl(
new DefaultLivePlaybackSpeedControl.Builder() new DefaultLivePlaybackSpeedControl.Builder()
......
docs/media-sources.md
...@@ -37,7 +37,7 @@ MediaSourceFactory mediaSourceFactory = ...@@ -37,7 +37,7 @@ MediaSourceFactory mediaSourceFactory =
new DefaultMediaSourceFactory(cacheDataSourceFactory) new DefaultMediaSourceFactory(cacheDataSourceFactory)
.setAdsLoaderProvider(adsLoaderProvider) .setAdsLoaderProvider(adsLoaderProvider)
.setAdViewProvider(playerView); .setAdViewProvider(playerView);
SimpleExoPlayer player = new ExoPlayer.Builder(context) ExoPlayer player = new ExoPlayer.Builder(context)
.setMediaSourceFactory(mediaSourceFactory) .setMediaSourceFactory(mediaSourceFactory)
.build(); .build();
~~~ ~~~
......
docs/network-stacks.md
...@@ -32,8 +32,8 @@ where `PreferredHttpDataSource.Factory` is the factory corresponding to your ...@@ -32,8 +32,8 @@ where `PreferredHttpDataSource.Factory` is the factory corresponding to your
preferred network stack. The `DefaultDataSourceFactory` layer adds in support preferred network stack. The `DefaultDataSourceFactory` layer adds in support
for non-http(s) sources such as local files. for non-http(s) sources such as local files.
The example below shows how to build a `SimpleExoPlayer` that will use The example below shows how to build an `ExoPlayer` that will use the Cronet
the Cronet network stack and also support playback of non-http(s) content. network stack and also support playback of non-http(s) content.
~~~ ~~~
// Given a CronetEngine and Executor, build a CronetDataSource.Factory. // Given a CronetEngine and Executor, build a CronetDataSource.Factory.
...@@ -49,7 +49,7 @@ DefaultDataSource.Factory dataSourceFactory = ...@@ -49,7 +49,7 @@ DefaultDataSource.Factory dataSourceFactory =
/* baseDataSourceFactory= */ cronetDataSourceFactory); /* baseDataSourceFactory= */ cronetDataSourceFactory);
// Inject the DefaultDataSourceFactory when creating the player. // Inject the DefaultDataSourceFactory when creating the player.
SimpleExoPlayer player = ExoPlayer player =
new ExoPlayer.Builder(context) new ExoPlayer.Builder(context)
.setMediaSourceFactory(new DefaultMediaSourceFactory(dataSourceFactory)) .setMediaSourceFactory(new DefaultMediaSourceFactory(dataSourceFactory))
.build(); .build();
......
docs/playlists.md
...@@ -166,9 +166,9 @@ This can be customized by providing a custom shuffle order implementation: ...@@ -166,9 +166,9 @@ This can be customized by providing a custom shuffle order implementation:
~~~ ~~~
// Set the custom shuffle order. // Set the custom shuffle order.
simpleExoPlayer.setShuffleOrder(shuffleOrder); exoPlayer.setShuffleOrder(shuffleOrder);
// Enable shuffle mode. // Enable shuffle mode.
simpleExoPlayer.setShuffleModeEnabled(/* shuffleModeEnabled= */ true); exoPlayer.setShuffleModeEnabled(/* shuffleModeEnabled= */ true);
~~~ ~~~
{: .language-java} {: .language-java}
......
docs/progressive.md
...@@ -11,7 +11,7 @@ it to the player. ...@@ -11,7 +11,7 @@ it to the player.
~~~ ~~~
// Create a player instance. // Create a player instance.
SimpleExoPlayer player = new ExoPlayer.Builder(context).build(); ExoPlayer player = new ExoPlayer.Builder(context).build();
// Set the media item to be played. // Set the media item to be played.
player.setMediaItem(MediaItem.fromUri(progressiveUri)); player.setMediaItem(MediaItem.fromUri(progressiveUri));
// Prepare the player. // Prepare the player.
...@@ -31,7 +31,7 @@ DataSource.Factory dataSourceFactory = new DefaultHttpDataSource.Factory(); ...@@ -31,7 +31,7 @@ DataSource.Factory dataSourceFactory = new DefaultHttpDataSource.Factory();
MediaSource mediaSource = new ProgressiveMediaSource.Factory(dataSourceFactory) MediaSource mediaSource = new ProgressiveMediaSource.Factory(dataSourceFactory)
.createMediaSource(MediaItem.fromUri(progressiveUri)); .createMediaSource(MediaItem.fromUri(progressiveUri));
// Create a player instance. // Create a player instance.
SimpleExoPlayer player = new ExoPlayer.Builder(context).build(); ExoPlayer player = new ExoPlayer.Builder(context).build();
// Set the media source to be played. // Set the media source to be played.
player.setMediaSource(mediaSource); player.setMediaSource(mediaSource);
// Prepare the player. // Prepare the player.
......
docs/rtsp.md
...@@ -17,7 +17,7 @@ You can then create a `MediaItem` for an RTSP URI and pass it to the player. ...@@ -17,7 +17,7 @@ You can then create a `MediaItem` for an RTSP URI and pass it to the player.
~~~ ~~~
// Create a player instance. // Create a player instance.
SimpleExoPlayer player = new ExoPlayer.Builder(context).build(); ExoPlayer player = new ExoPlayer.Builder(context).build();
// Set the media item to be played. // Set the media item to be played.
player.setMediaItem(MediaItem.fromUri(rtspUri)); player.setMediaItem(MediaItem.fromUri(rtspUri));
// Prepare the player. // Prepare the player.
...@@ -43,7 +43,7 @@ MediaSource mediaSource = ...@@ -43,7 +43,7 @@ MediaSource mediaSource =
new RtspMediaSource.Factory() new RtspMediaSource.Factory()
.createMediaSource(MediaItem.fromUri(rtspUri)); .createMediaSource(MediaItem.fromUri(rtspUri));
// Create a player instance. // Create a player instance.
SimpleExoPlayer player = new ExoPlayer.Builder(context).build(); ExoPlayer player = new ExoPlayer.Builder(context).build();
// Set the media source to be played. // Set the media source to be played.
player.setMediaSource(mediaSource); player.setMediaSource(mediaSource);
// Prepare the player. // Prepare the player.
......
docs/shrinking.md
...@@ -49,7 +49,7 @@ By default, the player's renderers will be created using ...@@ -49,7 +49,7 @@ By default, the player's renderers will be created using
none of them will be removed by code shrinking. If you know that your app only none of them will be removed by code shrinking. If you know that your app only
needs a subset of renderers, you can specify your own `RenderersFactory` needs a subset of renderers, you can specify your own `RenderersFactory`
instead. For example, an app that only plays audio can define a factory like instead. For example, an app that only plays audio can define a factory like
this when instantiating `SimpleExoPlayer` instances: this when instantiating `ExoPlayer` instances:
~~~ ~~~
RenderersFactory audioOnlyRenderersFactory = RenderersFactory audioOnlyRenderersFactory =
...@@ -58,7 +58,7 @@ RenderersFactory audioOnlyRenderersFactory = ...@@ -58,7 +58,7 @@ RenderersFactory audioOnlyRenderersFactory =
new MediaCodecAudioRenderer( new MediaCodecAudioRenderer(
context, MediaCodecSelector.DEFAULT, handler, audioListener) context, MediaCodecSelector.DEFAULT, handler, audioListener)
}; };
SimpleExoPlayer player = ExoPlayer player =
new ExoPlayer.Builder(context, audioOnlyRenderersFactory).build(); new ExoPlayer.Builder(context, audioOnlyRenderersFactory).build();
~~~ ~~~
{: .language-java} {: .language-java}
...@@ -80,7 +80,7 @@ an app that only needs to play mp4 files can provide a factory like: ...@@ -80,7 +80,7 @@ an app that only needs to play mp4 files can provide a factory like:
~~~ ~~~
ExtractorsFactory mp4ExtractorFactory = ExtractorsFactory mp4ExtractorFactory =
() -> new Extractor[] {new Mp4Extractor()}; () -> new Extractor[] {new Mp4Extractor()};
SimpleExoPlayer player = ExoPlayer player =
new ExoPlayer.Builder(context, mp4ExtractorFactory).build(); new ExoPlayer.Builder(context, mp4ExtractorFactory).build();
~~~ ~~~
{: .language-java} {: .language-java}
...@@ -98,18 +98,18 @@ constructor, if your app is doing one of the following: ...@@ -98,18 +98,18 @@ constructor, if your app is doing one of the following:
~~~ ~~~
// Only playing DASH, HLS or SmoothStreaming. // Only playing DASH, HLS or SmoothStreaming.
SimpleExoPlayer player = ExoPlayer player =
new ExoPlayer.Builder(context, ExtractorsFactory.EMPTY).build(); new ExoPlayer.Builder(context, ExtractorsFactory.EMPTY).build();
// Providing a customized `DefaultMediaSourceFactory` // Providing a customized `DefaultMediaSourceFactory`
SimpleExoPlayer player = ExoPlayer player =
new ExoPlayer.Builder(context, ExtractorsFactory.EMPTY) new ExoPlayer.Builder(context, ExtractorsFactory.EMPTY)
.setMediaSourceFactory( .setMediaSourceFactory(
new DefaultMediaSourceFactory(context, customExtractorsFactory)) new DefaultMediaSourceFactory(context, customExtractorsFactory))
.build(); .build();
// Using a MediaSource directly. // Using a MediaSource directly.
SimpleExoPlayer player = ExoPlayer player =
new ExoPlayer.Builder(context, ExtractorsFactory.EMPTY).build(); new ExoPlayer.Builder(context, ExtractorsFactory.EMPTY).build();
ProgressiveMediaSource mediaSource = ProgressiveMediaSource mediaSource =
new ProgressiveMediaSource.Factory( new ProgressiveMediaSource.Factory(
......
docs/smoothstreaming.md
...@@ -19,7 +19,7 @@ to the player. ...@@ -19,7 +19,7 @@ to the player.
~~~ ~~~
// Create a player instance. // Create a player instance.
SimpleExoPlayer player = new ExoPlayer.Builder(context).build(); ExoPlayer player = new ExoPlayer.Builder(context).build();
// Set the media item to be played. // Set the media item to be played.
player.setMediaItem(MediaItem.fromUri(ssUri)); player.setMediaItem(MediaItem.fromUri(ssUri));
// Prepare the player. // Prepare the player.
...@@ -47,7 +47,7 @@ MediaSource mediaSource = ...@@ -47,7 +47,7 @@ MediaSource mediaSource =
new SsMediaSource.Factory(dataSourceFactory) new SsMediaSource.Factory(dataSourceFactory)
.createMediaSource(MediaItem.fromUri(ssUri)); .createMediaSource(MediaItem.fromUri(ssUri));
// Create a player instance. // Create a player instance.
SimpleExoPlayer player = new ExoPlayer.Builder(context).build(); ExoPlayer player = new ExoPlayer.Builder(context).build();
// Set the media source to be played. // Set the media source to be played.
player.setMediaSource(mediaSource); player.setMediaSource(mediaSource);
// Prepare the player. // Prepare the player.
......
docs/track-selection.md
...@@ -8,7 +8,7 @@ of which can be provided whenever an `ExoPlayer` is built. ...@@ -8,7 +8,7 @@ of which can be provided whenever an `ExoPlayer` is built.
~~~ ~~~
DefaultTrackSelector trackSelector = new DefaultTrackSelector(context); DefaultTrackSelector trackSelector = new DefaultTrackSelector(context);
SimpleExoPlayer player = ExoPlayer player =
new ExoPlayer.Builder(context) new ExoPlayer.Builder(context)
.setTrackSelector(trackSelector) .setTrackSelector(trackSelector)
.build(); .build();
......
docs/troubleshooting.md
...@@ -230,7 +230,7 @@ audio when your app is in the background: ...@@ -230,7 +230,7 @@ audio when your app is in the background:
from killing your process to free up resources. from killing your process to free up resources.
1. You need to hold a [`WifiLock`][] and a [`WakeLock`][]. These ensure that the 1. You need to hold a [`WifiLock`][] and a [`WakeLock`][]. These ensure that the
system keeps the WiFi radio and CPU awake. This can be easily done if using system keeps the WiFi radio and CPU awake. This can be easily done if using
[`SimpleExoPlayer`][] by calling [`setWakeMode`][], which will automatically [`ExoPlayer`][] by calling [`setWakeMode`][], which will automatically
acquire and release the required locks at the correct times. acquire and release the required locks at the correct times.
It's important that you release the locks (if not using `setWakeMode`) and stop It's important that you release the locks (if not using `setWakeMode`) and stop
...@@ -335,8 +335,8 @@ is the official way to play YouTube videos on Android. ...@@ -335,8 +335,8 @@ is the official way to play YouTube videos on Android.
[foreground service]: https://developer.android.com/guide/components/services.html#Foreground [foreground service]: https://developer.android.com/guide/components/services.html#Foreground
[`WifiLock`]: {{ site.android_sdk }}/android/net/wifi/WifiManager.WifiLock.html [`WifiLock`]: {{ site.android_sdk }}/android/net/wifi/WifiManager.WifiLock.html
[`WakeLock`]: {{ site.android_sdk }}/android/os/PowerManager.WakeLock.html [`WakeLock`]: {{ site.android_sdk }}/android/os/PowerManager.WakeLock.html
[`SimpleExoPlayer`]: {{ site.exo_sdk }}/SimpleExoPlayer.html [`ExoPlayer`]: {{ site.exo_sdk }}/ExoPlayer.html
[`setWakeMode`]: {{ site.exo_sdk }}/SimpleExoPlayer.html#setWakeMode(int) [`setWakeMode`]: {{ site.exo_sdk }}/ExoPlayer.html#setWakeMode(int)
[A note on threading]: {{ site.base_url }}/hello-world.html#a-note-on-threading [A note on threading]: {{ site.base_url }}/hello-world.html#a-note-on-threading
[OkHttp extension]: {{ site.release_v2 }}/extensions/okhttp [OkHttp extension]: {{ site.release_v2 }}/extensions/okhttp
[CORS enabled]: https://www.w3.org/wiki/CORS_Enabled [CORS enabled]: https://www.w3.org/wiki/CORS_Enabled
......
extensions/flac/src/androidTest/java/com/google/android/exoplayer2/ext/flac/FlacPlaybackTest.java
...@@ -29,7 +29,6 @@ import com.google.android.exoplayer2.PlaybackException; ...@@ -29,7 +29,6 @@ import com.google.android.exoplayer2.PlaybackException;
import com.google.android.exoplayer2.Player; import com.google.android.exoplayer2.Player;
import com.google.android.exoplayer2.Renderer; import com.google.android.exoplayer2.Renderer;
import com.google.android.exoplayer2.RenderersFactory; import com.google.android.exoplayer2.RenderersFactory;
import com.google.android.exoplayer2.SimpleExoPlayer;
import com.google.android.exoplayer2.audio.AudioProcessor; import com.google.android.exoplayer2.audio.AudioProcessor;
import com.google.android.exoplayer2.audio.AudioSink; import com.google.android.exoplayer2.audio.AudioSink;
import com.google.android.exoplayer2.audio.DefaultAudioSink; import com.google.android.exoplayer2.audio.DefaultAudioSink;
...@@ -96,7 +95,7 @@ public class FlacPlaybackTest { ...@@ -96,7 +95,7 @@ public class FlacPlaybackTest {
private final Uri uri; private final Uri uri;
private final AudioSink audioSink; private final AudioSink audioSink;
@Nullable private SimpleExoPlayer player; @Nullable private ExoPlayer player;
@Nullable private PlaybackException playbackException; @Nullable private PlaybackException playbackException;
public TestPlaybackRunnable(Uri uri, Context context, AudioSink audioSink) { public TestPlaybackRunnable(Uri uri, Context context, AudioSink audioSink) {
......
extensions/ima/src/androidTest/java/com/google/android/exoplayer2/ext/ima/ImaPlaybackTest.java
...@@ -25,11 +25,11 @@ import androidx.annotation.Nullable; ...@@ -25,11 +25,11 @@ import androidx.annotation.Nullable;
import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.ext.junit.runners.AndroidJUnit4;
import androidx.test.rule.ActivityTestRule; import androidx.test.rule.ActivityTestRule;
import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.ExoPlayer;
import com.google.android.exoplayer2.MediaItem; import com.google.android.exoplayer2.MediaItem;
import com.google.android.exoplayer2.Player; import com.google.android.exoplayer2.Player;
import com.google.android.exoplayer2.Player.DiscontinuityReason; import com.google.android.exoplayer2.Player.DiscontinuityReason;
import com.google.android.exoplayer2.Player.TimelineChangeReason; import com.google.android.exoplayer2.Player.TimelineChangeReason;
import com.google.android.exoplayer2.SimpleExoPlayer;
import com.google.android.exoplayer2.Timeline.Window; import com.google.android.exoplayer2.Timeline.Window;
import com.google.android.exoplayer2.analytics.AnalyticsListener; import com.google.android.exoplayer2.analytics.AnalyticsListener;
import com.google.android.exoplayer2.decoder.DecoderCounters; import com.google.android.exoplayer2.decoder.DecoderCounters;
...@@ -192,7 +192,7 @@ public final class ImaPlaybackTest { ...@@ -192,7 +192,7 @@ public final class ImaPlaybackTest {
private final List<AdId> expectedAdIds; private final List<AdId> expectedAdIds;
private final List<AdId> seenAdIds; private final List<AdId> seenAdIds;
private @MonotonicNonNull ImaAdsLoader imaAdsLoader; private @MonotonicNonNull ImaAdsLoader imaAdsLoader;
private @MonotonicNonNull SimpleExoPlayer player; private @MonotonicNonNull ExoPlayer player;
private ImaHostedTest(Uri contentUri, String adsResponse, AdId... expectedAdIds) { private ImaHostedTest(Uri contentUri, String adsResponse, AdId... expectedAdIds) {
// fullPlaybackNoSeeking is false as the playback lasts longer than the content source // fullPlaybackNoSeeking is false as the playback lasts longer than the content source
...@@ -207,7 +207,7 @@ public final class ImaPlaybackTest { ...@@ -207,7 +207,7 @@ public final class ImaPlaybackTest {
} }
@Override @Override
protected SimpleExoPlayer buildExoPlayer( protected ExoPlayer buildExoPlayer(
HostActivity host, Surface surface, MappingTrackSelector trackSelector) { HostActivity host, Surface surface, MappingTrackSelector trackSelector) {
player = super.buildExoPlayer(host, surface, trackSelector); player = super.buildExoPlayer(host, surface, trackSelector);
player.addAnalyticsListener( player.addAnalyticsListener(
......
extensions/opus/src/androidTest/java/com/google/android/exoplayer2/ext/opus/OpusPlaybackTest.java
...@@ -29,7 +29,6 @@ import com.google.android.exoplayer2.PlaybackException; ...@@ -29,7 +29,6 @@ import com.google.android.exoplayer2.PlaybackException;
import com.google.android.exoplayer2.Player; import com.google.android.exoplayer2.Player;
import com.google.android.exoplayer2.Renderer; import com.google.android.exoplayer2.Renderer;
import com.google.android.exoplayer2.RenderersFactory; import com.google.android.exoplayer2.RenderersFactory;
import com.google.android.exoplayer2.SimpleExoPlayer;
import com.google.android.exoplayer2.extractor.mkv.MatroskaExtractor; import com.google.android.exoplayer2.extractor.mkv.MatroskaExtractor;
import com.google.android.exoplayer2.source.MediaSource; import com.google.android.exoplayer2.source.MediaSource;
import com.google.android.exoplayer2.source.ProgressiveMediaSource; import com.google.android.exoplayer2.source.ProgressiveMediaSource;
...@@ -79,7 +78,7 @@ public class OpusPlaybackTest { ...@@ -79,7 +78,7 @@ public class OpusPlaybackTest {
private final Context context; private final Context context;
private final Uri uri; private final Uri uri;
@Nullable private SimpleExoPlayer player; @Nullable private ExoPlayer player;
@Nullable private PlaybackException playbackException; @Nullable private PlaybackException playbackException;
public TestPlaybackRunnable(Uri uri, Context context) { public TestPlaybackRunnable(Uri uri, Context context) {
......
extensions/vp9/src/androidTest/java/com/google/android/exoplayer2/ext/vp9/VpxPlaybackTest.java
...@@ -30,7 +30,6 @@ import com.google.android.exoplayer2.PlaybackException; ...@@ -30,7 +30,6 @@ import com.google.android.exoplayer2.PlaybackException;
import com.google.android.exoplayer2.Player; import com.google.android.exoplayer2.Player;
import com.google.android.exoplayer2.Renderer; import com.google.android.exoplayer2.Renderer;
import com.google.android.exoplayer2.RenderersFactory; import com.google.android.exoplayer2.RenderersFactory;
import com.google.android.exoplayer2.SimpleExoPlayer;
import com.google.android.exoplayer2.extractor.mkv.MatroskaExtractor; import com.google.android.exoplayer2.extractor.mkv.MatroskaExtractor;
import com.google.android.exoplayer2.source.MediaSource; import com.google.android.exoplayer2.source.MediaSource;
import com.google.android.exoplayer2.source.ProgressiveMediaSource; import com.google.android.exoplayer2.source.ProgressiveMediaSource;
...@@ -107,7 +106,7 @@ public class VpxPlaybackTest { ...@@ -107,7 +106,7 @@ public class VpxPlaybackTest {
private final Context context; private final Context context;
private final Uri uri; private final Uri uri;
@Nullable private SimpleExoPlayer player; @Nullable private ExoPlayer player;
@Nullable private PlaybackException playbackException; @Nullable private PlaybackException playbackException;
public TestPlaybackRunnable(Uri uri, Context context) { public TestPlaybackRunnable(Uri uri, Context context) {
......
library/core/src/androidTest/java/com/google/android/exoplayer2/ClippedPlaybackTest.java
...@@ -54,7 +54,7 @@ public final class ClippedPlaybackTest { ...@@ -54,7 +54,7 @@ public final class ClippedPlaybackTest {
// Expect the clipping to affect both subtitles and video. // Expect the clipping to affect both subtitles and video.
.setClipEndPositionMs(1000) .setClipEndPositionMs(1000)
.build(); .build();
AtomicReference<SimpleExoPlayer> player = new AtomicReference<>(); AtomicReference<ExoPlayer> player = new AtomicReference<>();
TextCapturingPlaybackListener textCapturer = new TextCapturingPlaybackListener(); TextCapturingPlaybackListener textCapturer = new TextCapturingPlaybackListener();
getInstrumentation() getInstrumentation()
.runOnMainSync( .runOnMainSync(
...@@ -96,7 +96,7 @@ public final class ClippedPlaybackTest { ...@@ -96,7 +96,7 @@ public final class ClippedPlaybackTest {
// subtitle content (3.5s). // subtitle content (3.5s).
.setClipEndPositionMs(4_000) .setClipEndPositionMs(4_000)
.build()); .build());
AtomicReference<SimpleExoPlayer> player = new AtomicReference<>(); AtomicReference<ExoPlayer> player = new AtomicReference<>();
TextCapturingPlaybackListener textCapturer = new TextCapturingPlaybackListener(); TextCapturingPlaybackListener textCapturer = new TextCapturingPlaybackListener();
getInstrumentation() getInstrumentation()
.runOnMainSync( .runOnMainSync(
......
library/core/src/androidTest/java/com/google/android/exoplayer2/drm/DrmPlaybackTest.java
...@@ -24,7 +24,6 @@ import com.google.android.exoplayer2.ExoPlayer; ...@@ -24,7 +24,6 @@ import com.google.android.exoplayer2.ExoPlayer;
import com.google.android.exoplayer2.MediaItem; import com.google.android.exoplayer2.MediaItem;
import com.google.android.exoplayer2.PlaybackException; import com.google.android.exoplayer2.PlaybackException;
import com.google.android.exoplayer2.Player; import com.google.android.exoplayer2.Player;
import com.google.android.exoplayer2.SimpleExoPlayer;
import com.google.android.exoplayer2.util.ConditionVariable; import com.google.android.exoplayer2.util.ConditionVariable;
import java.util.concurrent.atomic.AtomicReference; import java.util.concurrent.atomic.AtomicReference;
import okhttp3.mockwebserver.MockResponse; import okhttp3.mockwebserver.MockResponse;
...@@ -64,7 +63,7 @@ public final class DrmPlaybackTest { ...@@ -64,7 +63,7 @@ public final class DrmPlaybackTest {
.setLicenseUri(mockWebServer.url("license").toString()) .setLicenseUri(mockWebServer.url("license").toString())
.build()) .build())
.build(); .build();
AtomicReference<SimpleExoPlayer> player = new AtomicReference<>(); AtomicReference<ExoPlayer> player = new AtomicReference<>();
ConditionVariable playbackComplete = new ConditionVariable(); ConditionVariable playbackComplete = new ConditionVariable();
AtomicReference<PlaybackException> playbackException = new AtomicReference<>(); AtomicReference<PlaybackException> playbackException = new AtomicReference<>();
getInstrumentation() getInstrumentation()
......
library/core/src/main/java/com/google/android/exoplayer2/RenderersFactory.java
...@@ -21,11 +21,11 @@ import com.google.android.exoplayer2.metadata.MetadataOutput; ...@@ -21,11 +21,11 @@ import com.google.android.exoplayer2.metadata.MetadataOutput;
import com.google.android.exoplayer2.text.TextOutput; import com.google.android.exoplayer2.text.TextOutput;
import com.google.android.exoplayer2.video.VideoRendererEventListener; import com.google.android.exoplayer2.video.VideoRendererEventListener;
/** Builds {@link Renderer} instances for use by a {@link SimpleExoPlayer}. */ /** Builds {@link Renderer} instances for use by an {@link ExoPlayer}. */
public interface RenderersFactory { public interface RenderersFactory {
/** /**
* Builds the {@link Renderer} instances for a {@link SimpleExoPlayer}. * Builds the {@link Renderer} instances for an {@link ExoPlayer}.
* *
* @param eventHandler A handler to use when invoking event listeners and outputs. * @param eventHandler A handler to use when invoking event listeners and outputs.
* @param videoRendererEventListener An event listener for video renderers. * @param videoRendererEventListener An event listener for video renderers.
......
library/core/src/main/java/com/google/android/exoplayer2/util/DebugTextViewHelper.java
...@@ -18,32 +18,32 @@ package com.google.android.exoplayer2.util; ...@@ -18,32 +18,32 @@ package com.google.android.exoplayer2.util;
import android.annotation.SuppressLint; import android.annotation.SuppressLint;
import android.os.Looper; import android.os.Looper;
import android.widget.TextView; import android.widget.TextView;
import com.google.android.exoplayer2.ExoPlayer;
import com.google.android.exoplayer2.Format; import com.google.android.exoplayer2.Format;
import com.google.android.exoplayer2.Player; import com.google.android.exoplayer2.Player;
import com.google.android.exoplayer2.SimpleExoPlayer;
import com.google.android.exoplayer2.decoder.DecoderCounters; import com.google.android.exoplayer2.decoder.DecoderCounters;
import java.util.Locale; import java.util.Locale;
/** /**
* A helper class for periodically updating a {@link TextView} with debug information obtained from * A helper class for periodically updating a {@link TextView} with debug information obtained from
* a {@link SimpleExoPlayer}. * an {@link ExoPlayer}.
*/ */
public class DebugTextViewHelper implements Player.Listener, Runnable { public class DebugTextViewHelper implements Player.Listener, Runnable {
private static final int REFRESH_INTERVAL_MS = 1000; private static final int REFRESH_INTERVAL_MS = 1000;
private final SimpleExoPlayer player; private final ExoPlayer player;
private final TextView textView; private final TextView textView;
private boolean started; private boolean started;
/** /**
* @param player The {@link SimpleExoPlayer} from which debug information should be obtained. Only * @param player The {@link ExoPlayer} from which debug information should be obtained. Only
* players which are accessed on the main thread are supported ({@code * players which are accessed on the main thread are supported ({@code
* player.getApplicationLooper() == Looper.getMainLooper()}). * player.getApplicationLooper() == Looper.getMainLooper()}).
* @param textView The {@link TextView} that should be updated to display the information. * @param textView The {@link TextView} that should be updated to display the information.
*/ */
public DebugTextViewHelper(SimpleExoPlayer player, TextView textView) { public DebugTextViewHelper(ExoPlayer player, TextView textView) {
Assertions.checkArgument(player.getApplicationLooper() == Looper.getMainLooper()); Assertions.checkArgument(player.getApplicationLooper() == Looper.getMainLooper());
this.player = player; this.player = player;
this.textView = textView; this.textView = textView;
......
library/core/src/test/java/com/google/android/exoplayer2/analytics/AnalyticsCollectorTest.java
...@@ -81,7 +81,6 @@ import com.google.android.exoplayer2.PlaybackParameters; ...@@ -81,7 +81,6 @@ import com.google.android.exoplayer2.PlaybackParameters;
import com.google.android.exoplayer2.Player; import com.google.android.exoplayer2.Player;
import com.google.android.exoplayer2.Renderer; import com.google.android.exoplayer2.Renderer;
import com.google.android.exoplayer2.RenderersFactory; import com.google.android.exoplayer2.RenderersFactory;
import com.google.android.exoplayer2.SimpleExoPlayer;
import com.google.android.exoplayer2.Timeline; import com.google.android.exoplayer2.Timeline;
import com.google.android.exoplayer2.Timeline.Window; import com.google.android.exoplayer2.Timeline.Window;
import com.google.android.exoplayer2.TracksInfo; import com.google.android.exoplayer2.TracksInfo;
...@@ -1048,7 +1047,7 @@ public final class AnalyticsCollectorTest { ...@@ -1048,7 +1047,7 @@ public final class AnalyticsCollectorTest {
.executeRunnable( .executeRunnable(
new PlayerRunnable() { new PlayerRunnable() {
@Override @Override
public void run(SimpleExoPlayer player) { public void run(ExoPlayer player) {
player.addListener( player.addListener(
new Player.Listener() { new Player.Listener() {
@Override @Override
...@@ -1422,7 +1421,7 @@ public final class AnalyticsCollectorTest { ...@@ -1422,7 +1421,7 @@ public final class AnalyticsCollectorTest {
.executeRunnable( .executeRunnable(
new PlayerRunnable() { new PlayerRunnable() {
@Override @Override
public void run(SimpleExoPlayer player) { public void run(ExoPlayer player) {
player.getAnalyticsCollector().notifySeekStarted(); player.getAnalyticsCollector().notifySeekStarted();
} }
}) })
...@@ -1653,7 +1652,7 @@ public final class AnalyticsCollectorTest { ...@@ -1653,7 +1652,7 @@ public final class AnalyticsCollectorTest {
@Test @Test
public void onEvents_isReportedWithCorrectEventTimes() throws Exception { public void onEvents_isReportedWithCorrectEventTimes() throws Exception {
SimpleExoPlayer player = ExoPlayer player =
new TestExoPlayerBuilder(ApplicationProvider.getApplicationContext()).build(); new TestExoPlayerBuilder(ApplicationProvider.getApplicationContext()).build();
Surface surface = new Surface(new SurfaceTexture(/* texName= */ 0)); Surface surface = new Surface(new SurfaceTexture(/* texName= */ 0));
player.setVideoSurface(surface); player.setVideoSurface(surface);
...@@ -1987,7 +1986,7 @@ public final class AnalyticsCollectorTest { ...@@ -1987,7 +1986,7 @@ public final class AnalyticsCollectorTest {
public void release_withCallbacksArrivingAfterRelease_onPlayerReleasedForwardedLast() public void release_withCallbacksArrivingAfterRelease_onPlayerReleasedForwardedLast()
throws Exception { throws Exception {
FakeClock fakeClock = new FakeClock(/* initialTimeMs= */ 0, /* isAutoAdvancing= */ true); FakeClock fakeClock = new FakeClock(/* initialTimeMs= */ 0, /* isAutoAdvancing= */ true);
SimpleExoPlayer simpleExoPlayer = ExoPlayer exoPlayer =
new TestExoPlayerBuilder(ApplicationProvider.getApplicationContext()) new TestExoPlayerBuilder(ApplicationProvider.getApplicationContext())
.setClock(fakeClock) .setClock(fakeClock)
.build(); .build();
...@@ -2001,16 +2000,16 @@ public final class AnalyticsCollectorTest { ...@@ -2001,16 +2000,16 @@ public final class AnalyticsCollectorTest {
fakeClock.advanceTime(1); fakeClock.advanceTime(1);
} }
}); });
simpleExoPlayer.addAnalyticsListener(analyticsListener); exoPlayer.addAnalyticsListener(analyticsListener);
// Prepare with media to ensure video renderer is enabled. // Prepare with media to ensure video renderer is enabled.
simpleExoPlayer.setMediaSource( exoPlayer.setMediaSource(
new FakeMediaSource(new FakeTimeline(), ExoPlayerTestRunner.VIDEO_FORMAT)); new FakeMediaSource(new FakeTimeline(), ExoPlayerTestRunner.VIDEO_FORMAT));
simpleExoPlayer.prepare(); exoPlayer.prepare();
TestPlayerRunHelper.runUntilPlaybackState(simpleExoPlayer, Player.STATE_READY); TestPlayerRunHelper.runUntilPlaybackState(exoPlayer, Player.STATE_READY);
// Release and add delay on releasing thread to verify timestamps of events. // Release and add delay on releasing thread to verify timestamps of events.
simpleExoPlayer.release(); exoPlayer.release();
long releaseTimeMs = fakeClock.currentTimeMillis(); long releaseTimeMs = fakeClock.currentTimeMillis();
fakeClock.advanceTime(1); fakeClock.advanceTime(1);
ShadowLooper.idleMainLooper(); ShadowLooper.idleMainLooper();
...@@ -2024,11 +2023,11 @@ public final class AnalyticsCollectorTest { ...@@ -2024,11 +2023,11 @@ public final class AnalyticsCollectorTest {
inOrder.verify(analyticsListener).onVideoDisabled(videoDisabledEventTime.capture(), any()); inOrder.verify(analyticsListener).onVideoDisabled(videoDisabledEventTime.capture(), any());
inOrder inOrder
.verify(analyticsListener) .verify(analyticsListener)
.onEvents(same(simpleExoPlayer), argThat(events -> events.contains(EVENT_VIDEO_DISABLED))); .onEvents(same(exoPlayer), argThat(events -> events.contains(EVENT_VIDEO_DISABLED)));
inOrder.verify(analyticsListener).onPlayerReleased(releasedEventTime.capture()); inOrder.verify(analyticsListener).onPlayerReleased(releasedEventTime.capture());
inOrder inOrder
.verify(analyticsListener) .verify(analyticsListener)
.onEvents(same(simpleExoPlayer), argThat(events -> events.contains(EVENT_PLAYER_RELEASED))); .onEvents(same(exoPlayer), argThat(events -> events.contains(EVENT_PLAYER_RELEASED)));
// Verify order of timestamps of these events. // Verify order of timestamps of these events.
// This verification is needed as a regression test against [internal ref: b/195396384]. The // This verification is needed as a regression test against [internal ref: b/195396384]. The
......
library/core/src/test/java/com/google/android/exoplayer2/analytics/PlaybackStatsListenerTest.java
...@@ -27,10 +27,10 @@ import static org.mockito.Mockito.verifyNoMoreInteractions; ...@@ -27,10 +27,10 @@ import static org.mockito.Mockito.verifyNoMoreInteractions;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.test.core.app.ApplicationProvider; import androidx.test.core.app.ApplicationProvider;
import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.google.android.exoplayer2.ExoPlayer;
import com.google.android.exoplayer2.MediaItem; import com.google.android.exoplayer2.MediaItem;
import com.google.android.exoplayer2.PlaybackParameters; import com.google.android.exoplayer2.PlaybackParameters;
import com.google.android.exoplayer2.Player; import com.google.android.exoplayer2.Player;
import com.google.android.exoplayer2.SimpleExoPlayer;
import com.google.android.exoplayer2.robolectric.TestPlayerRunHelper; import com.google.android.exoplayer2.robolectric.TestPlayerRunHelper;
import com.google.android.exoplayer2.source.MediaSource; import com.google.android.exoplayer2.source.MediaSource;
import com.google.android.exoplayer2.testutil.FakeMediaSource; import com.google.android.exoplayer2.testutil.FakeMediaSource;
...@@ -49,7 +49,7 @@ import org.robolectric.shadows.ShadowLooper; ...@@ -49,7 +49,7 @@ import org.robolectric.shadows.ShadowLooper;
@RunWith(AndroidJUnit4.class) @RunWith(AndroidJUnit4.class)
public final class PlaybackStatsListenerTest { public final class PlaybackStatsListenerTest {
private SimpleExoPlayer player; private ExoPlayer player;
@Before @Before
public void setUp() { public void setUp() {
......
library/core/src/test/java/com/google/android/exoplayer2/e2etest/EndToEndGaplessTest.java
...@@ -26,7 +26,6 @@ import com.google.android.exoplayer2.ExoPlayer; ...@@ -26,7 +26,6 @@ import com.google.android.exoplayer2.ExoPlayer;
import com.google.android.exoplayer2.Format; import com.google.android.exoplayer2.Format;
import com.google.android.exoplayer2.MediaItem; import com.google.android.exoplayer2.MediaItem;
import com.google.android.exoplayer2.Player; import com.google.android.exoplayer2.Player;
import com.google.android.exoplayer2.SimpleExoPlayer;
import com.google.android.exoplayer2.mediacodec.MediaCodecUtil; import com.google.android.exoplayer2.mediacodec.MediaCodecUtil;
import com.google.android.exoplayer2.robolectric.RandomizedMp3Decoder; import com.google.android.exoplayer2.robolectric.RandomizedMp3Decoder;
import com.google.android.exoplayer2.robolectric.TestPlayerRunHelper; import com.google.android.exoplayer2.robolectric.TestPlayerRunHelper;
...@@ -87,7 +86,7 @@ public class EndToEndGaplessTest { ...@@ -87,7 +86,7 @@ public class EndToEndGaplessTest {
@Test @Test
public void testPlayback_twoIdenticalMp3Files() throws Exception { public void testPlayback_twoIdenticalMp3Files() throws Exception {
SimpleExoPlayer player = ExoPlayer player =
new ExoPlayer.Builder(ApplicationProvider.getApplicationContext()) new ExoPlayer.Builder(ApplicationProvider.getApplicationContext())
.setClock(new FakeClock(/* isAutoAdvancing= */ true)) .setClock(new FakeClock(/* isAutoAdvancing= */ true))
.build(); .build();
......
library/core/src/test/java/com/google/android/exoplayer2/e2etest/FlacPlaybackTest.java
...@@ -20,7 +20,6 @@ import androidx.test.core.app.ApplicationProvider; ...@@ -20,7 +20,6 @@ import androidx.test.core.app.ApplicationProvider;
import com.google.android.exoplayer2.ExoPlayer; import com.google.android.exoplayer2.ExoPlayer;
import com.google.android.exoplayer2.MediaItem; import com.google.android.exoplayer2.MediaItem;
import com.google.android.exoplayer2.Player; import com.google.android.exoplayer2.Player;
import com.google.android.exoplayer2.SimpleExoPlayer;
import com.google.android.exoplayer2.robolectric.PlaybackOutput; import com.google.android.exoplayer2.robolectric.PlaybackOutput;
import com.google.android.exoplayer2.robolectric.ShadowMediaCodecConfig; import com.google.android.exoplayer2.robolectric.ShadowMediaCodecConfig;
import com.google.android.exoplayer2.robolectric.TestPlayerRunHelper; import com.google.android.exoplayer2.robolectric.TestPlayerRunHelper;
...@@ -64,7 +63,7 @@ public class FlacPlaybackTest { ...@@ -64,7 +63,7 @@ public class FlacPlaybackTest {
Context applicationContext = ApplicationProvider.getApplicationContext(); Context applicationContext = ApplicationProvider.getApplicationContext();
CapturingRenderersFactory capturingRenderersFactory = CapturingRenderersFactory capturingRenderersFactory =
new CapturingRenderersFactory(applicationContext); new CapturingRenderersFactory(applicationContext);
SimpleExoPlayer player = ExoPlayer player =
new ExoPlayer.Builder(applicationContext, capturingRenderersFactory) new ExoPlayer.Builder(applicationContext, capturingRenderersFactory)
.setClock(new FakeClock(/* isAutoAdvancing= */ true)) .setClock(new FakeClock(/* isAutoAdvancing= */ true))
.build(); .build();
......
library/core/src/test/java/com/google/android/exoplayer2/e2etest/FlvPlaybackTest.java
...@@ -22,7 +22,6 @@ import androidx.test.core.app.ApplicationProvider; ...@@ -22,7 +22,6 @@ import androidx.test.core.app.ApplicationProvider;
import com.google.android.exoplayer2.ExoPlayer; import com.google.android.exoplayer2.ExoPlayer;
import com.google.android.exoplayer2.MediaItem; import com.google.android.exoplayer2.MediaItem;
import com.google.android.exoplayer2.Player; import com.google.android.exoplayer2.Player;
import com.google.android.exoplayer2.SimpleExoPlayer;
import com.google.android.exoplayer2.robolectric.PlaybackOutput; import com.google.android.exoplayer2.robolectric.PlaybackOutput;
import com.google.android.exoplayer2.robolectric.ShadowMediaCodecConfig; import com.google.android.exoplayer2.robolectric.ShadowMediaCodecConfig;
import com.google.android.exoplayer2.robolectric.TestPlayerRunHelper; import com.google.android.exoplayer2.robolectric.TestPlayerRunHelper;
...@@ -55,7 +54,7 @@ public final class FlvPlaybackTest { ...@@ -55,7 +54,7 @@ public final class FlvPlaybackTest {
Context applicationContext = ApplicationProvider.getApplicationContext(); Context applicationContext = ApplicationProvider.getApplicationContext();
CapturingRenderersFactory capturingRenderersFactory = CapturingRenderersFactory capturingRenderersFactory =
new CapturingRenderersFactory(applicationContext); new CapturingRenderersFactory(applicationContext);
SimpleExoPlayer player = ExoPlayer player =
new ExoPlayer.Builder(applicationContext, capturingRenderersFactory) new ExoPlayer.Builder(applicationContext, capturingRenderersFactory)
.setClock(new FakeClock(/* isAutoAdvancing= */ true)) .setClock(new FakeClock(/* isAutoAdvancing= */ true))
.build(); .build();
......
library/core/src/test/java/com/google/android/exoplayer2/e2etest/MkaPlaybackTest.java
...@@ -20,7 +20,6 @@ import androidx.test.core.app.ApplicationProvider; ...@@ -20,7 +20,6 @@ import androidx.test.core.app.ApplicationProvider;
import com.google.android.exoplayer2.ExoPlayer; import com.google.android.exoplayer2.ExoPlayer;
import com.google.android.exoplayer2.MediaItem; import com.google.android.exoplayer2.MediaItem;
import com.google.android.exoplayer2.Player; import com.google.android.exoplayer2.Player;
import com.google.android.exoplayer2.SimpleExoPlayer;
import com.google.android.exoplayer2.robolectric.PlaybackOutput; import com.google.android.exoplayer2.robolectric.PlaybackOutput;
import com.google.android.exoplayer2.robolectric.ShadowMediaCodecConfig; import com.google.android.exoplayer2.robolectric.ShadowMediaCodecConfig;
import com.google.android.exoplayer2.robolectric.TestPlayerRunHelper; import com.google.android.exoplayer2.robolectric.TestPlayerRunHelper;
...@@ -57,7 +56,7 @@ public final class MkaPlaybackTest { ...@@ -57,7 +56,7 @@ public final class MkaPlaybackTest {
Context applicationContext = ApplicationProvider.getApplicationContext(); Context applicationContext = ApplicationProvider.getApplicationContext();
CapturingRenderersFactory capturingRenderersFactory = CapturingRenderersFactory capturingRenderersFactory =
new CapturingRenderersFactory(applicationContext); new CapturingRenderersFactory(applicationContext);
SimpleExoPlayer player = ExoPlayer player =
new ExoPlayer.Builder(applicationContext, capturingRenderersFactory) new ExoPlayer.Builder(applicationContext, capturingRenderersFactory)
.setClock(new FakeClock(/* isAutoAdvancing= */ true)) .setClock(new FakeClock(/* isAutoAdvancing= */ true))
.build(); .build();
......
library/core/src/test/java/com/google/android/exoplayer2/e2etest/MkvPlaybackTest.java
...@@ -23,7 +23,6 @@ import com.google.android.exoplayer2.C; ...@@ -23,7 +23,6 @@ import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.ExoPlayer; import com.google.android.exoplayer2.ExoPlayer;
import com.google.android.exoplayer2.MediaItem; import com.google.android.exoplayer2.MediaItem;
import com.google.android.exoplayer2.Player; import com.google.android.exoplayer2.Player;
import com.google.android.exoplayer2.SimpleExoPlayer;
import com.google.android.exoplayer2.robolectric.PlaybackOutput; import com.google.android.exoplayer2.robolectric.PlaybackOutput;
import com.google.android.exoplayer2.robolectric.ShadowMediaCodecConfig; import com.google.android.exoplayer2.robolectric.ShadowMediaCodecConfig;
import com.google.android.exoplayer2.robolectric.TestPlayerRunHelper; import com.google.android.exoplayer2.robolectric.TestPlayerRunHelper;
...@@ -63,7 +62,7 @@ public final class MkvPlaybackTest { ...@@ -63,7 +62,7 @@ public final class MkvPlaybackTest {
Context applicationContext = ApplicationProvider.getApplicationContext(); Context applicationContext = ApplicationProvider.getApplicationContext();
CapturingRenderersFactory capturingRenderersFactory = CapturingRenderersFactory capturingRenderersFactory =
new CapturingRenderersFactory(applicationContext); new CapturingRenderersFactory(applicationContext);
SimpleExoPlayer player = ExoPlayer player =
new ExoPlayer.Builder(applicationContext, capturingRenderersFactory) new ExoPlayer.Builder(applicationContext, capturingRenderersFactory)
.setClock(new FakeClock(/* isAutoAdvancing= */ true)) .setClock(new FakeClock(/* isAutoAdvancing= */ true))
.build(); .build();
......
library/core/src/test/java/com/google/android/exoplayer2/e2etest/Mp3PlaybackTest.java
...@@ -20,7 +20,6 @@ import androidx.test.core.app.ApplicationProvider; ...@@ -20,7 +20,6 @@ import androidx.test.core.app.ApplicationProvider;
import com.google.android.exoplayer2.ExoPlayer; import com.google.android.exoplayer2.ExoPlayer;
import com.google.android.exoplayer2.MediaItem; import com.google.android.exoplayer2.MediaItem;
import com.google.android.exoplayer2.Player; import com.google.android.exoplayer2.Player;
import com.google.android.exoplayer2.SimpleExoPlayer;
import com.google.android.exoplayer2.robolectric.PlaybackOutput; import com.google.android.exoplayer2.robolectric.PlaybackOutput;
import com.google.android.exoplayer2.robolectric.ShadowMediaCodecConfig; import com.google.android.exoplayer2.robolectric.ShadowMediaCodecConfig;
import com.google.android.exoplayer2.robolectric.TestPlayerRunHelper; import com.google.android.exoplayer2.robolectric.TestPlayerRunHelper;
...@@ -60,7 +59,7 @@ public final class Mp3PlaybackTest { ...@@ -60,7 +59,7 @@ public final class Mp3PlaybackTest {
Context applicationContext = ApplicationProvider.getApplicationContext(); Context applicationContext = ApplicationProvider.getApplicationContext();
CapturingRenderersFactory capturingRenderersFactory = CapturingRenderersFactory capturingRenderersFactory =
new CapturingRenderersFactory(applicationContext); new CapturingRenderersFactory(applicationContext);
SimpleExoPlayer player = ExoPlayer player =
new ExoPlayer.Builder(applicationContext, capturingRenderersFactory) new ExoPlayer.Builder(applicationContext, capturingRenderersFactory)
.setClock(new FakeClock(/* isAutoAdvancing= */ true)) .setClock(new FakeClock(/* isAutoAdvancing= */ true))
.build(); .build();
......
library/core/src/test/java/com/google/android/exoplayer2/e2etest/Mp4PlaybackTest.java
...@@ -22,7 +22,6 @@ import androidx.test.core.app.ApplicationProvider; ...@@ -22,7 +22,6 @@ import androidx.test.core.app.ApplicationProvider;
import com.google.android.exoplayer2.ExoPlayer; import com.google.android.exoplayer2.ExoPlayer;
import com.google.android.exoplayer2.MediaItem; import com.google.android.exoplayer2.MediaItem;
import com.google.android.exoplayer2.Player; import com.google.android.exoplayer2.Player;
import com.google.android.exoplayer2.SimpleExoPlayer;
import com.google.android.exoplayer2.robolectric.PlaybackOutput; import com.google.android.exoplayer2.robolectric.PlaybackOutput;
import com.google.android.exoplayer2.robolectric.ShadowMediaCodecConfig; import com.google.android.exoplayer2.robolectric.ShadowMediaCodecConfig;
import com.google.android.exoplayer2.robolectric.TestPlayerRunHelper; import com.google.android.exoplayer2.robolectric.TestPlayerRunHelper;
...@@ -77,7 +76,7 @@ public class Mp4PlaybackTest { ...@@ -77,7 +76,7 @@ public class Mp4PlaybackTest {
public void test() throws Exception { public void test() throws Exception {
Context applicationContext = ApplicationProvider.getApplicationContext(); Context applicationContext = ApplicationProvider.getApplicationContext();
CapturingRenderersFactory renderersFactory = new CapturingRenderersFactory(applicationContext); CapturingRenderersFactory renderersFactory = new CapturingRenderersFactory(applicationContext);
SimpleExoPlayer player = ExoPlayer player =
new ExoPlayer.Builder(applicationContext, renderersFactory) new ExoPlayer.Builder(applicationContext, renderersFactory)
.setClock(new FakeClock(/* isAutoAdvancing= */ true)) .setClock(new FakeClock(/* isAutoAdvancing= */ true))
.build(); .build();
......
library/core/src/test/java/com/google/android/exoplayer2/e2etest/OggPlaybackTest.java
...@@ -20,7 +20,6 @@ import androidx.test.core.app.ApplicationProvider; ...@@ -20,7 +20,6 @@ import androidx.test.core.app.ApplicationProvider;
import com.google.android.exoplayer2.ExoPlayer; import com.google.android.exoplayer2.ExoPlayer;
import com.google.android.exoplayer2.MediaItem; import com.google.android.exoplayer2.MediaItem;
import com.google.android.exoplayer2.Player; import com.google.android.exoplayer2.Player;
import com.google.android.exoplayer2.SimpleExoPlayer;
import com.google.android.exoplayer2.robolectric.PlaybackOutput; import com.google.android.exoplayer2.robolectric.PlaybackOutput;
import com.google.android.exoplayer2.robolectric.ShadowMediaCodecConfig; import com.google.android.exoplayer2.robolectric.ShadowMediaCodecConfig;
import com.google.android.exoplayer2.robolectric.TestPlayerRunHelper; import com.google.android.exoplayer2.robolectric.TestPlayerRunHelper;
...@@ -58,7 +57,7 @@ public final class OggPlaybackTest { ...@@ -58,7 +57,7 @@ public final class OggPlaybackTest {
Context applicationContext = ApplicationProvider.getApplicationContext(); Context applicationContext = ApplicationProvider.getApplicationContext();
CapturingRenderersFactory capturingRenderersFactory = CapturingRenderersFactory capturingRenderersFactory =
new CapturingRenderersFactory(applicationContext); new CapturingRenderersFactory(applicationContext);
SimpleExoPlayer player = ExoPlayer player =
new ExoPlayer.Builder(applicationContext, capturingRenderersFactory) new ExoPlayer.Builder(applicationContext, capturingRenderersFactory)
.setClock(new FakeClock(/* isAutoAdvancing= */ true)) .setClock(new FakeClock(/* isAutoAdvancing= */ true))
.build(); .build();
......
library/core/src/test/java/com/google/android/exoplayer2/e2etest/PlaylistPlaybackTest.java
...@@ -21,7 +21,6 @@ import androidx.test.ext.junit.runners.AndroidJUnit4; ...@@ -21,7 +21,6 @@ import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.google.android.exoplayer2.ExoPlayer; import com.google.android.exoplayer2.ExoPlayer;
import com.google.android.exoplayer2.MediaItem; import com.google.android.exoplayer2.MediaItem;
import com.google.android.exoplayer2.Player; import com.google.android.exoplayer2.Player;
import com.google.android.exoplayer2.SimpleExoPlayer;
import com.google.android.exoplayer2.robolectric.PlaybackOutput; import com.google.android.exoplayer2.robolectric.PlaybackOutput;
import com.google.android.exoplayer2.robolectric.ShadowMediaCodecConfig; import com.google.android.exoplayer2.robolectric.ShadowMediaCodecConfig;
import com.google.android.exoplayer2.robolectric.TestPlayerRunHelper; import com.google.android.exoplayer2.robolectric.TestPlayerRunHelper;
...@@ -45,7 +44,7 @@ public final class PlaylistPlaybackTest { ...@@ -45,7 +44,7 @@ public final class PlaylistPlaybackTest {
Context applicationContext = ApplicationProvider.getApplicationContext(); Context applicationContext = ApplicationProvider.getApplicationContext();
CapturingRenderersFactory capturingRenderersFactory = CapturingRenderersFactory capturingRenderersFactory =
new CapturingRenderersFactory(applicationContext); new CapturingRenderersFactory(applicationContext);
SimpleExoPlayer player = ExoPlayer player =
new ExoPlayer.Builder(applicationContext, capturingRenderersFactory) new ExoPlayer.Builder(applicationContext, capturingRenderersFactory)
.setClock(new FakeClock(/* isAutoAdvancing= */ true)) .setClock(new FakeClock(/* isAutoAdvancing= */ true))
.build(); .build();
...@@ -67,7 +66,7 @@ public final class PlaylistPlaybackTest { ...@@ -67,7 +66,7 @@ public final class PlaylistPlaybackTest {
Context applicationContext = ApplicationProvider.getApplicationContext(); Context applicationContext = ApplicationProvider.getApplicationContext();
CapturingRenderersFactory capturingRenderersFactory = CapturingRenderersFactory capturingRenderersFactory =
new CapturingRenderersFactory(applicationContext); new CapturingRenderersFactory(applicationContext);
SimpleExoPlayer player = ExoPlayer player =
new ExoPlayer.Builder(applicationContext, capturingRenderersFactory) new ExoPlayer.Builder(applicationContext, capturingRenderersFactory)
.setClock(new FakeClock(/* isAutoAdvancing= */ true)) .setClock(new FakeClock(/* isAutoAdvancing= */ true))
.build(); .build();
......
library/core/src/test/java/com/google/android/exoplayer2/e2etest/SilencePlaybackTest.java
...@@ -20,7 +20,6 @@ import androidx.test.core.app.ApplicationProvider; ...@@ -20,7 +20,6 @@ import androidx.test.core.app.ApplicationProvider;
import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.google.android.exoplayer2.ExoPlayer; import com.google.android.exoplayer2.ExoPlayer;
import com.google.android.exoplayer2.Player; import com.google.android.exoplayer2.Player;
import com.google.android.exoplayer2.SimpleExoPlayer;
import com.google.android.exoplayer2.robolectric.PlaybackOutput; import com.google.android.exoplayer2.robolectric.PlaybackOutput;
import com.google.android.exoplayer2.robolectric.ShadowMediaCodecConfig; import com.google.android.exoplayer2.robolectric.ShadowMediaCodecConfig;
import com.google.android.exoplayer2.robolectric.TestPlayerRunHelper; import com.google.android.exoplayer2.robolectric.TestPlayerRunHelper;
...@@ -45,7 +44,7 @@ public final class SilencePlaybackTest { ...@@ -45,7 +44,7 @@ public final class SilencePlaybackTest {
Context applicationContext = ApplicationProvider.getApplicationContext(); Context applicationContext = ApplicationProvider.getApplicationContext();
CapturingRenderersFactory capturingRenderersFactory = CapturingRenderersFactory capturingRenderersFactory =
new CapturingRenderersFactory(applicationContext); new CapturingRenderersFactory(applicationContext);
SimpleExoPlayer player = ExoPlayer player =
new ExoPlayer.Builder(applicationContext, capturingRenderersFactory) new ExoPlayer.Builder(applicationContext, capturingRenderersFactory)
.setClock(new FakeClock(/* isAutoAdvancing= */ true)) .setClock(new FakeClock(/* isAutoAdvancing= */ true))
.build(); .build();
...@@ -66,7 +65,7 @@ public final class SilencePlaybackTest { ...@@ -66,7 +65,7 @@ public final class SilencePlaybackTest {
Context applicationContext = ApplicationProvider.getApplicationContext(); Context applicationContext = ApplicationProvider.getApplicationContext();
CapturingRenderersFactory capturingRenderersFactory = CapturingRenderersFactory capturingRenderersFactory =
new CapturingRenderersFactory(applicationContext); new CapturingRenderersFactory(applicationContext);
SimpleExoPlayer player = ExoPlayer player =
new ExoPlayer.Builder(applicationContext, capturingRenderersFactory) new ExoPlayer.Builder(applicationContext, capturingRenderersFactory)
.setClock(new FakeClock(/* isAutoAdvancing= */ true)) .setClock(new FakeClock(/* isAutoAdvancing= */ true))
.build(); .build();
......
library/core/src/test/java/com/google/android/exoplayer2/e2etest/TsPlaybackTest.java
...@@ -22,7 +22,6 @@ import androidx.test.core.app.ApplicationProvider; ...@@ -22,7 +22,6 @@ import androidx.test.core.app.ApplicationProvider;
import com.google.android.exoplayer2.ExoPlayer; import com.google.android.exoplayer2.ExoPlayer;
import com.google.android.exoplayer2.MediaItem; import com.google.android.exoplayer2.MediaItem;
import com.google.android.exoplayer2.Player; import com.google.android.exoplayer2.Player;
import com.google.android.exoplayer2.SimpleExoPlayer;
import com.google.android.exoplayer2.robolectric.PlaybackOutput; import com.google.android.exoplayer2.robolectric.PlaybackOutput;
import com.google.android.exoplayer2.robolectric.ShadowMediaCodecConfig; import com.google.android.exoplayer2.robolectric.ShadowMediaCodecConfig;
import com.google.android.exoplayer2.robolectric.TestPlayerRunHelper; import com.google.android.exoplayer2.robolectric.TestPlayerRunHelper;
...@@ -81,7 +80,7 @@ public class TsPlaybackTest { ...@@ -81,7 +80,7 @@ public class TsPlaybackTest {
Context applicationContext = ApplicationProvider.getApplicationContext(); Context applicationContext = ApplicationProvider.getApplicationContext();
CapturingRenderersFactory capturingRenderersFactory = CapturingRenderersFactory capturingRenderersFactory =
new CapturingRenderersFactory(applicationContext); new CapturingRenderersFactory(applicationContext);
SimpleExoPlayer player = ExoPlayer player =
new ExoPlayer.Builder(applicationContext, capturingRenderersFactory) new ExoPlayer.Builder(applicationContext, capturingRenderersFactory)
.setClock(new FakeClock(/* isAutoAdvancing= */ true)) .setClock(new FakeClock(/* isAutoAdvancing= */ true))
.build(); .build();
......
library/core/src/test/java/com/google/android/exoplayer2/e2etest/Vp9PlaybackTest.java
...@@ -22,7 +22,6 @@ import androidx.test.core.app.ApplicationProvider; ...@@ -22,7 +22,6 @@ import androidx.test.core.app.ApplicationProvider;
import com.google.android.exoplayer2.ExoPlayer; import com.google.android.exoplayer2.ExoPlayer;
import com.google.android.exoplayer2.MediaItem; import com.google.android.exoplayer2.MediaItem;
import com.google.android.exoplayer2.Player; import com.google.android.exoplayer2.Player;
import com.google.android.exoplayer2.SimpleExoPlayer;
import com.google.android.exoplayer2.robolectric.PlaybackOutput; import com.google.android.exoplayer2.robolectric.PlaybackOutput;
import com.google.android.exoplayer2.robolectric.ShadowMediaCodecConfig; import com.google.android.exoplayer2.robolectric.ShadowMediaCodecConfig;
import com.google.android.exoplayer2.robolectric.TestPlayerRunHelper; import com.google.android.exoplayer2.robolectric.TestPlayerRunHelper;
...@@ -59,7 +58,7 @@ public final class Vp9PlaybackTest { ...@@ -59,7 +58,7 @@ public final class Vp9PlaybackTest {
Context applicationContext = ApplicationProvider.getApplicationContext(); Context applicationContext = ApplicationProvider.getApplicationContext();
CapturingRenderersFactory capturingRenderersFactory = CapturingRenderersFactory capturingRenderersFactory =
new CapturingRenderersFactory(applicationContext); new CapturingRenderersFactory(applicationContext);
SimpleExoPlayer player = ExoPlayer player =
new ExoPlayer.Builder(applicationContext, capturingRenderersFactory) new ExoPlayer.Builder(applicationContext, capturingRenderersFactory)
.setClock(new FakeClock(/* isAutoAdvancing= */ true)) .setClock(new FakeClock(/* isAutoAdvancing= */ true))
.build(); .build();
......
library/core/src/test/java/com/google/android/exoplayer2/e2etest/WavPlaybackTest.java
...@@ -20,7 +20,6 @@ import androidx.test.core.app.ApplicationProvider; ...@@ -20,7 +20,6 @@ import androidx.test.core.app.ApplicationProvider;
import com.google.android.exoplayer2.ExoPlayer; import com.google.android.exoplayer2.ExoPlayer;
import com.google.android.exoplayer2.MediaItem; import com.google.android.exoplayer2.MediaItem;
import com.google.android.exoplayer2.Player; import com.google.android.exoplayer2.Player;
import com.google.android.exoplayer2.SimpleExoPlayer;
import com.google.android.exoplayer2.robolectric.PlaybackOutput; import com.google.android.exoplayer2.robolectric.PlaybackOutput;
import com.google.android.exoplayer2.robolectric.ShadowMediaCodecConfig; import com.google.android.exoplayer2.robolectric.ShadowMediaCodecConfig;
import com.google.android.exoplayer2.robolectric.TestPlayerRunHelper; import com.google.android.exoplayer2.robolectric.TestPlayerRunHelper;
...@@ -52,7 +51,7 @@ public final class WavPlaybackTest { ...@@ -52,7 +51,7 @@ public final class WavPlaybackTest {
Context applicationContext = ApplicationProvider.getApplicationContext(); Context applicationContext = ApplicationProvider.getApplicationContext();
CapturingRenderersFactory capturingRenderersFactory = CapturingRenderersFactory capturingRenderersFactory =
new CapturingRenderersFactory(applicationContext); new CapturingRenderersFactory(applicationContext);
SimpleExoPlayer player = ExoPlayer player =
new ExoPlayer.Builder(applicationContext, capturingRenderersFactory) new ExoPlayer.Builder(applicationContext, capturingRenderersFactory)
.setClock(new FakeClock(/* isAutoAdvancing= */ true)) .setClock(new FakeClock(/* isAutoAdvancing= */ true))
.build(); .build();
......
library/core/src/test/java/com/google/android/exoplayer2/source/ads/ServerSideInsertedAdMediaSourceTest.java
...@@ -38,7 +38,6 @@ import androidx.test.ext.junit.runners.AndroidJUnit4; ...@@ -38,7 +38,6 @@ import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.google.android.exoplayer2.ExoPlayer; import com.google.android.exoplayer2.ExoPlayer;
import com.google.android.exoplayer2.MediaItem; import com.google.android.exoplayer2.MediaItem;
import com.google.android.exoplayer2.Player; import com.google.android.exoplayer2.Player;
import com.google.android.exoplayer2.SimpleExoPlayer;
import com.google.android.exoplayer2.Timeline; import com.google.android.exoplayer2.Timeline;
import com.google.android.exoplayer2.analytics.AnalyticsListener; import com.google.android.exoplayer2.analytics.AnalyticsListener;
import com.google.android.exoplayer2.robolectric.PlaybackOutput; import com.google.android.exoplayer2.robolectric.PlaybackOutput;
...@@ -143,7 +142,7 @@ public final class ServerSideInsertedAdMediaSourceTest { ...@@ -143,7 +142,7 @@ public final class ServerSideInsertedAdMediaSourceTest {
public void playbackWithPredefinedAds_playsSuccessfulWithoutRendererResets() throws Exception { public void playbackWithPredefinedAds_playsSuccessfulWithoutRendererResets() throws Exception {
Context context = ApplicationProvider.getApplicationContext(); Context context = ApplicationProvider.getApplicationContext();
CapturingRenderersFactory renderersFactory = new CapturingRenderersFactory(context); CapturingRenderersFactory renderersFactory = new CapturingRenderersFactory(context);
SimpleExoPlayer player = ExoPlayer player =
new ExoPlayer.Builder(context, renderersFactory) new ExoPlayer.Builder(context, renderersFactory)
.setClock(new FakeClock(/* isAutoAdvancing= */ true)) .setClock(new FakeClock(/* isAutoAdvancing= */ true))
.build(); .build();
...@@ -202,7 +201,7 @@ public final class ServerSideInsertedAdMediaSourceTest { ...@@ -202,7 +201,7 @@ public final class ServerSideInsertedAdMediaSourceTest {
public void playbackWithNewlyInsertedAds_playsSuccessfulWithoutRendererResets() throws Exception { public void playbackWithNewlyInsertedAds_playsSuccessfulWithoutRendererResets() throws Exception {
Context context = ApplicationProvider.getApplicationContext(); Context context = ApplicationProvider.getApplicationContext();
CapturingRenderersFactory renderersFactory = new CapturingRenderersFactory(context); CapturingRenderersFactory renderersFactory = new CapturingRenderersFactory(context);
SimpleExoPlayer player = ExoPlayer player =
new ExoPlayer.Builder(context, renderersFactory) new ExoPlayer.Builder(context, renderersFactory)
.setClock(new FakeClock(/* isAutoAdvancing= */ true)) .setClock(new FakeClock(/* isAutoAdvancing= */ true))
.build(); .build();
...@@ -262,7 +261,7 @@ public final class ServerSideInsertedAdMediaSourceTest { ...@@ -262,7 +261,7 @@ public final class ServerSideInsertedAdMediaSourceTest {
throws Exception { throws Exception {
Context context = ApplicationProvider.getApplicationContext(); Context context = ApplicationProvider.getApplicationContext();
CapturingRenderersFactory renderersFactory = new CapturingRenderersFactory(context); CapturingRenderersFactory renderersFactory = new CapturingRenderersFactory(context);
SimpleExoPlayer player = ExoPlayer player =
new ExoPlayer.Builder(context, renderersFactory) new ExoPlayer.Builder(context, renderersFactory)
.setClock(new FakeClock(/* isAutoAdvancing= */ true)) .setClock(new FakeClock(/* isAutoAdvancing= */ true))
.build(); .build();
...@@ -319,7 +318,7 @@ public final class ServerSideInsertedAdMediaSourceTest { ...@@ -319,7 +318,7 @@ public final class ServerSideInsertedAdMediaSourceTest {
@Test @Test
public void playbackWithSeek_isHandledCorrectly() throws Exception { public void playbackWithSeek_isHandledCorrectly() throws Exception {
Context context = ApplicationProvider.getApplicationContext(); Context context = ApplicationProvider.getApplicationContext();
SimpleExoPlayer player = ExoPlayer player =
new ExoPlayer.Builder(context).setClock(new FakeClock(/* isAutoAdvancing= */ true)).build(); new ExoPlayer.Builder(context).setClock(new FakeClock(/* isAutoAdvancing= */ true)).build();
player.setVideoSurface(new Surface(new SurfaceTexture(/* texName= */ 1))); player.setVideoSurface(new Surface(new SurfaceTexture(/* texName= */ 1)));
......
library/dash/src/test/java/com/google/android/exoplayer2/source/dash/e2etest/DashPlaybackTest.java
...@@ -25,7 +25,6 @@ import androidx.test.ext.junit.runners.AndroidJUnit4; ...@@ -25,7 +25,6 @@ import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.google.android.exoplayer2.ExoPlayer; import com.google.android.exoplayer2.ExoPlayer;
import com.google.android.exoplayer2.MediaItem; import com.google.android.exoplayer2.MediaItem;
import com.google.android.exoplayer2.Player; import com.google.android.exoplayer2.Player;
import com.google.android.exoplayer2.SimpleExoPlayer;
import com.google.android.exoplayer2.robolectric.PlaybackOutput; import com.google.android.exoplayer2.robolectric.PlaybackOutput;
import com.google.android.exoplayer2.robolectric.ShadowMediaCodecConfig; import com.google.android.exoplayer2.robolectric.ShadowMediaCodecConfig;
import com.google.android.exoplayer2.robolectric.TestPlayerRunHelper; import com.google.android.exoplayer2.robolectric.TestPlayerRunHelper;
...@@ -54,7 +53,7 @@ public final class DashPlaybackTest { ...@@ -54,7 +53,7 @@ public final class DashPlaybackTest {
Context applicationContext = ApplicationProvider.getApplicationContext(); Context applicationContext = ApplicationProvider.getApplicationContext();
CapturingRenderersFactory capturingRenderersFactory = CapturingRenderersFactory capturingRenderersFactory =
new CapturingRenderersFactory(applicationContext); new CapturingRenderersFactory(applicationContext);
SimpleExoPlayer player = ExoPlayer player =
new ExoPlayer.Builder(applicationContext, capturingRenderersFactory) new ExoPlayer.Builder(applicationContext, capturingRenderersFactory)
.setClock(new FakeClock(/* isAutoAdvancing= */ true)) .setClock(new FakeClock(/* isAutoAdvancing= */ true))
.build(); .build();
...@@ -81,7 +80,7 @@ public final class DashPlaybackTest { ...@@ -81,7 +80,7 @@ public final class DashPlaybackTest {
Context applicationContext = ApplicationProvider.getApplicationContext(); Context applicationContext = ApplicationProvider.getApplicationContext();
CapturingRenderersFactory capturingRenderersFactory = CapturingRenderersFactory capturingRenderersFactory =
new CapturingRenderersFactory(applicationContext); new CapturingRenderersFactory(applicationContext);
SimpleExoPlayer player = ExoPlayer player =
new ExoPlayer.Builder(applicationContext, capturingRenderersFactory) new ExoPlayer.Builder(applicationContext, capturingRenderersFactory)
.setClock(new FakeClock(/* isAutoAdvancing= */ true)) .setClock(new FakeClock(/* isAutoAdvancing= */ true))
.build(); .build();
......
library/rtsp/src/test/java/com/google/android/exoplayer2/source/rtsp/RtspPlaybackTest.java
...@@ -30,7 +30,6 @@ import com.google.android.exoplayer2.MediaItem; ...@@ -30,7 +30,6 @@ import com.google.android.exoplayer2.MediaItem;
import com.google.android.exoplayer2.PlaybackException; import com.google.android.exoplayer2.PlaybackException;
import com.google.android.exoplayer2.Player; import com.google.android.exoplayer2.Player;
import com.google.android.exoplayer2.Player.Listener; import com.google.android.exoplayer2.Player.Listener;
import com.google.android.exoplayer2.SimpleExoPlayer;
import com.google.android.exoplayer2.robolectric.PlaybackOutput; import com.google.android.exoplayer2.robolectric.PlaybackOutput;
import com.google.android.exoplayer2.robolectric.RobolectricUtil; import com.google.android.exoplayer2.robolectric.RobolectricUtil;
import com.google.android.exoplayer2.robolectric.ShadowMediaCodecConfig; import com.google.android.exoplayer2.robolectric.ShadowMediaCodecConfig;
...@@ -103,8 +102,7 @@ public final class RtspPlaybackTest { ...@@ -103,8 +102,7 @@ public final class RtspPlaybackTest {
fakeRtpDataChannel); fakeRtpDataChannel);
try (RtspServer rtspServer = new RtspServer(responseProvider)) { try (RtspServer rtspServer = new RtspServer(responseProvider)) {
SimpleExoPlayer player = ExoPlayer player = createExoPlayer(rtspServer.startAndGetPortNumber(), rtpDataChannelFactory);
createSimpleExoPlayer(rtspServer.startAndGetPortNumber(), rtpDataChannelFactory);
PlaybackOutput playbackOutput = PlaybackOutput.register(player, capturingRenderersFactory); PlaybackOutput playbackOutput = PlaybackOutput.register(player, capturingRenderersFactory);
player.prepare(); player.prepare();
...@@ -126,8 +124,7 @@ public final class RtspPlaybackTest { ...@@ -126,8 +124,7 @@ public final class RtspPlaybackTest {
new RtspServer( new RtspServer(
new ResponseProvider( new ResponseProvider(
clock, ImmutableList.of(mp4aLatmRtpPacketStreamDump), fakeRtpDataChannel))) { clock, ImmutableList.of(mp4aLatmRtpPacketStreamDump), fakeRtpDataChannel))) {
SimpleExoPlayer player = ExoPlayer player = createExoPlayer(rtspServer.startAndGetPortNumber(), rtpDataChannelFactory);
createSimpleExoPlayer(rtspServer.startAndGetPortNumber(), rtpDataChannelFactory);
AtomicReference<Throwable> playbackError = new AtomicReference<>(); AtomicReference<Throwable> playbackError = new AtomicReference<>();
player.prepare(); player.prepare();
...@@ -148,9 +145,9 @@ public final class RtspPlaybackTest { ...@@ -148,9 +145,9 @@ public final class RtspPlaybackTest {
} }
} }
private SimpleExoPlayer createSimpleExoPlayer( private ExoPlayer createExoPlayer(
int serverRtspPortNumber, RtpDataChannel.Factory rtpDataChannelFactory) { int serverRtspPortNumber, RtpDataChannel.Factory rtpDataChannelFactory) {
SimpleExoPlayer player = ExoPlayer player =
new ExoPlayer.Builder(applicationContext, capturingRenderersFactory) new ExoPlayer.Builder(applicationContext, capturingRenderersFactory)
.setClock(clock) .setClock(clock)
.build(); .build();
......
library/transformer/src/main/java/com/google/android/exoplayer2/transformer/TranscodingTransformer.java
...@@ -44,7 +44,6 @@ import com.google.android.exoplayer2.PlaybackException; ...@@ -44,7 +44,6 @@ import com.google.android.exoplayer2.PlaybackException;
import com.google.android.exoplayer2.Player; import com.google.android.exoplayer2.Player;
import com.google.android.exoplayer2.Renderer; import com.google.android.exoplayer2.Renderer;
import com.google.android.exoplayer2.RenderersFactory; import com.google.android.exoplayer2.RenderersFactory;
import com.google.android.exoplayer2.SimpleExoPlayer;
import com.google.android.exoplayer2.Timeline; import com.google.android.exoplayer2.Timeline;
import com.google.android.exoplayer2.TracksInfo; import com.google.android.exoplayer2.TracksInfo;
import com.google.android.exoplayer2.analytics.AnalyticsListener; import com.google.android.exoplayer2.analytics.AnalyticsListener;
...@@ -366,7 +365,7 @@ public final class TranscodingTransformer { ...@@ -366,7 +365,7 @@ public final class TranscodingTransformer {
private TranscodingTransformer.Listener listener; private TranscodingTransformer.Listener listener;
@Nullable private MuxerWrapper muxerWrapper; @Nullable private MuxerWrapper muxerWrapper;
@Nullable private SimpleExoPlayer player; @Nullable private ExoPlayer player;
@ProgressState private int progressState; @ProgressState private int progressState;
private TranscodingTransformer( private TranscodingTransformer(
......
library/transformer/src/main/java/com/google/android/exoplayer2/transformer/Transformer.java
...@@ -44,7 +44,6 @@ import com.google.android.exoplayer2.PlaybackException; ...@@ -44,7 +44,6 @@ import com.google.android.exoplayer2.PlaybackException;
import com.google.android.exoplayer2.Player; import com.google.android.exoplayer2.Player;
import com.google.android.exoplayer2.Renderer; import com.google.android.exoplayer2.Renderer;
import com.google.android.exoplayer2.RenderersFactory; import com.google.android.exoplayer2.RenderersFactory;
import com.google.android.exoplayer2.SimpleExoPlayer;
import com.google.android.exoplayer2.Timeline; import com.google.android.exoplayer2.Timeline;
import com.google.android.exoplayer2.TracksInfo; import com.google.android.exoplayer2.TracksInfo;
import com.google.android.exoplayer2.analytics.AnalyticsListener; import com.google.android.exoplayer2.analytics.AnalyticsListener;
...@@ -363,7 +362,7 @@ public final class Transformer { ...@@ -363,7 +362,7 @@ public final class Transformer {
private Transformer.Listener listener; private Transformer.Listener listener;
@Nullable private MuxerWrapper muxerWrapper; @Nullable private MuxerWrapper muxerWrapper;
@Nullable private SimpleExoPlayer player; @Nullable private ExoPlayer player;
@ProgressState private int progressState; @ProgressState private int progressState;
private Transformer( private Transformer(
......
playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/DashTestRunner.java
...@@ -29,7 +29,6 @@ import com.google.android.exoplayer2.ExoPlayer; ...@@ -29,7 +29,6 @@ import com.google.android.exoplayer2.ExoPlayer;
import com.google.android.exoplayer2.Format; import com.google.android.exoplayer2.Format;
import com.google.android.exoplayer2.MediaItem; import com.google.android.exoplayer2.MediaItem;
import com.google.android.exoplayer2.RendererCapabilities; import com.google.android.exoplayer2.RendererCapabilities;
import com.google.android.exoplayer2.SimpleExoPlayer;
import com.google.android.exoplayer2.decoder.DecoderCounters; import com.google.android.exoplayer2.decoder.DecoderCounters;
import com.google.android.exoplayer2.drm.DefaultDrmSessionManager; import com.google.android.exoplayer2.drm.DefaultDrmSessionManager;
import com.google.android.exoplayer2.drm.DrmSessionManager; import com.google.android.exoplayer2.drm.DrmSessionManager;
...@@ -312,9 +311,9 @@ import java.util.List; ...@@ -312,9 +311,9 @@ import java.util.List;
} }
@Override @Override
protected SimpleExoPlayer buildExoPlayer( protected ExoPlayer buildExoPlayer(
HostActivity host, Surface surface, MappingTrackSelector trackSelector) { HostActivity host, Surface surface, MappingTrackSelector trackSelector) {
SimpleExoPlayer player = ExoPlayer player =
new ExoPlayer.Builder(host, new DebugRenderersFactory(host)) new ExoPlayer.Builder(host, new DebugRenderersFactory(host))
.setTrackSelector(trackSelector) .setTrackSelector(trackSelector)
.build(); .build();
......
robolectricutils/src/main/java/com/google/android/exoplayer2/robolectric/TestPlayerRunHelper.java
...@@ -23,7 +23,6 @@ import android.os.Looper; ...@@ -23,7 +23,6 @@ import android.os.Looper;
import com.google.android.exoplayer2.ExoPlaybackException; import com.google.android.exoplayer2.ExoPlaybackException;
import com.google.android.exoplayer2.ExoPlayer; import com.google.android.exoplayer2.ExoPlayer;
import com.google.android.exoplayer2.Player; import com.google.android.exoplayer2.Player;
import com.google.android.exoplayer2.SimpleExoPlayer;
import com.google.android.exoplayer2.Timeline; import com.google.android.exoplayer2.Timeline;
import com.google.android.exoplayer2.util.ConditionVariable; import com.google.android.exoplayer2.util.ConditionVariable;
import com.google.android.exoplayer2.util.Util; import com.google.android.exoplayer2.util.Util;
...@@ -33,8 +32,8 @@ import java.util.concurrent.atomic.AtomicReference; ...@@ -33,8 +32,8 @@ import java.util.concurrent.atomic.AtomicReference;
import org.checkerframework.checker.nullness.compatqual.NullableType; import org.checkerframework.checker.nullness.compatqual.NullableType;
/** /**
* Helper methods to block the calling thread until the provided {@link SimpleExoPlayer} instance * Helper methods to block the calling thread until the provided {@link ExoPlayer} instance reaches
* reaches a particular state. * a particular state.
*/ */
public class TestPlayerRunHelper { public class TestPlayerRunHelper {
...@@ -260,7 +259,7 @@ public class TestPlayerRunHelper { ...@@ -260,7 +259,7 @@ public class TestPlayerRunHelper {
* @throws TimeoutException If the {@link RobolectricUtil#DEFAULT_TIMEOUT_MS default timeout} is * @throws TimeoutException If the {@link RobolectricUtil#DEFAULT_TIMEOUT_MS default timeout} is
* exceeded. * exceeded.
*/ */
public static void runUntilRenderedFirstFrame(SimpleExoPlayer player) throws TimeoutException { public static void runUntilRenderedFirstFrame(ExoPlayer player) throws TimeoutException {
verifyMainTestThread(player); verifyMainTestThread(player);
AtomicBoolean receivedCallback = new AtomicBoolean(false); AtomicBoolean receivedCallback = new AtomicBoolean(false);
Player.Listener listener = Player.Listener listener =
......
testutils/src/main/java/com/google/android/exoplayer2/testutil/ActionSchedule.java
...@@ -20,12 +20,12 @@ import android.view.Surface; ...@@ -20,12 +20,12 @@ import android.view.Surface;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.ExoPlaybackException; import com.google.android.exoplayer2.ExoPlaybackException;
import com.google.android.exoplayer2.ExoPlayer;
import com.google.android.exoplayer2.PlaybackParameters; import com.google.android.exoplayer2.PlaybackParameters;
import com.google.android.exoplayer2.Player; import com.google.android.exoplayer2.Player;
import com.google.android.exoplayer2.PlayerMessage; import com.google.android.exoplayer2.PlayerMessage;
import com.google.android.exoplayer2.PlayerMessage.Target; import com.google.android.exoplayer2.PlayerMessage.Target;
import com.google.android.exoplayer2.Renderer; import com.google.android.exoplayer2.Renderer;
import com.google.android.exoplayer2.SimpleExoPlayer;
import com.google.android.exoplayer2.Timeline; import com.google.android.exoplayer2.Timeline;
import com.google.android.exoplayer2.audio.AudioAttributes; import com.google.android.exoplayer2.audio.AudioAttributes;
import com.google.android.exoplayer2.source.MediaSource; import com.google.android.exoplayer2.source.MediaSource;
...@@ -91,7 +91,7 @@ public final class ActionSchedule { ...@@ -91,7 +91,7 @@ public final class ActionSchedule {
* notification is needed. * notification is needed.
*/ */
/* package */ void start( /* package */ void start(
SimpleExoPlayer player, ExoPlayer player,
DefaultTrackSelector trackSelector, DefaultTrackSelector trackSelector,
@Nullable Surface surface, @Nullable Surface surface,
HandlerWrapper mainHandler, HandlerWrapper mainHandler,
...@@ -601,7 +601,7 @@ public final class ActionSchedule { ...@@ -601,7 +601,7 @@ public final class ActionSchedule {
void onMessageArrived(); void onMessageArrived();
} }
@Nullable private SimpleExoPlayer player; @Nullable private ExoPlayer player;
private boolean hasArrived; private boolean hasArrived;
@Nullable private Callback callback; @Nullable private Callback callback;
...@@ -613,8 +613,7 @@ public final class ActionSchedule { ...@@ -613,8 +613,7 @@ public final class ActionSchedule {
} }
/** Handles the message send to the component and additionally provides access to the player. */ /** Handles the message send to the component and additionally provides access to the player. */
public abstract void handleMessage( public abstract void handleMessage(ExoPlayer player, int messageType, @Nullable Object message);
SimpleExoPlayer player, int messageType, @Nullable Object message);
@Override @Override
public final void handleMessage( public final void handleMessage(
...@@ -626,8 +625,8 @@ public final class ActionSchedule { ...@@ -626,8 +625,8 @@ public final class ActionSchedule {
} }
} }
/** Sets the player to be passed to {@link #handleMessage(SimpleExoPlayer, int, Object)}. */ /** Sets the player to be passed to {@link #handleMessage(ExoPlayer, int, Object)}. */
/* package */ void setPlayer(SimpleExoPlayer player) { /* package */ void setPlayer(ExoPlayer player) {
this.player = player; this.player = player;
} }
} }
...@@ -638,18 +637,18 @@ public final class ActionSchedule { ...@@ -638,18 +637,18 @@ public final class ActionSchedule {
*/ */
public abstract static class PlayerRunnable implements Runnable { public abstract static class PlayerRunnable implements Runnable {
@Nullable private SimpleExoPlayer player; @Nullable private ExoPlayer player;
/** Executes Runnable with reference to player. */ /** Executes Runnable with reference to player. */
public abstract void run(SimpleExoPlayer player); public abstract void run(ExoPlayer player);
@Override @Override
public final void run() { public final void run() {
run(Assertions.checkStateNotNull(player)); run(Assertions.checkStateNotNull(player));
} }
/** Sets the player to be passed to {@link #run(SimpleExoPlayer)} . */ /** Sets the player to be passed to {@link #run(ExoPlayer)} . */
/* package */ void setPlayer(SimpleExoPlayer player) { /* package */ void setPlayer(ExoPlayer player) {
this.player = player; this.player = player;
} }
} }
...@@ -663,7 +662,7 @@ public final class ActionSchedule { ...@@ -663,7 +662,7 @@ public final class ActionSchedule {
@Nullable private ActionNode next; @Nullable private ActionNode next;
private @MonotonicNonNull SimpleExoPlayer player; private @MonotonicNonNull ExoPlayer player;
private @MonotonicNonNull DefaultTrackSelector trackSelector; private @MonotonicNonNull DefaultTrackSelector trackSelector;
@Nullable private Surface surface; @Nullable private Surface surface;
private @MonotonicNonNull HandlerWrapper mainHandler; private @MonotonicNonNull HandlerWrapper mainHandler;
...@@ -707,7 +706,7 @@ public final class ActionSchedule { ...@@ -707,7 +706,7 @@ public final class ActionSchedule {
* @param mainHandler A handler associated with the main thread of the host activity. * @param mainHandler A handler associated with the main thread of the host activity.
*/ */
public void schedule( public void schedule(
SimpleExoPlayer player, ExoPlayer player,
DefaultTrackSelector trackSelector, DefaultTrackSelector trackSelector,
@Nullable Surface surface, @Nullable Surface surface,
HandlerWrapper mainHandler) { HandlerWrapper mainHandler) {
...@@ -754,7 +753,7 @@ public final class ActionSchedule { ...@@ -754,7 +753,7 @@ public final class ActionSchedule {
@Override @Override
protected void doActionImpl( protected void doActionImpl(
SimpleExoPlayer player, DefaultTrackSelector trackSelector, @Nullable Surface surface) { ExoPlayer player, DefaultTrackSelector trackSelector, @Nullable Surface surface) {
// Do nothing. // Do nothing.
} }
} }
...@@ -774,7 +773,7 @@ public final class ActionSchedule { ...@@ -774,7 +773,7 @@ public final class ActionSchedule {
@Override @Override
protected void doActionAndScheduleNextImpl( protected void doActionAndScheduleNextImpl(
SimpleExoPlayer player, ExoPlayer player,
DefaultTrackSelector trackSelector, DefaultTrackSelector trackSelector,
@Nullable Surface surface, @Nullable Surface surface,
HandlerWrapper handler, HandlerWrapper handler,
...@@ -788,7 +787,7 @@ public final class ActionSchedule { ...@@ -788,7 +787,7 @@ public final class ActionSchedule {
@Override @Override
protected void doActionImpl( protected void doActionImpl(
SimpleExoPlayer player, DefaultTrackSelector trackSelector, @Nullable Surface surface) { ExoPlayer player, DefaultTrackSelector trackSelector, @Nullable Surface surface) {
// Not triggered. // Not triggered.
} }
} }
......
testutils/src/main/java/com/google/android/exoplayer2/testutil/ExoHostedTest.java
...@@ -27,7 +27,6 @@ import com.google.android.exoplayer2.DefaultRenderersFactory; ...@@ -27,7 +27,6 @@ import com.google.android.exoplayer2.DefaultRenderersFactory;
import com.google.android.exoplayer2.ExoPlaybackException; import com.google.android.exoplayer2.ExoPlaybackException;
import com.google.android.exoplayer2.ExoPlayer; import com.google.android.exoplayer2.ExoPlayer;
import com.google.android.exoplayer2.Player; import com.google.android.exoplayer2.Player;
import com.google.android.exoplayer2.SimpleExoPlayer;
import com.google.android.exoplayer2.analytics.AnalyticsListener; import com.google.android.exoplayer2.analytics.AnalyticsListener;
import com.google.android.exoplayer2.audio.DefaultAudioSink; import com.google.android.exoplayer2.audio.DefaultAudioSink;
import com.google.android.exoplayer2.decoder.DecoderCounters; import com.google.android.exoplayer2.decoder.DecoderCounters;
...@@ -66,7 +65,7 @@ public abstract class ExoHostedTest implements AnalyticsListener, HostedTest { ...@@ -66,7 +65,7 @@ public abstract class ExoHostedTest implements AnalyticsListener, HostedTest {
private final ConditionVariable testFinished; private final ConditionVariable testFinished;
@Nullable private ActionSchedule pendingSchedule; @Nullable private ActionSchedule pendingSchedule;
private @MonotonicNonNull SimpleExoPlayer player; private @MonotonicNonNull ExoPlayer player;
private @MonotonicNonNull HandlerWrapper actionHandler; private @MonotonicNonNull HandlerWrapper actionHandler;
private @MonotonicNonNull DefaultTrackSelector trackSelector; private @MonotonicNonNull DefaultTrackSelector trackSelector;
private @MonotonicNonNull Surface surface; private @MonotonicNonNull Surface surface;
...@@ -242,12 +241,12 @@ public abstract class ExoHostedTest implements AnalyticsListener, HostedTest { ...@@ -242,12 +241,12 @@ public abstract class ExoHostedTest implements AnalyticsListener, HostedTest {
return new DefaultTrackSelector(host); return new DefaultTrackSelector(host);
} }
protected SimpleExoPlayer buildExoPlayer( protected ExoPlayer buildExoPlayer(
HostActivity host, Surface surface, MappingTrackSelector trackSelector) { HostActivity host, Surface surface, MappingTrackSelector trackSelector) {
DefaultRenderersFactory renderersFactory = new DefaultRenderersFactory(host); DefaultRenderersFactory renderersFactory = new DefaultRenderersFactory(host);
renderersFactory.setExtensionRendererMode(DefaultRenderersFactory.EXTENSION_RENDERER_MODE_OFF); renderersFactory.setExtensionRendererMode(DefaultRenderersFactory.EXTENSION_RENDERER_MODE_OFF);
renderersFactory.setAllowedVideoJoiningTimeMs(/* allowedVideoJoiningTimeMs= */ 0); renderersFactory.setAllowedVideoJoiningTimeMs(/* allowedVideoJoiningTimeMs= */ 0);
SimpleExoPlayer player = ExoPlayer player =
new ExoPlayer.Builder(host, renderersFactory).setTrackSelector(trackSelector).build(); new ExoPlayer.Builder(host, renderersFactory).setTrackSelector(trackSelector).build();
player.setVideoSurface(surface); player.setVideoSurface(surface);
return player; return player;
......
testutils/src/main/java/com/google/android/exoplayer2/testutil/ExoPlayerTestRunner.java
...@@ -34,7 +34,6 @@ import com.google.android.exoplayer2.PlaybackException; ...@@ -34,7 +34,6 @@ import com.google.android.exoplayer2.PlaybackException;
import com.google.android.exoplayer2.Player; import com.google.android.exoplayer2.Player;
import com.google.android.exoplayer2.Renderer; import com.google.android.exoplayer2.Renderer;
import com.google.android.exoplayer2.RenderersFactory; import com.google.android.exoplayer2.RenderersFactory;
import com.google.android.exoplayer2.SimpleExoPlayer;
import com.google.android.exoplayer2.Timeline; import com.google.android.exoplayer2.Timeline;
import com.google.android.exoplayer2.analytics.AnalyticsListener; import com.google.android.exoplayer2.analytics.AnalyticsListener;
import com.google.android.exoplayer2.source.MediaSource; import com.google.android.exoplayer2.source.MediaSource;
...@@ -71,7 +70,7 @@ public final class ExoPlayerTestRunner implements Player.Listener, ActionSchedul ...@@ -71,7 +70,7 @@ public final class ExoPlayerTestRunner implements Player.Listener, ActionSchedul
.build(); .build();
/** /**
* Builder to set-up a {@link ExoPlayerTestRunner}. Default fake implementations will be used for * Builder to set-up an {@link ExoPlayerTestRunner}. Default fake implementations will be used for
* unset test properties. * unset test properties.
*/ */
public static final class Builder { public static final class Builder {
...@@ -267,7 +266,7 @@ public final class ExoPlayerTestRunner implements Player.Listener, ActionSchedul ...@@ -267,7 +266,7 @@ public final class ExoPlayerTestRunner implements Player.Listener, ActionSchedul
/** /**
* Sets an {@link ActionSchedule} to be run by the test runner. The first action will be * Sets an {@link ActionSchedule} to be run by the test runner. The first action will be
* executed immediately before {@link SimpleExoPlayer#prepare()}. * executed immediately before {@link ExoPlayer#prepare()}.
* *
* @param actionSchedule An {@link ActionSchedule} to be used by the test runner. * @param actionSchedule An {@link ActionSchedule} to be used by the test runner.
* @return This builder. * @return This builder.
...@@ -379,7 +378,7 @@ public final class ExoPlayerTestRunner implements Player.Listener, ActionSchedul ...@@ -379,7 +378,7 @@ public final class ExoPlayerTestRunner implements Player.Listener, ActionSchedul
private final ArrayList<Integer> playbackStates; private final ArrayList<Integer> playbackStates;
private final boolean pauseAtEndOfMediaItems; private final boolean pauseAtEndOfMediaItems;
private SimpleExoPlayer player; private ExoPlayer player;
private Exception exception; private Exception exception;
private boolean playerWasPrepared; private boolean playerWasPrepared;
......
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