From 3c19850ed3c3c2cf45a21ecbb7c4761c984fa1a9 Mon Sep 17 00:00:00 2001 From: samrobinson Date: Wed, 13 Oct 2021 17:37:08 +0100 Subject: [PATCH] Migrate library usages of SimpleExoPlayer to ExoPlayer. PiperOrigin-RevId: 402853522 --- .../exoplayer2/castdemo/MainActivity.java | 6 +- .../exoplayer2/castdemo/PlayerManager.java | 3 +- .../exoplayer2/gldemo/MainActivity.java | 5 +- .../exoplayer2/demo/PlayerActivity.java | 5 +- .../exoplayer2/surfacedemo/MainActivity.java | 5 +- docs/ad-insertion.md | 4 +- docs/analytics.md | 6 +- docs/customization.md | 24 +- docs/dash.md | 4 +- docs/debug-logging.md | 2 +- docs/downloading-media.md | 2 +- docs/hello-world.md | 22 +- docs/hls.md | 4 +- docs/listening-to-player-events.md | 10 +- docs/live-streaming.md | 4 +- docs/media-sources.md | 2 +- docs/network-stacks.md | 6 +- docs/playlists.md | 4 +- docs/progressive.md | 4 +- docs/rtsp.md | 4 +- docs/shrinking.md | 12 +- docs/smoothstreaming.md | 4 +- docs/track-selection.md | 2 +- docs/troubleshooting.md | 6 +- .../exoplayer2/ext/flac/FlacPlaybackTest.java | 3 +- .../exoplayer2/ext/ima/ImaPlaybackTest.java | 6 +- .../exoplayer2/ext/opus/OpusPlaybackTest.java | 3 +- .../exoplayer2/ext/vp9/VpxPlaybackTest.java | 3 +- .../exoplayer2/ClippedPlaybackTest.java | 4 +- .../exoplayer2/drm/DrmPlaybackTest.java | 3 +- .../android/exoplayer2/RenderersFactory.java | 4 +- .../exoplayer2/util/DebugTextViewHelper.java | 10 +- .../android/exoplayer2/ExoPlayerTest.java | 340 +++++++++--------- .../analytics/AnalyticsCollectorTest.java | 23 +- .../analytics/PlaybackStatsListenerTest.java | 4 +- .../e2etest/EndToEndGaplessTest.java | 3 +- .../exoplayer2/e2etest/FlacPlaybackTest.java | 3 +- .../exoplayer2/e2etest/FlvPlaybackTest.java | 3 +- .../exoplayer2/e2etest/MkaPlaybackTest.java | 3 +- .../exoplayer2/e2etest/MkvPlaybackTest.java | 3 +- .../exoplayer2/e2etest/Mp3PlaybackTest.java | 3 +- .../exoplayer2/e2etest/Mp4PlaybackTest.java | 3 +- .../exoplayer2/e2etest/OggPlaybackTest.java | 3 +- .../e2etest/PlaylistPlaybackTest.java | 5 +- .../e2etest/SilencePlaybackTest.java | 5 +- .../exoplayer2/e2etest/TsPlaybackTest.java | 3 +- .../exoplayer2/e2etest/Vp9PlaybackTest.java | 3 +- .../exoplayer2/e2etest/WavPlaybackTest.java | 3 +- .../ServerSideInsertedAdMediaSourceTest.java | 9 +- .../source/dash/e2etest/DashPlaybackTest.java | 5 +- .../source/rtsp/RtspPlaybackTest.java | 11 +- .../transformer/TranscodingTransformer.java | 3 +- .../exoplayer2/transformer/Transformer.java | 3 +- .../playbacktests/gts/DashTestRunner.java | 5 +- .../robolectric/TestPlayerRunHelper.java | 7 +- .../android/exoplayer2/testutil/Action.java | 109 +++--- .../exoplayer2/testutil/ActionSchedule.java | 31 +- .../exoplayer2/testutil/ExoHostedTest.java | 7 +- .../testutil/ExoPlayerTestRunner.java | 7 +- 59 files changed, 377 insertions(+), 416 deletions(-) diff --git a/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/MainActivity.java b/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/MainActivity.java index b2b4d49555..478f11d74f 100644 --- a/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/MainActivity.java +++ b/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/MainActivity.java @@ -37,8 +37,8 @@ import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.RecyclerView.ViewHolder; import com.google.android.exoplayer2.C; +import com.google.android.exoplayer2.ExoPlayer; 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.PlayerView; import com.google.android.exoplayer2.util.Assertions; @@ -48,8 +48,8 @@ import com.google.android.gms.cast.framework.CastContext; import com.google.android.gms.dynamite.DynamiteModule; /** - * An activity that plays video using {@link SimpleExoPlayer} and supports casting using ExoPlayer's - * Cast extension. + * An activity that plays video using {@link ExoPlayer} and supports casting using ExoPlayer's Cast + * extension. */ public class MainActivity extends AppCompatActivity implements OnClickListener, PlayerManager.Listener { diff --git a/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/PlayerManager.java b/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/PlayerManager.java index 4853229c50..0c9406227d 100644 --- a/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/PlayerManager.java +++ b/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/PlayerManager.java @@ -25,7 +25,6 @@ import com.google.android.exoplayer2.MediaItem; import com.google.android.exoplayer2.Player; import com.google.android.exoplayer2.Player.DiscontinuityReason; import com.google.android.exoplayer2.Player.TimelineChangeReason; -import com.google.android.exoplayer2.SimpleExoPlayer; import com.google.android.exoplayer2.Timeline; import com.google.android.exoplayer2.TracksInfo; import com.google.android.exoplayer2.ext.cast.CastPlayer; @@ -64,7 +63,7 @@ import java.util.ArrayList; 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 localPlayerView The {@link PlayerView} for local playback. diff --git a/demos/gl/src/main/java/com/google/android/exoplayer2/gldemo/MainActivity.java b/demos/gl/src/main/java/com/google/android/exoplayer2/gldemo/MainActivity.java index 7488d94f98..5b513e93f5 100644 --- a/demos/gl/src/main/java/com/google/android/exoplayer2/gldemo/MainActivity.java +++ b/demos/gl/src/main/java/com/google/android/exoplayer2/gldemo/MainActivity.java @@ -27,7 +27,6 @@ import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.ExoPlayer; import com.google.android.exoplayer2.MediaItem; 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.DrmSessionManager; import com.google.android.exoplayer2.drm.FrameworkMediaDrm; @@ -65,7 +64,7 @@ public final class MainActivity extends Activity { @Nullable private PlayerView playerView; @Nullable private VideoProcessingGLSurfaceView videoProcessingGLSurfaceView; - @Nullable private SimpleExoPlayer player; + @Nullable private ExoPlayer player; @Override protected void onCreate(@Nullable Bundle savedInstanceState) { @@ -173,7 +172,7 @@ public final class MainActivity extends Activity { throw new IllegalStateException(); } - SimpleExoPlayer player = new ExoPlayer.Builder(getApplicationContext()).build(); + ExoPlayer player = new ExoPlayer.Builder(getApplicationContext()).build(); player.setRepeatMode(Player.REPEAT_MODE_ALL); player.setMediaSource(mediaSource); player.prepare(); diff --git a/demos/main/src/main/java/com/google/android/exoplayer2/demo/PlayerActivity.java b/demos/main/src/main/java/com/google/android/exoplayer2/demo/PlayerActivity.java index aaad17aaa8..d0f84a401a 100644 --- a/demos/main/src/main/java/com/google/android/exoplayer2/demo/PlayerActivity.java +++ b/demos/main/src/main/java/com/google/android/exoplayer2/demo/PlayerActivity.java @@ -37,7 +37,6 @@ import com.google.android.exoplayer2.MediaItem; import com.google.android.exoplayer2.PlaybackException; import com.google.android.exoplayer2.Player; import com.google.android.exoplayer2.RenderersFactory; -import com.google.android.exoplayer2.SimpleExoPlayer; import com.google.android.exoplayer2.TracksInfo; import com.google.android.exoplayer2.audio.AudioAttributes; import com.google.android.exoplayer2.drm.FrameworkMediaDrm; @@ -61,7 +60,7 @@ import java.util.Collections; import java.util.List; 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 implements OnClickListener, StyledPlayerControlView.VisibilityListener { @@ -75,7 +74,7 @@ public class PlayerActivity extends AppCompatActivity protected StyledPlayerView playerView; protected LinearLayout debugRootView; protected TextView debugTextView; - protected @Nullable SimpleExoPlayer player; + protected @Nullable ExoPlayer player; private boolean isShowingTrackSelectionDialog; private Button selectTracksButton; diff --git a/demos/surface/src/main/java/com/google/android/exoplayer2/surfacedemo/MainActivity.java b/demos/surface/src/main/java/com/google/android/exoplayer2/surfacedemo/MainActivity.java index 44dd9d423b..c9abfcef14 100644 --- a/demos/surface/src/main/java/com/google/android/exoplayer2/surfacedemo/MainActivity.java +++ b/demos/surface/src/main/java/com/google/android/exoplayer2/surfacedemo/MainActivity.java @@ -31,7 +31,6 @@ import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.ExoPlayer; import com.google.android.exoplayer2.MediaItem; 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.DrmSessionManager; import com.google.android.exoplayer2.drm.FrameworkMediaDrm; @@ -67,7 +66,7 @@ public final class MainActivity extends Activity { @Nullable private SurfaceView nonFullScreenView; @Nullable private SurfaceView currentOutputView; - @Nullable private static SimpleExoPlayer player; + @Nullable private static ExoPlayer player; @Nullable private static SurfaceControl surfaceControl; @Nullable private static Surface videoSurface; @@ -217,7 +216,7 @@ public final class MainActivity extends Activity { } else { throw new IllegalStateException(); } - SimpleExoPlayer player = new ExoPlayer.Builder(getApplicationContext()).build(); + ExoPlayer player = new ExoPlayer.Builder(getApplicationContext()).build(); player.setMediaSource(mediaSource); player.prepare(); player.play(); diff --git a/docs/ad-insertion.md b/docs/ad-insertion.md index 544488f14c..0886ca6a92 100644 --- a/docs/ad-insertion.md +++ b/docs/ad-insertion.md @@ -53,7 +53,7 @@ MediaSourceFactory mediaSourceFactory = new DefaultMediaSourceFactory(context) .setAdsLoaderProvider(adsLoaderProvider) .setAdViewProvider(playerView); -SimpleExoPlayer player = new ExoPlayer.Builder(context) +ExoPlayer player = new ExoPlayer.Builder(context) .setMediaSourceFactory(mediaSourceFactory) .build(); ~~~ @@ -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][] for information on what timed metadata formats are supported by ExoPlayer). Apps 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 provide any integration with the DAI part of the IMA SDK. diff --git a/docs/analytics.md b/docs/analytics.md index 149fc52022..f748cc1885 100644 --- a/docs/analytics.md +++ b/docs/analytics.md @@ -44,7 +44,7 @@ implementations. You can easily add your own listener and override only the methods you are interested in: ~~~ -simpleExoPlayer.addAnalyticsListener(new AnalyticsListener() { +exoPlayer.addAnalyticsListener(new AnalyticsListener() { @Override public void onPlaybackStateChanged( EventTime eventTime, @Player.State int state) { @@ -98,7 +98,7 @@ current playback session at any time using `PlaybackStatsListener.getPlaybackStats()`. ~~~ -simpleExoPlayer.addAnalyticsListener( +exoPlayer.addAnalyticsListener( new PlaybackStatsListener( /* keepHistory= */ true, (eventTime, playbackStats) -> { // Analytics data for the session started at `eventTime` is ready. @@ -246,7 +246,7 @@ class ExtendedCollector extends AnalyticsCollector { } // Usage - Setup and listener registration. -SimpleExoPlayer player = new ExoPlayer.Builder(context) +ExoPlayer player = new ExoPlayer.Builder(context) .setAnalyticsCollector(new ExtendedCollector()) .build(); player.addAnalyticsListener(new ExtendedListener() { diff --git a/docs/customization.md b/docs/customization.md index 7cf0077b5d..6be6d39e77 100644 --- a/docs/customization.md +++ b/docs/customization.md @@ -4,13 +4,13 @@ title: Customization 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 -buffer media, play, pause and seek. The default implementations `ExoPlayer` and -`SimpleExoPlayer` are designed to make few assumptions about (and hence impose -few restrictions on) the type of media being played, how and where it is stored, -and how it is rendered. Rather than implementing the loading and rendering of -media directly, `ExoPlayer` implementations delegate this work to components -that are injected when a player is created or when new media sources are passed -to the player. Components common to all `ExoPlayer` implementations are: +buffer media, play, pause and seek. The default implementation `ExoPlayer` is +designed to make few assumptions about (and hence impose few restrictions on) +the type of media being played, how and where it is stored, and how it is +rendered. Rather than implementing the loading and rendering of media directly, +`ExoPlayer` implementations delegate this work to components that are injected +when a player is created or when new media sources are passed to the player. +Components common to all `ExoPlayer` implementations are: * `MediaSource` instances that define media to be played, load the media, and from which the loaded media can be read. `MediaSource` instances are created @@ -59,7 +59,7 @@ DefaultDataSource.Factory dataSourceFactory = new DefaultDataSource.Factory(context, httpDataSourceFactory); // Inject the DefaultDataSourceFactory when creating the player. -SimpleExoPlayer player = +ExoPlayer player = new ExoPlayer.Builder(context) .setMediaSourceFactory(new DefaultMediaSourceFactory(dataSourceFactory)) .build(); @@ -82,7 +82,7 @@ DataSource.Factory cacheDataSourceFactory = .setCache(simpleCache) .setUpstreamDataSourceFactory(httpDataSourceFactory); -SimpleExoPlayer player = new ExoPlayer.Builder(context) +ExoPlayer player = new ExoPlayer.Builder(context) .setMediaSourceFactory( new DefaultMediaSourceFactory(cacheDataSourceFactory)) .build(); @@ -107,7 +107,7 @@ DataSource.Factory dataSourceFactory = () -> { return dataSource; }; -SimpleExoPlayer player = new ExoPlayer.Builder(context) +ExoPlayer player = new ExoPlayer.Builder(context) .setMediaSourceFactory(new DefaultMediaSourceFactory(dataSourceFactory)) .build(); ~~~ @@ -157,7 +157,7 @@ LoadErrorHandlingPolicy loadErrorHandlingPolicy = } }; -SimpleExoPlayer player = +ExoPlayer player = new ExoPlayer.Builder(context) .setMediaSourceFactory( new DefaultMediaSourceFactory(context) @@ -181,7 +181,7 @@ DefaultExtractorsFactory extractorsFactory = new DefaultExtractorsFactory() .setMp3ExtractorFlags(Mp3Extractor.FLAG_ENABLE_INDEX_SEEKING); -SimpleExoPlayer player = new ExoPlayer.Builder(context) +ExoPlayer player = new ExoPlayer.Builder(context) .setMediaSourceFactory( new DefaultMediaSourceFactory(context, extractorsFactory)) .build(); diff --git a/docs/dash.md b/docs/dash.md index 57159c0d6e..88cc667913 100644 --- a/docs/dash.md +++ b/docs/dash.md @@ -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. -SimpleExoPlayer player = new ExoPlayer.Builder(context).build(); +ExoPlayer player = new ExoPlayer.Builder(context).build(); // Set the media item to be played. player.setMediaItem(MediaItem.fromUri(dashUri)); // Prepare the player. @@ -45,7 +45,7 @@ MediaSource mediaSource = new DashMediaSource.Factory(dataSourceFactory) .createMediaSource(MediaItem.fromUri(dashUri)); // 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. player.setMediaSource(mediaSource); // Prepare the player. diff --git a/docs/debug-logging.md b/docs/debug-logging.md index 25ea13ccf5..c7d5a652ea 100644 --- a/docs/debug-logging.md +++ b/docs/debug-logging.md @@ -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 understanding what the player is doing, as well as for debugging playback issues. `EventLogger` implements `AnalyticsListener`, so registering an instance -with a `SimpleExoPlayer` is easy: +with an `ExoPlayer` is easy: ``` player.addAnalyticsListener(new EventLogger(trackSelector)); diff --git a/docs/downloading-media.md b/docs/downloading-media.md index d18438c77b..e724d0cd4a 100644 --- a/docs/downloading-media.md +++ b/docs/downloading-media.md @@ -322,7 +322,7 @@ DataSource.Factory cacheDataSourceFactory = .setUpstreamDataSourceFactory(httpDataSourceFactory) .setCacheWriteDataSinkFactory(null); // Disable writing. -SimpleExoPlayer player = new ExoPlayer.Builder(context) +ExoPlayer player = new ExoPlayer.Builder(context) .setMediaSourceFactory( new DefaultMediaSourceFactory(cacheDataSourceFactory)) .build(); diff --git a/docs/hello-world.md b/docs/hello-world.md index d6986c52be..9ad62fb617 100644 --- a/docs/hello-world.md +++ b/docs/hello-world.md @@ -14,7 +14,7 @@ For simple use cases, getting started with `ExoPlayer` consists of implementing the following steps: 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. Prepare the player with a `MediaItem` to play. 1. Release the player when done. @@ -97,7 +97,7 @@ a range of customization options. The code below is the simplest example of creating an instance. ~~~ -SimpleExoPlayer player = new ExoPlayer.Builder(context).build(); +ExoPlayer player = new ExoPlayer.Builder(context).build(); ~~~ {: .language-java} @@ -117,12 +117,12 @@ which the player must be accessed can be queried using `Player.getApplicationLooper`. 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 -`SimpleExoPlayer` instance on the wrong thread (the exception's stack trace -shows you where). You can temporarily opt out from these exceptions being thrown -by calling `SimpleExoPlayer.setThrowsWhenUsingWrongThread(false)`, in which case -the issue will be logged as a warning instead. Using this opt out is not safe -and may result in unexpected or obscure errors. It will be removed in ExoPlayer +accessed on the wrong thread", then some code in your app is accessing an +`ExoPlayer` instance on the wrong thread (the exception's stack trace shows you +where). You can temporarily opt out from these exceptions being thrown by +calling `ExoPlayer.setThrowsWhenUsingWrongThread(false)`, in which case the +issue will be logged as a warning instead. Using this opt out is not safe and +may result in unexpected or obscure errors. It will be removed in ExoPlayer 2.16. {:.info} @@ -148,10 +148,10 @@ useful for audio only use cases. Use of ExoPlayer's pre-built UI components is optional. For video applications 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 -`setVideoSurface` methods respectively. `SimpleExoPlayer`'s `addTextOutput` -method can be used to receive captions that should be rendered during playback. +`setVideoSurface` methods respectively. `ExoPlayer`'s `addTextOutput` method can +be used to receive captions that should be rendered during playback. ## Populating the playlist and preparing the player ## diff --git a/docs/hls.md b/docs/hls.md index f3bd225b09..adb750e02a 100644 --- a/docs/hls.md +++ b/docs/hls.md @@ -18,7 +18,7 @@ player. ~~~ // 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. player.setMediaItem(MediaItem.fromUri(hlsUri)); // Prepare the player. @@ -48,7 +48,7 @@ HlsMediaSource hlsMediaSource = new HlsMediaSource.Factory(dataSourceFactory) .createMediaSource(MediaItem.fromUri(hlsUri)); // 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. player.setMediaSource(hlsMediaSource); // Prepare the player. diff --git a/docs/listening-to-player-events.md b/docs/listening-to-player-events.md index de23a32c2b..99af0b6678 100644 --- a/docs/listening-to-player-events.md +++ b/docs/listening-to-player-events.md @@ -180,15 +180,15 @@ together in `onEvents`. ## Using AnalyticsListener ## -When using `SimpleExoPlayer`, an `AnalyticsListener` can be registered with the -player by calling `addAnalyticsListener`. `AnalyticsListener` implementations -are able to listen to detailed events that may be useful for analytics and -logging purposes. Please refer to the [analytics page][] for more details. +When using `ExoPlayer`, an `AnalyticsListener` can be registered with the player +by calling `addAnalyticsListener`. `AnalyticsListener` implementations are able +to listen to detailed events that may be useful for analytics and logging +purposes. Please refer to the [analytics page][] for more details. ### Using EventLogger ### `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. ``` diff --git a/docs/live-streaming.md b/docs/live-streaming.md index 5b09d0af68..d24d0f4dd0 100644 --- a/docs/live-streaming.md +++ b/docs/live-streaming.md @@ -96,7 +96,7 @@ values will override parameters defined by the media. ~~~ // Global settings. -SimpleExoPlayer player = +ExoPlayer player = new ExoPlayer.Builder(context) .setMediaSourceFactory( new DefaultMediaSourceFactory(context).setLiveTargetOffsetMs(5000)) @@ -166,7 +166,7 @@ implementation, which is `DefaultLivePlaybackSpeedControl`. In both cases an instance can be set when building the player: ~~~ -SimpleExoPlayer player = +ExoPlayer player = new ExoPlayer.Builder(context) .setLivePlaybackSpeedControl( new DefaultLivePlaybackSpeedControl.Builder() diff --git a/docs/media-sources.md b/docs/media-sources.md index c280739342..7cfde4af3b 100644 --- a/docs/media-sources.md +++ b/docs/media-sources.md @@ -37,7 +37,7 @@ MediaSourceFactory mediaSourceFactory = new DefaultMediaSourceFactory(cacheDataSourceFactory) .setAdsLoaderProvider(adsLoaderProvider) .setAdViewProvider(playerView); -SimpleExoPlayer player = new ExoPlayer.Builder(context) +ExoPlayer player = new ExoPlayer.Builder(context) .setMediaSourceFactory(mediaSourceFactory) .build(); ~~~ diff --git a/docs/network-stacks.md b/docs/network-stacks.md index b2db3a65b3..5b791bfaca 100644 --- a/docs/network-stacks.md +++ b/docs/network-stacks.md @@ -32,8 +32,8 @@ where `PreferredHttpDataSource.Factory` is the factory corresponding to your preferred network stack. The `DefaultDataSourceFactory` layer adds in support for non-http(s) sources such as local files. -The example below shows how to build a `SimpleExoPlayer` that will use -the Cronet network stack and also support playback of non-http(s) content. +The example below shows how to build an `ExoPlayer` that will use the Cronet +network stack and also support playback of non-http(s) content. ~~~ // Given a CronetEngine and Executor, build a CronetDataSource.Factory. @@ -49,7 +49,7 @@ DefaultDataSource.Factory dataSourceFactory = /* baseDataSourceFactory= */ cronetDataSourceFactory); // Inject the DefaultDataSourceFactory when creating the player. -SimpleExoPlayer player = +ExoPlayer player = new ExoPlayer.Builder(context) .setMediaSourceFactory(new DefaultMediaSourceFactory(dataSourceFactory)) .build(); diff --git a/docs/playlists.md b/docs/playlists.md index 85770396f0..e17e6ef452 100644 --- a/docs/playlists.md +++ b/docs/playlists.md @@ -166,9 +166,9 @@ This can be customized by providing a custom shuffle order implementation: ~~~ // Set the custom shuffle order. -simpleExoPlayer.setShuffleOrder(shuffleOrder); +exoPlayer.setShuffleOrder(shuffleOrder); // Enable shuffle mode. -simpleExoPlayer.setShuffleModeEnabled(/* shuffleModeEnabled= */ true); +exoPlayer.setShuffleModeEnabled(/* shuffleModeEnabled= */ true); ~~~ {: .language-java} diff --git a/docs/progressive.md b/docs/progressive.md index cf9e242ba1..26a8002f39 100644 --- a/docs/progressive.md +++ b/docs/progressive.md @@ -11,7 +11,7 @@ it to the player. ~~~ // 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. player.setMediaItem(MediaItem.fromUri(progressiveUri)); // Prepare the player. @@ -31,7 +31,7 @@ DataSource.Factory dataSourceFactory = new DefaultHttpDataSource.Factory(); MediaSource mediaSource = new ProgressiveMediaSource.Factory(dataSourceFactory) .createMediaSource(MediaItem.fromUri(progressiveUri)); // 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. player.setMediaSource(mediaSource); // Prepare the player. diff --git a/docs/rtsp.md b/docs/rtsp.md index 7af42ec888..9c4cd38753 100644 --- a/docs/rtsp.md +++ b/docs/rtsp.md @@ -17,7 +17,7 @@ You can then create a `MediaItem` for an RTSP URI and pass it to the player. ~~~ // 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. player.setMediaItem(MediaItem.fromUri(rtspUri)); // Prepare the player. @@ -43,7 +43,7 @@ MediaSource mediaSource = new RtspMediaSource.Factory() .createMediaSource(MediaItem.fromUri(rtspUri)); // 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. player.setMediaSource(mediaSource); // Prepare the player. diff --git a/docs/shrinking.md b/docs/shrinking.md index 53e753dc15..5506e742c2 100644 --- a/docs/shrinking.md +++ b/docs/shrinking.md @@ -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 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 -this when instantiating `SimpleExoPlayer` instances: +this when instantiating `ExoPlayer` instances: ~~~ RenderersFactory audioOnlyRenderersFactory = @@ -58,7 +58,7 @@ RenderersFactory audioOnlyRenderersFactory = new MediaCodecAudioRenderer( context, MediaCodecSelector.DEFAULT, handler, audioListener) }; -SimpleExoPlayer player = +ExoPlayer player = new ExoPlayer.Builder(context, audioOnlyRenderersFactory).build(); ~~~ {: .language-java} @@ -80,7 +80,7 @@ an app that only needs to play mp4 files can provide a factory like: ~~~ ExtractorsFactory mp4ExtractorFactory = () -> new Extractor[] {new Mp4Extractor()}; -SimpleExoPlayer player = +ExoPlayer player = new ExoPlayer.Builder(context, mp4ExtractorFactory).build(); ~~~ {: .language-java} @@ -98,18 +98,18 @@ constructor, if your app is doing one of the following: ~~~ // Only playing DASH, HLS or SmoothStreaming. -SimpleExoPlayer player = +ExoPlayer player = new ExoPlayer.Builder(context, ExtractorsFactory.EMPTY).build(); // Providing a customized `DefaultMediaSourceFactory` -SimpleExoPlayer player = +ExoPlayer player = new ExoPlayer.Builder(context, ExtractorsFactory.EMPTY) .setMediaSourceFactory( new DefaultMediaSourceFactory(context, customExtractorsFactory)) .build(); // Using a MediaSource directly. -SimpleExoPlayer player = +ExoPlayer player = new ExoPlayer.Builder(context, ExtractorsFactory.EMPTY).build(); ProgressiveMediaSource mediaSource = new ProgressiveMediaSource.Factory( diff --git a/docs/smoothstreaming.md b/docs/smoothstreaming.md index 6039046731..94b3dce089 100644 --- a/docs/smoothstreaming.md +++ b/docs/smoothstreaming.md @@ -19,7 +19,7 @@ to the player. ~~~ // 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. player.setMediaItem(MediaItem.fromUri(ssUri)); // Prepare the player. @@ -47,7 +47,7 @@ MediaSource mediaSource = new SsMediaSource.Factory(dataSourceFactory) .createMediaSource(MediaItem.fromUri(ssUri)); // 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. player.setMediaSource(mediaSource); // Prepare the player. diff --git a/docs/track-selection.md b/docs/track-selection.md index 206ccbf8fb..4dd71b5046 100644 --- a/docs/track-selection.md +++ b/docs/track-selection.md @@ -8,7 +8,7 @@ of which can be provided whenever an `ExoPlayer` is built. ~~~ DefaultTrackSelector trackSelector = new DefaultTrackSelector(context); -SimpleExoPlayer player = +ExoPlayer player = new ExoPlayer.Builder(context) .setTrackSelector(trackSelector) .build(); diff --git a/docs/troubleshooting.md b/docs/troubleshooting.md index 766f6e708a..80c922b615 100644 --- a/docs/troubleshooting.md +++ b/docs/troubleshooting.md @@ -230,7 +230,7 @@ audio when your app is in the background: from killing your process to free up resources. 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 - [`SimpleExoPlayer`][] by calling [`setWakeMode`][], which will automatically + [`ExoPlayer`][] by calling [`setWakeMode`][], which will automatically acquire and release the required locks at the correct times. 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. [foreground service]: https://developer.android.com/guide/components/services.html#Foreground [`WifiLock`]: {{ site.android_sdk }}/android/net/wifi/WifiManager.WifiLock.html [`WakeLock`]: {{ site.android_sdk }}/android/os/PowerManager.WakeLock.html -[`SimpleExoPlayer`]: {{ site.exo_sdk }}/SimpleExoPlayer.html -[`setWakeMode`]: {{ site.exo_sdk }}/SimpleExoPlayer.html#setWakeMode(int) +[`ExoPlayer`]: {{ site.exo_sdk }}/ExoPlayer.html +[`setWakeMode`]: {{ site.exo_sdk }}/ExoPlayer.html#setWakeMode(int) [A note on threading]: {{ site.base_url }}/hello-world.html#a-note-on-threading [OkHttp extension]: {{ site.release_v2 }}/extensions/okhttp [CORS enabled]: https://www.w3.org/wiki/CORS_Enabled diff --git a/extensions/flac/src/androidTest/java/com/google/android/exoplayer2/ext/flac/FlacPlaybackTest.java b/extensions/flac/src/androidTest/java/com/google/android/exoplayer2/ext/flac/FlacPlaybackTest.java index f5886505a9..925e466a83 100644 --- a/extensions/flac/src/androidTest/java/com/google/android/exoplayer2/ext/flac/FlacPlaybackTest.java +++ b/extensions/flac/src/androidTest/java/com/google/android/exoplayer2/ext/flac/FlacPlaybackTest.java @@ -29,7 +29,6 @@ import com.google.android.exoplayer2.PlaybackException; import com.google.android.exoplayer2.Player; import com.google.android.exoplayer2.Renderer; 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.AudioSink; import com.google.android.exoplayer2.audio.DefaultAudioSink; @@ -96,7 +95,7 @@ public class FlacPlaybackTest { private final Uri uri; private final AudioSink audioSink; - @Nullable private SimpleExoPlayer player; + @Nullable private ExoPlayer player; @Nullable private PlaybackException playbackException; public TestPlaybackRunnable(Uri uri, Context context, AudioSink audioSink) { diff --git a/extensions/ima/src/androidTest/java/com/google/android/exoplayer2/ext/ima/ImaPlaybackTest.java b/extensions/ima/src/androidTest/java/com/google/android/exoplayer2/ext/ima/ImaPlaybackTest.java index d467743dfa..5c1cd37551 100644 --- a/extensions/ima/src/androidTest/java/com/google/android/exoplayer2/ext/ima/ImaPlaybackTest.java +++ b/extensions/ima/src/androidTest/java/com/google/android/exoplayer2/ext/ima/ImaPlaybackTest.java @@ -25,11 +25,11 @@ import androidx.annotation.Nullable; import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.rule.ActivityTestRule; import com.google.android.exoplayer2.C; +import com.google.android.exoplayer2.ExoPlayer; import com.google.android.exoplayer2.MediaItem; import com.google.android.exoplayer2.Player; import com.google.android.exoplayer2.Player.DiscontinuityReason; 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.analytics.AnalyticsListener; import com.google.android.exoplayer2.decoder.DecoderCounters; @@ -192,7 +192,7 @@ public final class ImaPlaybackTest { private final List expectedAdIds; private final List seenAdIds; private @MonotonicNonNull ImaAdsLoader imaAdsLoader; - private @MonotonicNonNull SimpleExoPlayer player; + private @MonotonicNonNull ExoPlayer player; private ImaHostedTest(Uri contentUri, String adsResponse, AdId... expectedAdIds) { // fullPlaybackNoSeeking is false as the playback lasts longer than the content source @@ -207,7 +207,7 @@ public final class ImaPlaybackTest { } @Override - protected SimpleExoPlayer buildExoPlayer( + protected ExoPlayer buildExoPlayer( HostActivity host, Surface surface, MappingTrackSelector trackSelector) { player = super.buildExoPlayer(host, surface, trackSelector); player.addAnalyticsListener( diff --git a/extensions/opus/src/androidTest/java/com/google/android/exoplayer2/ext/opus/OpusPlaybackTest.java b/extensions/opus/src/androidTest/java/com/google/android/exoplayer2/ext/opus/OpusPlaybackTest.java index a398399068..86aa2e1f34 100644 --- a/extensions/opus/src/androidTest/java/com/google/android/exoplayer2/ext/opus/OpusPlaybackTest.java +++ b/extensions/opus/src/androidTest/java/com/google/android/exoplayer2/ext/opus/OpusPlaybackTest.java @@ -29,7 +29,6 @@ import com.google.android.exoplayer2.PlaybackException; import com.google.android.exoplayer2.Player; import com.google.android.exoplayer2.Renderer; 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.source.MediaSource; import com.google.android.exoplayer2.source.ProgressiveMediaSource; @@ -79,7 +78,7 @@ public class OpusPlaybackTest { private final Context context; private final Uri uri; - @Nullable private SimpleExoPlayer player; + @Nullable private ExoPlayer player; @Nullable private PlaybackException playbackException; public TestPlaybackRunnable(Uri uri, Context context) { diff --git a/extensions/vp9/src/androidTest/java/com/google/android/exoplayer2/ext/vp9/VpxPlaybackTest.java b/extensions/vp9/src/androidTest/java/com/google/android/exoplayer2/ext/vp9/VpxPlaybackTest.java index 544418bd51..7df4ebdb40 100644 --- a/extensions/vp9/src/androidTest/java/com/google/android/exoplayer2/ext/vp9/VpxPlaybackTest.java +++ b/extensions/vp9/src/androidTest/java/com/google/android/exoplayer2/ext/vp9/VpxPlaybackTest.java @@ -30,7 +30,6 @@ import com.google.android.exoplayer2.PlaybackException; import com.google.android.exoplayer2.Player; import com.google.android.exoplayer2.Renderer; 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.source.MediaSource; import com.google.android.exoplayer2.source.ProgressiveMediaSource; @@ -107,7 +106,7 @@ public class VpxPlaybackTest { private final Context context; private final Uri uri; - @Nullable private SimpleExoPlayer player; + @Nullable private ExoPlayer player; @Nullable private PlaybackException playbackException; public TestPlaybackRunnable(Uri uri, Context context) { diff --git a/library/core/src/androidTest/java/com/google/android/exoplayer2/ClippedPlaybackTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/ClippedPlaybackTest.java index a8f0697167..8cbfd9d552 100644 --- a/library/core/src/androidTest/java/com/google/android/exoplayer2/ClippedPlaybackTest.java +++ b/library/core/src/androidTest/java/com/google/android/exoplayer2/ClippedPlaybackTest.java @@ -54,7 +54,7 @@ public final class ClippedPlaybackTest { // Expect the clipping to affect both subtitles and video. .setClipEndPositionMs(1000) .build(); - AtomicReference player = new AtomicReference<>(); + AtomicReference player = new AtomicReference<>(); TextCapturingPlaybackListener textCapturer = new TextCapturingPlaybackListener(); getInstrumentation() .runOnMainSync( @@ -96,7 +96,7 @@ public final class ClippedPlaybackTest { // subtitle content (3.5s). .setClipEndPositionMs(4_000) .build()); - AtomicReference player = new AtomicReference<>(); + AtomicReference player = new AtomicReference<>(); TextCapturingPlaybackListener textCapturer = new TextCapturingPlaybackListener(); getInstrumentation() .runOnMainSync( diff --git a/library/core/src/androidTest/java/com/google/android/exoplayer2/drm/DrmPlaybackTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/drm/DrmPlaybackTest.java index c342e9a1a7..f2ad44440a 100644 --- a/library/core/src/androidTest/java/com/google/android/exoplayer2/drm/DrmPlaybackTest.java +++ b/library/core/src/androidTest/java/com/google/android/exoplayer2/drm/DrmPlaybackTest.java @@ -24,7 +24,6 @@ import com.google.android.exoplayer2.ExoPlayer; import com.google.android.exoplayer2.MediaItem; import com.google.android.exoplayer2.PlaybackException; import com.google.android.exoplayer2.Player; -import com.google.android.exoplayer2.SimpleExoPlayer; import com.google.android.exoplayer2.util.ConditionVariable; import java.util.concurrent.atomic.AtomicReference; import okhttp3.mockwebserver.MockResponse; @@ -64,7 +63,7 @@ public final class DrmPlaybackTest { .setLicenseUri(mockWebServer.url("license").toString()) .build()) .build(); - AtomicReference player = new AtomicReference<>(); + AtomicReference player = new AtomicReference<>(); ConditionVariable playbackComplete = new ConditionVariable(); AtomicReference playbackException = new AtomicReference<>(); getInstrumentation() diff --git a/library/core/src/main/java/com/google/android/exoplayer2/RenderersFactory.java b/library/core/src/main/java/com/google/android/exoplayer2/RenderersFactory.java index fba0ca247b..d012bfaaed 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/RenderersFactory.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/RenderersFactory.java @@ -21,11 +21,11 @@ import com.google.android.exoplayer2.metadata.MetadataOutput; import com.google.android.exoplayer2.text.TextOutput; 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 { /** - * 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 videoRendererEventListener An event listener for video renderers. diff --git a/library/core/src/main/java/com/google/android/exoplayer2/util/DebugTextViewHelper.java b/library/core/src/main/java/com/google/android/exoplayer2/util/DebugTextViewHelper.java index 9c11f37fb5..5eeaa060bc 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/util/DebugTextViewHelper.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/util/DebugTextViewHelper.java @@ -18,32 +18,32 @@ package com.google.android.exoplayer2.util; import android.annotation.SuppressLint; import android.os.Looper; import android.widget.TextView; +import com.google.android.exoplayer2.ExoPlayer; import com.google.android.exoplayer2.Format; import com.google.android.exoplayer2.Player; -import com.google.android.exoplayer2.SimpleExoPlayer; import com.google.android.exoplayer2.decoder.DecoderCounters; import java.util.Locale; /** * 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 { private static final int REFRESH_INTERVAL_MS = 1000; - private final SimpleExoPlayer player; + private final ExoPlayer player; private final TextView textView; 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 * player.getApplicationLooper() == Looper.getMainLooper()}). * @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()); this.player = player; this.textView = textView; diff --git a/library/core/src/test/java/com/google/android/exoplayer2/ExoPlayerTest.java b/library/core/src/test/java/com/google/android/exoplayer2/ExoPlayerTest.java index 876835c906..cbbd860b00 100644 --- a/library/core/src/test/java/com/google/android/exoplayer2/ExoPlayerTest.java +++ b/library/core/src/test/java/com/google/android/exoplayer2/ExoPlayerTest.java @@ -206,7 +206,7 @@ public final class ExoPlayerTest { new MaskingMediaSource.PlaceholderTimeline(FakeMediaSource.FAKE_MEDIA_ITEM); FakeRenderer renderer = new FakeRenderer(C.TRACK_TYPE_UNKNOWN); - SimpleExoPlayer player = new TestExoPlayerBuilder(context).setRenderers(renderer).build(); + ExoPlayer player = new TestExoPlayerBuilder(context).setRenderers(renderer).build(); Player.Listener mockListener = mock(Player.Listener.class); player.addListener(mockListener); @@ -237,7 +237,7 @@ public final class ExoPlayerTest { public void playSinglePeriodTimeline() throws Exception { Timeline timeline = new FakeTimeline(); FakeRenderer renderer = new FakeRenderer(C.TRACK_TYPE_VIDEO); - SimpleExoPlayer player = new TestExoPlayerBuilder(context).setRenderers(renderer).build(); + ExoPlayer player = new TestExoPlayerBuilder(context).setRenderers(renderer).build(); Player.Listener mockListener = mock(Player.Listener.class); player.addListener(mockListener); @@ -272,7 +272,7 @@ public final class ExoPlayerTest { public void playMultiPeriodTimeline() throws Exception { Timeline timeline = new FakeTimeline(/* windowCount= */ 3); FakeRenderer renderer = new FakeRenderer(C.TRACK_TYPE_VIDEO); - SimpleExoPlayer player = new TestExoPlayerBuilder(context).setRenderers(renderer).build(); + ExoPlayer player = new TestExoPlayerBuilder(context).setRenderers(renderer).build(); Player.Listener mockPlayerListener = mock(Player.Listener.class); player.addListener(mockPlayerListener); @@ -310,7 +310,7 @@ public final class ExoPlayerTest { Timeline timeline = new FakeTimeline(new TimelineWindowDefinition(/* periodCount= */ 100, /* id= */ 0)); FakeRenderer renderer = new FakeRenderer(C.TRACK_TYPE_VIDEO); - SimpleExoPlayer player = new TestExoPlayerBuilder(context).setRenderers(renderer).build(); + ExoPlayer player = new TestExoPlayerBuilder(context).setRenderers(renderer).build(); Player.Listener mockPlayerListener = mock(Player.Listener.class); player.addListener(mockPlayerListener); @@ -342,7 +342,7 @@ public final class ExoPlayerTest { Timeline timeline = new FakeTimeline(); final FakeRenderer videoRenderer = new FakeRenderer(C.TRACK_TYPE_VIDEO); final FakeRenderer audioRenderer = new FakeRenderer(C.TRACK_TYPE_AUDIO); - SimpleExoPlayer player = + ExoPlayer player = new TestExoPlayerBuilder(context).setRenderers(videoRenderer, audioRenderer).build(); Player.Listener mockPlayerListener = mock(Player.Listener.class); player.addListener(mockPlayerListener); @@ -366,7 +366,7 @@ public final class ExoPlayerTest { final FakeRenderer videoRenderer = new FakeRenderer(C.TRACK_TYPE_VIDEO); final FakeRenderer audioRenderer = new FakeRenderer(C.TRACK_TYPE_AUDIO); final FakeRenderer textRenderer = new FakeRenderer(C.TRACK_TYPE_TEXT); - SimpleExoPlayer player = + ExoPlayer player = new TestExoPlayerBuilder(context).setRenderers(videoRenderer, audioRenderer).build(); Player.Listener mockPlayerListener = mock(Player.Listener.class); player.addListener(mockPlayerListener); @@ -404,7 +404,7 @@ public final class ExoPlayerTest { final FakeRenderer textRenderer = new FakeRenderer(C.TRACK_TYPE_TEXT); Format textFormat = new Format.Builder().setSampleMimeType(MimeTypes.TEXT_VTT).setLanguage("en").build(); - SimpleExoPlayer player = + ExoPlayer player = new TestExoPlayerBuilder(context).setRenderers(audioRenderer, textRenderer).build(); Player.Listener mockPlayerListener = mock(Player.Listener.class); player.addListener(mockPlayerListener); @@ -440,7 +440,7 @@ public final class ExoPlayerTest { final FakeRenderer textRenderer = new FakeRenderer(C.TRACK_TYPE_TEXT); Format textFormat = new Format.Builder().setSampleMimeType(MimeTypes.TEXT_VTT).setLanguage("en").build(); - SimpleExoPlayer player = + ExoPlayer player = new TestExoPlayerBuilder(context) .setRenderers(videoRenderer, audioRenderer, textRenderer) .build(); @@ -531,7 +531,7 @@ public final class ExoPlayerTest { return videoRenderer.isEnded(); } }; - SimpleExoPlayer player = + ExoPlayer player = new TestExoPlayerBuilder(context).setRenderers(videoRenderer, audioRenderer).build(); Player.Listener mockPlayerListener = mock(Player.Listener.class); player.addListener(mockPlayerListener); @@ -581,7 +581,7 @@ public final class ExoPlayerTest { }; Timeline thirdTimeline = new FakeTimeline(); MediaSource thirdSource = new FakeMediaSource(thirdTimeline, ExoPlayerTestRunner.VIDEO_FORMAT); - SimpleExoPlayer player = new TestExoPlayerBuilder(context).setRenderers(renderer).build(); + ExoPlayer player = new TestExoPlayerBuilder(context).setRenderers(renderer).build(); Player.Listener mockPlayerListener = mock(Player.Listener.class); player.addListener(mockPlayerListener); @@ -639,7 +639,7 @@ public final class ExoPlayerTest { public void repeatModeChanges() throws Exception { Timeline timeline = new FakeTimeline(/* windowCount= */ 3); FakeRenderer renderer = new FakeRenderer(C.TRACK_TYPE_VIDEO); - SimpleExoPlayer player = new TestExoPlayerBuilder(context).setRenderers(renderer).build(); + ExoPlayer player = new TestExoPlayerBuilder(context).setRenderers(renderer).build(); AnalyticsListener mockAnalyticsListener = mock(AnalyticsListener.class); player.addAnalyticsListener(mockAnalyticsListener); @@ -803,7 +803,7 @@ public final class ExoPlayerTest { .executeRunnable( new PlayerRunnable() { @Override - public void run(SimpleExoPlayer player) { + public void run(ExoPlayer player) { try { player.seekTo(/* windowIndex= */ 100, /* positionMs= */ 0); } catch (IllegalSeekPositionException e) { @@ -1196,7 +1196,7 @@ public final class ExoPlayerTest { .executeRunnable( new PlayerRunnable() { @Override - public void run(SimpleExoPlayer player) { + public void run(ExoPlayer player) { try { player.getClock().onThreadBlocked(); createPeriodCalledCountDownLatch.await(); @@ -1273,7 +1273,7 @@ public final class ExoPlayerTest { .executeRunnable( new PlayerRunnable() { @Override - public void run(SimpleExoPlayer player) { + public void run(ExoPlayer player) { positionWhenReady.set(player.getCurrentPosition()); } }) @@ -1306,7 +1306,7 @@ public final class ExoPlayerTest { .executeRunnable( new PlayerRunnable() { @Override - public void run(SimpleExoPlayer player) { + public void run(ExoPlayer player) { currentWindowIndex[0] = player.getCurrentWindowIndex(); currentPosition[0] = player.getCurrentPosition(); bufferedPosition[0] = player.getBufferedPosition(); @@ -1322,7 +1322,7 @@ public final class ExoPlayerTest { .executeRunnable( new PlayerRunnable() { @Override - public void run(SimpleExoPlayer player) { + public void run(ExoPlayer player) { currentWindowIndex[2] = player.getCurrentWindowIndex(); currentPosition[2] = player.getCurrentPosition(); bufferedPosition[2] = player.getBufferedPosition(); @@ -1398,7 +1398,7 @@ public final class ExoPlayerTest { .executeRunnable( new PlayerRunnable() { @Override - public void run(SimpleExoPlayer player) { + public void run(ExoPlayer player) { currentWindowIndex[0] = player.getCurrentWindowIndex(); currentPosition[0] = player.getCurrentPosition(); bufferedPosition[0] = player.getBufferedPosition(); @@ -1414,7 +1414,7 @@ public final class ExoPlayerTest { .executeRunnable( new PlayerRunnable() { @Override - public void run(SimpleExoPlayer player) { + public void run(ExoPlayer player) { currentWindowIndex[2] = player.getCurrentWindowIndex(); currentPosition[2] = player.getCurrentPosition(); bufferedPosition[2] = player.getBufferedPosition(); @@ -1492,7 +1492,7 @@ public final class ExoPlayerTest { .executeRunnable( new PlayerRunnable() { @Override - public void run(SimpleExoPlayer player) { + public void run(ExoPlayer player) { currentWindowIndex[0] = player.getCurrentWindowIndex(); currentPosition[0] = player.getCurrentPosition(); bufferedPosition[0] = player.getBufferedPosition(); @@ -1508,7 +1508,7 @@ public final class ExoPlayerTest { .executeRunnable( new PlayerRunnable() { @Override - public void run(SimpleExoPlayer player) { + public void run(ExoPlayer player) { currentWindowIndex[2] = player.getCurrentWindowIndex(); currentPosition[2] = player.getCurrentPosition(); bufferedPosition[2] = player.getBufferedPosition(); @@ -1559,7 +1559,7 @@ public final class ExoPlayerTest { .executeRunnable( new PlayerRunnable() { @Override - public void run(SimpleExoPlayer player) { + public void run(ExoPlayer player) { windowIndexAfterStop.set(player.getCurrentWindowIndex()); positionAfterStop.set(player.getCurrentPosition()); } @@ -1627,7 +1627,7 @@ public final class ExoPlayerTest { .executeRunnable( new PlayerRunnable() { @Override - public void run(SimpleExoPlayer player) { + public void run(ExoPlayer player) { positionAfterReprepare.set(player.getCurrentPosition()); } }) @@ -1681,7 +1681,7 @@ public final class ExoPlayerTest { .executeRunnable( new PlayerRunnable() { @Override - public void run(SimpleExoPlayer player) { + public void run(ExoPlayer player) { positionAfterReprepare.set(player.getCurrentPosition()); } }) @@ -1738,7 +1738,7 @@ public final class ExoPlayerTest { .executeRunnable( new PlayerRunnable() { @Override - public void run(SimpleExoPlayer player) { + public void run(ExoPlayer player) { positionAfterReprepare.set(player.getCurrentPosition()); } }) @@ -1846,7 +1846,7 @@ public final class ExoPlayerTest { @Test public void seekAndReprepareAfterPlaybackError_keepsSeekPositionAndTimeline() throws Exception { - SimpleExoPlayer player = new TestExoPlayerBuilder(context).build(); + ExoPlayer player = new TestExoPlayerBuilder(context).build(); Player.Listener mockListener = mock(Player.Listener.class); player.addListener(mockListener); FakeMediaSource fakeMediaSource = new FakeMediaSource(); @@ -1907,7 +1907,7 @@ public final class ExoPlayerTest { .executeRunnable( new PlayerRunnable() { @Override - public void run(SimpleExoPlayer player) { + public void run(ExoPlayer player) { windowIndexAfterAddingSources.set(player.getCurrentWindowIndex()); } }) @@ -1940,7 +1940,7 @@ public final class ExoPlayerTest { .executeRunnable( new PlayerRunnable() { @Override - public void run(SimpleExoPlayer player) { + public void run(ExoPlayer player) { // Position while in error state positionHolder[0] = player.getCurrentPosition(); windowIndexHolder[0] = player.getCurrentWindowIndex(); @@ -1950,7 +1950,7 @@ public final class ExoPlayerTest { .executeRunnable( new PlayerRunnable() { @Override - public void run(SimpleExoPlayer player) { + public void run(ExoPlayer player) { // Position while repreparing. positionHolder[1] = player.getCurrentPosition(); windowIndexHolder[1] = player.getCurrentWindowIndex(); @@ -1960,7 +1960,7 @@ public final class ExoPlayerTest { .executeRunnable( new PlayerRunnable() { @Override - public void run(SimpleExoPlayer player) { + public void run(ExoPlayer player) { // Position after repreparation finished. positionHolder[2] = player.getCurrentPosition(); windowIndexHolder[2] = player.getCurrentWindowIndex(); @@ -2005,7 +2005,7 @@ public final class ExoPlayerTest { .executeRunnable( new PlayerRunnable() { @Override - public void run(SimpleExoPlayer player) { + public void run(ExoPlayer player) { // Position while in error state positionHolder[0] = player.getCurrentPosition(); windowIndexHolder[0] = player.getCurrentWindowIndex(); @@ -2016,7 +2016,7 @@ public final class ExoPlayerTest { .executeRunnable( new PlayerRunnable() { @Override - public void run(SimpleExoPlayer player) { + public void run(ExoPlayer player) { // Position while in error state positionHolder[1] = player.getCurrentPosition(); windowIndexHolder[1] = player.getCurrentWindowIndex(); @@ -2026,7 +2026,7 @@ public final class ExoPlayerTest { .executeRunnable( new PlayerRunnable() { @Override - public void run(SimpleExoPlayer player) { + public void run(ExoPlayer player) { // Position after prepare. positionHolder[2] = player.getCurrentPosition(); windowIndexHolder[2] = player.getCurrentWindowIndex(); @@ -2618,7 +2618,7 @@ public final class ExoPlayerTest { .executeRunnable( new PlayerRunnable() { @Override - public void run(SimpleExoPlayer player) { + public void run(ExoPlayer player) { message.set( player.createMessage(target).setPosition(/* positionMs= */ 50).send()); } @@ -2648,7 +2648,7 @@ public final class ExoPlayerTest { .executeRunnable( new PlayerRunnable() { @Override - public void run(SimpleExoPlayer player) { + public void run(ExoPlayer player) { message.set( player .createMessage(target) @@ -2879,7 +2879,7 @@ public final class ExoPlayerTest { return super.createPeriod(id, allocator, startPositionUs); } }; - SimpleExoPlayer player = new TestExoPlayerBuilder(context).build(); + ExoPlayer player = new TestExoPlayerBuilder(context).build(); player.setMediaSource(mediaSource); // Throw on the playback thread if the player position reaches a value that is just less than // seek position. This ensures that playback stops and the assertion on the player position @@ -2973,7 +2973,7 @@ public final class ExoPlayerTest { .executeRunnable( new PlayerRunnable() { @Override - public void run(SimpleExoPlayer player) { + public void run(ExoPlayer player) { mediaSource.removeMediaSource(/* index= */ 0); try { // Wait until the source to be removed is released on the playback thread. So @@ -2994,7 +2994,7 @@ public final class ExoPlayerTest { .executeRunnable( new PlayerRunnable() { @Override - public void run(SimpleExoPlayer player) { + public void run(ExoPlayer player) { windowCount[0] = player.getCurrentTimeline().getWindowCount(); position[0] = player.getCurrentPosition(); } @@ -3076,7 +3076,7 @@ public final class ExoPlayerTest { .executeRunnable( new PlayerRunnable() { @Override - public void run(SimpleExoPlayer player) { + public void run(ExoPlayer player) { playerReference.set(player); player.addListener(playerListener1); player.addListener(playerListener2); @@ -3137,7 +3137,7 @@ public final class ExoPlayerTest { .executeRunnable( new PlayerRunnable() { @Override - public void run(SimpleExoPlayer player) { + public void run(ExoPlayer player) { playerReference.set(player); player.addListener(playerListener); } @@ -3176,7 +3176,7 @@ public final class ExoPlayerTest { .executeRunnable( new PlayerRunnable() { @Override - public void run(SimpleExoPlayer player) { + public void run(ExoPlayer player) { playerReference.set(player); player.addListener(playerListener); } @@ -3244,7 +3244,7 @@ public final class ExoPlayerTest { .executeRunnable( new PlayerRunnable() { @Override - public void run(SimpleExoPlayer player) { + public void run(ExoPlayer player) { playerReference.set(player); player.addListener(playerListener); } @@ -3375,7 +3375,7 @@ public final class ExoPlayerTest { .executeRunnable( new PlayerRunnable() { @Override - public void run(SimpleExoPlayer player) { + public void run(ExoPlayer player) { positionWhenReady.set(player.getContentPosition()); } }) @@ -3419,7 +3419,7 @@ public final class ExoPlayerTest { .executeRunnable( new PlayerRunnable() { @Override - public void run(SimpleExoPlayer player) { + public void run(ExoPlayer player) { periodIndexWhenReady.set(player.getCurrentPeriodIndex()); positionWhenReady.set(player.getContentPosition()); } @@ -3469,7 +3469,7 @@ public final class ExoPlayerTest { .executeRunnable( new PlayerRunnable() { @Override - public void run(SimpleExoPlayer player) { + public void run(ExoPlayer player) { playerReference.set(player); player.addListener(playerListener); } @@ -3520,7 +3520,7 @@ public final class ExoPlayerTest { .executeRunnable( new PlayerRunnable() { @Override - public void run(SimpleExoPlayer player) { + public void run(ExoPlayer player) { playerReference.set(player); player.addListener(playerListener); } @@ -3573,7 +3573,7 @@ public final class ExoPlayerTest { .executeRunnable( new PlayerRunnable() { @Override - public void run(SimpleExoPlayer player) { + public void run(ExoPlayer player) { playerReference.set(player); player.addListener(playerListener); } @@ -3593,7 +3593,7 @@ public final class ExoPlayerTest { @Test public void adInMovingLiveWindow_keepsContentPosition() throws Exception { - SimpleExoPlayer player = new TestExoPlayerBuilder(context).build(); + ExoPlayer player = new TestExoPlayerBuilder(context).build(); AdPlaybackState adPlaybackState = FakeTimeline.createAdPlaybackState( /* adsPerAdGroup= */ 1, /* adGroupTimesUs...= */ 42_000_004_000_000L); @@ -3648,9 +3648,7 @@ public final class ExoPlayerTest { new Action("getPlaybackSpeed", /* description= */ null) { @Override protected void doActionImpl( - SimpleExoPlayer player, - DefaultTrackSelector trackSelector, - @Nullable Surface surface) { + ExoPlayer player, DefaultTrackSelector trackSelector, @Nullable Surface surface) { maskedPlaybackSpeeds.add(player.getPlaybackParameters().speed); } }; @@ -3864,7 +3862,7 @@ public final class ExoPlayerTest { .executeRunnable( new PlayerRunnable() { @Override - public void run(SimpleExoPlayer player) { + public void run(ExoPlayer player) { currentWindowIndices[0] = player.getCurrentWindowIndex(); currentPlaybackPositions[0] = player.getCurrentPosition(); windowCounts[0] = player.getCurrentTimeline().getWindowCount(); @@ -3902,7 +3900,7 @@ public final class ExoPlayerTest { .executeRunnable( new PlayerRunnable() { @Override - public void run(SimpleExoPlayer player) { + public void run(ExoPlayer player) { positionMs[0] = player.getCurrentPosition(); bufferedPositions[0] = player.getBufferedPosition(); //noinspection deprecation @@ -3916,7 +3914,7 @@ public final class ExoPlayerTest { .executeRunnable( new PlayerRunnable() { @Override - public void run(SimpleExoPlayer player) { + public void run(ExoPlayer player) { windowIndex[0] = player.getCurrentWindowIndex(); positionMs[2] = player.getCurrentPosition(); bufferedPositions[2] = player.getBufferedPosition(); @@ -3956,7 +3954,7 @@ public final class ExoPlayerTest { .executeRunnable( new PlayerRunnable() { @Override - public void run(SimpleExoPlayer player) { + public void run(ExoPlayer player) { positionMs[0] = player.getCurrentPosition(); bufferedPositions[0] = player.getBufferedPosition(); player.setMediaSource(mediaSource, /* startPositionMs= */ 7000); @@ -3969,7 +3967,7 @@ public final class ExoPlayerTest { .executeRunnable( new PlayerRunnable() { @Override - public void run(SimpleExoPlayer player) { + public void run(ExoPlayer player) { windowIndex[0] = player.getCurrentWindowIndex(); positionMs[2] = player.getCurrentPosition(); bufferedPositions[2] = player.getBufferedPosition(); @@ -4003,7 +4001,7 @@ public final class ExoPlayerTest { runPositionMaskingCapturingActionSchedule( new PlayerRunnable() { @Override - public void run(SimpleExoPlayer player) { + public void run(ExoPlayer player) { player.seekTo(9000); } }, @@ -4035,7 +4033,7 @@ public final class ExoPlayerTest { runPositionMaskingCapturingActionSchedule( new PlayerRunnable() { @Override - public void run(SimpleExoPlayer player) { + public void run(ExoPlayer player) { player.seekTo(9200); } }, @@ -4067,7 +4065,7 @@ public final class ExoPlayerTest { runPositionMaskingCapturingActionSchedule( new PlayerRunnable() { @Override - public void run(SimpleExoPlayer player) { + public void run(ExoPlayer player) { player.seekTo(1000); } }, @@ -4094,7 +4092,7 @@ public final class ExoPlayerTest { runPositionMaskingCapturingActionSchedule( new PlayerRunnable() { @Override - public void run(SimpleExoPlayer player) { + public void run(ExoPlayer player) { player.seekTo(0, 1000); } }, @@ -4123,7 +4121,7 @@ public final class ExoPlayerTest { runPositionMaskingCapturingActionSchedule( new PlayerRunnable() { @Override - public void run(SimpleExoPlayer player) { + public void run(ExoPlayer player) { player.seekTo(2, 1000); } }, @@ -4157,7 +4155,7 @@ public final class ExoPlayerTest { runPositionMaskingCapturingActionSchedule( new PlayerRunnable() { @Override - public void run(SimpleExoPlayer player) { + public void run(ExoPlayer player) { player.seekTo(1, 1000); } }, @@ -4193,7 +4191,7 @@ public final class ExoPlayerTest { runPositionMaskingCapturingActionSchedule( new PlayerRunnable() { @Override - public void run(SimpleExoPlayer player) { + public void run(ExoPlayer player) { player.seekTo(1, 1000); } }, @@ -4228,7 +4226,7 @@ public final class ExoPlayerTest { runPositionMaskingCapturingActionSchedule( new PlayerRunnable() { @Override - public void run(SimpleExoPlayer player) { + public void run(ExoPlayer player) { player.seekTo(1, 5000); } }, @@ -4261,7 +4259,7 @@ public final class ExoPlayerTest { runPositionMaskingCapturingActionSchedule( new PlayerRunnable() { @Override - public void run(SimpleExoPlayer player) { + public void run(ExoPlayer player) { player.seekTo(1, 5000); } }, @@ -4297,7 +4295,7 @@ public final class ExoPlayerTest { runPositionMaskingCapturingActionSchedule( new PlayerRunnable() { @Override - public void run(SimpleExoPlayer player) { + public void run(ExoPlayer player) { player.addMediaSource( /* index= */ 1, createPartiallyBufferedMediaSource(/* maxBufferedPositionMs= */ 0)); } @@ -4331,7 +4329,7 @@ public final class ExoPlayerTest { runPositionMaskingCapturingActionSchedule( new PlayerRunnable() { @Override - public void run(SimpleExoPlayer player) { + public void run(ExoPlayer player) { player.moveMediaItem(/* currentIndex= */ 1, /* newIndex= */ 2); } }, @@ -4365,7 +4363,7 @@ public final class ExoPlayerTest { runPositionMaskingCapturingActionSchedule( new PlayerRunnable() { @Override - public void run(SimpleExoPlayer player) { + public void run(ExoPlayer player) { player.moveMediaItem(/* currentIndex= */ 3, /* newIndex= */ 1); } }, @@ -4400,7 +4398,7 @@ public final class ExoPlayerTest { runPositionMaskingCapturingActionSchedule( new PlayerRunnable() { @Override - public void run(SimpleExoPlayer player) { + public void run(ExoPlayer player) { player.removeMediaItem(/* index= */ 0); } }, @@ -4435,7 +4433,7 @@ public final class ExoPlayerTest { runPositionMaskingCapturingActionSchedule( new PlayerRunnable() { @Override - public void run(SimpleExoPlayer player) { + public void run(ExoPlayer player) { player.removeMediaItem(/* index= */ 2); } }, @@ -4470,7 +4468,7 @@ public final class ExoPlayerTest { runPositionMaskingCapturingActionSchedule( new PlayerRunnable() { @Override - public void run(SimpleExoPlayer player) { + public void run(ExoPlayer player) { player.removeMediaItem(/* index= */ 1); } }, @@ -4504,7 +4502,7 @@ public final class ExoPlayerTest { runPositionMaskingCapturingActionSchedule( new PlayerRunnable() { @Override - public void run(SimpleExoPlayer player) { + public void run(ExoPlayer player) { player.clearMediaItems(); } }, @@ -4544,7 +4542,7 @@ public final class ExoPlayerTest { .executeRunnable( new PlayerRunnable() { @Override - public void run(SimpleExoPlayer player) { + public void run(ExoPlayer player) { windowIndex[0] = player.getCurrentWindowIndex(); positionMs[0] = player.getCurrentPosition(); bufferedPosition[0] = player.getBufferedPosition(); @@ -4555,7 +4553,7 @@ public final class ExoPlayerTest { .executeRunnable( new PlayerRunnable() { @Override - public void run(SimpleExoPlayer player) { + public void run(ExoPlayer player) { windowIndex[1] = player.getCurrentWindowIndex(); positionMs[1] = player.getCurrentPosition(); bufferedPosition[1] = player.getBufferedPosition(); @@ -4651,7 +4649,7 @@ public final class ExoPlayerTest { .executeRunnable( new PlayerRunnable() { @Override - public void run(SimpleExoPlayer player) { + public void run(ExoPlayer player) { player.addMediaSource(/* index= */ 1, new FakeMediaSource()); windowIndex[0] = player.getCurrentWindowIndex(); isPlayingAd[0] = player.isPlayingAd(); @@ -4664,7 +4662,7 @@ public final class ExoPlayerTest { .executeRunnable( new PlayerRunnable() { @Override - public void run(SimpleExoPlayer player) { + public void run(ExoPlayer player) { windowIndex[1] = player.getCurrentWindowIndex(); isPlayingAd[1] = player.isPlayingAd(); positionMs[1] = player.getCurrentPosition(); @@ -4677,7 +4675,7 @@ public final class ExoPlayerTest { .executeRunnable( new PlayerRunnable() { @Override - public void run(SimpleExoPlayer player) { + public void run(ExoPlayer player) { player.addMediaSource(new FakeMediaSource()); windowIndex[2] = player.getCurrentWindowIndex(); isPlayingAd[2] = player.isPlayingAd(); @@ -4752,7 +4750,7 @@ public final class ExoPlayerTest { .executeRunnable( new PlayerRunnable() { @Override - public void run(SimpleExoPlayer player) { + public void run(ExoPlayer player) { player.seekTo(/* windowIndex= */ 0, /* positionMs= */ 8000); windowIndex[0] = player.getCurrentWindowIndex(); isPlayingAd[0] = player.isPlayingAd(); @@ -4765,7 +4763,7 @@ public final class ExoPlayerTest { .executeRunnable( new PlayerRunnable() { @Override - public void run(SimpleExoPlayer player) { + public void run(ExoPlayer player) { windowIndex[1] = player.getCurrentWindowIndex(); isPlayingAd[1] = player.isPlayingAd(); positionMs[1] = player.getCurrentPosition(); @@ -4820,7 +4818,7 @@ public final class ExoPlayerTest { adPlaybackState)); FakeMediaSource adsMediaSource = new FakeMediaSource(adTimeline); - SimpleExoPlayer player = new TestExoPlayerBuilder(context).build(); + ExoPlayer player = new TestExoPlayerBuilder(context).build(); player.setMediaSource(adsMediaSource); player.pause(); player.prepare(); @@ -4835,7 +4833,7 @@ public final class ExoPlayerTest { @Test public void becomingNoisyIgnoredIfBecomingNoisyHandlingIsDisabled() throws Exception { - SimpleExoPlayer player = new TestExoPlayerBuilder(context).build(); + ExoPlayer player = new TestExoPlayerBuilder(context).build(); player.play(); player.setHandleAudioBecomingNoisy(false); @@ -4849,7 +4847,7 @@ public final class ExoPlayerTest { @Test public void pausesWhenBecomingNoisyIfBecomingNoisyHandlingIsEnabled() throws Exception { - SimpleExoPlayer player = new TestExoPlayerBuilder(context).build(); + ExoPlayer player = new TestExoPlayerBuilder(context).build(); player.play(); player.setHandleAudioBecomingNoisy(true); @@ -5063,7 +5061,7 @@ public final class ExoPlayerTest { /* deferOnPrepared= */ id.adIndexInAdGroup == 1); } }; - SimpleExoPlayer player = new TestExoPlayerBuilder(context).build(); + ExoPlayer player = new TestExoPlayerBuilder(context).build(); player.setMediaSource(mediaSource); player.prepare(); player.play(); @@ -5322,7 +5320,7 @@ public final class ExoPlayerTest { .executeRunnable( new PlayerRunnable() { @Override - public void run(SimpleExoPlayer player) { + public void run(ExoPlayer player) { player.setMediaSource(new FakeMediaSource(), /* startPositionMs= */ 1000); maskingPlaybackState[0] = player.getPlaybackState(); } @@ -5509,7 +5507,7 @@ public final class ExoPlayerTest { .executeRunnable( new PlayerRunnable() { @Override - public void run(SimpleExoPlayer player) { + public void run(ExoPlayer player) { currentWindowIndices[0] = player.getCurrentWindowIndex(); } }) @@ -5574,7 +5572,7 @@ public final class ExoPlayerTest { .executeRunnable( new PlayerRunnable() { @Override - public void run(SimpleExoPlayer player) { + public void run(ExoPlayer player) { currentWindowIndices[0] = player.getCurrentWindowIndex(); currentPlaybackPositions[0] = player.getCurrentPosition(); } @@ -5610,7 +5608,7 @@ public final class ExoPlayerTest { .executeRunnable( new PlayerRunnable() { @Override - public void run(SimpleExoPlayer player) { + public void run(ExoPlayer player) { currentWindowIndices[0] = player.getCurrentWindowIndex(); currentPlaybackPositions[0] = player.getCurrentPosition(); windowCounts[0] = player.getCurrentTimeline().getWindowCount(); @@ -5626,7 +5624,7 @@ public final class ExoPlayerTest { .executeRunnable( new PlayerRunnable() { @Override - public void run(SimpleExoPlayer player) { + public void run(ExoPlayer player) { currentWindowIndices[1] = player.getCurrentWindowIndex(); currentPlaybackPositions[1] = player.getCurrentPosition(); windowCounts[1] = player.getCurrentTimeline().getWindowCount(); @@ -5681,7 +5679,7 @@ public final class ExoPlayerTest { .executeRunnable( new PlayerRunnable() { @Override - public void run(SimpleExoPlayer player) { + public void run(ExoPlayer player) { currentWindowIndices[0] = player.getCurrentWindowIndex(); currentPlaybackPositions[0] = player.getCurrentPosition(); windowCounts[0] = player.getCurrentTimeline().getWindowCount(); @@ -5697,7 +5695,7 @@ public final class ExoPlayerTest { .executeRunnable( new PlayerRunnable() { @Override - public void run(SimpleExoPlayer player) { + public void run(ExoPlayer player) { currentWindowIndices[1] = player.getCurrentWindowIndex(); currentPlaybackPositions[1] = player.getCurrentPosition(); windowCounts[1] = player.getCurrentTimeline().getWindowCount(); @@ -5761,7 +5759,7 @@ public final class ExoPlayerTest { .executeRunnable( new PlayerRunnable() { @Override - public void run(SimpleExoPlayer player) { + public void run(ExoPlayer player) { positionAfterSetPlayWhenReady.set(player.getCurrentPosition()); } }) @@ -5785,7 +5783,7 @@ public final class ExoPlayerTest { .executeRunnable( new PlayerRunnable() { @Override - public void run(SimpleExoPlayer player) { + public void run(ExoPlayer player) { currentPositionMs[0] = player.getCurrentPosition(); bufferedPositionMs[0] = player.getBufferedPosition(); player.setPlayWhenReady(true); @@ -5822,7 +5820,7 @@ public final class ExoPlayerTest { .executeRunnable( new PlayerRunnable() { @Override - public void run(SimpleExoPlayer player) { + public void run(ExoPlayer player) { currentPositionMs[0] = player.getCurrentPosition(); bufferedPositionMs[0] = player.getBufferedPosition(); player.setShuffleModeEnabled(true); @@ -5859,7 +5857,7 @@ public final class ExoPlayerTest { .executeRunnable( new PlayerRunnable() { @Override - public void run(SimpleExoPlayer player) { + public void run(ExoPlayer player) { positionAfterSetShuffleOrder.set(player.getCurrentPosition()); } }) @@ -5882,7 +5880,7 @@ public final class ExoPlayerTest { .executeRunnable( new PlayerRunnable() { @Override - public void run(SimpleExoPlayer player) { + public void run(ExoPlayer player) { currentWindowIndices[0] = player.getCurrentWindowIndex(); List listOfTwo = ImmutableList.of(new FakeMediaSource(), new FakeMediaSource()); @@ -5895,7 +5893,7 @@ public final class ExoPlayerTest { .executeRunnable( new PlayerRunnable() { @Override - public void run(SimpleExoPlayer player) { + public void run(ExoPlayer player) { currentWindowIndices[2] = player.getCurrentWindowIndex(); } }) @@ -5920,7 +5918,7 @@ public final class ExoPlayerTest { .executeRunnable( new PlayerRunnable() { @Override - public void run(SimpleExoPlayer player) { + public void run(ExoPlayer player) { player.seekTo(/* windowIndex= */ 1, /* positionMs= */ 1000); currentWindowIndices[0] = player.getCurrentWindowIndex(); currentPositions[0] = player.getCurrentPosition(); @@ -5958,7 +5956,7 @@ public final class ExoPlayerTest { .executeRunnable( new PlayerRunnable() { @Override - public void run(SimpleExoPlayer player) { + public void run(ExoPlayer player) { currentWindowIndices[0] = player.getCurrentWindowIndex(); List listOfTwo = ImmutableList.of(new FakeMediaSource(), new FakeMediaSource()); @@ -5971,7 +5969,7 @@ public final class ExoPlayerTest { .executeRunnable( new PlayerRunnable() { @Override - public void run(SimpleExoPlayer player) { + public void run(ExoPlayer player) { currentWindowIndices[2] = player.getCurrentWindowIndex(); } }) @@ -5999,7 +5997,7 @@ public final class ExoPlayerTest { .executeRunnable( new PlayerRunnable() { @Override - public void run(SimpleExoPlayer player) { + public void run(ExoPlayer player) { currentWindowIndices[0] = player.getCurrentWindowIndex(); List listOfTwo = ImmutableList.of(new FakeMediaSource(), new FakeMediaSource()); @@ -6012,7 +6010,7 @@ public final class ExoPlayerTest { .executeRunnable( new PlayerRunnable() { @Override - public void run(SimpleExoPlayer player) { + public void run(ExoPlayer player) { currentWindowIndices[2] = player.getCurrentWindowIndex(); } }) @@ -6037,7 +6035,7 @@ public final class ExoPlayerTest { .executeRunnable( new PlayerRunnable() { @Override - public void run(SimpleExoPlayer player) { + public void run(ExoPlayer player) { // Increase current window index. player.addMediaSource(/* index= */ 0, new FakeMediaSource()); currentWindowIndices[0] = player.getCurrentWindowIndex(); @@ -6046,7 +6044,7 @@ public final class ExoPlayerTest { .executeRunnable( new PlayerRunnable() { @Override - public void run(SimpleExoPlayer player) { + public void run(ExoPlayer player) { // Current window index is unchanged. player.addMediaSource(/* index= */ 2, new FakeMediaSource()); currentWindowIndices[1] = player.getCurrentWindowIndex(); @@ -6055,7 +6053,7 @@ public final class ExoPlayerTest { .executeRunnable( new PlayerRunnable() { @Override - public void run(SimpleExoPlayer player) { + public void run(ExoPlayer player) { MediaSource mediaSource = new FakeMediaSource(); ConcatenatingMediaSource concatenatingMediaSource = new ConcatenatingMediaSource(mediaSource, mediaSource, mediaSource); @@ -6067,7 +6065,7 @@ public final class ExoPlayerTest { .executeRunnable( new PlayerRunnable() { @Override - public void run(SimpleExoPlayer player) { + public void run(ExoPlayer player) { ConcatenatingMediaSource concatenatingMediaSource = new ConcatenatingMediaSource(); // Current window index is unchanged when adding empty source. @@ -6103,7 +6101,7 @@ public final class ExoPlayerTest { .executeRunnable( new PlayerRunnable() { @Override - public void run(SimpleExoPlayer player) { + public void run(ExoPlayer player) { currentWindowIndices[0] = player.getCurrentWindowIndex(); currentPositions[0] = player.getCurrentPosition(); bufferedPositions[0] = player.getBufferedPosition(); @@ -6119,7 +6117,7 @@ public final class ExoPlayerTest { .executeRunnable( new PlayerRunnable() { @Override - public void run(SimpleExoPlayer player) { + public void run(ExoPlayer player) { currentWindowIndices[2] = player.getCurrentWindowIndex(); currentPositions[2] = player.getCurrentPosition(); bufferedPositions[2] = player.getBufferedPosition(); @@ -6152,7 +6150,7 @@ public final class ExoPlayerTest { .executeRunnable( new PlayerRunnable() { @Override - public void run(SimpleExoPlayer player) { + public void run(ExoPlayer player) { currentWindowIndices[0] = player.getCurrentWindowIndex(); currentPositions[0] = player.getCurrentPosition(); bufferedPositions[0] = player.getBufferedPosition(); @@ -6168,7 +6166,7 @@ public final class ExoPlayerTest { .executeRunnable( new PlayerRunnable() { @Override - public void run(SimpleExoPlayer player) { + public void run(ExoPlayer player) { currentWindowIndices[2] = player.getCurrentWindowIndex(); currentPositions[2] = player.getCurrentPosition(); bufferedPositions[2] = player.getBufferedPosition(); @@ -6198,7 +6196,7 @@ public final class ExoPlayerTest { .executeRunnable( new PlayerRunnable() { @Override - public void run(SimpleExoPlayer player) { + public void run(ExoPlayer player) { currentWindowIndices[0] = player.getCurrentWindowIndex(); // Increase current window index. player.addMediaSource(/* index= */ 0, new FakeMediaSource()); @@ -6209,7 +6207,7 @@ public final class ExoPlayerTest { .executeRunnable( new PlayerRunnable() { @Override - public void run(SimpleExoPlayer player) { + public void run(ExoPlayer player) { currentWindowIndices[2] = player.getCurrentWindowIndex(); } }) @@ -6233,7 +6231,7 @@ public final class ExoPlayerTest { .executeRunnable( new PlayerRunnable() { @Override - public void run(SimpleExoPlayer player) { + public void run(ExoPlayer player) { // Set empty media item with no seek. player.setMediaSource(new ConcatenatingMediaSource()); maskingPlaybackStates[0] = player.getPlaybackState(); @@ -6242,7 +6240,7 @@ public final class ExoPlayerTest { .executeRunnable( new PlayerRunnable() { @Override - public void run(SimpleExoPlayer player) { + public void run(ExoPlayer player) { // Set media item with an implicit seek to the current position. player.setMediaSource(new FakeMediaSource()); maskingPlaybackStates[1] = player.getPlaybackState(); @@ -6251,7 +6249,7 @@ public final class ExoPlayerTest { .executeRunnable( new PlayerRunnable() { @Override - public void run(SimpleExoPlayer player) { + public void run(ExoPlayer player) { // Set media item with an explicit seek. player.setMediaSource( new FakeMediaSource(), /* startPositionMs= */ C.TIME_UNSET); @@ -6261,7 +6259,7 @@ public final class ExoPlayerTest { .executeRunnable( new PlayerRunnable() { @Override - public void run(SimpleExoPlayer player) { + public void run(ExoPlayer player) { // Set empty media item with an explicit seek. player.setMediaSource( new ConcatenatingMediaSource(), /* startPositionMs= */ C.TIME_UNSET); @@ -6301,7 +6299,7 @@ public final class ExoPlayerTest { .executeRunnable( new PlayerRunnable() { @Override - public void run(SimpleExoPlayer player) { + public void run(ExoPlayer player) { // Set a media item with an implicit seek to the current position which is // invalid in the new timeline. player.setMediaSource( @@ -6339,7 +6337,7 @@ public final class ExoPlayerTest { .executeRunnable( new PlayerRunnable() { @Override - public void run(SimpleExoPlayer player) { + public void run(ExoPlayer player) { // Set media item with no seek. player.setMediaSource(new FakeMediaSource()); maskingPlaybackStates[0] = player.getPlaybackState(); @@ -6374,7 +6372,7 @@ public final class ExoPlayerTest { .executeRunnable( new PlayerRunnable() { @Override - public void run(SimpleExoPlayer player) { + public void run(ExoPlayer player) { // Set an empty media item with no seek. player.setMediaSource(new ConcatenatingMediaSource()); maskingPlaybackStates[0] = player.getPlaybackState(); @@ -6415,7 +6413,7 @@ public final class ExoPlayerTest { .executeRunnable( new PlayerRunnable() { @Override - public void run(SimpleExoPlayer player) { + public void run(ExoPlayer player) { // Set empty media item with an implicit seek to the current position. player.setMediaSource(new ConcatenatingMediaSource()); maskingPlaybackStates[0] = player.getPlaybackState(); @@ -6425,7 +6423,7 @@ public final class ExoPlayerTest { .executeRunnable( new PlayerRunnable() { @Override - public void run(SimpleExoPlayer player) { + public void run(ExoPlayer player) { // Set empty media item with an explicit seek. player.setMediaSource( new ConcatenatingMediaSource(), /* startPositionMs= */ C.TIME_UNSET); @@ -6436,7 +6434,7 @@ public final class ExoPlayerTest { .executeRunnable( new PlayerRunnable() { @Override - public void run(SimpleExoPlayer player) { + public void run(ExoPlayer player) { // Set media item with an implicit seek to the current position. player.setMediaSource(firstMediaSource); maskingPlaybackStates[2] = player.getPlaybackState(); @@ -6447,7 +6445,7 @@ public final class ExoPlayerTest { .executeRunnable( new PlayerRunnable() { @Override - public void run(SimpleExoPlayer player) { + public void run(ExoPlayer player) { // Set media item with an explicit seek. player.setMediaSource(secondMediaSource, /* startPositionMs= */ C.TIME_UNSET); maskingPlaybackStates[3] = player.getPlaybackState(); @@ -6496,7 +6494,7 @@ public final class ExoPlayerTest { .executeRunnable( new PlayerRunnable() { @Override - public void run(SimpleExoPlayer player) { + public void run(ExoPlayer player) { // Set media item with an invalid implicit seek to the current position. player.setMediaSource( new FakeMediaSource(new FakeTimeline(/* windowCount= */ 1, 1L)), @@ -6536,7 +6534,7 @@ public final class ExoPlayerTest { .executeRunnable( new PlayerRunnable() { @Override - public void run(SimpleExoPlayer player) { + public void run(ExoPlayer player) { // Set media item with no seek (keep current position). player.setMediaSource(new FakeMediaSource(), /* resetPosition= */ false); maskingPlaybackStates[0] = player.getPlaybackState(); @@ -6576,7 +6574,7 @@ public final class ExoPlayerTest { .executeRunnable( new PlayerRunnable() { @Override - public void run(SimpleExoPlayer player) { + public void run(ExoPlayer player) { // Set an empty media item with no seek. player.setMediaSource(new ConcatenatingMediaSource()); maskingPlaybackStates[0] = player.getPlaybackState(); @@ -6616,7 +6614,7 @@ public final class ExoPlayerTest { .executeRunnable( new PlayerRunnable() { @Override - public void run(SimpleExoPlayer player) { + public void run(ExoPlayer player) { // Set empty media item with an implicit seek to current position. player.setMediaSource( new ConcatenatingMediaSource(), /* resetPosition= */ false); @@ -6630,7 +6628,7 @@ public final class ExoPlayerTest { .executeRunnable( new PlayerRunnable() { @Override - public void run(SimpleExoPlayer player) { + public void run(ExoPlayer player) { // Set empty media item with an explicit seek. player.setMediaSource( new ConcatenatingMediaSource(), /* startPositionMs= */ C.TIME_UNSET); @@ -6644,7 +6642,7 @@ public final class ExoPlayerTest { .executeRunnable( new PlayerRunnable() { @Override - public void run(SimpleExoPlayer player) { + public void run(ExoPlayer player) { // Set media item with an explicit seek. player.setMediaSource(secondMediaSource, /* startPositionMs= */ C.TIME_UNSET); // Expect masking state is buffering, @@ -6657,7 +6655,7 @@ public final class ExoPlayerTest { .executeRunnable( new PlayerRunnable() { @Override - public void run(SimpleExoPlayer player) { + public void run(ExoPlayer player) { // Set media item with an implicit seek to the current position. player.setMediaSource(secondMediaSource, /* resetPosition= */ false); // Expect masking state is buffering, @@ -6729,7 +6727,7 @@ public final class ExoPlayerTest { .executeRunnable( new PlayerRunnable() { @Override - public void run(SimpleExoPlayer player) { + public void run(ExoPlayer player) { // An implicit, invalid seek picking up the position set by the initial seek. player.setMediaSource(firstMediaSource, /* resetPosition= */ false); // Expect masking state is ended, @@ -6778,7 +6776,7 @@ public final class ExoPlayerTest { .executeRunnable( new PlayerRunnable() { @Override - public void run(SimpleExoPlayer player) { + public void run(ExoPlayer player) { player.addMediaSource(/* index= */ 0, new FakeMediaSource()); positions[0] = player.getCurrentPosition(); positions[1] = player.getBufferedPosition(); @@ -6814,7 +6812,7 @@ public final class ExoPlayerTest { .executeRunnable( new PlayerRunnable() { @Override - public void run(SimpleExoPlayer player) { + public void run(ExoPlayer player) { currentWindowIndices[0] = player.getCurrentWindowIndex(); // If the timeline is empty masking variables are used. currentPositions[0] = player.getCurrentPosition(); @@ -6837,7 +6835,7 @@ public final class ExoPlayerTest { .executeRunnable( new PlayerRunnable() { @Override - public void run(SimpleExoPlayer player) { + public void run(ExoPlayer player) { currentWindowIndices[4] = player.getCurrentWindowIndex(); // Finally original playbackInfo coming from EPII is used. currentPositions[2] = player.getCurrentPosition(); @@ -6875,7 +6873,7 @@ public final class ExoPlayerTest { .executeRunnable( new PlayerRunnable() { @Override - public void run(SimpleExoPlayer player) { + public void run(ExoPlayer player) { currentWindowIndices[0] = player.getCurrentWindowIndex(); player.addMediaSource(new FakeMediaSource()); currentWindowIndices[1] = player.getCurrentWindowIndex(); @@ -6886,7 +6884,7 @@ public final class ExoPlayerTest { .executeRunnable( new PlayerRunnable() { @Override - public void run(SimpleExoPlayer player) { + public void run(ExoPlayer player) { currentWindowIndices[2] = player.getCurrentWindowIndex(); } }) @@ -6917,7 +6915,7 @@ public final class ExoPlayerTest { .executeRunnable( new PlayerRunnable() { @Override - public void run(SimpleExoPlayer player) { + public void run(ExoPlayer player) { // Move the current item down in the playlist. player.moveMediaItems(/* fromIndex= */ 0, /* toIndex= */ 2, /* newIndex= */ 1); currentWindowIndices[0] = player.getCurrentWindowIndex(); @@ -6926,7 +6924,7 @@ public final class ExoPlayerTest { .executeRunnable( new PlayerRunnable() { @Override - public void run(SimpleExoPlayer player) { + public void run(ExoPlayer player) { // Move the current item up in the playlist. player.moveMediaItems(/* fromIndex= */ 1, /* toIndex= */ 3, /* newIndex= */ 0); currentWindowIndices[1] = player.getCurrentWindowIndex(); @@ -6936,7 +6934,7 @@ public final class ExoPlayerTest { .executeRunnable( new PlayerRunnable() { @Override - public void run(SimpleExoPlayer player) { + public void run(ExoPlayer player) { // Move items from before to behind the current item. player.moveMediaItems(/* fromIndex= */ 0, /* toIndex= */ 2, /* newIndex= */ 1); currentWindowIndices[2] = player.getCurrentWindowIndex(); @@ -6945,7 +6943,7 @@ public final class ExoPlayerTest { .executeRunnable( new PlayerRunnable() { @Override - public void run(SimpleExoPlayer player) { + public void run(ExoPlayer player) { // Move items from behind to before the current item. player.moveMediaItems(/* fromIndex= */ 1, /* toIndex= */ 3, /* newIndex= */ 0); currentWindowIndices[3] = player.getCurrentWindowIndex(); @@ -6954,7 +6952,7 @@ public final class ExoPlayerTest { .executeRunnable( new PlayerRunnable() { @Override - public void run(SimpleExoPlayer player) { + public void run(ExoPlayer player) { // Move items from before to before the current item. // No change in currentWindowIndex. player.moveMediaItems(/* fromIndex= */ 0, /* toIndex= */ 1, /* newIndex= */ 1); @@ -6965,7 +6963,7 @@ public final class ExoPlayerTest { .executeRunnable( new PlayerRunnable() { @Override - public void run(SimpleExoPlayer player) { + public void run(ExoPlayer player) { // Move items from behind to behind the current item. // No change in currentWindowIndex. player.moveMediaItems(/* fromIndex= */ 1, /* toIndex= */ 2, /* newIndex= */ 2); @@ -6992,7 +6990,7 @@ public final class ExoPlayerTest { .executeRunnable( new PlayerRunnable() { @Override - public void run(SimpleExoPlayer player) { + public void run(ExoPlayer player) { // Increase current window index. currentWindowIndices[0] = player.getCurrentWindowIndex(); player.moveMediaItem(/* currentIndex= */ 0, /* newIndex= */ 1); @@ -7004,7 +7002,7 @@ public final class ExoPlayerTest { .executeRunnable( new PlayerRunnable() { @Override - public void run(SimpleExoPlayer player) { + public void run(ExoPlayer player) { currentWindowIndices[2] = player.getCurrentWindowIndex(); } }) @@ -7028,7 +7026,7 @@ public final class ExoPlayerTest { .executeRunnable( new PlayerRunnable() { @Override - public void run(SimpleExoPlayer player) { + public void run(ExoPlayer player) { // Decrease current window index. currentWindowIndices[0] = player.getCurrentWindowIndex(); player.removeMediaItem(/* index= */ 0); @@ -7058,7 +7056,7 @@ public final class ExoPlayerTest { .executeRunnable( new PlayerRunnable() { @Override - public void run(SimpleExoPlayer player) { + public void run(ExoPlayer player) { // Remove the current item. currentWindowIndices[0] = player.getCurrentWindowIndex(); currentPositions[0] = player.getCurrentPosition(); @@ -7110,7 +7108,7 @@ public final class ExoPlayerTest { .executeRunnable( new PlayerRunnable() { @Override - public void run(SimpleExoPlayer player) { + public void run(ExoPlayer player) { // Expect the current window index to be 2 after seek. currentWindowIndices[0] = player.getCurrentWindowIndex(); currentPositions[0] = player.getCurrentPosition(); @@ -7129,7 +7127,7 @@ public final class ExoPlayerTest { .executeRunnable( new PlayerRunnable() { @Override - public void run(SimpleExoPlayer player) { + public void run(ExoPlayer player) { // Expects the current window index still on 0. currentWindowIndices[2] = player.getCurrentWindowIndex(); // Insert an item at begin when the playlist is not empty. @@ -7146,7 +7144,7 @@ public final class ExoPlayerTest { .executeRunnable( new PlayerRunnable() { @Override - public void run(SimpleExoPlayer player) { + public void run(ExoPlayer player) { currentWindowIndices[4] = player.getCurrentWindowIndex(); // Implicit seek to the current window index, which is out of bounds in new // timeline. @@ -7161,7 +7159,7 @@ public final class ExoPlayerTest { .executeRunnable( new PlayerRunnable() { @Override - public void run(SimpleExoPlayer player) { + public void run(ExoPlayer player) { currentWindowIndices[6] = player.getCurrentWindowIndex(); // Explicit seek to (0, C.TIME_UNSET). Player transitions to BUFFERING. player.setMediaSource(fourthMediaSource, /* startPositionMs= */ 5000); @@ -7175,7 +7173,7 @@ public final class ExoPlayerTest { .executeRunnable( new PlayerRunnable() { @Override - public void run(SimpleExoPlayer player) { + public void run(ExoPlayer player) { // Check whether actual window index is equal masking index from above. currentWindowIndices[8] = player.getCurrentWindowIndex(); } @@ -7253,7 +7251,7 @@ public final class ExoPlayerTest { .executeRunnable( new PlayerRunnable() { @Override - public void run(SimpleExoPlayer player) { + public void run(ExoPlayer player) { currentWindowIndices[0] = player.getCurrentWindowIndex(); currentPosition[0] = player.getCurrentPosition(); bufferedPosition[0] = player.getBufferedPosition(); @@ -7294,7 +7292,7 @@ public final class ExoPlayerTest { .executeRunnable( new PlayerRunnable() { @Override - public void run(SimpleExoPlayer player) { + public void run(ExoPlayer player) { currentWindowIndices[0] = player.getCurrentWindowIndex(); currentStates[0] = player.getPlaybackState(); player.clearMediaItems(); @@ -7306,7 +7304,7 @@ public final class ExoPlayerTest { .executeRunnable( new PlayerRunnable() { @Override - public void run(SimpleExoPlayer player) { + public void run(ExoPlayer player) { // Transitions to ended when prepared with zero media items. currentStates[2] = player.getPlaybackState(); } @@ -7357,7 +7355,7 @@ public final class ExoPlayerTest { .executeRunnable( new PlayerRunnable() { @Override - public void run(SimpleExoPlayer player) { + public void run(ExoPlayer player) { player.addAnalyticsListener( new AnalyticsListener() { @Override @@ -7412,7 +7410,7 @@ public final class ExoPlayerTest { .executeRunnable( new PlayerRunnable() { @Override - public void run(SimpleExoPlayer player) { + public void run(ExoPlayer player) { player.seekTo(player.getCurrentPosition()); } }) @@ -7421,7 +7419,7 @@ public final class ExoPlayerTest { .executeRunnable( new PlayerRunnable() { @Override - public void run(SimpleExoPlayer player) { + public void run(ExoPlayer player) { windowIndexAfterFinalEndedState.set(player.getCurrentWindowIndex()); } }) @@ -7456,7 +7454,7 @@ public final class ExoPlayerTest { .executeRunnable( new PlayerRunnable() { @Override - public void run(SimpleExoPlayer player) { + public void run(ExoPlayer player) { playbackStateAfterPause.set(player.getPlaybackState()); windowIndexAfterPause.set(player.getCurrentWindowIndex()); positionAfterPause.set(player.getContentPosition()); @@ -7495,7 +7493,7 @@ public final class ExoPlayerTest { .executeRunnable( new PlayerRunnable() { @Override - public void run(SimpleExoPlayer player) { + public void run(ExoPlayer player) { playbackStateAfterPause.set(player.getPlaybackState()); windowIndexAfterPause.set(player.getCurrentWindowIndex()); positionAfterPause.set(player.getContentPosition()); @@ -7747,7 +7745,7 @@ public final class ExoPlayerTest { .executeRunnable( new PlayerRunnable() { @Override - public void run(SimpleExoPlayer player) { + public void run(ExoPlayer player) { player.addListener(playerListener1); player.addListener(playerListener2); } @@ -7915,7 +7913,7 @@ public final class ExoPlayerTest { .executeRunnable( new PlayerRunnable() { @Override - public void run(SimpleExoPlayer player) { + public void run(ExoPlayer player) { playerHolder[0] = player; } }) @@ -8993,7 +8991,7 @@ public final class ExoPlayerTest { @Test public void enableOffloadSchedulingWhileIdle_isToggled_isReported() throws Exception { - SimpleExoPlayer player = new TestExoPlayerBuilder(context).build(); + ExoPlayer player = new TestExoPlayerBuilder(context).build(); player.experimentalSetOffloadSchedulingEnabled(true); assertThat(runUntilReceiveOffloadSchedulingEnabledNewState(player)).isTrue(); @@ -9005,7 +9003,7 @@ public final class ExoPlayerTest { @Test public void enableOffloadSchedulingWhilePlaying_isToggled_isReported() throws Exception { FakeSleepRenderer sleepRenderer = new FakeSleepRenderer(C.TRACK_TYPE_AUDIO).sleepOnNextRender(); - SimpleExoPlayer player = new TestExoPlayerBuilder(context).setRenderers(sleepRenderer).build(); + ExoPlayer player = new TestExoPlayerBuilder(context).setRenderers(sleepRenderer).build(); Timeline timeline = new FakeTimeline(); player.setMediaSource(new FakeMediaSource(timeline, ExoPlayerTestRunner.AUDIO_FORMAT)); player.prepare(); @@ -9022,7 +9020,7 @@ public final class ExoPlayerTest { public void enableOffloadSchedulingWhileSleepingForOffload_isDisabled_isReported() throws Exception { FakeSleepRenderer sleepRenderer = new FakeSleepRenderer(C.TRACK_TYPE_AUDIO).sleepOnNextRender(); - SimpleExoPlayer player = new TestExoPlayerBuilder(context).setRenderers(sleepRenderer).build(); + ExoPlayer player = new TestExoPlayerBuilder(context).setRenderers(sleepRenderer).build(); Timeline timeline = new FakeTimeline(); player.setMediaSource(new FakeMediaSource(timeline, ExoPlayerTestRunner.AUDIO_FORMAT)); player.experimentalSetOffloadSchedulingEnabled(true); @@ -9038,7 +9036,7 @@ public final class ExoPlayerTest { @Test public void enableOffloadScheduling_isEnable_playerSleeps() throws Exception { FakeSleepRenderer sleepRenderer = new FakeSleepRenderer(C.TRACK_TYPE_AUDIO); - SimpleExoPlayer player = new TestExoPlayerBuilder(context).setRenderers(sleepRenderer).build(); + ExoPlayer player = new TestExoPlayerBuilder(context).setRenderers(sleepRenderer).build(); Timeline timeline = new FakeTimeline(); player.setMediaSource(new FakeMediaSource(timeline, ExoPlayerTestRunner.AUDIO_FORMAT)); player.experimentalSetOffloadSchedulingEnabled(true); @@ -9056,7 +9054,7 @@ public final class ExoPlayerTest { experimentalEnableOffloadSchedulingWhileSleepingForOffload_isDisabled_renderingResumes() throws Exception { FakeSleepRenderer sleepRenderer = new FakeSleepRenderer(C.TRACK_TYPE_AUDIO).sleepOnNextRender(); - SimpleExoPlayer player = new TestExoPlayerBuilder(context).setRenderers(sleepRenderer).build(); + ExoPlayer player = new TestExoPlayerBuilder(context).setRenderers(sleepRenderer).build(); Timeline timeline = new FakeTimeline(); player.setMediaSource(new FakeMediaSource(timeline, ExoPlayerTestRunner.AUDIO_FORMAT)); player.experimentalSetOffloadSchedulingEnabled(true); @@ -9074,7 +9072,7 @@ public final class ExoPlayerTest { @Test public void wakeupListenerWhileSleepingForOffload_isWokenUp_renderingResumes() throws Exception { FakeSleepRenderer sleepRenderer = new FakeSleepRenderer(C.TRACK_TYPE_AUDIO).sleepOnNextRender(); - SimpleExoPlayer player = new TestExoPlayerBuilder(context).setRenderers(sleepRenderer).build(); + ExoPlayer player = new TestExoPlayerBuilder(context).setRenderers(sleepRenderer).build(); Timeline timeline = new FakeTimeline(); player.setMediaSource(new FakeMediaSource(timeline, ExoPlayerTestRunner.AUDIO_FORMAT)); player.experimentalSetOffloadSchedulingEnabled(true); @@ -11119,7 +11117,7 @@ public final class ExoPlayerTest { public void newServerSideInsertedAdAtPlaybackPosition_keepsRenderersEnabled() throws Exception { // Injecting renderer to count number of renderer resets. AtomicReference videoRenderer = new AtomicReference<>(); - SimpleExoPlayer player = + ExoPlayer player = new TestExoPlayerBuilder(context) .setRenderersFactory( (handler, videoListener, audioListener, textOutput, metadataOutput) -> { @@ -11192,14 +11190,14 @@ public final class ExoPlayerTest { .executeRunnable( new PlayerRunnable() { @Override - public void run(SimpleExoPlayer player) { + public void run(ExoPlayer player) { player.setVideoSurface(surface1); } }) .executeRunnable( new PlayerRunnable() { @Override - public void run(SimpleExoPlayer player) { + public void run(ExoPlayer player) { player.setVideoSurface(surface2); } }); @@ -11330,7 +11328,7 @@ public final class ExoPlayerTest { } @Override - public void handleMessage(SimpleExoPlayer player, int messageType, @Nullable Object message) { + public void handleMessage(ExoPlayer player, int messageType, @Nullable Object message) { windowIndex = player.getCurrentWindowIndex(); positionMs = player.getCurrentPosition(); messageCount++; @@ -11344,7 +11342,7 @@ public final class ExoPlayerTest { @Nullable public Timeline timeline; @Override - public void run(SimpleExoPlayer player) { + public void run(ExoPlayer player) { playWhenReady = player.getPlayWhenReady(); playbackState = player.getPlaybackState(); timeline = player.getCurrentTimeline(); @@ -11379,7 +11377,7 @@ public final class ExoPlayerTest { } @Override - public void run(SimpleExoPlayer player) { + public void run(ExoPlayer player) { playbackStates[index] = player.getPlaybackState(); timelineWindowCount[index] = player.getCurrentTimeline().getWindowCount(); } diff --git a/library/core/src/test/java/com/google/android/exoplayer2/analytics/AnalyticsCollectorTest.java b/library/core/src/test/java/com/google/android/exoplayer2/analytics/AnalyticsCollectorTest.java index 58432dd227..b1cdc07945 100644 --- a/library/core/src/test/java/com/google/android/exoplayer2/analytics/AnalyticsCollectorTest.java +++ b/library/core/src/test/java/com/google/android/exoplayer2/analytics/AnalyticsCollectorTest.java @@ -81,7 +81,6 @@ import com.google.android.exoplayer2.PlaybackParameters; import com.google.android.exoplayer2.Player; import com.google.android.exoplayer2.Renderer; import com.google.android.exoplayer2.RenderersFactory; -import com.google.android.exoplayer2.SimpleExoPlayer; import com.google.android.exoplayer2.Timeline; import com.google.android.exoplayer2.Timeline.Window; import com.google.android.exoplayer2.TracksInfo; @@ -1048,7 +1047,7 @@ public final class AnalyticsCollectorTest { .executeRunnable( new PlayerRunnable() { @Override - public void run(SimpleExoPlayer player) { + public void run(ExoPlayer player) { player.addListener( new Player.Listener() { @Override @@ -1422,7 +1421,7 @@ public final class AnalyticsCollectorTest { .executeRunnable( new PlayerRunnable() { @Override - public void run(SimpleExoPlayer player) { + public void run(ExoPlayer player) { player.getAnalyticsCollector().notifySeekStarted(); } }) @@ -1653,7 +1652,7 @@ public final class AnalyticsCollectorTest { @Test public void onEvents_isReportedWithCorrectEventTimes() throws Exception { - SimpleExoPlayer player = + ExoPlayer player = new TestExoPlayerBuilder(ApplicationProvider.getApplicationContext()).build(); Surface surface = new Surface(new SurfaceTexture(/* texName= */ 0)); player.setVideoSurface(surface); @@ -1987,7 +1986,7 @@ public final class AnalyticsCollectorTest { public void release_withCallbacksArrivingAfterRelease_onPlayerReleasedForwardedLast() throws Exception { FakeClock fakeClock = new FakeClock(/* initialTimeMs= */ 0, /* isAutoAdvancing= */ true); - SimpleExoPlayer simpleExoPlayer = + ExoPlayer exoPlayer = new TestExoPlayerBuilder(ApplicationProvider.getApplicationContext()) .setClock(fakeClock) .build(); @@ -2001,16 +2000,16 @@ public final class AnalyticsCollectorTest { fakeClock.advanceTime(1); } }); - simpleExoPlayer.addAnalyticsListener(analyticsListener); + exoPlayer.addAnalyticsListener(analyticsListener); // Prepare with media to ensure video renderer is enabled. - simpleExoPlayer.setMediaSource( + exoPlayer.setMediaSource( new FakeMediaSource(new FakeTimeline(), ExoPlayerTestRunner.VIDEO_FORMAT)); - simpleExoPlayer.prepare(); - TestPlayerRunHelper.runUntilPlaybackState(simpleExoPlayer, Player.STATE_READY); + exoPlayer.prepare(); + TestPlayerRunHelper.runUntilPlaybackState(exoPlayer, Player.STATE_READY); // Release and add delay on releasing thread to verify timestamps of events. - simpleExoPlayer.release(); + exoPlayer.release(); long releaseTimeMs = fakeClock.currentTimeMillis(); fakeClock.advanceTime(1); ShadowLooper.idleMainLooper(); @@ -2024,11 +2023,11 @@ public final class AnalyticsCollectorTest { inOrder.verify(analyticsListener).onVideoDisabled(videoDisabledEventTime.capture(), any()); inOrder .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) - .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. // This verification is needed as a regression test against [internal ref: b/195396384]. The diff --git a/library/core/src/test/java/com/google/android/exoplayer2/analytics/PlaybackStatsListenerTest.java b/library/core/src/test/java/com/google/android/exoplayer2/analytics/PlaybackStatsListenerTest.java index 668ed5f556..2fe9a13d88 100644 --- a/library/core/src/test/java/com/google/android/exoplayer2/analytics/PlaybackStatsListenerTest.java +++ b/library/core/src/test/java/com/google/android/exoplayer2/analytics/PlaybackStatsListenerTest.java @@ -27,10 +27,10 @@ import static org.mockito.Mockito.verifyNoMoreInteractions; import androidx.annotation.Nullable; import androidx.test.core.app.ApplicationProvider; import androidx.test.ext.junit.runners.AndroidJUnit4; +import com.google.android.exoplayer2.ExoPlayer; import com.google.android.exoplayer2.MediaItem; import com.google.android.exoplayer2.PlaybackParameters; import com.google.android.exoplayer2.Player; -import com.google.android.exoplayer2.SimpleExoPlayer; import com.google.android.exoplayer2.robolectric.TestPlayerRunHelper; import com.google.android.exoplayer2.source.MediaSource; import com.google.android.exoplayer2.testutil.FakeMediaSource; @@ -49,7 +49,7 @@ import org.robolectric.shadows.ShadowLooper; @RunWith(AndroidJUnit4.class) public final class PlaybackStatsListenerTest { - private SimpleExoPlayer player; + private ExoPlayer player; @Before public void setUp() { diff --git a/library/core/src/test/java/com/google/android/exoplayer2/e2etest/EndToEndGaplessTest.java b/library/core/src/test/java/com/google/android/exoplayer2/e2etest/EndToEndGaplessTest.java index 3e2422f064..cd760c692b 100644 --- a/library/core/src/test/java/com/google/android/exoplayer2/e2etest/EndToEndGaplessTest.java +++ b/library/core/src/test/java/com/google/android/exoplayer2/e2etest/EndToEndGaplessTest.java @@ -26,7 +26,6 @@ import com.google.android.exoplayer2.ExoPlayer; import com.google.android.exoplayer2.Format; import com.google.android.exoplayer2.MediaItem; import com.google.android.exoplayer2.Player; -import com.google.android.exoplayer2.SimpleExoPlayer; import com.google.android.exoplayer2.mediacodec.MediaCodecUtil; import com.google.android.exoplayer2.robolectric.RandomizedMp3Decoder; import com.google.android.exoplayer2.robolectric.TestPlayerRunHelper; @@ -87,7 +86,7 @@ public class EndToEndGaplessTest { @Test public void testPlayback_twoIdenticalMp3Files() throws Exception { - SimpleExoPlayer player = + ExoPlayer player = new ExoPlayer.Builder(ApplicationProvider.getApplicationContext()) .setClock(new FakeClock(/* isAutoAdvancing= */ true)) .build(); diff --git a/library/core/src/test/java/com/google/android/exoplayer2/e2etest/FlacPlaybackTest.java b/library/core/src/test/java/com/google/android/exoplayer2/e2etest/FlacPlaybackTest.java index 779199c7a7..8f22e5663b 100644 --- a/library/core/src/test/java/com/google/android/exoplayer2/e2etest/FlacPlaybackTest.java +++ b/library/core/src/test/java/com/google/android/exoplayer2/e2etest/FlacPlaybackTest.java @@ -20,7 +20,6 @@ import androidx.test.core.app.ApplicationProvider; import com.google.android.exoplayer2.ExoPlayer; import com.google.android.exoplayer2.MediaItem; 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.ShadowMediaCodecConfig; import com.google.android.exoplayer2.robolectric.TestPlayerRunHelper; @@ -64,7 +63,7 @@ public class FlacPlaybackTest { Context applicationContext = ApplicationProvider.getApplicationContext(); CapturingRenderersFactory capturingRenderersFactory = new CapturingRenderersFactory(applicationContext); - SimpleExoPlayer player = + ExoPlayer player = new ExoPlayer.Builder(applicationContext, capturingRenderersFactory) .setClock(new FakeClock(/* isAutoAdvancing= */ true)) .build(); diff --git a/library/core/src/test/java/com/google/android/exoplayer2/e2etest/FlvPlaybackTest.java b/library/core/src/test/java/com/google/android/exoplayer2/e2etest/FlvPlaybackTest.java index 51e9051b60..5290620c10 100644 --- a/library/core/src/test/java/com/google/android/exoplayer2/e2etest/FlvPlaybackTest.java +++ b/library/core/src/test/java/com/google/android/exoplayer2/e2etest/FlvPlaybackTest.java @@ -22,7 +22,6 @@ import androidx.test.core.app.ApplicationProvider; import com.google.android.exoplayer2.ExoPlayer; import com.google.android.exoplayer2.MediaItem; 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.ShadowMediaCodecConfig; import com.google.android.exoplayer2.robolectric.TestPlayerRunHelper; @@ -55,7 +54,7 @@ public final class FlvPlaybackTest { Context applicationContext = ApplicationProvider.getApplicationContext(); CapturingRenderersFactory capturingRenderersFactory = new CapturingRenderersFactory(applicationContext); - SimpleExoPlayer player = + ExoPlayer player = new ExoPlayer.Builder(applicationContext, capturingRenderersFactory) .setClock(new FakeClock(/* isAutoAdvancing= */ true)) .build(); diff --git a/library/core/src/test/java/com/google/android/exoplayer2/e2etest/MkaPlaybackTest.java b/library/core/src/test/java/com/google/android/exoplayer2/e2etest/MkaPlaybackTest.java index a3e2c1c32e..f18a0e54f6 100644 --- a/library/core/src/test/java/com/google/android/exoplayer2/e2etest/MkaPlaybackTest.java +++ b/library/core/src/test/java/com/google/android/exoplayer2/e2etest/MkaPlaybackTest.java @@ -20,7 +20,6 @@ import androidx.test.core.app.ApplicationProvider; import com.google.android.exoplayer2.ExoPlayer; import com.google.android.exoplayer2.MediaItem; 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.ShadowMediaCodecConfig; import com.google.android.exoplayer2.robolectric.TestPlayerRunHelper; @@ -57,7 +56,7 @@ public final class MkaPlaybackTest { Context applicationContext = ApplicationProvider.getApplicationContext(); CapturingRenderersFactory capturingRenderersFactory = new CapturingRenderersFactory(applicationContext); - SimpleExoPlayer player = + ExoPlayer player = new ExoPlayer.Builder(applicationContext, capturingRenderersFactory) .setClock(new FakeClock(/* isAutoAdvancing= */ true)) .build(); diff --git a/library/core/src/test/java/com/google/android/exoplayer2/e2etest/MkvPlaybackTest.java b/library/core/src/test/java/com/google/android/exoplayer2/e2etest/MkvPlaybackTest.java index b5d242f52e..c719cdfa00 100644 --- a/library/core/src/test/java/com/google/android/exoplayer2/e2etest/MkvPlaybackTest.java +++ b/library/core/src/test/java/com/google/android/exoplayer2/e2etest/MkvPlaybackTest.java @@ -23,7 +23,6 @@ import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.ExoPlayer; import com.google.android.exoplayer2.MediaItem; 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.ShadowMediaCodecConfig; import com.google.android.exoplayer2.robolectric.TestPlayerRunHelper; @@ -63,7 +62,7 @@ public final class MkvPlaybackTest { Context applicationContext = ApplicationProvider.getApplicationContext(); CapturingRenderersFactory capturingRenderersFactory = new CapturingRenderersFactory(applicationContext); - SimpleExoPlayer player = + ExoPlayer player = new ExoPlayer.Builder(applicationContext, capturingRenderersFactory) .setClock(new FakeClock(/* isAutoAdvancing= */ true)) .build(); diff --git a/library/core/src/test/java/com/google/android/exoplayer2/e2etest/Mp3PlaybackTest.java b/library/core/src/test/java/com/google/android/exoplayer2/e2etest/Mp3PlaybackTest.java index 53a2d62de7..3c4c8a6153 100644 --- a/library/core/src/test/java/com/google/android/exoplayer2/e2etest/Mp3PlaybackTest.java +++ b/library/core/src/test/java/com/google/android/exoplayer2/e2etest/Mp3PlaybackTest.java @@ -20,7 +20,6 @@ import androidx.test.core.app.ApplicationProvider; import com.google.android.exoplayer2.ExoPlayer; import com.google.android.exoplayer2.MediaItem; 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.ShadowMediaCodecConfig; import com.google.android.exoplayer2.robolectric.TestPlayerRunHelper; @@ -60,7 +59,7 @@ public final class Mp3PlaybackTest { Context applicationContext = ApplicationProvider.getApplicationContext(); CapturingRenderersFactory capturingRenderersFactory = new CapturingRenderersFactory(applicationContext); - SimpleExoPlayer player = + ExoPlayer player = new ExoPlayer.Builder(applicationContext, capturingRenderersFactory) .setClock(new FakeClock(/* isAutoAdvancing= */ true)) .build(); diff --git a/library/core/src/test/java/com/google/android/exoplayer2/e2etest/Mp4PlaybackTest.java b/library/core/src/test/java/com/google/android/exoplayer2/e2etest/Mp4PlaybackTest.java index ccb6ca9961..b6d6ca5640 100644 --- a/library/core/src/test/java/com/google/android/exoplayer2/e2etest/Mp4PlaybackTest.java +++ b/library/core/src/test/java/com/google/android/exoplayer2/e2etest/Mp4PlaybackTest.java @@ -22,7 +22,6 @@ import androidx.test.core.app.ApplicationProvider; import com.google.android.exoplayer2.ExoPlayer; import com.google.android.exoplayer2.MediaItem; 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.ShadowMediaCodecConfig; import com.google.android.exoplayer2.robolectric.TestPlayerRunHelper; @@ -77,7 +76,7 @@ public class Mp4PlaybackTest { public void test() throws Exception { Context applicationContext = ApplicationProvider.getApplicationContext(); CapturingRenderersFactory renderersFactory = new CapturingRenderersFactory(applicationContext); - SimpleExoPlayer player = + ExoPlayer player = new ExoPlayer.Builder(applicationContext, renderersFactory) .setClock(new FakeClock(/* isAutoAdvancing= */ true)) .build(); diff --git a/library/core/src/test/java/com/google/android/exoplayer2/e2etest/OggPlaybackTest.java b/library/core/src/test/java/com/google/android/exoplayer2/e2etest/OggPlaybackTest.java index 3966dd59ca..4d69302e1a 100644 --- a/library/core/src/test/java/com/google/android/exoplayer2/e2etest/OggPlaybackTest.java +++ b/library/core/src/test/java/com/google/android/exoplayer2/e2etest/OggPlaybackTest.java @@ -20,7 +20,6 @@ import androidx.test.core.app.ApplicationProvider; import com.google.android.exoplayer2.ExoPlayer; import com.google.android.exoplayer2.MediaItem; 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.ShadowMediaCodecConfig; import com.google.android.exoplayer2.robolectric.TestPlayerRunHelper; @@ -58,7 +57,7 @@ public final class OggPlaybackTest { Context applicationContext = ApplicationProvider.getApplicationContext(); CapturingRenderersFactory capturingRenderersFactory = new CapturingRenderersFactory(applicationContext); - SimpleExoPlayer player = + ExoPlayer player = new ExoPlayer.Builder(applicationContext, capturingRenderersFactory) .setClock(new FakeClock(/* isAutoAdvancing= */ true)) .build(); diff --git a/library/core/src/test/java/com/google/android/exoplayer2/e2etest/PlaylistPlaybackTest.java b/library/core/src/test/java/com/google/android/exoplayer2/e2etest/PlaylistPlaybackTest.java index a5ecc58580..0691e422c6 100644 --- a/library/core/src/test/java/com/google/android/exoplayer2/e2etest/PlaylistPlaybackTest.java +++ b/library/core/src/test/java/com/google/android/exoplayer2/e2etest/PlaylistPlaybackTest.java @@ -21,7 +21,6 @@ import androidx.test.ext.junit.runners.AndroidJUnit4; import com.google.android.exoplayer2.ExoPlayer; import com.google.android.exoplayer2.MediaItem; 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.ShadowMediaCodecConfig; import com.google.android.exoplayer2.robolectric.TestPlayerRunHelper; @@ -45,7 +44,7 @@ public final class PlaylistPlaybackTest { Context applicationContext = ApplicationProvider.getApplicationContext(); CapturingRenderersFactory capturingRenderersFactory = new CapturingRenderersFactory(applicationContext); - SimpleExoPlayer player = + ExoPlayer player = new ExoPlayer.Builder(applicationContext, capturingRenderersFactory) .setClock(new FakeClock(/* isAutoAdvancing= */ true)) .build(); @@ -67,7 +66,7 @@ public final class PlaylistPlaybackTest { Context applicationContext = ApplicationProvider.getApplicationContext(); CapturingRenderersFactory capturingRenderersFactory = new CapturingRenderersFactory(applicationContext); - SimpleExoPlayer player = + ExoPlayer player = new ExoPlayer.Builder(applicationContext, capturingRenderersFactory) .setClock(new FakeClock(/* isAutoAdvancing= */ true)) .build(); diff --git a/library/core/src/test/java/com/google/android/exoplayer2/e2etest/SilencePlaybackTest.java b/library/core/src/test/java/com/google/android/exoplayer2/e2etest/SilencePlaybackTest.java index 7acd02fc66..4db242db09 100644 --- a/library/core/src/test/java/com/google/android/exoplayer2/e2etest/SilencePlaybackTest.java +++ b/library/core/src/test/java/com/google/android/exoplayer2/e2etest/SilencePlaybackTest.java @@ -20,7 +20,6 @@ import androidx.test.core.app.ApplicationProvider; import androidx.test.ext.junit.runners.AndroidJUnit4; import com.google.android.exoplayer2.ExoPlayer; 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.ShadowMediaCodecConfig; import com.google.android.exoplayer2.robolectric.TestPlayerRunHelper; @@ -45,7 +44,7 @@ public final class SilencePlaybackTest { Context applicationContext = ApplicationProvider.getApplicationContext(); CapturingRenderersFactory capturingRenderersFactory = new CapturingRenderersFactory(applicationContext); - SimpleExoPlayer player = + ExoPlayer player = new ExoPlayer.Builder(applicationContext, capturingRenderersFactory) .setClock(new FakeClock(/* isAutoAdvancing= */ true)) .build(); @@ -66,7 +65,7 @@ public final class SilencePlaybackTest { Context applicationContext = ApplicationProvider.getApplicationContext(); CapturingRenderersFactory capturingRenderersFactory = new CapturingRenderersFactory(applicationContext); - SimpleExoPlayer player = + ExoPlayer player = new ExoPlayer.Builder(applicationContext, capturingRenderersFactory) .setClock(new FakeClock(/* isAutoAdvancing= */ true)) .build(); diff --git a/library/core/src/test/java/com/google/android/exoplayer2/e2etest/TsPlaybackTest.java b/library/core/src/test/java/com/google/android/exoplayer2/e2etest/TsPlaybackTest.java index fc741e0710..50fbbe9cf8 100644 --- a/library/core/src/test/java/com/google/android/exoplayer2/e2etest/TsPlaybackTest.java +++ b/library/core/src/test/java/com/google/android/exoplayer2/e2etest/TsPlaybackTest.java @@ -22,7 +22,6 @@ import androidx.test.core.app.ApplicationProvider; import com.google.android.exoplayer2.ExoPlayer; import com.google.android.exoplayer2.MediaItem; 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.ShadowMediaCodecConfig; import com.google.android.exoplayer2.robolectric.TestPlayerRunHelper; @@ -81,7 +80,7 @@ public class TsPlaybackTest { Context applicationContext = ApplicationProvider.getApplicationContext(); CapturingRenderersFactory capturingRenderersFactory = new CapturingRenderersFactory(applicationContext); - SimpleExoPlayer player = + ExoPlayer player = new ExoPlayer.Builder(applicationContext, capturingRenderersFactory) .setClock(new FakeClock(/* isAutoAdvancing= */ true)) .build(); diff --git a/library/core/src/test/java/com/google/android/exoplayer2/e2etest/Vp9PlaybackTest.java b/library/core/src/test/java/com/google/android/exoplayer2/e2etest/Vp9PlaybackTest.java index 01f12d272d..abe1320325 100644 --- a/library/core/src/test/java/com/google/android/exoplayer2/e2etest/Vp9PlaybackTest.java +++ b/library/core/src/test/java/com/google/android/exoplayer2/e2etest/Vp9PlaybackTest.java @@ -22,7 +22,6 @@ import androidx.test.core.app.ApplicationProvider; import com.google.android.exoplayer2.ExoPlayer; import com.google.android.exoplayer2.MediaItem; 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.ShadowMediaCodecConfig; import com.google.android.exoplayer2.robolectric.TestPlayerRunHelper; @@ -59,7 +58,7 @@ public final class Vp9PlaybackTest { Context applicationContext = ApplicationProvider.getApplicationContext(); CapturingRenderersFactory capturingRenderersFactory = new CapturingRenderersFactory(applicationContext); - SimpleExoPlayer player = + ExoPlayer player = new ExoPlayer.Builder(applicationContext, capturingRenderersFactory) .setClock(new FakeClock(/* isAutoAdvancing= */ true)) .build(); diff --git a/library/core/src/test/java/com/google/android/exoplayer2/e2etest/WavPlaybackTest.java b/library/core/src/test/java/com/google/android/exoplayer2/e2etest/WavPlaybackTest.java index 451a9d9f8b..eccd89f285 100644 --- a/library/core/src/test/java/com/google/android/exoplayer2/e2etest/WavPlaybackTest.java +++ b/library/core/src/test/java/com/google/android/exoplayer2/e2etest/WavPlaybackTest.java @@ -20,7 +20,6 @@ import androidx.test.core.app.ApplicationProvider; import com.google.android.exoplayer2.ExoPlayer; import com.google.android.exoplayer2.MediaItem; 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.ShadowMediaCodecConfig; import com.google.android.exoplayer2.robolectric.TestPlayerRunHelper; @@ -52,7 +51,7 @@ public final class WavPlaybackTest { Context applicationContext = ApplicationProvider.getApplicationContext(); CapturingRenderersFactory capturingRenderersFactory = new CapturingRenderersFactory(applicationContext); - SimpleExoPlayer player = + ExoPlayer player = new ExoPlayer.Builder(applicationContext, capturingRenderersFactory) .setClock(new FakeClock(/* isAutoAdvancing= */ true)) .build(); diff --git a/library/core/src/test/java/com/google/android/exoplayer2/source/ads/ServerSideInsertedAdMediaSourceTest.java b/library/core/src/test/java/com/google/android/exoplayer2/source/ads/ServerSideInsertedAdMediaSourceTest.java index d93f802190..6b1f858f96 100644 --- a/library/core/src/test/java/com/google/android/exoplayer2/source/ads/ServerSideInsertedAdMediaSourceTest.java +++ b/library/core/src/test/java/com/google/android/exoplayer2/source/ads/ServerSideInsertedAdMediaSourceTest.java @@ -38,7 +38,6 @@ import androidx.test.ext.junit.runners.AndroidJUnit4; import com.google.android.exoplayer2.ExoPlayer; import com.google.android.exoplayer2.MediaItem; import com.google.android.exoplayer2.Player; -import com.google.android.exoplayer2.SimpleExoPlayer; import com.google.android.exoplayer2.Timeline; import com.google.android.exoplayer2.analytics.AnalyticsListener; import com.google.android.exoplayer2.robolectric.PlaybackOutput; @@ -143,7 +142,7 @@ public final class ServerSideInsertedAdMediaSourceTest { public void playbackWithPredefinedAds_playsSuccessfulWithoutRendererResets() throws Exception { Context context = ApplicationProvider.getApplicationContext(); CapturingRenderersFactory renderersFactory = new CapturingRenderersFactory(context); - SimpleExoPlayer player = + ExoPlayer player = new ExoPlayer.Builder(context, renderersFactory) .setClock(new FakeClock(/* isAutoAdvancing= */ true)) .build(); @@ -202,7 +201,7 @@ public final class ServerSideInsertedAdMediaSourceTest { public void playbackWithNewlyInsertedAds_playsSuccessfulWithoutRendererResets() throws Exception { Context context = ApplicationProvider.getApplicationContext(); CapturingRenderersFactory renderersFactory = new CapturingRenderersFactory(context); - SimpleExoPlayer player = + ExoPlayer player = new ExoPlayer.Builder(context, renderersFactory) .setClock(new FakeClock(/* isAutoAdvancing= */ true)) .build(); @@ -262,7 +261,7 @@ public final class ServerSideInsertedAdMediaSourceTest { throws Exception { Context context = ApplicationProvider.getApplicationContext(); CapturingRenderersFactory renderersFactory = new CapturingRenderersFactory(context); - SimpleExoPlayer player = + ExoPlayer player = new ExoPlayer.Builder(context, renderersFactory) .setClock(new FakeClock(/* isAutoAdvancing= */ true)) .build(); @@ -319,7 +318,7 @@ public final class ServerSideInsertedAdMediaSourceTest { @Test public void playbackWithSeek_isHandledCorrectly() throws Exception { Context context = ApplicationProvider.getApplicationContext(); - SimpleExoPlayer player = + ExoPlayer player = new ExoPlayer.Builder(context).setClock(new FakeClock(/* isAutoAdvancing= */ true)).build(); player.setVideoSurface(new Surface(new SurfaceTexture(/* texName= */ 1))); diff --git a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/e2etest/DashPlaybackTest.java b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/e2etest/DashPlaybackTest.java index a6f7cf5aec..bca3e3362d 100644 --- a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/e2etest/DashPlaybackTest.java +++ b/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; import com.google.android.exoplayer2.ExoPlayer; import com.google.android.exoplayer2.MediaItem; 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.ShadowMediaCodecConfig; import com.google.android.exoplayer2.robolectric.TestPlayerRunHelper; @@ -54,7 +53,7 @@ public final class DashPlaybackTest { Context applicationContext = ApplicationProvider.getApplicationContext(); CapturingRenderersFactory capturingRenderersFactory = new CapturingRenderersFactory(applicationContext); - SimpleExoPlayer player = + ExoPlayer player = new ExoPlayer.Builder(applicationContext, capturingRenderersFactory) .setClock(new FakeClock(/* isAutoAdvancing= */ true)) .build(); @@ -81,7 +80,7 @@ public final class DashPlaybackTest { Context applicationContext = ApplicationProvider.getApplicationContext(); CapturingRenderersFactory capturingRenderersFactory = new CapturingRenderersFactory(applicationContext); - SimpleExoPlayer player = + ExoPlayer player = new ExoPlayer.Builder(applicationContext, capturingRenderersFactory) .setClock(new FakeClock(/* isAutoAdvancing= */ true)) .build(); diff --git a/library/rtsp/src/test/java/com/google/android/exoplayer2/source/rtsp/RtspPlaybackTest.java b/library/rtsp/src/test/java/com/google/android/exoplayer2/source/rtsp/RtspPlaybackTest.java index 4fd7361444..c82f68c0a3 100644 --- a/library/rtsp/src/test/java/com/google/android/exoplayer2/source/rtsp/RtspPlaybackTest.java +++ b/library/rtsp/src/test/java/com/google/android/exoplayer2/source/rtsp/RtspPlaybackTest.java @@ -30,7 +30,6 @@ import com.google.android.exoplayer2.MediaItem; import com.google.android.exoplayer2.PlaybackException; import com.google.android.exoplayer2.Player; 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.RobolectricUtil; import com.google.android.exoplayer2.robolectric.ShadowMediaCodecConfig; @@ -103,8 +102,7 @@ public final class RtspPlaybackTest { fakeRtpDataChannel); try (RtspServer rtspServer = new RtspServer(responseProvider)) { - SimpleExoPlayer player = - createSimpleExoPlayer(rtspServer.startAndGetPortNumber(), rtpDataChannelFactory); + ExoPlayer player = createExoPlayer(rtspServer.startAndGetPortNumber(), rtpDataChannelFactory); PlaybackOutput playbackOutput = PlaybackOutput.register(player, capturingRenderersFactory); player.prepare(); @@ -126,8 +124,7 @@ public final class RtspPlaybackTest { new RtspServer( new ResponseProvider( clock, ImmutableList.of(mp4aLatmRtpPacketStreamDump), fakeRtpDataChannel))) { - SimpleExoPlayer player = - createSimpleExoPlayer(rtspServer.startAndGetPortNumber(), rtpDataChannelFactory); + ExoPlayer player = createExoPlayer(rtspServer.startAndGetPortNumber(), rtpDataChannelFactory); AtomicReference playbackError = new AtomicReference<>(); player.prepare(); @@ -148,9 +145,9 @@ public final class RtspPlaybackTest { } } - private SimpleExoPlayer createSimpleExoPlayer( + private ExoPlayer createExoPlayer( int serverRtspPortNumber, RtpDataChannel.Factory rtpDataChannelFactory) { - SimpleExoPlayer player = + ExoPlayer player = new ExoPlayer.Builder(applicationContext, capturingRenderersFactory) .setClock(clock) .build(); diff --git a/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/TranscodingTransformer.java b/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/TranscodingTransformer.java index c768ad9476..02db36c6ad 100644 --- a/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/TranscodingTransformer.java +++ b/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/TranscodingTransformer.java @@ -44,7 +44,6 @@ import com.google.android.exoplayer2.PlaybackException; import com.google.android.exoplayer2.Player; import com.google.android.exoplayer2.Renderer; import com.google.android.exoplayer2.RenderersFactory; -import com.google.android.exoplayer2.SimpleExoPlayer; import com.google.android.exoplayer2.Timeline; import com.google.android.exoplayer2.TracksInfo; import com.google.android.exoplayer2.analytics.AnalyticsListener; @@ -366,7 +365,7 @@ public final class TranscodingTransformer { private TranscodingTransformer.Listener listener; @Nullable private MuxerWrapper muxerWrapper; - @Nullable private SimpleExoPlayer player; + @Nullable private ExoPlayer player; @ProgressState private int progressState; private TranscodingTransformer( diff --git a/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/Transformer.java b/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/Transformer.java index 370ff1e167..f300f66aa3 100644 --- a/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/Transformer.java +++ b/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/Transformer.java @@ -44,7 +44,6 @@ import com.google.android.exoplayer2.PlaybackException; import com.google.android.exoplayer2.Player; import com.google.android.exoplayer2.Renderer; import com.google.android.exoplayer2.RenderersFactory; -import com.google.android.exoplayer2.SimpleExoPlayer; import com.google.android.exoplayer2.Timeline; import com.google.android.exoplayer2.TracksInfo; import com.google.android.exoplayer2.analytics.AnalyticsListener; @@ -363,7 +362,7 @@ public final class Transformer { private Transformer.Listener listener; @Nullable private MuxerWrapper muxerWrapper; - @Nullable private SimpleExoPlayer player; + @Nullable private ExoPlayer player; @ProgressState private int progressState; private Transformer( diff --git a/playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/DashTestRunner.java b/playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/DashTestRunner.java index e0ae2074e2..d653c92ffb 100644 --- a/playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/DashTestRunner.java +++ b/playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/DashTestRunner.java @@ -29,7 +29,6 @@ import com.google.android.exoplayer2.ExoPlayer; import com.google.android.exoplayer2.Format; import com.google.android.exoplayer2.MediaItem; import com.google.android.exoplayer2.RendererCapabilities; -import com.google.android.exoplayer2.SimpleExoPlayer; import com.google.android.exoplayer2.decoder.DecoderCounters; import com.google.android.exoplayer2.drm.DefaultDrmSessionManager; import com.google.android.exoplayer2.drm.DrmSessionManager; @@ -312,9 +311,9 @@ import java.util.List; } @Override - protected SimpleExoPlayer buildExoPlayer( + protected ExoPlayer buildExoPlayer( HostActivity host, Surface surface, MappingTrackSelector trackSelector) { - SimpleExoPlayer player = + ExoPlayer player = new ExoPlayer.Builder(host, new DebugRenderersFactory(host)) .setTrackSelector(trackSelector) .build(); diff --git a/robolectricutils/src/main/java/com/google/android/exoplayer2/robolectric/TestPlayerRunHelper.java b/robolectricutils/src/main/java/com/google/android/exoplayer2/robolectric/TestPlayerRunHelper.java index c31a310de0..efcb290579 100644 --- a/robolectricutils/src/main/java/com/google/android/exoplayer2/robolectric/TestPlayerRunHelper.java +++ b/robolectricutils/src/main/java/com/google/android/exoplayer2/robolectric/TestPlayerRunHelper.java @@ -23,7 +23,6 @@ import android.os.Looper; import com.google.android.exoplayer2.ExoPlaybackException; import com.google.android.exoplayer2.ExoPlayer; import com.google.android.exoplayer2.Player; -import com.google.android.exoplayer2.SimpleExoPlayer; import com.google.android.exoplayer2.Timeline; import com.google.android.exoplayer2.util.ConditionVariable; import com.google.android.exoplayer2.util.Util; @@ -33,8 +32,8 @@ import java.util.concurrent.atomic.AtomicReference; import org.checkerframework.checker.nullness.compatqual.NullableType; /** - * Helper methods to block the calling thread until the provided {@link SimpleExoPlayer} instance - * reaches a particular state. + * Helper methods to block the calling thread until the provided {@link ExoPlayer} instance reaches + * a particular state. */ public class TestPlayerRunHelper { @@ -260,7 +259,7 @@ public class TestPlayerRunHelper { * @throws TimeoutException If the {@link RobolectricUtil#DEFAULT_TIMEOUT_MS default timeout} is * exceeded. */ - public static void runUntilRenderedFirstFrame(SimpleExoPlayer player) throws TimeoutException { + public static void runUntilRenderedFirstFrame(ExoPlayer player) throws TimeoutException { verifyMainTestThread(player); AtomicBoolean receivedCallback = new AtomicBoolean(false); Player.Listener listener = diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/Action.java b/testutils/src/main/java/com/google/android/exoplayer2/testutil/Action.java index 81f9b57c1e..43d5162bd3 100644 --- a/testutils/src/main/java/com/google/android/exoplayer2/testutil/Action.java +++ b/testutils/src/main/java/com/google/android/exoplayer2/testutil/Action.java @@ -26,7 +26,6 @@ import com.google.android.exoplayer2.PlaybackParameters; import com.google.android.exoplayer2.Player; import com.google.android.exoplayer2.PlayerMessage; import com.google.android.exoplayer2.PlayerMessage.Target; -import com.google.android.exoplayer2.SimpleExoPlayer; import com.google.android.exoplayer2.Timeline; import com.google.android.exoplayer2.audio.AudioAttributes; import com.google.android.exoplayer2.source.MediaSource; @@ -72,7 +71,7 @@ public abstract class Action { * null} if there's no next action. */ public final void doActionAndScheduleNext( - SimpleExoPlayer player, + ExoPlayer player, DefaultTrackSelector trackSelector, @Nullable Surface surface, HandlerWrapper handler, @@ -84,7 +83,7 @@ public abstract class Action { } /** - * Called by {@link #doActionAndScheduleNext(SimpleExoPlayer, DefaultTrackSelector, Surface, + * Called by {@link #doActionAndScheduleNext(ExoPlayer, DefaultTrackSelector, Surface, * HandlerWrapper, ActionNode)} to perform the action and to schedule the next action node. * * @param player The player to which the action should be applied. @@ -96,7 +95,7 @@ public abstract class Action { * null} if there's no next action. */ protected void doActionAndScheduleNextImpl( - SimpleExoPlayer player, + ExoPlayer player, DefaultTrackSelector trackSelector, @Nullable Surface surface, HandlerWrapper handler, @@ -108,7 +107,7 @@ public abstract class Action { } /** - * Called by {@link #doActionAndScheduleNextImpl(SimpleExoPlayer, DefaultTrackSelector, Surface, + * Called by {@link #doActionAndScheduleNextImpl(ExoPlayer, DefaultTrackSelector, Surface, * HandlerWrapper, ActionNode)} to perform the action. * * @param player The player to which the action should be applied. @@ -117,7 +116,7 @@ public abstract class Action { * needed. */ protected abstract void doActionImpl( - SimpleExoPlayer player, DefaultTrackSelector trackSelector, @Nullable Surface surface); + ExoPlayer player, DefaultTrackSelector trackSelector, @Nullable Surface surface); /** Calls {@link Player#seekTo(long)} or {@link Player#seekTo(int, long)}. */ public static final class Seek extends Action { @@ -157,7 +156,7 @@ public abstract class Action { @Override protected void doActionImpl( - SimpleExoPlayer player, DefaultTrackSelector trackSelector, @Nullable Surface surface) { + ExoPlayer player, DefaultTrackSelector trackSelector, @Nullable Surface surface) { try { if (windowIndex == null) { player.seekTo(positionMs); @@ -172,7 +171,7 @@ public abstract class Action { } } - /** Calls {@link SimpleExoPlayer#setMediaSources(List, int, long)}. */ + /** Calls {@link ExoPlayer#setMediaSources(List, int, long)}. */ public static final class SetMediaItems extends Action { private final int windowIndex; @@ -195,12 +194,12 @@ public abstract class Action { @Override protected void doActionImpl( - SimpleExoPlayer player, DefaultTrackSelector trackSelector, @Nullable Surface surface) { + ExoPlayer player, DefaultTrackSelector trackSelector, @Nullable Surface surface) { player.setMediaSources(Arrays.asList(mediaSources), windowIndex, positionMs); } } - /** Calls {@link SimpleExoPlayer#addMediaSources(List)}. */ + /** Calls {@link ExoPlayer#addMediaSources(List)}. */ public static final class AddMediaItems extends Action { private final MediaSource[] mediaSources; @@ -216,12 +215,12 @@ public abstract class Action { @Override protected void doActionImpl( - SimpleExoPlayer player, DefaultTrackSelector trackSelector, @Nullable Surface surface) { + ExoPlayer player, DefaultTrackSelector trackSelector, @Nullable Surface surface) { player.addMediaSources(Arrays.asList(mediaSources)); } } - /** Calls {@link SimpleExoPlayer#setMediaSources(List, boolean)}. */ + /** Calls {@link ExoPlayer#setMediaSources(List, boolean)}. */ public static final class SetMediaItemsResetPosition extends Action { private final boolean resetPosition; @@ -241,12 +240,12 @@ public abstract class Action { @Override protected void doActionImpl( - SimpleExoPlayer player, DefaultTrackSelector trackSelector, @Nullable Surface surface) { + ExoPlayer player, DefaultTrackSelector trackSelector, @Nullable Surface surface) { player.setMediaSources(Arrays.asList(mediaSources), resetPosition); } } - /** Calls {@link SimpleExoPlayer#moveMediaItem(int, int)}. */ + /** Calls {@link ExoPlayer#moveMediaItem(int, int)}. */ public static class MoveMediaItem extends Action { private final int currentIndex; @@ -265,12 +264,12 @@ public abstract class Action { @Override protected void doActionImpl( - SimpleExoPlayer player, DefaultTrackSelector trackSelector, @Nullable Surface surface) { + ExoPlayer player, DefaultTrackSelector trackSelector, @Nullable Surface surface) { player.moveMediaItem(currentIndex, newIndex); } } - /** Calls {@link SimpleExoPlayer#removeMediaItem(int)}. */ + /** Calls {@link ExoPlayer#removeMediaItem(int)}. */ public static class RemoveMediaItem extends Action { private final int index; @@ -286,12 +285,12 @@ public abstract class Action { @Override protected void doActionImpl( - SimpleExoPlayer player, DefaultTrackSelector trackSelector, @Nullable Surface surface) { + ExoPlayer player, DefaultTrackSelector trackSelector, @Nullable Surface surface) { player.removeMediaItem(index); } } - /** Calls {@link SimpleExoPlayer#removeMediaItems(int, int)}. */ + /** Calls {@link ExoPlayer#removeMediaItems(int, int)}. */ public static class RemoveMediaItems extends Action { private final int fromIndex; @@ -310,12 +309,12 @@ public abstract class Action { @Override protected void doActionImpl( - SimpleExoPlayer player, DefaultTrackSelector trackSelector, @Nullable Surface surface) { + ExoPlayer player, DefaultTrackSelector trackSelector, @Nullable Surface surface) { player.removeMediaItems(fromIndex, toIndex); } } - /** Calls {@link SimpleExoPlayer#clearMediaItems()}}. */ + /** Calls {@link ExoPlayer#clearMediaItems()}}. */ public static class ClearMediaItems extends Action { /** @param tag A tag to use for logging. */ @@ -325,7 +324,7 @@ public abstract class Action { @Override protected void doActionImpl( - SimpleExoPlayer player, DefaultTrackSelector trackSelector, @Nullable Surface surface) { + ExoPlayer player, DefaultTrackSelector trackSelector, @Nullable Surface surface) { player.clearMediaItems(); } } @@ -360,7 +359,7 @@ public abstract class Action { @Override protected void doActionImpl( - SimpleExoPlayer player, DefaultTrackSelector trackSelector, @Nullable Surface surface) { + ExoPlayer player, DefaultTrackSelector trackSelector, @Nullable Surface surface) { if (reset == null) { player.stop(); } else { @@ -385,7 +384,7 @@ public abstract class Action { @Override protected void doActionImpl( - SimpleExoPlayer player, DefaultTrackSelector trackSelector, @Nullable Surface surface) { + ExoPlayer player, DefaultTrackSelector trackSelector, @Nullable Surface surface) { player.setPlayWhenReady(playWhenReady); } } @@ -412,13 +411,13 @@ public abstract class Action { @Override protected void doActionImpl( - SimpleExoPlayer player, DefaultTrackSelector trackSelector, @Nullable Surface surface) { + ExoPlayer player, DefaultTrackSelector trackSelector, @Nullable Surface surface) { trackSelector.setParameters( trackSelector.buildUponParameters().setRendererDisabled(rendererIndex, disabled)); } } - /** Calls {@link SimpleExoPlayer#clearVideoSurface()}. */ + /** Calls {@link ExoPlayer#clearVideoSurface()}. */ public static final class ClearVideoSurface extends Action { /** @param tag A tag to use for logging. */ @@ -428,12 +427,12 @@ public abstract class Action { @Override protected void doActionImpl( - SimpleExoPlayer player, DefaultTrackSelector trackSelector, @Nullable Surface surface) { + ExoPlayer player, DefaultTrackSelector trackSelector, @Nullable Surface surface) { player.clearVideoSurface(); } } - /** Calls {@link SimpleExoPlayer#setVideoSurface(Surface)}. */ + /** Calls {@link ExoPlayer#setVideoSurface(Surface)}. */ public static final class SetVideoSurface extends Action { /** @param tag A tag to use for logging. */ @@ -443,12 +442,12 @@ public abstract class Action { @Override protected void doActionImpl( - SimpleExoPlayer player, DefaultTrackSelector trackSelector, @Nullable Surface surface) { + ExoPlayer player, DefaultTrackSelector trackSelector, @Nullable Surface surface) { player.setVideoSurface(Assertions.checkNotNull(surface)); } } - /** Calls {@link SimpleExoPlayer#setAudioAttributes(AudioAttributes, boolean)}. */ + /** Calls {@link ExoPlayer#setAudioAttributes(AudioAttributes, boolean)}. */ public static final class SetAudioAttributes extends Action { private final AudioAttributes audioAttributes; @@ -468,7 +467,7 @@ public abstract class Action { @Override protected void doActionImpl( - SimpleExoPlayer player, DefaultTrackSelector trackSelector, @Nullable Surface surface) { + ExoPlayer player, DefaultTrackSelector trackSelector, @Nullable Surface surface) { player.setAudioAttributes(audioAttributes, handleAudioFocus); } } @@ -482,7 +481,7 @@ public abstract class Action { @Override protected void doActionImpl( - SimpleExoPlayer player, DefaultTrackSelector trackSelector, @Nullable Surface surface) { + ExoPlayer player, DefaultTrackSelector trackSelector, @Nullable Surface surface) { player.prepare(); } } @@ -503,7 +502,7 @@ public abstract class Action { @Override protected void doActionImpl( - SimpleExoPlayer player, DefaultTrackSelector trackSelector, @Nullable Surface surface) { + ExoPlayer player, DefaultTrackSelector trackSelector, @Nullable Surface surface) { player.setRepeatMode(repeatMode); } } @@ -524,7 +523,7 @@ public abstract class Action { @Override protected void doActionImpl( - SimpleExoPlayer player, DefaultTrackSelector trackSelector, @Nullable Surface surface) { + ExoPlayer player, DefaultTrackSelector trackSelector, @Nullable Surface surface) { player.setShuffleOrder(shuffleOrder); } } @@ -545,7 +544,7 @@ public abstract class Action { @Override protected void doActionImpl( - SimpleExoPlayer player, DefaultTrackSelector trackSelector, @Nullable Surface surface) { + ExoPlayer player, DefaultTrackSelector trackSelector, @Nullable Surface surface) { player.setShuffleModeEnabled(shuffleModeEnabled); } } @@ -591,9 +590,7 @@ public abstract class Action { @Override protected void doActionImpl( - final SimpleExoPlayer player, - DefaultTrackSelector trackSelector, - @Nullable Surface surface) { + final ExoPlayer player, DefaultTrackSelector trackSelector, @Nullable Surface surface) { if (target instanceof PlayerTarget) { ((PlayerTarget) target).setPlayer(player); } @@ -627,7 +624,7 @@ public abstract class Action { @Override protected void doActionImpl( - SimpleExoPlayer player, DefaultTrackSelector trackSelector, @Nullable Surface surface) { + ExoPlayer player, DefaultTrackSelector trackSelector, @Nullable Surface surface) { player.setPlaybackParameters(playbackParameters); } } @@ -648,7 +645,7 @@ public abstract class Action { @Override protected void doActionImpl( - SimpleExoPlayer player, DefaultTrackSelector trackSelector, @Nullable Surface surface) { + ExoPlayer player, DefaultTrackSelector trackSelector, @Nullable Surface surface) { player .createMessage( (messageType, payload) -> { @@ -680,7 +677,7 @@ public abstract class Action { @Override protected void doActionAndScheduleNextImpl( - SimpleExoPlayer player, + ExoPlayer player, DefaultTrackSelector trackSelector, @Nullable Surface surface, HandlerWrapper handler, @@ -724,7 +721,7 @@ public abstract class Action { @Override protected void doActionImpl( - SimpleExoPlayer player, DefaultTrackSelector trackSelector, @Nullable Surface surface) { + ExoPlayer player, DefaultTrackSelector trackSelector, @Nullable Surface surface) { // Not triggered. } } @@ -768,7 +765,7 @@ public abstract class Action { @Override protected void doActionAndScheduleNextImpl( - SimpleExoPlayer player, + ExoPlayer player, DefaultTrackSelector trackSelector, @Nullable Surface surface, HandlerWrapper handler, @@ -798,7 +795,7 @@ public abstract class Action { @Override protected void doActionImpl( - SimpleExoPlayer player, DefaultTrackSelector trackSelector, @Nullable Surface surface) { + ExoPlayer player, DefaultTrackSelector trackSelector, @Nullable Surface surface) { // Not triggered. } } @@ -816,7 +813,7 @@ public abstract class Action { @Override protected void doActionAndScheduleNextImpl( - SimpleExoPlayer player, + ExoPlayer player, DefaultTrackSelector trackSelector, @Nullable Surface surface, HandlerWrapper handler, @@ -839,7 +836,7 @@ public abstract class Action { @Override protected void doActionImpl( - SimpleExoPlayer player, DefaultTrackSelector trackSelector, @Nullable Surface surface) { + ExoPlayer player, DefaultTrackSelector trackSelector, @Nullable Surface surface) { // Not triggered. } } @@ -863,7 +860,7 @@ public abstract class Action { @Override protected void doActionAndScheduleNextImpl( - SimpleExoPlayer player, + ExoPlayer player, DefaultTrackSelector trackSelector, @Nullable Surface surface, HandlerWrapper handler, @@ -890,7 +887,7 @@ public abstract class Action { @Override protected void doActionImpl( - SimpleExoPlayer player, DefaultTrackSelector trackSelector, @Nullable Surface surface) { + ExoPlayer player, DefaultTrackSelector trackSelector, @Nullable Surface surface) { // Not triggered. } } @@ -914,7 +911,7 @@ public abstract class Action { @Override protected void doActionAndScheduleNextImpl( - SimpleExoPlayer player, + ExoPlayer player, DefaultTrackSelector trackSelector, @Nullable Surface surface, HandlerWrapper handler, @@ -940,7 +937,7 @@ public abstract class Action { @Override protected void doActionImpl( - SimpleExoPlayer player, DefaultTrackSelector trackSelector, @Nullable Surface surface) { + ExoPlayer player, DefaultTrackSelector trackSelector, @Nullable Surface surface) { // Not triggered. } } @@ -964,7 +961,7 @@ public abstract class Action { @Override protected void doActionAndScheduleNextImpl( - SimpleExoPlayer player, + ExoPlayer player, DefaultTrackSelector trackSelector, @Nullable Surface surface, HandlerWrapper handler, @@ -980,7 +977,7 @@ public abstract class Action { @Override protected void doActionImpl( - SimpleExoPlayer player, DefaultTrackSelector trackSelector, @Nullable Surface surface) { + ExoPlayer player, DefaultTrackSelector trackSelector, @Nullable Surface surface) { // Not triggered. } } @@ -1004,7 +1001,7 @@ public abstract class Action { @Override protected void doActionAndScheduleNextImpl( - SimpleExoPlayer player, + ExoPlayer player, DefaultTrackSelector trackSelector, @Nullable Surface surface, HandlerWrapper handler, @@ -1030,7 +1027,7 @@ public abstract class Action { @Override protected void doActionImpl( - SimpleExoPlayer player, DefaultTrackSelector trackSelector, @Nullable Surface surface) { + ExoPlayer player, DefaultTrackSelector trackSelector, @Nullable Surface surface) { // Not triggered. } } @@ -1045,7 +1042,7 @@ public abstract class Action { @Override protected void doActionAndScheduleNextImpl( - SimpleExoPlayer player, + ExoPlayer player, DefaultTrackSelector trackSelector, @Nullable Surface surface, HandlerWrapper handler, @@ -1065,7 +1062,7 @@ public abstract class Action { @Override protected void doActionImpl( - SimpleExoPlayer player, DefaultTrackSelector trackSelector, @Nullable Surface surface) { + ExoPlayer player, DefaultTrackSelector trackSelector, @Nullable Surface surface) { // Not triggered. } } @@ -1083,7 +1080,7 @@ public abstract class Action { @Override protected void doActionImpl( - SimpleExoPlayer player, DefaultTrackSelector trackSelector, @Nullable Surface surface) { + ExoPlayer player, DefaultTrackSelector trackSelector, @Nullable Surface surface) { if (runnable instanceof PlayerRunnable) { ((PlayerRunnable) runnable).setPlayer(player); } diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/ActionSchedule.java b/testutils/src/main/java/com/google/android/exoplayer2/testutil/ActionSchedule.java index a93d23ab95..4590d5fd6b 100644 --- a/testutils/src/main/java/com/google/android/exoplayer2/testutil/ActionSchedule.java +++ b/testutils/src/main/java/com/google/android/exoplayer2/testutil/ActionSchedule.java @@ -20,12 +20,12 @@ import android.view.Surface; import androidx.annotation.Nullable; import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.ExoPlaybackException; +import com.google.android.exoplayer2.ExoPlayer; import com.google.android.exoplayer2.PlaybackParameters; import com.google.android.exoplayer2.Player; import com.google.android.exoplayer2.PlayerMessage; import com.google.android.exoplayer2.PlayerMessage.Target; import com.google.android.exoplayer2.Renderer; -import com.google.android.exoplayer2.SimpleExoPlayer; import com.google.android.exoplayer2.Timeline; import com.google.android.exoplayer2.audio.AudioAttributes; import com.google.android.exoplayer2.source.MediaSource; @@ -91,7 +91,7 @@ public final class ActionSchedule { * notification is needed. */ /* package */ void start( - SimpleExoPlayer player, + ExoPlayer player, DefaultTrackSelector trackSelector, @Nullable Surface surface, HandlerWrapper mainHandler, @@ -601,7 +601,7 @@ public final class ActionSchedule { void onMessageArrived(); } - @Nullable private SimpleExoPlayer player; + @Nullable private ExoPlayer player; private boolean hasArrived; @Nullable private Callback callback; @@ -613,8 +613,7 @@ public final class ActionSchedule { } /** Handles the message send to the component and additionally provides access to the player. */ - public abstract void handleMessage( - SimpleExoPlayer player, int messageType, @Nullable Object message); + public abstract void handleMessage(ExoPlayer player, int messageType, @Nullable Object message); @Override public final void handleMessage( @@ -626,8 +625,8 @@ public final class ActionSchedule { } } - /** Sets the player to be passed to {@link #handleMessage(SimpleExoPlayer, int, Object)}. */ - /* package */ void setPlayer(SimpleExoPlayer player) { + /** Sets the player to be passed to {@link #handleMessage(ExoPlayer, int, Object)}. */ + /* package */ void setPlayer(ExoPlayer player) { this.player = player; } } @@ -638,18 +637,18 @@ public final class ActionSchedule { */ public abstract static class PlayerRunnable implements Runnable { - @Nullable private SimpleExoPlayer player; + @Nullable private ExoPlayer player; /** Executes Runnable with reference to player. */ - public abstract void run(SimpleExoPlayer player); + public abstract void run(ExoPlayer player); @Override public final void run() { run(Assertions.checkStateNotNull(player)); } - /** Sets the player to be passed to {@link #run(SimpleExoPlayer)} . */ - /* package */ void setPlayer(SimpleExoPlayer player) { + /** Sets the player to be passed to {@link #run(ExoPlayer)} . */ + /* package */ void setPlayer(ExoPlayer player) { this.player = player; } } @@ -663,7 +662,7 @@ public final class ActionSchedule { @Nullable private ActionNode next; - private @MonotonicNonNull SimpleExoPlayer player; + private @MonotonicNonNull ExoPlayer player; private @MonotonicNonNull DefaultTrackSelector trackSelector; @Nullable private Surface surface; private @MonotonicNonNull HandlerWrapper mainHandler; @@ -707,7 +706,7 @@ public final class ActionSchedule { * @param mainHandler A handler associated with the main thread of the host activity. */ public void schedule( - SimpleExoPlayer player, + ExoPlayer player, DefaultTrackSelector trackSelector, @Nullable Surface surface, HandlerWrapper mainHandler) { @@ -754,7 +753,7 @@ public final class ActionSchedule { @Override protected void doActionImpl( - SimpleExoPlayer player, DefaultTrackSelector trackSelector, @Nullable Surface surface) { + ExoPlayer player, DefaultTrackSelector trackSelector, @Nullable Surface surface) { // Do nothing. } } @@ -774,7 +773,7 @@ public final class ActionSchedule { @Override protected void doActionAndScheduleNextImpl( - SimpleExoPlayer player, + ExoPlayer player, DefaultTrackSelector trackSelector, @Nullable Surface surface, HandlerWrapper handler, @@ -788,7 +787,7 @@ public final class ActionSchedule { @Override protected void doActionImpl( - SimpleExoPlayer player, DefaultTrackSelector trackSelector, @Nullable Surface surface) { + ExoPlayer player, DefaultTrackSelector trackSelector, @Nullable Surface surface) { // Not triggered. } } diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/ExoHostedTest.java b/testutils/src/main/java/com/google/android/exoplayer2/testutil/ExoHostedTest.java index 97004ddacb..e432b918cb 100644 --- a/testutils/src/main/java/com/google/android/exoplayer2/testutil/ExoHostedTest.java +++ b/testutils/src/main/java/com/google/android/exoplayer2/testutil/ExoHostedTest.java @@ -27,7 +27,6 @@ import com.google.android.exoplayer2.DefaultRenderersFactory; import com.google.android.exoplayer2.ExoPlaybackException; import com.google.android.exoplayer2.ExoPlayer; import com.google.android.exoplayer2.Player; -import com.google.android.exoplayer2.SimpleExoPlayer; import com.google.android.exoplayer2.analytics.AnalyticsListener; import com.google.android.exoplayer2.audio.DefaultAudioSink; import com.google.android.exoplayer2.decoder.DecoderCounters; @@ -66,7 +65,7 @@ public abstract class ExoHostedTest implements AnalyticsListener, HostedTest { private final ConditionVariable testFinished; @Nullable private ActionSchedule pendingSchedule; - private @MonotonicNonNull SimpleExoPlayer player; + private @MonotonicNonNull ExoPlayer player; private @MonotonicNonNull HandlerWrapper actionHandler; private @MonotonicNonNull DefaultTrackSelector trackSelector; private @MonotonicNonNull Surface surface; @@ -242,12 +241,12 @@ public abstract class ExoHostedTest implements AnalyticsListener, HostedTest { return new DefaultTrackSelector(host); } - protected SimpleExoPlayer buildExoPlayer( + protected ExoPlayer buildExoPlayer( HostActivity host, Surface surface, MappingTrackSelector trackSelector) { DefaultRenderersFactory renderersFactory = new DefaultRenderersFactory(host); renderersFactory.setExtensionRendererMode(DefaultRenderersFactory.EXTENSION_RENDERER_MODE_OFF); renderersFactory.setAllowedVideoJoiningTimeMs(/* allowedVideoJoiningTimeMs= */ 0); - SimpleExoPlayer player = + ExoPlayer player = new ExoPlayer.Builder(host, renderersFactory).setTrackSelector(trackSelector).build(); player.setVideoSurface(surface); return player; diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/ExoPlayerTestRunner.java b/testutils/src/main/java/com/google/android/exoplayer2/testutil/ExoPlayerTestRunner.java index 4096548a5c..6df171442d 100644 --- a/testutils/src/main/java/com/google/android/exoplayer2/testutil/ExoPlayerTestRunner.java +++ b/testutils/src/main/java/com/google/android/exoplayer2/testutil/ExoPlayerTestRunner.java @@ -34,7 +34,6 @@ import com.google.android.exoplayer2.PlaybackException; import com.google.android.exoplayer2.Player; import com.google.android.exoplayer2.Renderer; import com.google.android.exoplayer2.RenderersFactory; -import com.google.android.exoplayer2.SimpleExoPlayer; import com.google.android.exoplayer2.Timeline; import com.google.android.exoplayer2.analytics.AnalyticsListener; import com.google.android.exoplayer2.source.MediaSource; @@ -71,7 +70,7 @@ public final class ExoPlayerTestRunner implements Player.Listener, ActionSchedul .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. */ public static final class Builder { @@ -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 - * executed immediately before {@link SimpleExoPlayer#prepare()}. + * executed immediately before {@link ExoPlayer#prepare()}. * * @param actionSchedule An {@link ActionSchedule} to be used by the test runner. * @return This builder. @@ -379,7 +378,7 @@ public final class ExoPlayerTestRunner implements Player.Listener, ActionSchedul private final ArrayList playbackStates; private final boolean pauseAtEndOfMediaItems; - private SimpleExoPlayer player; + private ExoPlayer player; private Exception exception; private boolean playerWasPrepared;