Skip to content

SDK / exoplayer

Go to a project
Commit e4221c38 by ibaker Committed by bachinger
Options

Rollback of https://github.com/google/ExoPlayer/commit/ed23b2905bcf74b3cbe915fdb87ff3f6c50e28b9 

*** Original commit ***

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

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

PiperOrigin-RevId: 401468532
parent f3fb03e6
Inline Side-by-side
Showing with 45 additions and 53 deletions
demos/gl/src/main/java/com/google/android/exoplayer2/gldemo/MainActivity.java
...@@ -173,7 +173,7 @@ public final class MainActivity extends Activity { ...@@ -173,7 +173,7 @@ public final class MainActivity extends Activity {
throw new IllegalStateException(); throw new IllegalStateException();
} }
SimpleExoPlayer player = new ExoPlayer.Builder(getApplicationContext()).buildExoPlayer(); SimpleExoPlayer player = new ExoPlayer.Builder(getApplicationContext()).build();
player.setRepeatMode(Player.REPEAT_MODE_ALL); player.setRepeatMode(Player.REPEAT_MODE_ALL);
player.setMediaSource(mediaSource); player.setMediaSource(mediaSource);
player.prepare(); player.prepare();
......
demos/surface/src/main/java/com/google/android/exoplayer2/surfacedemo/MainActivity.java
...@@ -217,7 +217,7 @@ public final class MainActivity extends Activity { ...@@ -217,7 +217,7 @@ public final class MainActivity extends Activity {
} else { } else {
throw new IllegalStateException(); throw new IllegalStateException();
} }
SimpleExoPlayer player = new ExoPlayer.Builder(getApplicationContext()).buildExoPlayer(); SimpleExoPlayer player = new ExoPlayer.Builder(getApplicationContext()).build();
player.setMediaSource(mediaSource); player.setMediaSource(mediaSource);
player.prepare(); player.prepare();
player.play(); player.play();
......
extensions/flac/src/androidTest/java/com/google/android/exoplayer2/ext/flac/FlacPlaybackTest.java
...@@ -117,7 +117,7 @@ public class FlacPlaybackTest { ...@@ -117,7 +117,7 @@ public class FlacPlaybackTest {
new Renderer[] { new Renderer[] {
new LibflacAudioRenderer(eventHandler, audioRendererEventListener, audioSink) new LibflacAudioRenderer(eventHandler, audioRendererEventListener, audioSink)
}; };
player = new ExoPlayer.Builder(context, renderersFactory).buildExoPlayer(); player = new ExoPlayer.Builder(context, renderersFactory).build();
player.addListener(this); player.addListener(this);
MediaSource mediaSource = MediaSource mediaSource =
new ProgressiveMediaSource.Factory( 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; ...@@ -73,7 +73,7 @@ import org.junit.rules.ExternalResource;
new ExoPlayer.Builder(context) new ExoPlayer.Builder(context)
.setLooper(Looper.myLooper()) .setLooper(Looper.myLooper())
.setMediaSourceFactory(new DefaultMediaSourceFactory(dataSourceFactory)) .setMediaSourceFactory(new DefaultMediaSourceFactory(dataSourceFactory))
.buildExoPlayer(); .build();
sessionPlayerConnector = new SessionPlayerConnector(exoPlayer); sessionPlayerConnector = new SessionPlayerConnector(exoPlayer);
}); });
} }
......
extensions/media2/src/androidTest/java/com/google/android/exoplayer2/ext/media2/SessionPlayerConnectorTest.java
...@@ -170,8 +170,7 @@ public class SessionPlayerConnectorTest { ...@@ -170,8 +170,7 @@ public class SessionPlayerConnectorTest {
SimpleExoPlayer simpleExoPlayer = null; SimpleExoPlayer simpleExoPlayer = null;
SessionPlayerConnector playerConnector = null; SessionPlayerConnector playerConnector = null;
try { try {
simpleExoPlayer = simpleExoPlayer = new ExoPlayer.Builder(context).setLooper(Looper.myLooper()).build();
new ExoPlayer.Builder(context).setLooper(Looper.myLooper()).buildExoPlayer();
playerConnector = playerConnector =
new SessionPlayerConnector(simpleExoPlayer, new DefaultMediaItemConverter()); new SessionPlayerConnector(simpleExoPlayer, new DefaultMediaItemConverter());
playerConnector.setControlDispatcher(controlDispatcher); playerConnector.setControlDispatcher(controlDispatcher);
...@@ -196,8 +195,7 @@ public class SessionPlayerConnectorTest { ...@@ -196,8 +195,7 @@ public class SessionPlayerConnectorTest {
Player forwardingPlayer = null; Player forwardingPlayer = null;
SessionPlayerConnector playerConnector = null; SessionPlayerConnector playerConnector = null;
try { try {
Player simpleExoPlayer = Player simpleExoPlayer = new ExoPlayer.Builder(context).setLooper(Looper.myLooper()).build();
new ExoPlayer.Builder(context).setLooper(Looper.myLooper()).buildExoPlayer();
forwardingPlayer = forwardingPlayer =
new ForwardingPlayer(simpleExoPlayer) { new ForwardingPlayer(simpleExoPlayer) {
@Override @Override
......
extensions/opus/src/androidTest/java/com/google/android/exoplayer2/ext/opus/OpusPlaybackTest.java
...@@ -97,7 +97,7 @@ public class OpusPlaybackTest { ...@@ -97,7 +97,7 @@ public class OpusPlaybackTest {
textRendererOutput, textRendererOutput,
metadataRendererOutput) -> metadataRendererOutput) ->
new Renderer[] {new LibopusAudioRenderer(eventHandler, audioRendererEventListener)}; new Renderer[] {new LibopusAudioRenderer(eventHandler, audioRendererEventListener)};
player = new ExoPlayer.Builder(context, renderersFactory).buildExoPlayer(); player = new ExoPlayer.Builder(context, renderersFactory).build();
player.addListener(this); player.addListener(this);
MediaSource mediaSource = MediaSource mediaSource =
new ProgressiveMediaSource.Factory( new ProgressiveMediaSource.Factory(
......
extensions/vp9/src/androidTest/java/com/google/android/exoplayer2/ext/vp9/VpxPlaybackTest.java
...@@ -131,7 +131,7 @@ public class VpxPlaybackTest { ...@@ -131,7 +131,7 @@ public class VpxPlaybackTest {
videoRendererEventListener, videoRendererEventListener,
/* maxDroppedFramesToNotify= */ -1) /* maxDroppedFramesToNotify= */ -1)
}; };
player = new ExoPlayer.Builder(context, renderersFactory).buildExoPlayer(); player = new ExoPlayer.Builder(context, renderersFactory).build();
player.addListener(this); player.addListener(this);
MediaSource mediaSource = MediaSource mediaSource =
new ProgressiveMediaSource.Factory( new ProgressiveMediaSource.Factory(
......
library/core/src/androidTest/java/com/google/android/exoplayer2/ClippedPlaybackTest.java
...@@ -59,7 +59,7 @@ public final class ClippedPlaybackTest { ...@@ -59,7 +59,7 @@ public final class ClippedPlaybackTest {
getInstrumentation() getInstrumentation()
.runOnMainSync( .runOnMainSync(
() -> { () -> {
player.set(new ExoPlayer.Builder(getInstrumentation().getContext()).buildExoPlayer()); player.set(new ExoPlayer.Builder(getInstrumentation().getContext()).build());
player.get().addListener(textCapturer); player.get().addListener(textCapturer);
player.get().setMediaItem(mediaItem); player.get().setMediaItem(mediaItem);
player.get().prepare(); player.get().prepare();
...@@ -101,7 +101,7 @@ public final class ClippedPlaybackTest { ...@@ -101,7 +101,7 @@ public final class ClippedPlaybackTest {
getInstrumentation() getInstrumentation()
.runOnMainSync( .runOnMainSync(
() -> { () -> {
player.set(new ExoPlayer.Builder(getInstrumentation().getContext()).buildExoPlayer()); player.set(new ExoPlayer.Builder(getInstrumentation().getContext()).build());
player.get().addListener(textCapturer); player.get().addListener(textCapturer);
player.get().setMediaItems(mediaItems); player.get().setMediaItems(mediaItems);
player.get().prepare(); player.get().prepare();
......
library/core/src/androidTest/java/com/google/android/exoplayer2/drm/DrmPlaybackTest.java
...@@ -70,7 +70,7 @@ public final class DrmPlaybackTest { ...@@ -70,7 +70,7 @@ public final class DrmPlaybackTest {
getInstrumentation() getInstrumentation()
.runOnMainSync( .runOnMainSync(
() -> { () -> {
player.set(new ExoPlayer.Builder(getInstrumentation().getContext()).buildExoPlayer()); player.set(new ExoPlayer.Builder(getInstrumentation().getContext()).build());
player player
.get() .get()
.addListener( .addListener(
......
library/core/src/test/java/com/google/android/exoplayer2/SimpleExoPlayerTest.java
...@@ -52,9 +52,7 @@ public class SimpleExoPlayerTest { ...@@ -52,9 +52,7 @@ public class SimpleExoPlayerTest {
public void builder_inBackgroundThread_doesNotThrow() throws Exception { public void builder_inBackgroundThread_doesNotThrow() throws Exception {
Thread builderThread = Thread builderThread =
new Thread( new Thread(
() -> () -> new ExoPlayer.Builder(ApplicationProvider.getApplicationContext()).build());
new ExoPlayer.Builder(ApplicationProvider.getApplicationContext())
.buildExoPlayer());
AtomicReference<Throwable> builderThrow = new AtomicReference<>(); AtomicReference<Throwable> builderThrow = new AtomicReference<>();
builderThread.setUncaughtExceptionHandler((thread, throwable) -> builderThrow.set(throwable)); builderThread.setUncaughtExceptionHandler((thread, throwable) -> builderThrow.set(throwable));
...@@ -67,7 +65,7 @@ public class SimpleExoPlayerTest { ...@@ -67,7 +65,7 @@ public class SimpleExoPlayerTest {
@Test @Test
public void onPlaylistMetadataChanged_calledWhenPlaylistMetadataSet() { public void onPlaylistMetadataChanged_calledWhenPlaylistMetadataSet() {
SimpleExoPlayer player = SimpleExoPlayer player =
new ExoPlayer.Builder(ApplicationProvider.getApplicationContext()).buildExoPlayer(); new ExoPlayer.Builder(ApplicationProvider.getApplicationContext()).build();
Player.Listener playerListener = mock(Player.Listener.class); Player.Listener playerListener = mock(Player.Listener.class);
player.addListener(playerListener); player.addListener(playerListener);
AnalyticsListener analyticsListener = mock(AnalyticsListener.class); AnalyticsListener analyticsListener = mock(AnalyticsListener.class);
...@@ -88,7 +86,7 @@ public class SimpleExoPlayerTest { ...@@ -88,7 +86,7 @@ public class SimpleExoPlayerTest {
(handler, videoListener, audioListener, textOutput, metadataOutput) -> (handler, videoListener, audioListener, textOutput, metadataOutput) ->
new Renderer[] {new FakeVideoRenderer(handler, videoListener)}) new Renderer[] {new FakeVideoRenderer(handler, videoListener)})
.setClock(new FakeClock(/* isAutoAdvancing= */ true)) .setClock(new FakeClock(/* isAutoAdvancing= */ true))
.buildExoPlayer(); .build();
AnalyticsListener listener = mock(AnalyticsListener.class); AnalyticsListener listener = mock(AnalyticsListener.class);
player.addAnalyticsListener(listener); player.addAnalyticsListener(listener);
// Do something that requires clean-up callbacks like decoder disabling. // Do something that requires clean-up callbacks like decoder disabling.
...@@ -114,7 +112,7 @@ public class SimpleExoPlayerTest { ...@@ -114,7 +112,7 @@ public class SimpleExoPlayerTest {
(handler, videoListener, audioListener, textOutput, metadataOutput) -> (handler, videoListener, audioListener, textOutput, metadataOutput) ->
new Renderer[] {new FakeVideoRenderer(handler, videoListener)}) new Renderer[] {new FakeVideoRenderer(handler, videoListener)})
.setClock(new FakeClock(/* isAutoAdvancing= */ true)) .setClock(new FakeClock(/* isAutoAdvancing= */ true))
.buildExoPlayer(); .build();
Player.Listener listener = mock(Player.Listener.class); Player.Listener listener = mock(Player.Listener.class);
player.addListener(listener); player.addListener(listener);
player.setMediaSource( player.setMediaSource(
...@@ -135,7 +133,7 @@ public class SimpleExoPlayerTest { ...@@ -135,7 +133,7 @@ public class SimpleExoPlayerTest {
@Test @Test
public void releaseAfterVolumeChanges_triggerPendingVolumeEventInListener() throws Exception { public void releaseAfterVolumeChanges_triggerPendingVolumeEventInListener() throws Exception {
SimpleExoPlayer player = SimpleExoPlayer player =
new ExoPlayer.Builder(ApplicationProvider.getApplicationContext()).buildExoPlayer(); new ExoPlayer.Builder(ApplicationProvider.getApplicationContext()).build();
Player.Listener listener = mock(Player.Listener.class); Player.Listener listener = mock(Player.Listener.class);
player.addListener(listener); player.addListener(listener);
...@@ -149,7 +147,7 @@ public class SimpleExoPlayerTest { ...@@ -149,7 +147,7 @@ public class SimpleExoPlayerTest {
@Test @Test
public void releaseAfterVolumeChanges_triggerPendingDeviceVolumeEventsInListener() { public void releaseAfterVolumeChanges_triggerPendingDeviceVolumeEventsInListener() {
SimpleExoPlayer player = SimpleExoPlayer player =
new ExoPlayer.Builder(ApplicationProvider.getApplicationContext()).buildExoPlayer(); new ExoPlayer.Builder(ApplicationProvider.getApplicationContext()).build();
Player.Listener listener = mock(Player.Listener.class); Player.Listener listener = mock(Player.Listener.class);
player.addListener(listener); player.addListener(listener);
......
library/core/src/test/java/com/google/android/exoplayer2/analytics/AnalyticsCollectorTest.java
...@@ -1954,7 +1954,7 @@ public final class AnalyticsCollectorTest { ...@@ -1954,7 +1954,7 @@ public final class AnalyticsCollectorTest {
public void recursiveListenerInvocation_arrivesInCorrectOrder() { public void recursiveListenerInvocation_arrivesInCorrectOrder() {
AnalyticsCollector analyticsCollector = new AnalyticsCollector(Clock.DEFAULT); AnalyticsCollector analyticsCollector = new AnalyticsCollector(Clock.DEFAULT);
analyticsCollector.setPlayer( analyticsCollector.setPlayer(
new ExoPlayer.Builder(ApplicationProvider.getApplicationContext()).buildExoPlayer(), new ExoPlayer.Builder(ApplicationProvider.getApplicationContext()).build(),
Looper.myLooper()); Looper.myLooper());
AnalyticsListener listener1 = mock(AnalyticsListener.class); AnalyticsListener listener1 = mock(AnalyticsListener.class);
AnalyticsListener listener2 = AnalyticsListener listener2 =
......
library/core/src/test/java/com/google/android/exoplayer2/e2etest/EndToEndGaplessTest.java
...@@ -90,7 +90,7 @@ public class EndToEndGaplessTest { ...@@ -90,7 +90,7 @@ public class EndToEndGaplessTest {
SimpleExoPlayer player = SimpleExoPlayer player =
new ExoPlayer.Builder(ApplicationProvider.getApplicationContext()) new ExoPlayer.Builder(ApplicationProvider.getApplicationContext())
.setClock(new FakeClock(/* isAutoAdvancing= */ true)) .setClock(new FakeClock(/* isAutoAdvancing= */ true))
.buildExoPlayer(); .build();
player.setMediaItems( player.setMediaItems(
ImmutableList.of( ImmutableList.of(
......
library/core/src/test/java/com/google/android/exoplayer2/e2etest/FlacPlaybackTest.java
...@@ -67,7 +67,7 @@ public class FlacPlaybackTest { ...@@ -67,7 +67,7 @@ public class FlacPlaybackTest {
SimpleExoPlayer player = SimpleExoPlayer player =
new ExoPlayer.Builder(applicationContext, capturingRenderersFactory) new ExoPlayer.Builder(applicationContext, capturingRenderersFactory)
.setClock(new FakeClock(/* isAutoAdvancing= */ true)) .setClock(new FakeClock(/* isAutoAdvancing= */ true))
.buildExoPlayer(); .build();
PlaybackOutput playbackOutput = PlaybackOutput.register(player, capturingRenderersFactory); PlaybackOutput playbackOutput = PlaybackOutput.register(player, capturingRenderersFactory);
player.setMediaItem(MediaItem.fromUri("asset:///media/flac/" + inputFile)); 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 { ...@@ -58,7 +58,7 @@ public final class FlvPlaybackTest {
SimpleExoPlayer player = SimpleExoPlayer player =
new ExoPlayer.Builder(applicationContext, capturingRenderersFactory) new ExoPlayer.Builder(applicationContext, capturingRenderersFactory)
.setClock(new FakeClock(/* isAutoAdvancing= */ true)) .setClock(new FakeClock(/* isAutoAdvancing= */ true))
.buildExoPlayer(); .build();
player.setVideoSurface(new Surface(new SurfaceTexture(/* texName= */ 1))); player.setVideoSurface(new Surface(new SurfaceTexture(/* texName= */ 1)));
PlaybackOutput playbackOutput = PlaybackOutput.register(player, capturingRenderersFactory); 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 { ...@@ -60,7 +60,7 @@ public final class MkaPlaybackTest {
SimpleExoPlayer player = SimpleExoPlayer player =
new ExoPlayer.Builder(applicationContext, capturingRenderersFactory) new ExoPlayer.Builder(applicationContext, capturingRenderersFactory)
.setClock(new FakeClock(/* isAutoAdvancing= */ true)) .setClock(new FakeClock(/* isAutoAdvancing= */ true))
.buildExoPlayer(); .build();
PlaybackOutput playbackOutput = PlaybackOutput.register(player, capturingRenderersFactory); PlaybackOutput playbackOutput = PlaybackOutput.register(player, capturingRenderersFactory);
player.setMediaItem(MediaItem.fromUri("asset:///media/mka/" + inputFile)); 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 { ...@@ -64,7 +64,7 @@ public final class MkvPlaybackTest {
SimpleExoPlayer player = SimpleExoPlayer player =
new ExoPlayer.Builder(applicationContext, capturingRenderersFactory) new ExoPlayer.Builder(applicationContext, capturingRenderersFactory)
.setClock(new FakeClock(/* isAutoAdvancing= */ true)) .setClock(new FakeClock(/* isAutoAdvancing= */ true))
.buildExoPlayer(); .build();
player.setVideoSurface(new Surface(new SurfaceTexture(/* texName= */ 1))); player.setVideoSurface(new Surface(new SurfaceTexture(/* texName= */ 1)));
PlaybackOutput playbackOutput = PlaybackOutput.register(player, capturingRenderersFactory); 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 { ...@@ -63,7 +63,7 @@ public final class Mp3PlaybackTest {
SimpleExoPlayer player = SimpleExoPlayer player =
new ExoPlayer.Builder(applicationContext, capturingRenderersFactory) new ExoPlayer.Builder(applicationContext, capturingRenderersFactory)
.setClock(new FakeClock(/* isAutoAdvancing= */ true)) .setClock(new FakeClock(/* isAutoAdvancing= */ true))
.buildExoPlayer(); .build();
PlaybackOutput playbackOutput = PlaybackOutput.register(player, capturingRenderersFactory); PlaybackOutput playbackOutput = PlaybackOutput.register(player, capturingRenderersFactory);
player.setMediaItem(MediaItem.fromUri("asset:///media/mp3/" + inputFile)); 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 { ...@@ -80,7 +80,7 @@ public class Mp4PlaybackTest {
SimpleExoPlayer player = SimpleExoPlayer player =
new ExoPlayer.Builder(applicationContext, renderersFactory) new ExoPlayer.Builder(applicationContext, renderersFactory)
.setClock(new FakeClock(/* isAutoAdvancing= */ true)) .setClock(new FakeClock(/* isAutoAdvancing= */ true))
.buildExoPlayer(); .build();
player.setVideoSurface(new Surface(new SurfaceTexture(/* texName= */ 1))); player.setVideoSurface(new Surface(new SurfaceTexture(/* texName= */ 1)));
PlaybackOutput playbackOutput = PlaybackOutput.register(player, renderersFactory); 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 { ...@@ -61,7 +61,7 @@ public final class OggPlaybackTest {
SimpleExoPlayer player = SimpleExoPlayer player =
new ExoPlayer.Builder(applicationContext, capturingRenderersFactory) new ExoPlayer.Builder(applicationContext, capturingRenderersFactory)
.setClock(new FakeClock(/* isAutoAdvancing= */ true)) .setClock(new FakeClock(/* isAutoAdvancing= */ true))
.buildExoPlayer(); .build();
PlaybackOutput playbackOutput = PlaybackOutput.register(player, capturingRenderersFactory); PlaybackOutput playbackOutput = PlaybackOutput.register(player, capturingRenderersFactory);
player.setMediaItem(MediaItem.fromUri("asset:///media/ogg/" + inputFile)); 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 { ...@@ -48,7 +48,7 @@ public final class PlaylistPlaybackTest {
SimpleExoPlayer player = SimpleExoPlayer player =
new ExoPlayer.Builder(applicationContext, capturingRenderersFactory) new ExoPlayer.Builder(applicationContext, capturingRenderersFactory)
.setClock(new FakeClock(/* isAutoAdvancing= */ true)) .setClock(new FakeClock(/* isAutoAdvancing= */ true))
.buildExoPlayer(); .build();
PlaybackOutput playbackOutput = PlaybackOutput.register(player, capturingRenderersFactory); PlaybackOutput playbackOutput = PlaybackOutput.register(player, capturingRenderersFactory);
player.addMediaItem(MediaItem.fromUri("asset:///media/wav/sample.wav")); player.addMediaItem(MediaItem.fromUri("asset:///media/wav/sample.wav"));
...@@ -70,7 +70,7 @@ public final class PlaylistPlaybackTest { ...@@ -70,7 +70,7 @@ public final class PlaylistPlaybackTest {
SimpleExoPlayer player = SimpleExoPlayer player =
new ExoPlayer.Builder(applicationContext, capturingRenderersFactory) new ExoPlayer.Builder(applicationContext, capturingRenderersFactory)
.setClock(new FakeClock(/* isAutoAdvancing= */ true)) .setClock(new FakeClock(/* isAutoAdvancing= */ true))
.buildExoPlayer(); .build();
PlaybackOutput playbackOutput = PlaybackOutput.register(player, capturingRenderersFactory); PlaybackOutput playbackOutput = PlaybackOutput.register(player, capturingRenderersFactory);
player.addMediaItem(MediaItem.fromUri("asset:///media/mka/bear-opus.mka")); 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 { ...@@ -48,7 +48,7 @@ public final class SilencePlaybackTest {
SimpleExoPlayer player = SimpleExoPlayer player =
new ExoPlayer.Builder(applicationContext, capturingRenderersFactory) new ExoPlayer.Builder(applicationContext, capturingRenderersFactory)
.setClock(new FakeClock(/* isAutoAdvancing= */ true)) .setClock(new FakeClock(/* isAutoAdvancing= */ true))
.buildExoPlayer(); .build();
PlaybackOutput playbackOutput = PlaybackOutput.register(player, capturingRenderersFactory); PlaybackOutput playbackOutput = PlaybackOutput.register(player, capturingRenderersFactory);
player.setMediaSource(new SilenceMediaSource(/* durationUs= */ 500_000)); player.setMediaSource(new SilenceMediaSource(/* durationUs= */ 500_000));
...@@ -69,7 +69,7 @@ public final class SilencePlaybackTest { ...@@ -69,7 +69,7 @@ public final class SilencePlaybackTest {
SimpleExoPlayer player = SimpleExoPlayer player =
new ExoPlayer.Builder(applicationContext, capturingRenderersFactory) new ExoPlayer.Builder(applicationContext, capturingRenderersFactory)
.setClock(new FakeClock(/* isAutoAdvancing= */ true)) .setClock(new FakeClock(/* isAutoAdvancing= */ true))
.buildExoPlayer(); .build();
PlaybackOutput playbackOutput = PlaybackOutput.register(player, capturingRenderersFactory); PlaybackOutput playbackOutput = PlaybackOutput.register(player, capturingRenderersFactory);
player.setMediaSource(new SilenceMediaSource(/* durationUs= */ 0)); 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 { ...@@ -84,7 +84,7 @@ public class TsPlaybackTest {
SimpleExoPlayer player = SimpleExoPlayer player =
new ExoPlayer.Builder(applicationContext, capturingRenderersFactory) new ExoPlayer.Builder(applicationContext, capturingRenderersFactory)
.setClock(new FakeClock(/* isAutoAdvancing= */ true)) .setClock(new FakeClock(/* isAutoAdvancing= */ true))
.buildExoPlayer(); .build();
player.setVideoSurface(new Surface(new SurfaceTexture(/* texName= */ 1))); player.setVideoSurface(new Surface(new SurfaceTexture(/* texName= */ 1)));
PlaybackOutput playbackOutput = PlaybackOutput.register(player, capturingRenderersFactory); 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 { ...@@ -62,7 +62,7 @@ public final class Vp9PlaybackTest {
SimpleExoPlayer player = SimpleExoPlayer player =
new ExoPlayer.Builder(applicationContext, capturingRenderersFactory) new ExoPlayer.Builder(applicationContext, capturingRenderersFactory)
.setClock(new FakeClock(/* isAutoAdvancing= */ true)) .setClock(new FakeClock(/* isAutoAdvancing= */ true))
.buildExoPlayer(); .build();
player.setVideoSurface(new Surface(new SurfaceTexture(/* texName= */ 1))); player.setVideoSurface(new Surface(new SurfaceTexture(/* texName= */ 1)));
PlaybackOutput playbackOutput = PlaybackOutput.register(player, capturingRenderersFactory); 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 { ...@@ -55,7 +55,7 @@ public final class WavPlaybackTest {
SimpleExoPlayer player = SimpleExoPlayer player =
new ExoPlayer.Builder(applicationContext, capturingRenderersFactory) new ExoPlayer.Builder(applicationContext, capturingRenderersFactory)
.setClock(new FakeClock(/* isAutoAdvancing= */ true)) .setClock(new FakeClock(/* isAutoAdvancing= */ true))
.buildExoPlayer(); .build();
PlaybackOutput playbackOutput = PlaybackOutput.register(player, capturingRenderersFactory); PlaybackOutput playbackOutput = PlaybackOutput.register(player, capturingRenderersFactory);
player.setMediaItem(MediaItem.fromUri("asset:///media/wav/" + inputFile)); 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 { ...@@ -146,7 +146,7 @@ public final class ServerSideInsertedAdMediaSourceTest {
SimpleExoPlayer player = SimpleExoPlayer player =
new ExoPlayer.Builder(context, renderersFactory) new ExoPlayer.Builder(context, renderersFactory)
.setClock(new FakeClock(/* isAutoAdvancing= */ true)) .setClock(new FakeClock(/* isAutoAdvancing= */ true))
.buildExoPlayer(); .build();
player.setVideoSurface(new Surface(new SurfaceTexture(/* texName= */ 1))); player.setVideoSurface(new Surface(new SurfaceTexture(/* texName= */ 1)));
PlaybackOutput playbackOutput = PlaybackOutput.register(player, renderersFactory); PlaybackOutput playbackOutput = PlaybackOutput.register(player, renderersFactory);
...@@ -205,7 +205,7 @@ public final class ServerSideInsertedAdMediaSourceTest { ...@@ -205,7 +205,7 @@ public final class ServerSideInsertedAdMediaSourceTest {
SimpleExoPlayer player = SimpleExoPlayer player =
new ExoPlayer.Builder(context, renderersFactory) new ExoPlayer.Builder(context, renderersFactory)
.setClock(new FakeClock(/* isAutoAdvancing= */ true)) .setClock(new FakeClock(/* isAutoAdvancing= */ true))
.buildExoPlayer(); .build();
player.setVideoSurface(new Surface(new SurfaceTexture(/* texName= */ 1))); player.setVideoSurface(new Surface(new SurfaceTexture(/* texName= */ 1)));
PlaybackOutput playbackOutput = PlaybackOutput.register(player, renderersFactory); PlaybackOutput playbackOutput = PlaybackOutput.register(player, renderersFactory);
...@@ -265,7 +265,7 @@ public final class ServerSideInsertedAdMediaSourceTest { ...@@ -265,7 +265,7 @@ public final class ServerSideInsertedAdMediaSourceTest {
SimpleExoPlayer player = SimpleExoPlayer player =
new ExoPlayer.Builder(context, renderersFactory) new ExoPlayer.Builder(context, renderersFactory)
.setClock(new FakeClock(/* isAutoAdvancing= */ true)) .setClock(new FakeClock(/* isAutoAdvancing= */ true))
.buildExoPlayer(); .build();
player.setVideoSurface(new Surface(new SurfaceTexture(/* texName= */ 1))); player.setVideoSurface(new Surface(new SurfaceTexture(/* texName= */ 1)));
PlaybackOutput playbackOutput = PlaybackOutput.register(player, renderersFactory); PlaybackOutput playbackOutput = PlaybackOutput.register(player, renderersFactory);
...@@ -320,9 +320,7 @@ public final class ServerSideInsertedAdMediaSourceTest { ...@@ -320,9 +320,7 @@ public final class ServerSideInsertedAdMediaSourceTest {
public void playbackWithSeek_isHandledCorrectly() throws Exception { public void playbackWithSeek_isHandledCorrectly() throws Exception {
Context context = ApplicationProvider.getApplicationContext(); Context context = ApplicationProvider.getApplicationContext();
SimpleExoPlayer player = SimpleExoPlayer player =
new ExoPlayer.Builder(context) new ExoPlayer.Builder(context).setClock(new FakeClock(/* isAutoAdvancing= */ true)).build();
.setClock(new FakeClock(/* isAutoAdvancing= */ true))
.buildExoPlayer();
player.setVideoSurface(new Surface(new SurfaceTexture(/* texName= */ 1))); player.setVideoSurface(new Surface(new SurfaceTexture(/* texName= */ 1)));
ServerSideInsertedAdsMediaSource mediaSource = ServerSideInsertedAdsMediaSource mediaSource =
......
library/dash/src/test/java/com/google/android/exoplayer2/source/dash/e2etest/DashPlaybackTest.java
...@@ -54,7 +54,7 @@ public final class DashPlaybackTest { ...@@ -54,7 +54,7 @@ public final class DashPlaybackTest {
SimpleExoPlayer player = SimpleExoPlayer player =
new ExoPlayer.Builder(applicationContext, capturingRenderersFactory) new ExoPlayer.Builder(applicationContext, capturingRenderersFactory)
.setClock(new FakeClock(/* isAutoAdvancing= */ true)) .setClock(new FakeClock(/* isAutoAdvancing= */ true))
.buildExoPlayer(); .build();
player.setVideoSurface(new Surface(new SurfaceTexture(/* texName= */ 1))); player.setVideoSurface(new Surface(new SurfaceTexture(/* texName= */ 1)));
PlaybackOutput playbackOutput = PlaybackOutput.register(player, capturingRenderersFactory); PlaybackOutput playbackOutput = PlaybackOutput.register(player, capturingRenderersFactory);
...@@ -81,7 +81,7 @@ public final class DashPlaybackTest { ...@@ -81,7 +81,7 @@ public final class DashPlaybackTest {
SimpleExoPlayer player = SimpleExoPlayer player =
new ExoPlayer.Builder(applicationContext, capturingRenderersFactory) new ExoPlayer.Builder(applicationContext, capturingRenderersFactory)
.setClock(new FakeClock(/* isAutoAdvancing= */ true)) .setClock(new FakeClock(/* isAutoAdvancing= */ true))
.buildExoPlayer(); .build();
player.setVideoSurface(new Surface(new SurfaceTexture(/* texName= */ 1))); player.setVideoSurface(new Surface(new SurfaceTexture(/* texName= */ 1)));
PlaybackOutput playbackOutput = PlaybackOutput.register(player, capturingRenderersFactory); 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 { ...@@ -153,7 +153,7 @@ public final class RtspPlaybackTest {
SimpleExoPlayer player = SimpleExoPlayer player =
new ExoPlayer.Builder(applicationContext, capturingRenderersFactory) new ExoPlayer.Builder(applicationContext, capturingRenderersFactory)
.setClock(clock) .setClock(clock)
.buildExoPlayer(); .build();
player.setMediaSource( player.setMediaSource(
new RtspMediaSource( new RtspMediaSource(
MediaItem.fromUri(RtspTestUtils.getTestUri(serverRtspPortNumber)), MediaItem.fromUri(RtspTestUtils.getTestUri(serverRtspPortNumber)),
......
library/transformer/src/main/java/com/google/android/exoplayer2/transformer/TranscodingTransformer.java
...@@ -496,7 +496,7 @@ public final class TranscodingTransformer { ...@@ -496,7 +496,7 @@ public final class TranscodingTransformer {
.setLoadControl(loadControl) .setLoadControl(loadControl)
.setLooper(looper) .setLooper(looper)
.setClock(clock) .setClock(clock)
.buildExoPlayer(); .build();
player.setMediaItem(mediaItem); player.setMediaItem(mediaItem);
player.addAnalyticsListener( player.addAnalyticsListener(
new TranscodingTransformerAnalyticsListener(mediaItem, muxerWrapper)); new TranscodingTransformerAnalyticsListener(mediaItem, muxerWrapper));
......
library/transformer/src/main/java/com/google/android/exoplayer2/transformer/Transformer.java
...@@ -485,7 +485,7 @@ public final class Transformer { ...@@ -485,7 +485,7 @@ public final class Transformer {
.setLoadControl(loadControl) .setLoadControl(loadControl)
.setLooper(looper) .setLooper(looper)
.setClock(clock) .setClock(clock)
.buildExoPlayer(); .build();
player.setMediaItem(mediaItem); player.setMediaItem(mediaItem);
player.addAnalyticsListener(new TransformerAnalyticsListener(mediaItem, muxerWrapper)); player.addAnalyticsListener(new TransformerAnalyticsListener(mediaItem, muxerWrapper));
player.prepare(); player.prepare();
......
playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/DashTestRunner.java
...@@ -317,7 +317,7 @@ import java.util.List; ...@@ -317,7 +317,7 @@ import java.util.List;
SimpleExoPlayer player = SimpleExoPlayer player =
new ExoPlayer.Builder(host, new DebugRenderersFactory(host)) new ExoPlayer.Builder(host, new DebugRenderersFactory(host))
.setTrackSelector(trackSelector) .setTrackSelector(trackSelector)
.buildExoPlayer(); .build();
player.setVideoSurface(surface); player.setVideoSurface(surface);
return player; return player;
} }
......
testutils/src/main/java/com/google/android/exoplayer2/testutil/ExoHostedTest.java
...@@ -248,9 +248,7 @@ public abstract class ExoHostedTest implements AnalyticsListener, HostedTest { ...@@ -248,9 +248,7 @@ public abstract class ExoHostedTest implements AnalyticsListener, HostedTest {
renderersFactory.setExtensionRendererMode(DefaultRenderersFactory.EXTENSION_RENDERER_MODE_OFF); renderersFactory.setExtensionRendererMode(DefaultRenderersFactory.EXTENSION_RENDERER_MODE_OFF);
renderersFactory.setAllowedVideoJoiningTimeMs(/* allowedVideoJoiningTimeMs= */ 0); renderersFactory.setAllowedVideoJoiningTimeMs(/* allowedVideoJoiningTimeMs= */ 0);
SimpleExoPlayer player = SimpleExoPlayer player =
new ExoPlayer.Builder(host, renderersFactory) new ExoPlayer.Builder(host, renderersFactory).setTrackSelector(trackSelector).build();
.setTrackSelector(trackSelector)
.buildExoPlayer();
player.setVideoSurface(surface); player.setVideoSurface(surface);
return player; return player;
} }
......
testutils/src/main/java/com/google/android/exoplayer2/testutil/TestExoPlayerBuilder.java
...@@ -313,6 +313,6 @@ public class TestExoPlayerBuilder { ...@@ -313,6 +313,6 @@ public class TestExoPlayerBuilder {
if (mediaSourceFactory != null) { if (mediaSourceFactory != null) {
builder.setMediaSourceFactory(mediaSourceFactory); builder.setMediaSourceFactory(mediaSourceFactory);
} }
return builder.buildExoPlayer(); return builder.build();
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment