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 f1df1c32d5..711550c923 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 @@ -21,6 +21,7 @@ import android.view.View; import androidx.annotation.NonNull; import androidx.annotation.Nullable; 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; @@ -94,7 +95,7 @@ import java.util.ArrayList; currentItemIndex = C.INDEX_UNSET; trackSelector = new DefaultTrackSelector(context); - exoPlayer = new SimpleExoPlayer.Builder(context).setTrackSelector(trackSelector).build(); + exoPlayer = new ExoPlayer.Builder(context).setTrackSelector(trackSelector).build(); exoPlayer.addListener(this); localPlayerView.setPlayer(exoPlayer); 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 abccb41c49..7488d94f98 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 @@ -24,6 +24,7 @@ import android.widget.FrameLayout; import android.widget.Toast; import androidx.annotation.Nullable; 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; @@ -172,7 +173,7 @@ public final class MainActivity extends Activity { throw new IllegalStateException(); } - SimpleExoPlayer player = new SimpleExoPlayer.Builder(getApplicationContext()).build(); + SimpleExoPlayer 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 48748f2c08..c918603931 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 @@ -32,6 +32,7 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.appcompat.app.AppCompatActivity; import com.google.android.exoplayer2.C; +import com.google.android.exoplayer2.ExoPlayer; import com.google.android.exoplayer2.MediaItem; import com.google.android.exoplayer2.PlaybackException; import com.google.android.exoplayer2.Player; @@ -272,7 +273,7 @@ public class PlayerActivity extends AppCompatActivity trackSelector.setParameters(trackSelectorParameters); lastSeenTrackGroupArray = null; player = - new SimpleExoPlayer.Builder(/* context= */ this, renderersFactory) + new ExoPlayer.Builder(/* context= */ this, renderersFactory) .setMediaSourceFactory(mediaSourceFactory) .setTrackSelector(trackSelector) .build(); 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 6a40cd48a4..44dd9d423b 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 @@ -28,6 +28,7 @@ import android.widget.Button; import android.widget.GridLayout; import androidx.annotation.Nullable; 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; @@ -216,7 +217,7 @@ public final class MainActivity extends Activity { } else { throw new IllegalStateException(); } - SimpleExoPlayer player = new SimpleExoPlayer.Builder(getApplicationContext()).build(); + SimpleExoPlayer 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 972f07a9c5..be1371f201 100644 --- a/docs/ad-insertion.md +++ b/docs/ad-insertion.md @@ -49,7 +49,7 @@ MediaSourceFactory mediaSourceFactory = new DefaultMediaSourceFactory(context) .setAdsLoaderProvider(adsLoaderProvider) .setAdViewProvider(playerView); -SimpleExoPlayer player = new SimpleExoPlayer.Builder(context) +SimpleExoPlayer player = new ExoPlayer.Builder(context) .setMediaSourceFactory(mediaSourceFactory) .build(); ~~~ diff --git a/docs/analytics.md b/docs/analytics.md index 5451d8a992..2a819fe2e3 100644 --- a/docs/analytics.md +++ b/docs/analytics.md @@ -246,7 +246,7 @@ class ExtendedCollector extends AnalyticsCollector { } // Usage - Setup and listener registration. -SimpleExoPlayer player = new SimpleExoPlayer.Builder(context) +SimpleExoPlayer player = new ExoPlayer.Builder(context) .setAnalyticsCollector(new ExtendedCollector()) .build(); player.addAnalyticsListener(new ExtendedListener() { diff --git a/docs/customization.md b/docs/customization.md index 38024a816b..7cf0077b5d 100644 --- a/docs/customization.md +++ b/docs/customization.md @@ -60,7 +60,7 @@ DefaultDataSource.Factory dataSourceFactory = // Inject the DefaultDataSourceFactory when creating the player. SimpleExoPlayer player = - new SimpleExoPlayer.Builder(context) + new ExoPlayer.Builder(context) .setMediaSourceFactory(new DefaultMediaSourceFactory(dataSourceFactory)) .build(); ~~~ @@ -82,7 +82,7 @@ DataSource.Factory cacheDataSourceFactory = .setCache(simpleCache) .setUpstreamDataSourceFactory(httpDataSourceFactory); -SimpleExoPlayer player = new SimpleExoPlayer.Builder(context) +SimpleExoPlayer player = new ExoPlayer.Builder(context) .setMediaSourceFactory( new DefaultMediaSourceFactory(cacheDataSourceFactory)) .build(); @@ -107,7 +107,7 @@ DataSource.Factory dataSourceFactory = () -> { return dataSource; }; -SimpleExoPlayer player = new SimpleExoPlayer.Builder(context) +SimpleExoPlayer player = new ExoPlayer.Builder(context) .setMediaSourceFactory(new DefaultMediaSourceFactory(dataSourceFactory)) .build(); ~~~ @@ -158,7 +158,7 @@ LoadErrorHandlingPolicy loadErrorHandlingPolicy = }; SimpleExoPlayer player = - new SimpleExoPlayer.Builder(context) + new ExoPlayer.Builder(context) .setMediaSourceFactory( new DefaultMediaSourceFactory(context) .setLoadErrorHandlingPolicy(loadErrorHandlingPolicy)) @@ -181,7 +181,7 @@ DefaultExtractorsFactory extractorsFactory = new DefaultExtractorsFactory() .setMp3ExtractorFlags(Mp3Extractor.FLAG_ENABLE_INDEX_SEEKING); -SimpleExoPlayer player = new SimpleExoPlayer.Builder(context) +SimpleExoPlayer player = new ExoPlayer.Builder(context) .setMediaSourceFactory( new DefaultMediaSourceFactory(context, extractorsFactory)) .build(); diff --git a/docs/dash.md b/docs/dash.md index 01bf698455..57159c0d6e 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 SimpleExoPlayer.Builder(context).build(); +SimpleExoPlayer 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 SimpleExoPlayer.Builder(context).build(); +SimpleExoPlayer player = new ExoPlayer.Builder(context).build(); // Set the media source to be played. player.setMediaSource(mediaSource); // Prepare the player. diff --git a/docs/downloading-media.md b/docs/downloading-media.md index d696520a2f..d18438c77b 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 SimpleExoPlayer.Builder(context) +SimpleExoPlayer player = new ExoPlayer.Builder(context) .setMediaSourceFactory( new DefaultMediaSourceFactory(cacheDataSourceFactory)) .build(); diff --git a/docs/hello-world.md b/docs/hello-world.md index 80dd002825..d6986c52be 100644 --- a/docs/hello-world.md +++ b/docs/hello-world.md @@ -92,12 +92,12 @@ to prevent build errors. ## Creating the player ## -You can create an `ExoPlayer` instance using `SimpleExoPlayer.Builder`, which -provides a range of customization options. The code below is the simplest -example of creating an instance. +You can create an `ExoPlayer` instance using `ExoPlayer.Builder`, which provides +a range of customization options. The code below is the simplest example of +creating an instance. ~~~ -SimpleExoPlayer player = new SimpleExoPlayer.Builder(context).build(); +SimpleExoPlayer player = new ExoPlayer.Builder(context).build(); ~~~ {: .language-java} diff --git a/docs/hls.md b/docs/hls.md index bc017ae74d..f3bd225b09 100644 --- a/docs/hls.md +++ b/docs/hls.md @@ -18,7 +18,7 @@ player. ~~~ // Create a player instance. -SimpleExoPlayer player = new SimpleExoPlayer.Builder(context).build(); +SimpleExoPlayer 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 SimpleExoPlayer.Builder(context).build(); +SimpleExoPlayer player = new ExoPlayer.Builder(context).build(); // Set the media source to be played. player.setMediaSource(hlsMediaSource); // Prepare the player. diff --git a/docs/live-streaming.md b/docs/live-streaming.md index 4756296e2b..368ae11afc 100644 --- a/docs/live-streaming.md +++ b/docs/live-streaming.md @@ -97,7 +97,7 @@ values will override parameters defined by the media. ~~~ // Global settings. SimpleExoPlayer player = - new SimpleExoPlayer.Builder(context) + new ExoPlayer.Builder(context) .setMediaSourceFactory( new DefaultMediaSourceFactory(context).setLiveTargetOffsetMs(5000)) .build(); @@ -164,7 +164,7 @@ instance can be set when building the player: ~~~ SimpleExoPlayer player = - new SimpleExoPlayer.Builder(context) + new ExoPlayer.Builder(context) .setLivePlaybackSpeedControl( new DefaultLivePlaybackSpeedControl.Builder() .setFallbackMaxPlaybackSpeed(1.04f) diff --git a/docs/media-sources.md b/docs/media-sources.md index 4cc6376303..c280739342 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 SimpleExoPlayer.Builder(context) +SimpleExoPlayer player = new ExoPlayer.Builder(context) .setMediaSourceFactory(mediaSourceFactory) .build(); ~~~ diff --git a/docs/network-stacks.md b/docs/network-stacks.md index ee89344bad..b2db3a65b3 100644 --- a/docs/network-stacks.md +++ b/docs/network-stacks.md @@ -50,7 +50,7 @@ DefaultDataSource.Factory dataSourceFactory = // Inject the DefaultDataSourceFactory when creating the player. SimpleExoPlayer player = - new SimpleExoPlayer.Builder(context) + new ExoPlayer.Builder(context) .setMediaSourceFactory(new DefaultMediaSourceFactory(dataSourceFactory)) .build(); ~~~ diff --git a/docs/progressive.md b/docs/progressive.md index 061e9cf522..cf9e242ba1 100644 --- a/docs/progressive.md +++ b/docs/progressive.md @@ -11,7 +11,7 @@ it to the player. ~~~ // Create a player instance. -SimpleExoPlayer player = new SimpleExoPlayer.Builder(context).build(); +SimpleExoPlayer 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 SimpleExoPlayer.Builder(context).build(); +SimpleExoPlayer 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 9c56cc9614..7af42ec888 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 SimpleExoPlayer.Builder(context).build(); +SimpleExoPlayer 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 SimpleExoPlayer.Builder(context).build(); +SimpleExoPlayer 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 57e96386f8..53e753dc15 100644 --- a/docs/shrinking.md +++ b/docs/shrinking.md @@ -59,7 +59,7 @@ RenderersFactory audioOnlyRenderersFactory = context, MediaCodecSelector.DEFAULT, handler, audioListener) }; SimpleExoPlayer player = - new SimpleExoPlayer.Builder(context, audioOnlyRenderersFactory).build(); + new ExoPlayer.Builder(context, audioOnlyRenderersFactory).build(); ~~~ {: .language-java} @@ -81,14 +81,14 @@ an app that only needs to play mp4 files can provide a factory like: ExtractorsFactory mp4ExtractorFactory = () -> new Extractor[] {new Mp4Extractor()}; SimpleExoPlayer player = - new SimpleExoPlayer.Builder(context, mp4ExtractorFactory).build(); + new ExoPlayer.Builder(context, mp4ExtractorFactory).build(); ~~~ {: .language-java} This will allow other `Extractor` implementations to be removed by code shrinking, which can result in a significant reduction in size. -You should pass `ExtractorsFactory.EMPTY` to the `SimpleExoPlayer.Builder` +You should pass `ExtractorsFactory.EMPTY` to the `ExoPlayer.Builder` constructor, if your app is doing one of the following: * Not playing progressive media at all, for example because it only @@ -99,18 +99,18 @@ constructor, if your app is doing one of the following: ~~~ // Only playing DASH, HLS or SmoothStreaming. SimpleExoPlayer player = - new SimpleExoPlayer.Builder(context, ExtractorsFactory.EMPTY).build(); + new ExoPlayer.Builder(context, ExtractorsFactory.EMPTY).build(); // Providing a customized `DefaultMediaSourceFactory` SimpleExoPlayer player = - new SimpleExoPlayer.Builder(context, ExtractorsFactory.EMPTY) + new ExoPlayer.Builder(context, ExtractorsFactory.EMPTY) .setMediaSourceFactory( new DefaultMediaSourceFactory(context, customExtractorsFactory)) .build(); // Using a MediaSource directly. SimpleExoPlayer player = - new SimpleExoPlayer.Builder(context, ExtractorsFactory.EMPTY).build(); + new ExoPlayer.Builder(context, ExtractorsFactory.EMPTY).build(); ProgressiveMediaSource mediaSource = new ProgressiveMediaSource.Factory( dataSourceFactory, customExtractorsFactory) diff --git a/docs/smoothstreaming.md b/docs/smoothstreaming.md index 67c04cbd49..6039046731 100644 --- a/docs/smoothstreaming.md +++ b/docs/smoothstreaming.md @@ -19,7 +19,7 @@ to the player. ~~~ // Create a player instance. -SimpleExoPlayer player = new SimpleExoPlayer.Builder(context).build(); +SimpleExoPlayer 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 SimpleExoPlayer.Builder(context).build(); +SimpleExoPlayer 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 0a525ecff0..206ccbf8fb 100644 --- a/docs/track-selection.md +++ b/docs/track-selection.md @@ -9,7 +9,7 @@ of which can be provided whenever an `ExoPlayer` is built. ~~~ DefaultTrackSelector trackSelector = new DefaultTrackSelector(context); SimpleExoPlayer player = - new SimpleExoPlayer.Builder(context) + new ExoPlayer.Builder(context) .setTrackSelector(trackSelector) .build(); ~~~ diff --git a/docs/ui-components.md b/docs/ui-components.md index c8942e86da..79078b1731 100644 --- a/docs/ui-components.md +++ b/docs/ui-components.md @@ -70,7 +70,7 @@ When a player has been initialized, it can be attached to the view by calling ~~~ // Instantiate the player. -player = new SimpleExoPlayer.Builder(context).build(); +player = new ExoPlayer.Builder(context).build(); // Attach player to the view. playerView.setPlayer(player); // Set the media source to be played. @@ -157,7 +157,7 @@ protected void onCreate(Bundle savedInstanceState) { private void initializePlayer() { // Instantiate the player. - player = new SimpleExoPlayer.Builder(context).build(); + player = new ExoPlayer.Builder(context).build(); // Attach player to the view. playerControlView.setPlayer(player); // Prepare the player with the dash media source. diff --git a/extensions/av1/README.md b/extensions/av1/README.md index 8e11a5e2e7..fad332a00e 100644 --- a/extensions/av1/README.md +++ b/extensions/av1/README.md @@ -74,13 +74,13 @@ Once you've followed the instructions above to check out, build and depend on the extension, the next step is to tell ExoPlayer to use `Libgav1VideoRenderer`. How you do this depends on which player API you're using: -* If you're passing a `DefaultRenderersFactory` to `SimpleExoPlayer.Builder`, - you can enable using the extension by setting the `extensionRendererMode` - parameter of the `DefaultRenderersFactory` constructor to - `EXTENSION_RENDERER_MODE_ON`. This will use `Libgav1VideoRenderer` for - playback if `MediaCodecVideoRenderer` doesn't support decoding the input AV1 - stream. Pass `EXTENSION_RENDERER_MODE_PREFER` to give `Libgav1VideoRenderer` - priority over `MediaCodecVideoRenderer`. +* If you're passing a `DefaultRenderersFactory` to `ExoPlayer.Builder`, you can + enable using the extension by setting the `extensionRendererMode` parameter of + the `DefaultRenderersFactory` constructor to `EXTENSION_RENDERER_MODE_ON`. + This will use `Libgav1VideoRenderer` for playback if `MediaCodecVideoRenderer` + doesn't support decoding the input AV1 stream. Pass + `EXTENSION_RENDERER_MODE_PREFER` to give `Libgav1VideoRenderer` priority over + `MediaCodecVideoRenderer`. * If you've subclassed `DefaultRenderersFactory`, add a `Libvgav1VideoRenderer` to the output list in `buildVideoRenderers`. ExoPlayer will use the first `Renderer` in the list that supports the input media format. diff --git a/extensions/ffmpeg/README.md b/extensions/ffmpeg/README.md index 77dbc2588d..ad3481c4f6 100644 --- a/extensions/ffmpeg/README.md +++ b/extensions/ffmpeg/README.md @@ -90,13 +90,12 @@ Once you've followed the instructions above to check out, build and depend on the extension, the next step is to tell ExoPlayer to use `FfmpegAudioRenderer`. How you do this depends on which player API you're using: -* If you're passing a `DefaultRenderersFactory` to `SimpleExoPlayer.Builder`, - you can enable using the extension by setting the `extensionRendererMode` - parameter of the `DefaultRenderersFactory` constructor to - `EXTENSION_RENDERER_MODE_ON`. This will use `FfmpegAudioRenderer` for playback - if `MediaCodecAudioRenderer` doesn't support the input format. Pass - `EXTENSION_RENDERER_MODE_PREFER` to give `FfmpegAudioRenderer` priority over - `MediaCodecAudioRenderer`. +* If you're passing a `DefaultRenderersFactory` to `ExoPlayer.Builder`, you can + enable using the extension by setting the `extensionRendererMode` parameter of + the `DefaultRenderersFactory` constructor to `EXTENSION_RENDERER_MODE_ON`. + This will use `FfmpegAudioRenderer` for playback if `MediaCodecAudioRenderer` + doesn't support the input format. Pass `EXTENSION_RENDERER_MODE_PREFER` to + give `FfmpegAudioRenderer` priority over `MediaCodecAudioRenderer`. * If you've subclassed `DefaultRenderersFactory`, add an `FfmpegAudioRenderer` to the output list in `buildAudioRenderers`. ExoPlayer will use the first `Renderer` in the list that supports the input media format. diff --git a/extensions/flac/README.md b/extensions/flac/README.md index 074daca71e..8b58a3fc6b 100644 --- a/extensions/flac/README.md +++ b/extensions/flac/README.md @@ -75,13 +75,12 @@ renderer. ### Using `LibflacAudioRenderer` ### -* If you're passing a `DefaultRenderersFactory` to `SimpleExoPlayer.Builder`, - you can enable using the extension by setting the `extensionRendererMode` - parameter of the `DefaultRenderersFactory` constructor to - `EXTENSION_RENDERER_MODE_ON`. This will use `LibflacAudioRenderer` for - playback if `MediaCodecAudioRenderer` doesn't support the input format. Pass - `EXTENSION_RENDERER_MODE_PREFER` to give `LibflacAudioRenderer` priority over - `MediaCodecAudioRenderer`. +* If you're passing a `DefaultRenderersFactory` to `ExoPlayer.Builder`, you can + enable using the extension by setting the `extensionRendererMode` parameter of + the `DefaultRenderersFactory` constructor to `EXTENSION_RENDERER_MODE_ON`. + This will use `LibflacAudioRenderer` for playback if `MediaCodecAudioRenderer` + doesn't support the input format. Pass `EXTENSION_RENDERER_MODE_PREFER` to + give `LibflacAudioRenderer` priority over `MediaCodecAudioRenderer`. * If you've subclassed `DefaultRenderersFactory`, add a `LibflacAudioRenderer` to the output list in `buildAudioRenderers`. ExoPlayer will use the first `Renderer` in the list that supports the input media format. 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 ecf7d5f934..f5886505a9 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 @@ -23,6 +23,7 @@ import android.os.Looper; 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.PlaybackException; import com.google.android.exoplayer2.Player; @@ -116,7 +117,7 @@ public class FlacPlaybackTest { new Renderer[] { new LibflacAudioRenderer(eventHandler, audioRendererEventListener, audioSink) }; - player = new SimpleExoPlayer.Builder(context, renderersFactory).build(); + player = new ExoPlayer.Builder(context, renderersFactory).build(); player.addListener(this); MediaSource mediaSource = new ProgressiveMediaSource.Factory( diff --git a/extensions/leanback/src/main/java/com/google/android/exoplayer2/ext/leanback/LeanbackPlayerAdapter.java b/extensions/leanback/src/main/java/com/google/android/exoplayer2/ext/leanback/LeanbackPlayerAdapter.java index f38fe14f20..f0d7b246a4 100644 --- a/extensions/leanback/src/main/java/com/google/android/exoplayer2/ext/leanback/LeanbackPlayerAdapter.java +++ b/extensions/leanback/src/main/java/com/google/android/exoplayer2/ext/leanback/LeanbackPlayerAdapter.java @@ -79,7 +79,7 @@ public final class LeanbackPlayerAdapter extends PlayerAdapter implements Runnab /** * @deprecated Use a {@link ForwardingPlayer} and pass it to the constructor instead. You can also * customize some operations when configuring the player (for example by using {@code - * SimpleExoPlayer.Builder#setSeekBackIncrementMs(long)}). + * ExoPlayer.Builder#setSeekBackIncrementMs(long)}). */ @Deprecated public void setControlDispatcher(@Nullable ControlDispatcher controlDispatcher) { diff --git a/extensions/media2/src/androidTest/java/com/google/android/exoplayer2/ext/media2/PlayerTestRule.java b/extensions/media2/src/androidTest/java/com/google/android/exoplayer2/ext/media2/PlayerTestRule.java index 89a58312ef..0dc6b89238 100644 --- a/extensions/media2/src/androidTest/java/com/google/android/exoplayer2/ext/media2/PlayerTestRule.java +++ b/extensions/media2/src/androidTest/java/com/google/android/exoplayer2/ext/media2/PlayerTestRule.java @@ -21,6 +21,7 @@ import android.os.Looper; import androidx.annotation.Nullable; import androidx.test.core.app.ApplicationProvider; import androidx.test.platform.app.InstrumentationRegistry; +import com.google.android.exoplayer2.ExoPlayer; import com.google.android.exoplayer2.SimpleExoPlayer; import com.google.android.exoplayer2.source.DefaultMediaSourceFactory; import com.google.android.exoplayer2.upstream.DataSource; @@ -69,7 +70,7 @@ import org.junit.rules.ExternalResource; DataSource.Factory dataSourceFactory = new InstrumentingDataSourceFactory(context); exoPlayer = - new SimpleExoPlayer.Builder(context) + new ExoPlayer.Builder(context) .setLooper(Looper.myLooper()) .setMediaSourceFactory(new DefaultMediaSourceFactory(dataSourceFactory)) .build(); diff --git a/extensions/media2/src/androidTest/java/com/google/android/exoplayer2/ext/media2/SessionPlayerConnectorTest.java b/extensions/media2/src/androidTest/java/com/google/android/exoplayer2/ext/media2/SessionPlayerConnectorTest.java index d8e29cc79f..5e78ba99a2 100644 --- a/extensions/media2/src/androidTest/java/com/google/android/exoplayer2/ext/media2/SessionPlayerConnectorTest.java +++ b/extensions/media2/src/androidTest/java/com/google/android/exoplayer2/ext/media2/SessionPlayerConnectorTest.java @@ -44,6 +44,7 @@ import androidx.test.filters.SmallTest; import androidx.test.platform.app.InstrumentationRegistry; import com.google.android.exoplayer2.ControlDispatcher; import com.google.android.exoplayer2.DefaultControlDispatcher; +import com.google.android.exoplayer2.ExoPlayer; import com.google.android.exoplayer2.ForwardingPlayer; import com.google.android.exoplayer2.Player; import com.google.android.exoplayer2.SimpleExoPlayer; @@ -169,7 +170,7 @@ public class SessionPlayerConnectorTest { SimpleExoPlayer simpleExoPlayer = null; SessionPlayerConnector playerConnector = null; try { - simpleExoPlayer = new SimpleExoPlayer.Builder(context).setLooper(Looper.myLooper()).build(); + simpleExoPlayer = new ExoPlayer.Builder(context).setLooper(Looper.myLooper()).build(); playerConnector = new SessionPlayerConnector(simpleExoPlayer, new DefaultMediaItemConverter()); playerConnector.setControlDispatcher(controlDispatcher); @@ -194,8 +195,7 @@ public class SessionPlayerConnectorTest { Player forwardingPlayer = null; SessionPlayerConnector playerConnector = null; try { - Player simpleExoPlayer = - new SimpleExoPlayer.Builder(context).setLooper(Looper.myLooper()).build(); + Player simpleExoPlayer = new ExoPlayer.Builder(context).setLooper(Looper.myLooper()).build(); forwardingPlayer = new ForwardingPlayer(simpleExoPlayer) { @Override diff --git a/extensions/media2/src/main/java/com/google/android/exoplayer2/ext/media2/PlayerWrapper.java b/extensions/media2/src/main/java/com/google/android/exoplayer2/ext/media2/PlayerWrapper.java index 4b25db5643..739029a20e 100644 --- a/extensions/media2/src/main/java/com/google/android/exoplayer2/ext/media2/PlayerWrapper.java +++ b/extensions/media2/src/main/java/com/google/android/exoplayer2/ext/media2/PlayerWrapper.java @@ -166,7 +166,7 @@ import java.util.List; /** * @deprecated Use a {@link ForwardingPlayer} and pass it to the constructor instead. You can also * customize some operations when configuring the player (for example by using {@code - * SimpleExoPlayer.Builder#setSeekBackIncrementMs(long)}). + * ExoPlayer.Builder#setSeekBackIncrementMs(long)}). */ @Deprecated public void setControlDispatcher(ControlDispatcher controlDispatcher) { diff --git a/extensions/media2/src/main/java/com/google/android/exoplayer2/ext/media2/SessionPlayerConnector.java b/extensions/media2/src/main/java/com/google/android/exoplayer2/ext/media2/SessionPlayerConnector.java index e2eb6d1134..b26ecf1193 100644 --- a/extensions/media2/src/main/java/com/google/android/exoplayer2/ext/media2/SessionPlayerConnector.java +++ b/extensions/media2/src/main/java/com/google/android/exoplayer2/ext/media2/SessionPlayerConnector.java @@ -116,7 +116,7 @@ public final class SessionPlayerConnector extends SessionPlayer { /** * @deprecated Use a {@link ForwardingPlayer} and pass it to the constructor instead. You can also * customize some operations when configuring the player (for example by using {@code - * SimpleExoPlayer.Builder#setSeekBackIncrementMs(long)}). + * ExoPlayer.Builder#setSeekBackIncrementMs(long)}). */ @Deprecated public void setControlDispatcher(ControlDispatcher controlDispatcher) { diff --git a/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/MediaSessionConnector.java b/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/MediaSessionConnector.java index 3c461c8853..e1bc902dc3 100644 --- a/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/MediaSessionConnector.java +++ b/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/MediaSessionConnector.java @@ -176,7 +176,7 @@ public final class MediaSessionConnector { * @param controlDispatcher This parameter is deprecated. Use {@code player} instead. Operations * can be customized by passing a {@link ForwardingPlayer} to {@link #setPlayer(Player)}, or * when configuring the player (for example by using {@code - * SimpleExoPlayer.Builder#setSeekBackIncrementMs(long)}). + * ExoPlayer.Builder#setSeekBackIncrementMs(long)}). * @param command The command name. * @param extras Optional parameters for the command, may be null. * @param cb A result receiver to which a result may be sent by the command, may be null. @@ -299,7 +299,7 @@ public final class MediaSessionConnector { * @param controlDispatcher This parameter is deprecated. Use {@code player} instead. Operations * can be customized by passing a {@link ForwardingPlayer} to {@link #setPlayer(Player)}, or * when configuring the player (for example by using {@code - * SimpleExoPlayer.Builder#setSeekBackIncrementMs(long)}). + * ExoPlayer.Builder#setSeekBackIncrementMs(long)}). */ void onSkipToPrevious(Player player, @Deprecated ControlDispatcher controlDispatcher); /** @@ -309,7 +309,7 @@ public final class MediaSessionConnector { * @param controlDispatcher This parameter is deprecated. Use {@code player} instead. Operations * can be customized by passing a {@link ForwardingPlayer} to {@link #setPlayer(Player)}, or * when configuring the player (for example by using {@code - * SimpleExoPlayer.Builder#setSeekBackIncrementMs(long)}). + * ExoPlayer.Builder#setSeekBackIncrementMs(long)}). */ void onSkipToQueueItem(Player player, @Deprecated ControlDispatcher controlDispatcher, long id); /** @@ -319,7 +319,7 @@ public final class MediaSessionConnector { * @param controlDispatcher This parameter is deprecated. Use {@code player} instead. Operations * can be customized by passing a {@link ForwardingPlayer} to {@link #setPlayer(Player)}, or * when configuring the player (for example by using {@code - * SimpleExoPlayer.Builder#setSeekBackIncrementMs(long)}). + * ExoPlayer.Builder#setSeekBackIncrementMs(long)}). */ void onSkipToNext(Player player, @Deprecated ControlDispatcher controlDispatcher); } @@ -377,7 +377,7 @@ public final class MediaSessionConnector { * @param controlDispatcher This parameter is deprecated. Use {@code player} instead. Operations * can be customized by passing a {@link ForwardingPlayer} to {@link #setPlayer(Player)}, or * when configuring the player (for example by using {@code - * SimpleExoPlayer.Builder#setSeekBackIncrementMs(long)}). + * ExoPlayer.Builder#setSeekBackIncrementMs(long)}). * @param mediaButtonEvent The {@link Intent}. * @return True if the event was handled, false otherwise. */ @@ -397,7 +397,7 @@ public final class MediaSessionConnector { * @param controlDispatcher This parameter is deprecated. Use {@code player} instead. Operations * can be customized by passing a {@link ForwardingPlayer} to {@link #setPlayer(Player)}, or * when configuring the player (for example by using {@code - * SimpleExoPlayer.Builder#setSeekBackIncrementMs(long)}). + * ExoPlayer.Builder#setSeekBackIncrementMs(long)}). * @param action The name of the action which was sent by a media controller. * @param extras Optional extras sent by a media controller, may be null. */ @@ -562,7 +562,7 @@ public final class MediaSessionConnector { /** * @deprecated Use a {@link ForwardingPlayer} and pass it to {@link #setPlayer(Player)} instead. * You can also customize some operations when configuring the player (for example by using - * {@code SimpleExoPlayer.Builder#setSeekBackIncrementMs(long)}). + * {@code ExoPlayer.Builder#setSeekBackIncrementMs(long)}). */ @Deprecated public void setControlDispatcher(ControlDispatcher controlDispatcher) { diff --git a/extensions/opus/README.md b/extensions/opus/README.md index 4daff54abf..29c4a46357 100644 --- a/extensions/opus/README.md +++ b/extensions/opus/README.md @@ -79,13 +79,12 @@ Once you've followed the instructions above to check out, build and depend on the extension, the next step is to tell ExoPlayer to use `LibopusAudioRenderer`. How you do this depends on which player API you're using: -* If you're passing a `DefaultRenderersFactory` to `SimpleExoPlayer.Builder`, - you can enable using the extension by setting the `extensionRendererMode` - parameter of the `DefaultRenderersFactory` constructor to - `EXTENSION_RENDERER_MODE_ON`. This will use `LibopusAudioRenderer` for - playback if `MediaCodecAudioRenderer` doesn't support the input format. Pass - `EXTENSION_RENDERER_MODE_PREFER` to give `LibopusAudioRenderer` priority over - `MediaCodecAudioRenderer`. +* If you're passing a `DefaultRenderersFactory` to `ExoPlayer.Builder`, you can + enable using the extension by setting the `extensionRendererMode` parameter of + the `DefaultRenderersFactory` constructor to `EXTENSION_RENDERER_MODE_ON`. + This will use `LibopusAudioRenderer` for playback if `MediaCodecAudioRenderer` + doesn't support the input format. Pass `EXTENSION_RENDERER_MODE_PREFER` to + give `LibopusAudioRenderer` priority over `MediaCodecAudioRenderer`. * If you've subclassed `DefaultRenderersFactory`, add a `LibopusAudioRenderer` to the output list in `buildAudioRenderers`. ExoPlayer will use the first `Renderer` in the list that supports the input media format. 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 0ca53d4b41..a398399068 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 @@ -23,6 +23,7 @@ import android.os.Looper; 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.PlaybackException; import com.google.android.exoplayer2.Player; @@ -96,7 +97,7 @@ public class OpusPlaybackTest { textRendererOutput, metadataRendererOutput) -> new Renderer[] {new LibopusAudioRenderer(eventHandler, audioRendererEventListener)}; - player = new SimpleExoPlayer.Builder(context, renderersFactory).build(); + player = new ExoPlayer.Builder(context, renderersFactory).build(); player.addListener(this); MediaSource mediaSource = new ProgressiveMediaSource.Factory( diff --git a/extensions/vp9/README.md b/extensions/vp9/README.md index 84f3f01326..557e7e6d70 100644 --- a/extensions/vp9/README.md +++ b/extensions/vp9/README.md @@ -89,13 +89,13 @@ Once you've followed the instructions above to check out, build and depend on the extension, the next step is to tell ExoPlayer to use `LibvpxVideoRenderer`. How you do this depends on which player API you're using: -* If you're passing a `DefaultRenderersFactory` to `SimpleExoPlayer.Builder`, - you can enable using the extension by setting the `extensionRendererMode` - parameter of the `DefaultRenderersFactory` constructor to - `EXTENSION_RENDERER_MODE_ON`. This will use `LibvpxVideoRenderer` for playback - if `MediaCodecVideoRenderer` doesn't support decoding the input VP9 stream. - Pass `EXTENSION_RENDERER_MODE_PREFER` to give `LibvpxVideoRenderer` priority - over `MediaCodecVideoRenderer`. +* If you're passing a `DefaultRenderersFactory` to `ExoPlayer.Builder`, you can + enable using the extension by setting the `extensionRendererMode` parameter of + the `DefaultRenderersFactory` constructor to `EXTENSION_RENDERER_MODE_ON`. + This will use `LibvpxVideoRenderer` for playback if `MediaCodecVideoRenderer` + doesn't support decoding the input VP9 stream. Pass + `EXTENSION_RENDERER_MODE_PREFER` to give `LibvpxVideoRenderer` priority over + `MediaCodecVideoRenderer`. * If you've subclassed `DefaultRenderersFactory`, add a `LibvpxVideoRenderer` to the output list in `buildVideoRenderers`. ExoPlayer will use the first `Renderer` in the list that supports the input media format. 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 37b4d4110b..544418bd51 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 @@ -24,6 +24,7 @@ import android.os.Looper; 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.PlaybackException; import com.google.android.exoplayer2.Player; @@ -130,7 +131,7 @@ public class VpxPlaybackTest { videoRendererEventListener, /* maxDroppedFramesToNotify= */ -1) }; - player = new SimpleExoPlayer.Builder(context, renderersFactory).build(); + player = new ExoPlayer.Builder(context, renderersFactory).build(); player.addListener(this); MediaSource mediaSource = new ProgressiveMediaSource.Factory( 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 81d39c65c2..001c3d69c9 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 @@ -59,7 +59,7 @@ public final class ClippedPlaybackTest { getInstrumentation() .runOnMainSync( () -> { - player.set(new SimpleExoPlayer.Builder(getInstrumentation().getContext()).build()); + player.set(new ExoPlayer.Builder(getInstrumentation().getContext()).build()); player.get().addListener(textCapturer); player.get().setMediaItem(mediaItem); player.get().prepare(); @@ -101,7 +101,7 @@ public final class ClippedPlaybackTest { getInstrumentation() .runOnMainSync( () -> { - player.set(new SimpleExoPlayer.Builder(getInstrumentation().getContext()).build()); + player.set(new ExoPlayer.Builder(getInstrumentation().getContext()).build()); player.get().addListener(textCapturer); player.get().setMediaItems(mediaItems); player.get().prepare(); diff --git a/library/core/src/test/java/com/google/android/exoplayer2/SimpleExoPlayerTest.java b/library/core/src/test/java/com/google/android/exoplayer2/SimpleExoPlayerTest.java index 4fb49e8b79..15bd503925 100644 --- a/library/core/src/test/java/com/google/android/exoplayer2/SimpleExoPlayerTest.java +++ b/library/core/src/test/java/com/google/android/exoplayer2/SimpleExoPlayerTest.java @@ -52,7 +52,7 @@ public class SimpleExoPlayerTest { public void builder_inBackgroundThread_doesNotThrow() throws Exception { Thread builderThread = new Thread( - () -> new SimpleExoPlayer.Builder(ApplicationProvider.getApplicationContext()).build()); + () -> new ExoPlayer.Builder(ApplicationProvider.getApplicationContext()).build()); AtomicReference builderThrow = new AtomicReference<>(); builderThread.setUncaughtExceptionHandler((thread, throwable) -> builderThrow.set(throwable)); @@ -65,7 +65,7 @@ public class SimpleExoPlayerTest { @Test public void onPlaylistMetadataChanged_calledWhenPlaylistMetadataSet() { SimpleExoPlayer player = - new SimpleExoPlayer.Builder(ApplicationProvider.getApplicationContext()).build(); + new ExoPlayer.Builder(ApplicationProvider.getApplicationContext()).build(); Player.Listener playerListener = mock(Player.Listener.class); player.addListener(playerListener); AnalyticsListener analyticsListener = mock(AnalyticsListener.class); @@ -81,7 +81,7 @@ public class SimpleExoPlayerTest { @Test public void release_triggersAllPendingEventsInAnalyticsListeners() throws Exception { SimpleExoPlayer player = - new SimpleExoPlayer.Builder( + new ExoPlayer.Builder( ApplicationProvider.getApplicationContext(), (handler, videoListener, audioListener, textOutput, metadataOutput) -> new Renderer[] {new FakeVideoRenderer(handler, videoListener)}) @@ -107,7 +107,7 @@ public class SimpleExoPlayerTest { public void releaseAfterRendererEvents_triggersPendingVideoEventsInListener() throws Exception { Surface surface = new Surface(new SurfaceTexture(/* texName= */ 0)); SimpleExoPlayer player = - new SimpleExoPlayer.Builder( + new ExoPlayer.Builder( ApplicationProvider.getApplicationContext(), (handler, videoListener, audioListener, textOutput, metadataOutput) -> new Renderer[] {new FakeVideoRenderer(handler, videoListener)}) @@ -133,7 +133,7 @@ public class SimpleExoPlayerTest { @Test public void releaseAfterVolumeChanges_triggerPendingVolumeEventInListener() throws Exception { SimpleExoPlayer player = - new SimpleExoPlayer.Builder(ApplicationProvider.getApplicationContext()).build(); + new ExoPlayer.Builder(ApplicationProvider.getApplicationContext()).build(); Player.Listener listener = mock(Player.Listener.class); player.addListener(listener); @@ -147,7 +147,7 @@ public class SimpleExoPlayerTest { @Test public void releaseAfterVolumeChanges_triggerPendingDeviceVolumeEventsInListener() { SimpleExoPlayer player = - new SimpleExoPlayer.Builder(ApplicationProvider.getApplicationContext()).build(); + new ExoPlayer.Builder(ApplicationProvider.getApplicationContext()).build(); Player.Listener listener = mock(Player.Listener.class); player.addListener(listener); 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 549fa0cd5b..8cd72a140f 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 @@ -69,6 +69,7 @@ import androidx.test.core.app.ApplicationProvider; import androidx.test.ext.junit.runners.AndroidJUnit4; import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.ExoPlaybackException; +import com.google.android.exoplayer2.ExoPlayer; import com.google.android.exoplayer2.Format; import com.google.android.exoplayer2.MediaItem; import com.google.android.exoplayer2.PlaybackException; @@ -1944,7 +1945,7 @@ public final class AnalyticsCollectorTest { public void recursiveListenerInvocation_arrivesInCorrectOrder() { AnalyticsCollector analyticsCollector = new AnalyticsCollector(Clock.DEFAULT); analyticsCollector.setPlayer( - new SimpleExoPlayer.Builder(ApplicationProvider.getApplicationContext()).build(), + new ExoPlayer.Builder(ApplicationProvider.getApplicationContext()).build(), Looper.myLooper()); AnalyticsListener listener1 = mock(AnalyticsListener.class); AnalyticsListener listener2 = 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 b4574a6b7f..3e2422f064 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 @@ -22,6 +22,7 @@ import android.media.AudioFormat; import android.media.MediaFormat; import androidx.test.core.app.ApplicationProvider; import androidx.test.ext.junit.runners.AndroidJUnit4; +import com.google.android.exoplayer2.ExoPlayer; import com.google.android.exoplayer2.Format; import com.google.android.exoplayer2.MediaItem; import com.google.android.exoplayer2.Player; @@ -87,7 +88,7 @@ public class EndToEndGaplessTest { @Test public void testPlayback_twoIdenticalMp3Files() throws Exception { SimpleExoPlayer player = - new SimpleExoPlayer.Builder(ApplicationProvider.getApplicationContext()) + 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 200b071e75..779199c7a7 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 @@ -17,6 +17,7 @@ package com.google.android.exoplayer2.e2etest; import android.content.Context; 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; @@ -64,7 +65,7 @@ public class FlacPlaybackTest { CapturingRenderersFactory capturingRenderersFactory = new CapturingRenderersFactory(applicationContext); SimpleExoPlayer player = - new SimpleExoPlayer.Builder(applicationContext, capturingRenderersFactory) + new ExoPlayer.Builder(applicationContext, capturingRenderersFactory) .setClock(new FakeClock(/* isAutoAdvancing= */ true)) .build(); PlaybackOutput playbackOutput = PlaybackOutput.register(player, capturingRenderersFactory); 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 8a414ced43..51e9051b60 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 @@ -19,6 +19,7 @@ import android.content.Context; import android.graphics.SurfaceTexture; import android.view.Surface; 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; @@ -55,7 +56,7 @@ public final class FlvPlaybackTest { CapturingRenderersFactory capturingRenderersFactory = new CapturingRenderersFactory(applicationContext); SimpleExoPlayer player = - new SimpleExoPlayer.Builder(applicationContext, capturingRenderersFactory) + new ExoPlayer.Builder(applicationContext, capturingRenderersFactory) .setClock(new FakeClock(/* isAutoAdvancing= */ true)) .build(); player.setVideoSurface(new Surface(new SurfaceTexture(/* texName= */ 1))); 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 081a6a5658..a3e2c1c32e 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 @@ -17,6 +17,7 @@ package com.google.android.exoplayer2.e2etest; import android.content.Context; 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; @@ -57,7 +58,7 @@ public final class MkaPlaybackTest { CapturingRenderersFactory capturingRenderersFactory = new CapturingRenderersFactory(applicationContext); SimpleExoPlayer player = - new SimpleExoPlayer.Builder(applicationContext, capturingRenderersFactory) + new ExoPlayer.Builder(applicationContext, capturingRenderersFactory) .setClock(new FakeClock(/* isAutoAdvancing= */ true)) .build(); PlaybackOutput playbackOutput = PlaybackOutput.register(player, capturingRenderersFactory); 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 2d6bd31fdd..398d6c05d4 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 @@ -19,6 +19,7 @@ import android.content.Context; import android.graphics.SurfaceTexture; import android.view.Surface; 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; @@ -61,7 +62,7 @@ public final class MkvPlaybackTest { CapturingRenderersFactory capturingRenderersFactory = new CapturingRenderersFactory(applicationContext); SimpleExoPlayer player = - new SimpleExoPlayer.Builder(applicationContext, capturingRenderersFactory) + new ExoPlayer.Builder(applicationContext, capturingRenderersFactory) .setClock(new FakeClock(/* isAutoAdvancing= */ true)) .build(); player.setVideoSurface(new Surface(new SurfaceTexture(/* texName= */ 1))); 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 773f274388..53a2d62de7 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 @@ -17,6 +17,7 @@ package com.google.android.exoplayer2.e2etest; import android.content.Context; 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; @@ -60,7 +61,7 @@ public final class Mp3PlaybackTest { CapturingRenderersFactory capturingRenderersFactory = new CapturingRenderersFactory(applicationContext); SimpleExoPlayer player = - new SimpleExoPlayer.Builder(applicationContext, capturingRenderersFactory) + new ExoPlayer.Builder(applicationContext, capturingRenderersFactory) .setClock(new FakeClock(/* isAutoAdvancing= */ true)) .build(); PlaybackOutput playbackOutput = PlaybackOutput.register(player, capturingRenderersFactory); 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 557f00f64d..ccb6ca9961 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 @@ -19,6 +19,7 @@ import android.content.Context; import android.graphics.SurfaceTexture; import android.view.Surface; 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; @@ -77,7 +78,7 @@ public class Mp4PlaybackTest { Context applicationContext = ApplicationProvider.getApplicationContext(); CapturingRenderersFactory renderersFactory = new CapturingRenderersFactory(applicationContext); SimpleExoPlayer player = - new SimpleExoPlayer.Builder(applicationContext, renderersFactory) + new ExoPlayer.Builder(applicationContext, renderersFactory) .setClock(new FakeClock(/* isAutoAdvancing= */ true)) .build(); player.setVideoSurface(new Surface(new SurfaceTexture(/* texName= */ 1))); 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 88c2e14c61..3966dd59ca 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 @@ -17,6 +17,7 @@ package com.google.android.exoplayer2.e2etest; import android.content.Context; 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; @@ -58,7 +59,7 @@ public final class OggPlaybackTest { CapturingRenderersFactory capturingRenderersFactory = new CapturingRenderersFactory(applicationContext); SimpleExoPlayer player = - new SimpleExoPlayer.Builder(applicationContext, capturingRenderersFactory) + new ExoPlayer.Builder(applicationContext, capturingRenderersFactory) .setClock(new FakeClock(/* isAutoAdvancing= */ true)) .build(); PlaybackOutput playbackOutput = PlaybackOutput.register(player, capturingRenderersFactory); 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 9d2316e37f..a5ecc58580 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 @@ -18,6 +18,7 @@ package com.google.android.exoplayer2.e2etest; import android.content.Context; 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.Player; import com.google.android.exoplayer2.SimpleExoPlayer; @@ -45,7 +46,7 @@ public final class PlaylistPlaybackTest { CapturingRenderersFactory capturingRenderersFactory = new CapturingRenderersFactory(applicationContext); SimpleExoPlayer player = - new SimpleExoPlayer.Builder(applicationContext, capturingRenderersFactory) + new ExoPlayer.Builder(applicationContext, capturingRenderersFactory) .setClock(new FakeClock(/* isAutoAdvancing= */ true)) .build(); PlaybackOutput playbackOutput = PlaybackOutput.register(player, capturingRenderersFactory); @@ -67,7 +68,7 @@ public final class PlaylistPlaybackTest { CapturingRenderersFactory capturingRenderersFactory = new CapturingRenderersFactory(applicationContext); SimpleExoPlayer player = - new SimpleExoPlayer.Builder(applicationContext, capturingRenderersFactory) + new ExoPlayer.Builder(applicationContext, capturingRenderersFactory) .setClock(new FakeClock(/* isAutoAdvancing= */ true)) .build(); PlaybackOutput playbackOutput = PlaybackOutput.register(player, capturingRenderersFactory); 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 f7f9da385a..7acd02fc66 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 @@ -18,6 +18,7 @@ package com.google.android.exoplayer2.e2etest; import android.content.Context; 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; @@ -45,7 +46,7 @@ public final class SilencePlaybackTest { CapturingRenderersFactory capturingRenderersFactory = new CapturingRenderersFactory(applicationContext); SimpleExoPlayer player = - new SimpleExoPlayer.Builder(applicationContext, capturingRenderersFactory) + new ExoPlayer.Builder(applicationContext, capturingRenderersFactory) .setClock(new FakeClock(/* isAutoAdvancing= */ true)) .build(); PlaybackOutput playbackOutput = PlaybackOutput.register(player, capturingRenderersFactory); @@ -66,7 +67,7 @@ public final class SilencePlaybackTest { CapturingRenderersFactory capturingRenderersFactory = new CapturingRenderersFactory(applicationContext); SimpleExoPlayer player = - new SimpleExoPlayer.Builder(applicationContext, capturingRenderersFactory) + new ExoPlayer.Builder(applicationContext, capturingRenderersFactory) .setClock(new FakeClock(/* isAutoAdvancing= */ true)) .build(); PlaybackOutput playbackOutput = PlaybackOutput.register(player, capturingRenderersFactory); 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 5ac951f51b..fc741e0710 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 @@ -19,6 +19,7 @@ import android.content.Context; import android.graphics.SurfaceTexture; import android.view.Surface; 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; @@ -81,7 +82,7 @@ public class TsPlaybackTest { CapturingRenderersFactory capturingRenderersFactory = new CapturingRenderersFactory(applicationContext); SimpleExoPlayer player = - new SimpleExoPlayer.Builder(applicationContext, capturingRenderersFactory) + new ExoPlayer.Builder(applicationContext, capturingRenderersFactory) .setClock(new FakeClock(/* isAutoAdvancing= */ true)) .build(); player.setVideoSurface(new Surface(new SurfaceTexture(/* texName= */ 1))); 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 9c29e27808..01f12d272d 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 @@ -19,6 +19,7 @@ import android.content.Context; import android.graphics.SurfaceTexture; import android.view.Surface; 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; @@ -59,7 +60,7 @@ public final class Vp9PlaybackTest { CapturingRenderersFactory capturingRenderersFactory = new CapturingRenderersFactory(applicationContext); SimpleExoPlayer player = - new SimpleExoPlayer.Builder(applicationContext, capturingRenderersFactory) + new ExoPlayer.Builder(applicationContext, capturingRenderersFactory) .setClock(new FakeClock(/* isAutoAdvancing= */ true)) .build(); player.setVideoSurface(new Surface(new SurfaceTexture(/* texName= */ 1))); 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 6391547433..451a9d9f8b 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 @@ -17,6 +17,7 @@ package com.google.android.exoplayer2.e2etest; import android.content.Context; 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; @@ -52,7 +53,7 @@ public final class WavPlaybackTest { CapturingRenderersFactory capturingRenderersFactory = new CapturingRenderersFactory(applicationContext); SimpleExoPlayer player = - new SimpleExoPlayer.Builder(applicationContext, capturingRenderersFactory) + new ExoPlayer.Builder(applicationContext, capturingRenderersFactory) .setClock(new FakeClock(/* isAutoAdvancing= */ true)) .build(); PlaybackOutput playbackOutput = PlaybackOutput.register(player, capturingRenderersFactory); 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 1169522103..d93f802190 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 @@ -35,6 +35,7 @@ import android.graphics.SurfaceTexture; import android.view.Surface; 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.Player; import com.google.android.exoplayer2.SimpleExoPlayer; @@ -143,7 +144,7 @@ public final class ServerSideInsertedAdMediaSourceTest { Context context = ApplicationProvider.getApplicationContext(); CapturingRenderersFactory renderersFactory = new CapturingRenderersFactory(context); SimpleExoPlayer player = - new SimpleExoPlayer.Builder(context, renderersFactory) + new ExoPlayer.Builder(context, renderersFactory) .setClock(new FakeClock(/* isAutoAdvancing= */ true)) .build(); player.setVideoSurface(new Surface(new SurfaceTexture(/* texName= */ 1))); @@ -202,7 +203,7 @@ public final class ServerSideInsertedAdMediaSourceTest { Context context = ApplicationProvider.getApplicationContext(); CapturingRenderersFactory renderersFactory = new CapturingRenderersFactory(context); SimpleExoPlayer player = - new SimpleExoPlayer.Builder(context, renderersFactory) + new ExoPlayer.Builder(context, renderersFactory) .setClock(new FakeClock(/* isAutoAdvancing= */ true)) .build(); player.setVideoSurface(new Surface(new SurfaceTexture(/* texName= */ 1))); @@ -262,7 +263,7 @@ public final class ServerSideInsertedAdMediaSourceTest { Context context = ApplicationProvider.getApplicationContext(); CapturingRenderersFactory renderersFactory = new CapturingRenderersFactory(context); SimpleExoPlayer player = - new SimpleExoPlayer.Builder(context, renderersFactory) + new ExoPlayer.Builder(context, renderersFactory) .setClock(new FakeClock(/* isAutoAdvancing= */ true)) .build(); player.setVideoSurface(new Surface(new SurfaceTexture(/* texName= */ 1))); @@ -319,9 +320,7 @@ public final class ServerSideInsertedAdMediaSourceTest { public void playbackWithSeek_isHandledCorrectly() throws Exception { Context context = ApplicationProvider.getApplicationContext(); SimpleExoPlayer player = - new SimpleExoPlayer.Builder(context) - .setClock(new FakeClock(/* isAutoAdvancing= */ true)) - .build(); + new ExoPlayer.Builder(context).setClock(new FakeClock(/* isAutoAdvancing= */ true)).build(); player.setVideoSurface(new Surface(new SurfaceTexture(/* texName= */ 1))); ServerSideInsertedAdsMediaSource mediaSource = 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 e3615d8f8e..053fd707e4 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 @@ -22,6 +22,7 @@ import android.graphics.SurfaceTexture; import android.view.Surface; 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.Player; import com.google.android.exoplayer2.SimpleExoPlayer; @@ -51,7 +52,7 @@ public final class DashPlaybackTest { CapturingRenderersFactory capturingRenderersFactory = new CapturingRenderersFactory(applicationContext); SimpleExoPlayer player = - new SimpleExoPlayer.Builder(applicationContext, capturingRenderersFactory) + new ExoPlayer.Builder(applicationContext, capturingRenderersFactory) .setClock(new FakeClock(/* isAutoAdvancing= */ true)) .build(); player.setVideoSurface(new Surface(new SurfaceTexture(/* texName= */ 1))); @@ -78,7 +79,7 @@ public final class DashPlaybackTest { CapturingRenderersFactory capturingRenderersFactory = new CapturingRenderersFactory(applicationContext); SimpleExoPlayer player = - new SimpleExoPlayer.Builder(applicationContext, capturingRenderersFactory) + new ExoPlayer.Builder(applicationContext, capturingRenderersFactory) .setClock(new FakeClock(/* isAutoAdvancing= */ true)) .build(); player.setVideoSurface(new Surface(new SurfaceTexture(/* texName= */ 1))); 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 61cde4a725..4fd7361444 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 @@ -25,6 +25,7 @@ import androidx.annotation.Nullable; import androidx.test.core.app.ApplicationProvider; import androidx.test.ext.junit.runners.AndroidJUnit4; import com.google.android.exoplayer2.C; +import com.google.android.exoplayer2.ExoPlayer; import com.google.android.exoplayer2.MediaItem; import com.google.android.exoplayer2.PlaybackException; import com.google.android.exoplayer2.Player; @@ -150,7 +151,7 @@ public final class RtspPlaybackTest { private SimpleExoPlayer createSimpleExoPlayer( int serverRtspPortNumber, RtpDataChannel.Factory rtpDataChannelFactory) { SimpleExoPlayer player = - new SimpleExoPlayer.Builder(applicationContext, capturingRenderersFactory) + new ExoPlayer.Builder(applicationContext, capturingRenderersFactory) .setClock(clock) .build(); player.setMediaSource( 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 57583c79ad..bb36733a48 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 @@ -37,6 +37,7 @@ import androidx.annotation.RequiresApi; import androidx.annotation.VisibleForTesting; import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.DefaultLoadControl; +import com.google.android.exoplayer2.ExoPlayer; import com.google.android.exoplayer2.MediaItem; import com.google.android.exoplayer2.PlaybackException; import com.google.android.exoplayer2.Player; @@ -477,7 +478,7 @@ public final class Transformer { DEFAULT_BUFFER_FOR_PLAYBACK_AFTER_REBUFFER_MS / 10) .build(); player = - new SimpleExoPlayer.Builder( + new ExoPlayer.Builder( context, new TransformerRenderersFactory(muxerWrapper, transformation)) .setMediaSourceFactory(mediaSourceFactory) .setTrackSelector(trackSelector) diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerControlView.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerControlView.java index dd8a6d212f..2c1e469d81 100644 --- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerControlView.java +++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerControlView.java @@ -47,12 +47,12 @@ import android.widget.TextView; import androidx.annotation.Nullable; import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.ControlDispatcher; +import com.google.android.exoplayer2.ExoPlayer; import com.google.android.exoplayer2.ExoPlayerLibraryInfo; import com.google.android.exoplayer2.ForwardingPlayer; import com.google.android.exoplayer2.Player; import com.google.android.exoplayer2.Player.Events; import com.google.android.exoplayer2.Player.State; -import com.google.android.exoplayer2.SimpleExoPlayer; import com.google.android.exoplayer2.Timeline; import com.google.android.exoplayer2.util.Assertions; import com.google.android.exoplayer2.util.RepeatModeUtil; @@ -603,7 +603,7 @@ public class PlayerControlView extends FrameLayout { /** * @deprecated Use a {@link ForwardingPlayer} and pass it to {@link #setPlayer(Player)} instead. * You can also customize some operations when configuring the player (for example by using - * {@link SimpleExoPlayer.Builder#setSeekBackIncrementMs(long)}). + * {@link ExoPlayer.Builder#setSeekBackIncrementMs(long)}). */ @Deprecated public void setControlDispatcher(ControlDispatcher controlDispatcher) { diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerNotificationManager.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerNotificationManager.java index 53d989d9d6..f6ccf5a77a 100644 --- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerNotificationManager.java +++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerNotificationManager.java @@ -53,9 +53,9 @@ import androidx.media.app.NotificationCompat.MediaStyle; import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.ControlDispatcher; import com.google.android.exoplayer2.DefaultControlDispatcher; +import com.google.android.exoplayer2.ExoPlayer; import com.google.android.exoplayer2.ForwardingPlayer; import com.google.android.exoplayer2.Player; -import com.google.android.exoplayer2.SimpleExoPlayer; import com.google.android.exoplayer2.util.NotificationUtil; import com.google.android.exoplayer2.util.Util; import java.lang.annotation.Documented; @@ -819,9 +819,9 @@ public class PlayerNotificationManager { /** * @deprecated Use a {@link ForwardingPlayer} and pass it to {@link #setPlayer(Player)} instead. * You can also customize some operations when configuring the player (for example by using - * {@link SimpleExoPlayer.Builder#setSeekBackIncrementMs(long)}), or configure whether the - * rewind and fast forward actions should be used with {{@link #setUseRewindAction(boolean)}} - * and {@link #setUseFastForwardAction(boolean)}. + * {@link ExoPlayer.Builder#setSeekBackIncrementMs(long)}), or configure whether the rewind + * and fast forward actions should be used with {{@link #setUseRewindAction(boolean)}} and + * {@link #setUseFastForwardAction(boolean)}. */ @Deprecated public final void setControlDispatcher(ControlDispatcher controlDispatcher) { diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerView.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerView.java index 4ef12414d0..fa454a1813 100644 --- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerView.java +++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerView.java @@ -47,13 +47,13 @@ import androidx.annotation.RequiresApi; import androidx.core.content.ContextCompat; import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.ControlDispatcher; +import com.google.android.exoplayer2.ExoPlayer; import com.google.android.exoplayer2.Format; import com.google.android.exoplayer2.ForwardingPlayer; import com.google.android.exoplayer2.MediaMetadata; import com.google.android.exoplayer2.PlaybackException; import com.google.android.exoplayer2.Player; import com.google.android.exoplayer2.Player.DiscontinuityReason; -import com.google.android.exoplayer2.SimpleExoPlayer; import com.google.android.exoplayer2.Timeline; import com.google.android.exoplayer2.Timeline.Period; import com.google.android.exoplayer2.source.TrackGroupArray; @@ -931,7 +931,7 @@ public class PlayerView extends FrameLayout implements AdViewProvider { /** * @deprecated Use a {@link ForwardingPlayer} and pass it to {@link #setPlayer(Player)} instead. * You can also customize some operations when configuring the player (for example by using - * {@link SimpleExoPlayer.Builder#setSeekBackIncrementMs(long)}). + * {@link ExoPlayer.Builder#setSeekBackIncrementMs(long)}). */ @Deprecated public void setControlDispatcher(ControlDispatcher controlDispatcher) { diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/StyledPlayerControlView.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/StyledPlayerControlView.java index 8a4b6ae9a9..45786b1eaa 100644 --- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/StyledPlayerControlView.java +++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/StyledPlayerControlView.java @@ -65,7 +65,6 @@ import com.google.android.exoplayer2.ForwardingPlayer; import com.google.android.exoplayer2.Player; import com.google.android.exoplayer2.Player.Events; import com.google.android.exoplayer2.Player.State; -import com.google.android.exoplayer2.SimpleExoPlayer; import com.google.android.exoplayer2.Timeline; import com.google.android.exoplayer2.source.TrackGroup; import com.google.android.exoplayer2.source.TrackGroupArray; @@ -836,7 +835,7 @@ public class StyledPlayerControlView extends FrameLayout { /** * @deprecated Use a {@link ForwardingPlayer} and pass it to {@link #setPlayer(Player)} instead. * You can also customize some operations when configuring the player (for example by using - * {@link SimpleExoPlayer.Builder#setSeekBackIncrementMs(long)}). + * {@link ExoPlayer.Builder#setSeekBackIncrementMs(long)}). */ @Deprecated public void setControlDispatcher(ControlDispatcher controlDispatcher) { diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/StyledPlayerView.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/StyledPlayerView.java index 2fb299048b..cb8e95997c 100644 --- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/StyledPlayerView.java +++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/StyledPlayerView.java @@ -48,13 +48,13 @@ import androidx.annotation.RequiresApi; import androidx.core.content.ContextCompat; import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.ControlDispatcher; +import com.google.android.exoplayer2.ExoPlayer; import com.google.android.exoplayer2.Format; import com.google.android.exoplayer2.ForwardingPlayer; import com.google.android.exoplayer2.MediaMetadata; import com.google.android.exoplayer2.PlaybackException; import com.google.android.exoplayer2.Player; import com.google.android.exoplayer2.Player.DiscontinuityReason; -import com.google.android.exoplayer2.SimpleExoPlayer; import com.google.android.exoplayer2.Timeline; import com.google.android.exoplayer2.Timeline.Period; import com.google.android.exoplayer2.source.TrackGroupArray; @@ -949,7 +949,7 @@ public class StyledPlayerView extends FrameLayout implements AdViewProvider { /** * @deprecated Use a {@link ForwardingPlayer} and pass it to {@link #setPlayer(Player)} instead. * You can also customize some operations when configuring the player (for example by using - * {@link SimpleExoPlayer.Builder#setSeekBackIncrementMs(long)}). + * {@link ExoPlayer.Builder#setSeekBackIncrementMs(long)}). */ @Deprecated public void setControlDispatcher(ControlDispatcher controlDispatcher) { 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 836c05bb22..e0ae2074e2 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 @@ -25,6 +25,7 @@ import androidx.annotation.RequiresApi; import androidx.test.core.app.ApplicationProvider; import androidx.test.platform.app.InstrumentationRegistry; import com.google.android.exoplayer2.C; +import com.google.android.exoplayer2.ExoPlayer; import com.google.android.exoplayer2.Format; import com.google.android.exoplayer2.MediaItem; import com.google.android.exoplayer2.RendererCapabilities; @@ -314,7 +315,7 @@ import java.util.List; protected SimpleExoPlayer buildExoPlayer( HostActivity host, Surface surface, MappingTrackSelector trackSelector) { SimpleExoPlayer player = - new SimpleExoPlayer.Builder(host, new DebugRenderersFactory(host)) + new ExoPlayer.Builder(host, new DebugRenderersFactory(host)) .setTrackSelector(trackSelector) .build(); player.setVideoSurface(surface); 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 e83d2a2a1a..97004ddacb 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 @@ -248,7 +248,7 @@ public abstract class ExoHostedTest implements AnalyticsListener, HostedTest { renderersFactory.setExtensionRendererMode(DefaultRenderersFactory.EXTENSION_RENDERER_MODE_OFF); renderersFactory.setAllowedVideoJoiningTimeMs(/* allowedVideoJoiningTimeMs= */ 0); SimpleExoPlayer player = - new SimpleExoPlayer.Builder(host, renderersFactory).setTrackSelector(trackSelector).build(); + 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/TestExoPlayerBuilder.java b/testutils/src/main/java/com/google/android/exoplayer2/testutil/TestExoPlayerBuilder.java index 5c847c10be..654218e1a5 100644 --- a/testutils/src/main/java/com/google/android/exoplayer2/testutil/TestExoPlayerBuilder.java +++ b/testutils/src/main/java/com/google/android/exoplayer2/testutil/TestExoPlayerBuilder.java @@ -22,6 +22,7 @@ import android.os.Looper; import androidx.annotation.Nullable; import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.DefaultLoadControl; +import com.google.android.exoplayer2.ExoPlayer; import com.google.android.exoplayer2.LoadControl; import com.google.android.exoplayer2.Renderer; import com.google.android.exoplayer2.RenderersFactory; @@ -276,7 +277,7 @@ public class TestExoPlayerBuilder { }; } - return new SimpleExoPlayer.Builder(context, playerRenderersFactory) + return new ExoPlayer.Builder(context, playerRenderersFactory) .setTrackSelector(trackSelector) .setLoadControl(loadControl) .setBandwidthMeter(bandwidthMeter)