Migrate callers of ExoPlayer.Builder#build() to buildExoPlayer()

An upcoming change will update build() to return Player.

PiperOrigin-RevId: 399382297

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()).build();
+    SimpleExoPlayer player = new ExoPlayer.Builder(getApplicationContext()).buildExoPlayer();
     player.setRepeatMode(Player.REPEAT_MODE_ALL);
     player.setMediaSource(mediaSource);
     player.prepare();

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()).build();
+    SimpleExoPlayer player = new ExoPlayer.Builder(getApplicationContext()).buildExoPlayer();
     player.setMediaSource(mediaSource);
     player.prepare();
     player.play();

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).build();
+      player = new ExoPlayer.Builder(context, renderersFactory).buildExoPlayer();
       player.addListener(this);
       MediaSource mediaSource =
           new ProgressiveMediaSource.Factory(

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))
-                      .build();
+                      .buildExoPlayer();
               sessionPlayerConnector = new SessionPlayerConnector(exoPlayer);
             });
   }

extensions/media2/src/androidTest/java/com/google/android/exoplayer2/ext/media2/SessionPlayerConnectorTest.java

@@ -170,7 +170,8 @@ public class SessionPlayerConnectorTest {
     SimpleExoPlayer simpleExoPlayer = null;
     SessionPlayerConnector playerConnector = null;
     try {
-      simpleExoPlayer = new ExoPlayer.Builder(context).setLooper(Looper.myLooper()).build();
+      simpleExoPlayer =
+          new ExoPlayer.Builder(context).setLooper(Looper.myLooper()).buildExoPlayer();
       playerConnector =
           new SessionPlayerConnector(simpleExoPlayer, new DefaultMediaItemConverter());
       playerConnector.setControlDispatcher(controlDispatcher);
@@ -195,7 +196,8 @@ public class SessionPlayerConnectorTest {
     Player forwardingPlayer = null;
     SessionPlayerConnector playerConnector = null;
     try {
-      Player simpleExoPlayer = new ExoPlayer.Builder(context).setLooper(Looper.myLooper()).build();
+      Player simpleExoPlayer =
+          new ExoPlayer.Builder(context).setLooper(Looper.myLooper()).buildExoPlayer();
       forwardingPlayer =
           new ForwardingPlayer(simpleExoPlayer) {
             @Override

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).build();
+      player = new ExoPlayer.Builder(context, renderersFactory).buildExoPlayer();
       player.addListener(this);
       MediaSource mediaSource =
           new ProgressiveMediaSource.Factory(

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).build();
+      player = new ExoPlayer.Builder(context, renderersFactory).buildExoPlayer();
       player.addListener(this);
       MediaSource mediaSource =
           new ProgressiveMediaSource.Factory(

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()).build());
+              player.set(new ExoPlayer.Builder(getInstrumentation().getContext()).buildExoPlayer());
               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()).build());
+              player.set(new ExoPlayer.Builder(getInstrumentation().getContext()).buildExoPlayer());
               player.get().addListener(textCapturer);
               player.get().setMediaItems(mediaItems);
               player.get().prepare();

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()).build());
+              player.set(new ExoPlayer.Builder(getInstrumentation().getContext()).buildExoPlayer());
               player
                   .get()
                   .addListener(

library/core/src/test/java/com/google/android/exoplayer2/SimpleExoPlayerTest.java

@@ -52,7 +52,9 @@ public class SimpleExoPlayerTest {
   public void builder_inBackgroundThread_doesNotThrow() throws Exception {
     Thread builderThread =
         new Thread(
-            () -> new ExoPlayer.Builder(ApplicationProvider.getApplicationContext()).build());
+            () ->
+                new ExoPlayer.Builder(ApplicationProvider.getApplicationContext())
+                    .buildExoPlayer());
     AtomicReference<Throwable> builderThrow = new AtomicReference<>();
     builderThread.setUncaughtExceptionHandler((thread, throwable) -> builderThrow.set(throwable));
 
@@ -65,7 +67,7 @@ public class SimpleExoPlayerTest {
   @Test
   public void onPlaylistMetadataChanged_calledWhenPlaylistMetadataSet() {
     SimpleExoPlayer player =
-        new ExoPlayer.Builder(ApplicationProvider.getApplicationContext()).build();
+        new ExoPlayer.Builder(ApplicationProvider.getApplicationContext()).buildExoPlayer();
     Player.Listener playerListener = mock(Player.Listener.class);
     player.addListener(playerListener);
     AnalyticsListener analyticsListener = mock(AnalyticsListener.class);
@@ -86,7 +88,7 @@ public class SimpleExoPlayerTest {
                 (handler, videoListener, audioListener, textOutput, metadataOutput) ->
                     new Renderer[] {new FakeVideoRenderer(handler, videoListener)})
             .setClock(new FakeClock(/* isAutoAdvancing= */ true))
-            .build();
+            .buildExoPlayer();
     AnalyticsListener listener = mock(AnalyticsListener.class);
     player.addAnalyticsListener(listener);
     // Do something that requires clean-up callbacks like decoder disabling.
@@ -112,7 +114,7 @@ public class SimpleExoPlayerTest {
                 (handler, videoListener, audioListener, textOutput, metadataOutput) ->
                     new Renderer[] {new FakeVideoRenderer(handler, videoListener)})
             .setClock(new FakeClock(/* isAutoAdvancing= */ true))
-            .build();
+            .buildExoPlayer();
     Player.Listener listener = mock(Player.Listener.class);
     player.addListener(listener);
     player.setMediaSource(
@@ -133,7 +135,7 @@ public class SimpleExoPlayerTest {
   @Test
   public void releaseAfterVolumeChanges_triggerPendingVolumeEventInListener() throws Exception {
     SimpleExoPlayer player =
-        new ExoPlayer.Builder(ApplicationProvider.getApplicationContext()).build();
+        new ExoPlayer.Builder(ApplicationProvider.getApplicationContext()).buildExoPlayer();
     Player.Listener listener = mock(Player.Listener.class);
     player.addListener(listener);
 
@@ -147,7 +149,7 @@ public class SimpleExoPlayerTest {
   @Test
   public void releaseAfterVolumeChanges_triggerPendingDeviceVolumeEventsInListener() {
     SimpleExoPlayer player =
-        new ExoPlayer.Builder(ApplicationProvider.getApplicationContext()).build();
+        new ExoPlayer.Builder(ApplicationProvider.getApplicationContext()).buildExoPlayer();
     Player.Listener listener = mock(Player.Listener.class);
     player.addListener(listener);
 

library/core/src/test/java/com/google/android/exoplayer2/analytics/AnalyticsCollectorTest.java

@@ -1951,7 +1951,7 @@ public final class AnalyticsCollectorTest {
   public void recursiveListenerInvocation_arrivesInCorrectOrder() {
     AnalyticsCollector analyticsCollector = new AnalyticsCollector(Clock.DEFAULT);
     analyticsCollector.setPlayer(
-        new ExoPlayer.Builder(ApplicationProvider.getApplicationContext()).build(),
+        new ExoPlayer.Builder(ApplicationProvider.getApplicationContext()).buildExoPlayer(),
         Looper.myLooper());
     AnalyticsListener listener1 = mock(AnalyticsListener.class);
     AnalyticsListener listener2 =

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))
-            .build();
+            .buildExoPlayer();
 
     player.setMediaItems(
         ImmutableList.of(

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))
-            .build();
+            .buildExoPlayer();
     PlaybackOutput playbackOutput = PlaybackOutput.register(player, capturingRenderersFactory);
 
     player.setMediaItem(MediaItem.fromUri("asset:///media/flac/" + inputFile));

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))
-            .build();
+            .buildExoPlayer();
     player.setVideoSurface(new Surface(new SurfaceTexture(/* texName= */ 1)));
     PlaybackOutput playbackOutput = PlaybackOutput.register(player, capturingRenderersFactory);
 

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))
-            .build();
+            .buildExoPlayer();
     PlaybackOutput playbackOutput = PlaybackOutput.register(player, capturingRenderersFactory);
 
     player.setMediaItem(MediaItem.fromUri("asset:///media/mka/" + inputFile));

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))
-            .build();
+            .buildExoPlayer();
     player.setVideoSurface(new Surface(new SurfaceTexture(/* texName= */ 1)));
     PlaybackOutput playbackOutput = PlaybackOutput.register(player, capturingRenderersFactory);
 

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))
-            .build();
+            .buildExoPlayer();
     PlaybackOutput playbackOutput = PlaybackOutput.register(player, capturingRenderersFactory);
 
     player.setMediaItem(MediaItem.fromUri("asset:///media/mp3/" + inputFile));

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))
-            .build();
+            .buildExoPlayer();
     player.setVideoSurface(new Surface(new SurfaceTexture(/* texName= */ 1)));
 
     PlaybackOutput playbackOutput = PlaybackOutput.register(player, renderersFactory);

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))
-            .build();
+            .buildExoPlayer();
     PlaybackOutput playbackOutput = PlaybackOutput.register(player, capturingRenderersFactory);
 
     player.setMediaItem(MediaItem.fromUri("asset:///media/ogg/" + inputFile));

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))
-            .build();
+            .buildExoPlayer();
     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))
-            .build();
+            .buildExoPlayer();
     PlaybackOutput playbackOutput = PlaybackOutput.register(player, capturingRenderersFactory);
 
     player.addMediaItem(MediaItem.fromUri("asset:///media/mka/bear-opus.mka"));

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))
-            .build();
+            .buildExoPlayer();
     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))
-            .build();
+            .buildExoPlayer();
     PlaybackOutput playbackOutput = PlaybackOutput.register(player, capturingRenderersFactory);
 
     player.setMediaSource(new SilenceMediaSource(/* durationUs= */ 0));

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))
-            .build();
+            .buildExoPlayer();
     player.setVideoSurface(new Surface(new SurfaceTexture(/* texName= */ 1)));
     PlaybackOutput playbackOutput = PlaybackOutput.register(player, capturingRenderersFactory);
 

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))
-            .build();
+            .buildExoPlayer();
     player.setVideoSurface(new Surface(new SurfaceTexture(/* texName= */ 1)));
     PlaybackOutput playbackOutput = PlaybackOutput.register(player, capturingRenderersFactory);
 

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))
-            .build();
+            .buildExoPlayer();
     PlaybackOutput playbackOutput = PlaybackOutput.register(player, capturingRenderersFactory);
 
     player.setMediaItem(MediaItem.fromUri("asset:///media/wav/" + inputFile));

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))
-            .build();
+            .buildExoPlayer();
     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))
-            .build();
+            .buildExoPlayer();
     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))
-            .build();
+            .buildExoPlayer();
     player.setVideoSurface(new Surface(new SurfaceTexture(/* texName= */ 1)));
     PlaybackOutput playbackOutput = PlaybackOutput.register(player, renderersFactory);
 
@@ -320,7 +320,9 @@ 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)).build();
+        new ExoPlayer.Builder(context)
+            .setClock(new FakeClock(/* isAutoAdvancing= */ true))
+            .buildExoPlayer();
     player.setVideoSurface(new Surface(new SurfaceTexture(/* texName= */ 1)));
 
     ServerSideInsertedAdsMediaSource mediaSource =

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))
-            .build();
+            .buildExoPlayer();
     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))
-            .build();
+            .buildExoPlayer();
     player.setVideoSurface(new Surface(new SurfaceTexture(/* texName= */ 1)));
     PlaybackOutput playbackOutput = PlaybackOutput.register(player, capturingRenderersFactory);
 

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)
-            .build();
+            .buildExoPlayer();
     player.setMediaSource(
         new RtspMediaSource(
             MediaItem.fromUri(RtspTestUtils.getTestUri(serverRtspPortNumber)),

library/transformer/src/main/java/com/google/android/exoplayer2/transformer/Transformer.java

@@ -486,7 +486,7 @@ public final class Transformer {
             .setLoadControl(loadControl)
             .setLooper(looper)
             .setClock(clock)
-            .build();
+            .buildExoPlayer();
     player.setMediaItem(mediaItem);
     player.addAnalyticsListener(new TransformerAnalyticsListener(mediaItem, muxerWrapper));
     player.prepare();

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)
-              .build();
+              .buildExoPlayer();
       player.setVideoSurface(surface);
       return player;
     }

testutils/src/main/java/com/google/android/exoplayer2/testutil/ExoHostedTest.java

@@ -248,7 +248,9 @@ 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).build();
+        new ExoPlayer.Builder(host, renderersFactory)
+            .setTrackSelector(trackSelector)
+            .buildExoPlayer();
     player.setVideoSurface(surface);
     return player;
   }

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.build();
+    return builder.buildExoPlayer();
   }
 }