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 aff3dbbf48..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 @@ -173,7 +173,7 @@ public final class MainActivity extends Activity { throw new IllegalStateException(); } - SimpleExoPlayer player = new ExoPlayer.Builder(getApplicationContext()).buildExoPlayer(); + SimpleExoPlayer player = new ExoPlayer.Builder(getApplicationContext()).build(); player.setRepeatMode(Player.REPEAT_MODE_ALL); player.setMediaSource(mediaSource); player.prepare(); 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 a5fbd98431..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 @@ -217,7 +217,7 @@ public final class MainActivity extends Activity { } else { throw new IllegalStateException(); } - SimpleExoPlayer player = new ExoPlayer.Builder(getApplicationContext()).buildExoPlayer(); + SimpleExoPlayer player = new ExoPlayer.Builder(getApplicationContext()).build(); player.setMediaSource(mediaSource); player.prepare(); player.play(); 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 f0f667ae4b..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 @@ -117,7 +117,7 @@ public class FlacPlaybackTest { new Renderer[] { new LibflacAudioRenderer(eventHandler, audioRendererEventListener, audioSink) }; - player = new ExoPlayer.Builder(context, renderersFactory).buildExoPlayer(); + player = new ExoPlayer.Builder(context, renderersFactory).build(); player.addListener(this); MediaSource mediaSource = new ProgressiveMediaSource.Factory( 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 fcbd97e965..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 @@ -73,7 +73,7 @@ import org.junit.rules.ExternalResource; new ExoPlayer.Builder(context) .setLooper(Looper.myLooper()) .setMediaSourceFactory(new DefaultMediaSourceFactory(dataSourceFactory)) - .buildExoPlayer(); + .build(); sessionPlayerConnector = new SessionPlayerConnector(exoPlayer); }); } 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 8a1712e3fe..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 @@ -170,8 +170,7 @@ public class SessionPlayerConnectorTest { SimpleExoPlayer simpleExoPlayer = null; SessionPlayerConnector playerConnector = null; try { - simpleExoPlayer = - new ExoPlayer.Builder(context).setLooper(Looper.myLooper()).buildExoPlayer(); + simpleExoPlayer = new ExoPlayer.Builder(context).setLooper(Looper.myLooper()).build(); playerConnector = new SessionPlayerConnector(simpleExoPlayer, new DefaultMediaItemConverter()); playerConnector.setControlDispatcher(controlDispatcher); @@ -196,8 +195,7 @@ public class SessionPlayerConnectorTest { Player forwardingPlayer = null; SessionPlayerConnector playerConnector = null; try { - Player simpleExoPlayer = - new ExoPlayer.Builder(context).setLooper(Looper.myLooper()).buildExoPlayer(); + Player simpleExoPlayer = new ExoPlayer.Builder(context).setLooper(Looper.myLooper()).build(); forwardingPlayer = new ForwardingPlayer(simpleExoPlayer) { @Override 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 629a6b55ad..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 @@ -97,7 +97,7 @@ public class OpusPlaybackTest { textRendererOutput, metadataRendererOutput) -> new Renderer[] {new LibopusAudioRenderer(eventHandler, audioRendererEventListener)}; - player = new ExoPlayer.Builder(context, renderersFactory).buildExoPlayer(); + player = new ExoPlayer.Builder(context, renderersFactory).build(); player.addListener(this); MediaSource mediaSource = new ProgressiveMediaSource.Factory( 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 a571f72c51..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 @@ -131,7 +131,7 @@ public class VpxPlaybackTest { videoRendererEventListener, /* maxDroppedFramesToNotify= */ -1) }; - player = new ExoPlayer.Builder(context, renderersFactory).buildExoPlayer(); + 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 1ab81138aa..a8f0697167 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 ExoPlayer.Builder(getInstrumentation().getContext()).buildExoPlayer()); + 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 ExoPlayer.Builder(getInstrumentation().getContext()).buildExoPlayer()); + 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/androidTest/java/com/google/android/exoplayer2/drm/DrmPlaybackTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/drm/DrmPlaybackTest.java index 57357974db..c342e9a1a7 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 @@ -70,7 +70,7 @@ public final class DrmPlaybackTest { getInstrumentation() .runOnMainSync( () -> { - player.set(new ExoPlayer.Builder(getInstrumentation().getContext()).buildExoPlayer()); + player.set(new ExoPlayer.Builder(getInstrumentation().getContext()).build()); player .get() .addListener( 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 a758250fb4..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,9 +52,7 @@ public class SimpleExoPlayerTest { public void builder_inBackgroundThread_doesNotThrow() throws Exception { Thread builderThread = new Thread( - () -> - new ExoPlayer.Builder(ApplicationProvider.getApplicationContext()) - .buildExoPlayer()); + () -> new ExoPlayer.Builder(ApplicationProvider.getApplicationContext()).build()); AtomicReference builderThrow = new AtomicReference<>(); builderThread.setUncaughtExceptionHandler((thread, throwable) -> builderThrow.set(throwable)); @@ -67,7 +65,7 @@ public class SimpleExoPlayerTest { @Test public void onPlaylistMetadataChanged_calledWhenPlaylistMetadataSet() { SimpleExoPlayer player = - new ExoPlayer.Builder(ApplicationProvider.getApplicationContext()).buildExoPlayer(); + new ExoPlayer.Builder(ApplicationProvider.getApplicationContext()).build(); Player.Listener playerListener = mock(Player.Listener.class); player.addListener(playerListener); AnalyticsListener analyticsListener = mock(AnalyticsListener.class); @@ -88,7 +86,7 @@ public class SimpleExoPlayerTest { (handler, videoListener, audioListener, textOutput, metadataOutput) -> new Renderer[] {new FakeVideoRenderer(handler, videoListener)}) .setClock(new FakeClock(/* isAutoAdvancing= */ true)) - .buildExoPlayer(); + .build(); AnalyticsListener listener = mock(AnalyticsListener.class); player.addAnalyticsListener(listener); // Do something that requires clean-up callbacks like decoder disabling. @@ -114,7 +112,7 @@ public class SimpleExoPlayerTest { (handler, videoListener, audioListener, textOutput, metadataOutput) -> new Renderer[] {new FakeVideoRenderer(handler, videoListener)}) .setClock(new FakeClock(/* isAutoAdvancing= */ true)) - .buildExoPlayer(); + .build(); Player.Listener listener = mock(Player.Listener.class); player.addListener(listener); player.setMediaSource( @@ -135,7 +133,7 @@ public class SimpleExoPlayerTest { @Test public void releaseAfterVolumeChanges_triggerPendingVolumeEventInListener() throws Exception { SimpleExoPlayer player = - new ExoPlayer.Builder(ApplicationProvider.getApplicationContext()).buildExoPlayer(); + new ExoPlayer.Builder(ApplicationProvider.getApplicationContext()).build(); Player.Listener listener = mock(Player.Listener.class); player.addListener(listener); @@ -149,7 +147,7 @@ public class SimpleExoPlayerTest { @Test public void releaseAfterVolumeChanges_triggerPendingDeviceVolumeEventsInListener() { SimpleExoPlayer player = - new ExoPlayer.Builder(ApplicationProvider.getApplicationContext()).buildExoPlayer(); + 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 4be75e1443..58432dd227 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 @@ -1954,7 +1954,7 @@ public final class AnalyticsCollectorTest { public void recursiveListenerInvocation_arrivesInCorrectOrder() { AnalyticsCollector analyticsCollector = new AnalyticsCollector(Clock.DEFAULT); analyticsCollector.setPlayer( - new ExoPlayer.Builder(ApplicationProvider.getApplicationContext()).buildExoPlayer(), + 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 254a658981..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 @@ -90,7 +90,7 @@ public class EndToEndGaplessTest { SimpleExoPlayer player = new ExoPlayer.Builder(ApplicationProvider.getApplicationContext()) .setClock(new FakeClock(/* isAutoAdvancing= */ true)) - .buildExoPlayer(); + .build(); player.setMediaItems( ImmutableList.of( 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 83d9e0db00..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 @@ -67,7 +67,7 @@ public class FlacPlaybackTest { SimpleExoPlayer player = new ExoPlayer.Builder(applicationContext, capturingRenderersFactory) .setClock(new FakeClock(/* isAutoAdvancing= */ true)) - .buildExoPlayer(); + .build(); PlaybackOutput playbackOutput = PlaybackOutput.register(player, capturingRenderersFactory); player.setMediaItem(MediaItem.fromUri("asset:///media/flac/" + inputFile)); 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 c00b1f4f01..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 @@ -58,7 +58,7 @@ public final class FlvPlaybackTest { SimpleExoPlayer player = new ExoPlayer.Builder(applicationContext, capturingRenderersFactory) .setClock(new FakeClock(/* isAutoAdvancing= */ true)) - .buildExoPlayer(); + .build(); player.setVideoSurface(new Surface(new SurfaceTexture(/* texName= */ 1))); PlaybackOutput playbackOutput = PlaybackOutput.register(player, capturingRenderersFactory); 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 fedef9f8b6..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 @@ -60,7 +60,7 @@ public final class MkaPlaybackTest { SimpleExoPlayer player = new ExoPlayer.Builder(applicationContext, capturingRenderersFactory) .setClock(new FakeClock(/* isAutoAdvancing= */ true)) - .buildExoPlayer(); + .build(); PlaybackOutput playbackOutput = PlaybackOutput.register(player, capturingRenderersFactory); player.setMediaItem(MediaItem.fromUri("asset:///media/mka/" + inputFile)); 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 d8158efe9c..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 @@ -64,7 +64,7 @@ public final class MkvPlaybackTest { SimpleExoPlayer player = new ExoPlayer.Builder(applicationContext, capturingRenderersFactory) .setClock(new FakeClock(/* isAutoAdvancing= */ true)) - .buildExoPlayer(); + .build(); player.setVideoSurface(new Surface(new SurfaceTexture(/* texName= */ 1))); PlaybackOutput playbackOutput = PlaybackOutput.register(player, capturingRenderersFactory); 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 e4ec831b70..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 @@ -63,7 +63,7 @@ public final class Mp3PlaybackTest { SimpleExoPlayer player = new ExoPlayer.Builder(applicationContext, capturingRenderersFactory) .setClock(new FakeClock(/* isAutoAdvancing= */ true)) - .buildExoPlayer(); + .build(); PlaybackOutput playbackOutput = PlaybackOutput.register(player, capturingRenderersFactory); player.setMediaItem(MediaItem.fromUri("asset:///media/mp3/" + inputFile)); 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 9076c3c2b6..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 @@ -80,7 +80,7 @@ public class Mp4PlaybackTest { SimpleExoPlayer player = new ExoPlayer.Builder(applicationContext, renderersFactory) .setClock(new FakeClock(/* isAutoAdvancing= */ true)) - .buildExoPlayer(); + .build(); player.setVideoSurface(new Surface(new SurfaceTexture(/* texName= */ 1))); PlaybackOutput playbackOutput = PlaybackOutput.register(player, renderersFactory); 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 79b17c6952..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 @@ -61,7 +61,7 @@ public final class OggPlaybackTest { SimpleExoPlayer player = new ExoPlayer.Builder(applicationContext, capturingRenderersFactory) .setClock(new FakeClock(/* isAutoAdvancing= */ true)) - .buildExoPlayer(); + .build(); PlaybackOutput playbackOutput = PlaybackOutput.register(player, capturingRenderersFactory); player.setMediaItem(MediaItem.fromUri("asset:///media/ogg/" + inputFile)); 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 37b2b1ed3f..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 @@ -48,7 +48,7 @@ public final class PlaylistPlaybackTest { SimpleExoPlayer player = new ExoPlayer.Builder(applicationContext, capturingRenderersFactory) .setClock(new FakeClock(/* isAutoAdvancing= */ true)) - .buildExoPlayer(); + .build(); PlaybackOutput playbackOutput = PlaybackOutput.register(player, capturingRenderersFactory); player.addMediaItem(MediaItem.fromUri("asset:///media/wav/sample.wav")); @@ -70,7 +70,7 @@ public final class PlaylistPlaybackTest { SimpleExoPlayer player = new ExoPlayer.Builder(applicationContext, capturingRenderersFactory) .setClock(new FakeClock(/* isAutoAdvancing= */ true)) - .buildExoPlayer(); + .build(); PlaybackOutput playbackOutput = PlaybackOutput.register(player, capturingRenderersFactory); player.addMediaItem(MediaItem.fromUri("asset:///media/mka/bear-opus.mka")); 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 94438c922a..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 @@ -48,7 +48,7 @@ public final class SilencePlaybackTest { SimpleExoPlayer player = new ExoPlayer.Builder(applicationContext, capturingRenderersFactory) .setClock(new FakeClock(/* isAutoAdvancing= */ true)) - .buildExoPlayer(); + .build(); PlaybackOutput playbackOutput = PlaybackOutput.register(player, capturingRenderersFactory); player.setMediaSource(new SilenceMediaSource(/* durationUs= */ 500_000)); @@ -69,7 +69,7 @@ public final class SilencePlaybackTest { SimpleExoPlayer player = new ExoPlayer.Builder(applicationContext, capturingRenderersFactory) .setClock(new FakeClock(/* isAutoAdvancing= */ true)) - .buildExoPlayer(); + .build(); PlaybackOutput playbackOutput = PlaybackOutput.register(player, capturingRenderersFactory); player.setMediaSource(new SilenceMediaSource(/* durationUs= */ 0)); 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 3afe1c28ea..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 @@ -84,7 +84,7 @@ public class TsPlaybackTest { SimpleExoPlayer player = new ExoPlayer.Builder(applicationContext, capturingRenderersFactory) .setClock(new FakeClock(/* isAutoAdvancing= */ true)) - .buildExoPlayer(); + .build(); player.setVideoSurface(new Surface(new SurfaceTexture(/* texName= */ 1))); PlaybackOutput playbackOutput = PlaybackOutput.register(player, capturingRenderersFactory); 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 69ad00f769..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 @@ -62,7 +62,7 @@ public final class Vp9PlaybackTest { SimpleExoPlayer player = new ExoPlayer.Builder(applicationContext, capturingRenderersFactory) .setClock(new FakeClock(/* isAutoAdvancing= */ true)) - .buildExoPlayer(); + .build(); player.setVideoSurface(new Surface(new SurfaceTexture(/* texName= */ 1))); PlaybackOutput playbackOutput = PlaybackOutput.register(player, capturingRenderersFactory); 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 f51dd92a71..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 @@ -55,7 +55,7 @@ public final class WavPlaybackTest { SimpleExoPlayer player = new ExoPlayer.Builder(applicationContext, capturingRenderersFactory) .setClock(new FakeClock(/* isAutoAdvancing= */ true)) - .buildExoPlayer(); + .build(); PlaybackOutput playbackOutput = PlaybackOutput.register(player, capturingRenderersFactory); player.setMediaItem(MediaItem.fromUri("asset:///media/wav/" + inputFile)); 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 0bf3080830..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 @@ -146,7 +146,7 @@ public final class ServerSideInsertedAdMediaSourceTest { SimpleExoPlayer player = new ExoPlayer.Builder(context, renderersFactory) .setClock(new FakeClock(/* isAutoAdvancing= */ true)) - .buildExoPlayer(); + .build(); player.setVideoSurface(new Surface(new SurfaceTexture(/* texName= */ 1))); PlaybackOutput playbackOutput = PlaybackOutput.register(player, renderersFactory); @@ -205,7 +205,7 @@ public final class ServerSideInsertedAdMediaSourceTest { SimpleExoPlayer player = new ExoPlayer.Builder(context, renderersFactory) .setClock(new FakeClock(/* isAutoAdvancing= */ true)) - .buildExoPlayer(); + .build(); player.setVideoSurface(new Surface(new SurfaceTexture(/* texName= */ 1))); PlaybackOutput playbackOutput = PlaybackOutput.register(player, renderersFactory); @@ -265,7 +265,7 @@ public final class ServerSideInsertedAdMediaSourceTest { SimpleExoPlayer player = new ExoPlayer.Builder(context, renderersFactory) .setClock(new FakeClock(/* isAutoAdvancing= */ true)) - .buildExoPlayer(); + .build(); player.setVideoSurface(new Surface(new SurfaceTexture(/* texName= */ 1))); PlaybackOutput playbackOutput = PlaybackOutput.register(player, renderersFactory); @@ -320,9 +320,7 @@ public final class ServerSideInsertedAdMediaSourceTest { public void playbackWithSeek_isHandledCorrectly() throws Exception { Context context = ApplicationProvider.getApplicationContext(); SimpleExoPlayer player = - new ExoPlayer.Builder(context) - .setClock(new FakeClock(/* isAutoAdvancing= */ true)) - .buildExoPlayer(); + 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 52c6d0fa99..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 @@ -54,7 +54,7 @@ public final class DashPlaybackTest { SimpleExoPlayer player = new ExoPlayer.Builder(applicationContext, capturingRenderersFactory) .setClock(new FakeClock(/* isAutoAdvancing= */ true)) - .buildExoPlayer(); + .build(); player.setVideoSurface(new Surface(new SurfaceTexture(/* texName= */ 1))); PlaybackOutput playbackOutput = PlaybackOutput.register(player, capturingRenderersFactory); @@ -81,7 +81,7 @@ public final class DashPlaybackTest { SimpleExoPlayer player = new ExoPlayer.Builder(applicationContext, capturingRenderersFactory) .setClock(new FakeClock(/* isAutoAdvancing= */ true)) - .buildExoPlayer(); + .build(); player.setVideoSurface(new Surface(new SurfaceTexture(/* texName= */ 1))); PlaybackOutput playbackOutput = PlaybackOutput.register(player, capturingRenderersFactory); 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 87b9064229..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 @@ -153,7 +153,7 @@ public final class RtspPlaybackTest { SimpleExoPlayer player = new ExoPlayer.Builder(applicationContext, capturingRenderersFactory) .setClock(clock) - .buildExoPlayer(); + .build(); player.setMediaSource( new RtspMediaSource( MediaItem.fromUri(RtspTestUtils.getTestUri(serverRtspPortNumber)), 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 641d846af5..c768ad9476 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 @@ -496,7 +496,7 @@ public final class TranscodingTransformer { .setLoadControl(loadControl) .setLooper(looper) .setClock(clock) - .buildExoPlayer(); + .build(); player.setMediaItem(mediaItem); player.addAnalyticsListener( new TranscodingTransformerAnalyticsListener(mediaItem, muxerWrapper)); 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 7c6ba909c9..80c0a73846 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 @@ -485,7 +485,7 @@ public final class Transformer { .setLoadControl(loadControl) .setLooper(looper) .setClock(clock) - .buildExoPlayer(); + .build(); player.setMediaItem(mediaItem); player.addAnalyticsListener(new TransformerAnalyticsListener(mediaItem, muxerWrapper)); player.prepare(); 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 87419dc67d..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 @@ -317,7 +317,7 @@ import java.util.List; SimpleExoPlayer player = new ExoPlayer.Builder(host, new DebugRenderersFactory(host)) .setTrackSelector(trackSelector) - .buildExoPlayer(); + .build(); player.setVideoSurface(surface); return player; } 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 d4aa6b259f..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,9 +248,7 @@ public abstract class ExoHostedTest implements AnalyticsListener, HostedTest { renderersFactory.setExtensionRendererMode(DefaultRenderersFactory.EXTENSION_RENDERER_MODE_OFF); renderersFactory.setAllowedVideoJoiningTimeMs(/* allowedVideoJoiningTimeMs= */ 0); SimpleExoPlayer player = - new ExoPlayer.Builder(host, renderersFactory) - .setTrackSelector(trackSelector) - .buildExoPlayer(); + 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 ea524256c9..c7089dcc9d 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 @@ -313,6 +313,6 @@ public class TestExoPlayerBuilder { if (mediaSourceFactory != null) { builder.setMediaSourceFactory(mediaSourceFactory); } - return builder.buildExoPlayer(); + return builder.build(); } }