loliball/media3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

PiperOrigin-RevId: 399382297
This commit is contained in:
ibaker 2021-09-28 09:36:18 +01:00 committed by bachinger
parent a04f1d1726
commit ed23b2905b
31 changed files with 52 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
demos/gl/src/main/java/com/google/android/exoplayer2/gldemo/MainActivity.java
View File

@ -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();

2
demos/surface/src/main/java/com/google/android/exoplayer2/surfacedemo/MainActivity.java
View File

@ -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();

2
extensions/flac/src/androidTest/java/com/google/android/exoplayer2/ext/flac/FlacPlaybackTest.java
View File

@ -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(

2
extensions/media2/src/androidTest/java/com/google/android/exoplayer2/ext/media2/PlayerTestRule.java
View File

@ -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);
});
}

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

@ -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

2
extensions/opus/src/androidTest/java/com/google/android/exoplayer2/ext/opus/OpusPlaybackTest.java
View File

@ -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(

2
extensions/vp9/src/androidTest/java/com/google/android/exoplayer2/ext/vp9/VpxPlaybackTest.java
View File

@ -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(

4
library/core/src/androidTest/java/com/google/android/exoplayer2/ClippedPlaybackTest.java
View File

@ -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();

2
library/core/src/androidTest/java/com/google/android/exoplayer2/drm/DrmPlaybackTest.java
View File

@ -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(

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

@ -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);

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

@ -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 =

2
library/core/src/test/java/com/google/android/exoplayer2/e2etest/EndToEndGaplessTest.java
View File

@ -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(

2
library/core/src/test/java/com/google/android/exoplayer2/e2etest/FlacPlaybackTest.java
View File

@ -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));

2
library/core/src/test/java/com/google/android/exoplayer2/e2etest/FlvPlaybackTest.java
View File

@ -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);

2
library/core/src/test/java/com/google/android/exoplayer2/e2etest/MkaPlaybackTest.java
View File

@ -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));

2
library/core/src/test/java/com/google/android/exoplayer2/e2etest/MkvPlaybackTest.java
View File

@ -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);

2
library/core/src/test/java/com/google/android/exoplayer2/e2etest/Mp3PlaybackTest.java
View File

@ -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));

2
library/core/src/test/java/com/google/android/exoplayer2/e2etest/Mp4PlaybackTest.java
View File

@ -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);

2
library/core/src/test/java/com/google/android/exoplayer2/e2etest/OggPlaybackTest.java
View File

@ -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));

4
library/core/src/test/java/com/google/android/exoplayer2/e2etest/PlaylistPlaybackTest.java
View File

@ -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"));

4
library/core/src/test/java/com/google/android/exoplayer2/e2etest/SilencePlaybackTest.java
View File

@ -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));

2
library/core/src/test/java/com/google/android/exoplayer2/e2etest/TsPlaybackTest.java
View File

@ -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);

2
library/core/src/test/java/com/google/android/exoplayer2/e2etest/Vp9PlaybackTest.java
View File

@ -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);

2
library/core/src/test/java/com/google/android/exoplayer2/e2etest/WavPlaybackTest.java
View File

@ -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));

10
library/core/src/test/java/com/google/android/exoplayer2/source/ads/ServerSideInsertedAdMediaSourceTest.java
View File

@ -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 =

4
library/dash/src/test/java/com/google/android/exoplayer2/source/dash/e2etest/DashPlaybackTest.java
View File

@ -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);

2
library/rtsp/src/test/java/com/google/android/exoplayer2/source/rtsp/RtspPlaybackTest.java
View File

@ -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)),

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

@ -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();

2
playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/DashTestRunner.java
View File

@ -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;
}

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

@ -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;
}

2
testutils/src/main/java/com/google/android/exoplayer2/testutil/TestExoPlayerBuilder.java
View File

@ -313,6 +313,6 @@ public class TestExoPlayerBuilder {
if (mediaSourceFactory != null) {
builder.setMediaSourceFactory(mediaSourceFactory);
}
return builder.build();
return builder.buildExoPlayer();
}
}