Commit cb873dd1 by olly Committed by Oliver Woodman

Use play and pause convenience methods

PiperOrigin-RevId: 283949259
parent b35d5d89
...@@ -221,7 +221,7 @@ public final class MainActivity extends Activity { ...@@ -221,7 +221,7 @@ public final class MainActivity extends Activity {
} }
SimpleExoPlayer player = new SimpleExoPlayer.Builder(getApplicationContext()).build(); SimpleExoPlayer player = new SimpleExoPlayer.Builder(getApplicationContext()).build();
player.prepare(mediaSource); player.prepare(mediaSource);
player.setPlayWhenReady(true); player.play();
player.setRepeatMode(Player.REPEAT_MODE_ALL); player.setRepeatMode(Player.REPEAT_MODE_ALL);
surfaceControl = surfaceControl =
......
...@@ -85,7 +85,7 @@ public class CastPlayerTest { ...@@ -85,7 +85,7 @@ public class CastPlayerTest {
when(mockRemoteMediaClient.play()).thenReturn(mockPendingResult); when(mockRemoteMediaClient.play()).thenReturn(mockPendingResult);
assertThat(castPlayer.getPlayWhenReady()).isFalse(); assertThat(castPlayer.getPlayWhenReady()).isFalse();
castPlayer.setPlayWhenReady(true); castPlayer.play();
verify(mockPendingResult).setResultCallback(setResultCallbackArgumentCaptor.capture()); verify(mockPendingResult).setResultCallback(setResultCallbackArgumentCaptor.capture());
assertThat(castPlayer.getPlayWhenReady()).isTrue(); assertThat(castPlayer.getPlayWhenReady()).isTrue();
verify(mockListener).onPlayerStateChanged(true, Player.STATE_IDLE); verify(mockListener).onPlayerStateChanged(true, Player.STATE_IDLE);
...@@ -107,7 +107,7 @@ public class CastPlayerTest { ...@@ -107,7 +107,7 @@ public class CastPlayerTest {
when(mockRemoteMediaClient.play()).thenReturn(mockPendingResult); when(mockRemoteMediaClient.play()).thenReturn(mockPendingResult);
assertThat(castPlayer.getPlayWhenReady()).isFalse(); assertThat(castPlayer.getPlayWhenReady()).isFalse();
castPlayer.setPlayWhenReady(true); castPlayer.play();
verify(mockPendingResult).setResultCallback(setResultCallbackArgumentCaptor.capture()); verify(mockPendingResult).setResultCallback(setResultCallbackArgumentCaptor.capture());
assertThat(castPlayer.getPlayWhenReady()).isTrue(); assertThat(castPlayer.getPlayWhenReady()).isTrue();
verify(mockListener).onPlayerStateChanged(true, Player.STATE_IDLE); verify(mockListener).onPlayerStateChanged(true, Player.STATE_IDLE);
......
...@@ -87,7 +87,7 @@ public class FlacPlaybackTest { ...@@ -87,7 +87,7 @@ public class FlacPlaybackTest {
MatroskaExtractor.FACTORY) MatroskaExtractor.FACTORY)
.createMediaSource(uri); .createMediaSource(uri);
player.prepare(mediaSource); player.prepare(mediaSource);
player.setPlayWhenReady(true); player.play();
Looper.loop(); Looper.loop();
} }
......
...@@ -87,7 +87,7 @@ public class OpusPlaybackTest { ...@@ -87,7 +87,7 @@ public class OpusPlaybackTest {
MatroskaExtractor.FACTORY) MatroskaExtractor.FACTORY)
.createMediaSource(uri); .createMediaSource(uri);
player.prepare(mediaSource); player.prepare(mediaSource);
player.setPlayWhenReady(true); player.play();
Looper.loop(); Looper.loop();
} }
......
...@@ -127,7 +127,7 @@ public class VpxPlaybackTest { ...@@ -127,7 +127,7 @@ public class VpxPlaybackTest {
.setPayload(new VideoDecoderGLSurfaceView(context).getVideoDecoderOutputBufferRenderer()) .setPayload(new VideoDecoderGLSurfaceView(context).getVideoDecoderOutputBufferRenderer())
.send(); .send();
player.prepare(mediaSource); player.prepare(mediaSource);
player.setPlayWhenReady(true); player.play();
Looper.loop(); Looper.loop();
} }
......
...@@ -1794,7 +1794,7 @@ public class SimpleExoPlayer extends BasePlayer ...@@ -1794,7 +1794,7 @@ public class SimpleExoPlayer extends BasePlayer
@Override @Override
public void onAudioBecomingNoisy() { public void onAudioBecomingNoisy() {
setPlayWhenReady(false); pause();
} }
// Player.EventListener implementation. // Player.EventListener implementation.
......
...@@ -2298,7 +2298,7 @@ public final class ExoPlayerTest { ...@@ -2298,7 +2298,7 @@ public final class ExoPlayerTest {
@Override @Override
public void onTimelineChanged(Timeline timeline, int reason) { public void onTimelineChanged(Timeline timeline, int reason) {
if (timeline.isEmpty()) { if (timeline.isEmpty()) {
playerReference.get().setPlayWhenReady(/* playWhenReady= */ false); playerReference.get().pause();
} }
} }
......
...@@ -513,7 +513,7 @@ public abstract class Action { ...@@ -513,7 +513,7 @@ public abstract class Action {
ConditionVariable blockPlaybackThreadCondition = new ConditionVariable(); ConditionVariable blockPlaybackThreadCondition = new ConditionVariable();
testThreadHandler.post( testThreadHandler.post(
() -> { () -> {
player.setPlayWhenReady(/* playWhenReady= */ false); player.pause();
blockPlaybackThreadCondition.open(); blockPlaybackThreadCondition.open();
}); });
try { try {
...@@ -532,7 +532,7 @@ public abstract class Action { ...@@ -532,7 +532,7 @@ public abstract class Action {
.setPosition(windowIndex, positionMs) .setPosition(windowIndex, positionMs)
.setHandler(testThreadHandler) .setHandler(testThreadHandler)
.send(); .send();
player.setPlayWhenReady(true); player.play();
} }
@Override @Override
......
...@@ -131,7 +131,7 @@ public abstract class ExoHostedTest implements AnalyticsListener, HostedTest { ...@@ -131,7 +131,7 @@ public abstract class ExoHostedTest implements AnalyticsListener, HostedTest {
trackSelector = buildTrackSelector(host); trackSelector = buildTrackSelector(host);
String userAgent = "ExoPlayerPlaybackTests"; String userAgent = "ExoPlayerPlaybackTests";
player = buildExoPlayer(host, surface, trackSelector); player = buildExoPlayer(host, surface, trackSelector);
player.setPlayWhenReady(true); player.play();
player.addAnalyticsListener(this); player.addAnalyticsListener(this);
player.addAnalyticsListener(new EventLogger(trackSelector, tag)); player.addAnalyticsListener(new EventLogger(trackSelector, tag));
// Schedule any pending actions. // Schedule any pending actions.
......
...@@ -443,7 +443,7 @@ public final class ExoPlayerTestRunner implements Player.EventListener, ActionSc ...@@ -443,7 +443,7 @@ public final class ExoPlayerTestRunner implements Player.EventListener, ActionSc
if (analyticsListener != null) { if (analyticsListener != null) {
player.addAnalyticsListener(analyticsListener); player.addAnalyticsListener(analyticsListener);
} }
player.setPlayWhenReady(true); player.play();
if (actionSchedule != null) { if (actionSchedule != null) {
actionSchedule.start(player, trackSelector, null, handler, ExoPlayerTestRunner.this); actionSchedule.start(player, trackSelector, null, handler, ExoPlayerTestRunner.this);
} }
......
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