From f83d478cc3a6179a26fa843a5c5cad73032a0a56 Mon Sep 17 00:00:00 2001
From: ibaker <ibaker@google.com>
Date: Tue, 14 Jul 2020 14:39:59 +0100
Subject: [PATCH] Migrate uses of prepare(MediaSource) to setMediaSource() &
 prepare()

PiperOrigin-RevId: 321147910
---
 .../ext/media2/ConcatenatingMediaSourcePlaybackPreparer.java   | 3 ++-
 .../google/android/exoplayer2/ext/opus/OpusPlaybackTest.java   | 3 ++-
 .../com/google/android/exoplayer2/ext/vp9/VpxPlaybackTest.java | 3 ++-
 .../src/main/java/com/google/android/exoplayer2/ExoPlayer.java | 2 +-
 .../test/java/com/google/android/exoplayer2/ExoPlayerTest.java | 2 +-
 5 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/extensions/media2/src/main/java/com/google/android/exoplayer2/ext/media2/ConcatenatingMediaSourcePlaybackPreparer.java b/extensions/media2/src/main/java/com/google/android/exoplayer2/ext/media2/ConcatenatingMediaSourcePlaybackPreparer.java
index 6731fad4c0..bb1129dc83 100644
--- a/extensions/media2/src/main/java/com/google/android/exoplayer2/ext/media2/ConcatenatingMediaSourcePlaybackPreparer.java
+++ b/extensions/media2/src/main/java/com/google/android/exoplayer2/ext/media2/ConcatenatingMediaSourcePlaybackPreparer.java
@@ -42,6 +42,7 @@ public final class ConcatenatingMediaSourcePlaybackPreparer implements PlaybackP
 
   @Override
   public void preparePlayback() {
-    exoPlayer.prepare(concatenatingMediaSource);
+    exoPlayer.setMediaSource(concatenatingMediaSource);
+    exoPlayer.prepare();
   }
 }
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 73e4941cf9..26f013d572 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
@@ -95,7 +95,8 @@ public class OpusPlaybackTest {
                   new DefaultDataSourceFactory(context, "ExoPlayerExtOpusTest"),
                   MatroskaExtractor.FACTORY)
               .createMediaSource(MediaItem.fromUri(uri));
-      player.prepare(mediaSource);
+      player.setMediaSource(mediaSource);
+      player.prepare();
       player.play();
       Looper.loop();
     }
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 b16592fdc6..210a5bbc8a 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
@@ -128,7 +128,8 @@ public class VpxPlaybackTest {
           .setType(C.MSG_SET_VIDEO_DECODER_OUTPUT_BUFFER_RENDERER)
           .setPayload(new VideoDecoderGLSurfaceView(context).getVideoDecoderOutputBufferRenderer())
           .send();
-      player.prepare(mediaSource);
+      player.setMediaSource(mediaSource);
+      player.prepare();
       player.play();
       Looper.loop();
     }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayer.java b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayer.java
index 736ed9f708..85d40095ac 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayer.java
@@ -61,7 +61,7 @@ import java.util.List;
  * <ul>
  *   <li>A <b>{@link MediaSource}</b> that defines the media to be played, loads the media, and from
  *       which the loaded media can be read. A MediaSource is injected via {@link
- *       #prepare(MediaSource)} at the start of playback. The library modules provide default
+ *       #setMediaSource(MediaSource)} at the start of playback. The library modules provide default
  *       implementations for progressive media files ({@link ProgressiveMediaSource}), DASH
  *       (DashMediaSource), SmoothStreaming (SsMediaSource) and HLS (HlsMediaSource), an
  *       implementation for loading single media samples ({@link SingleSampleMediaSource}) that's
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/ExoPlayerTest.java b/library/core/src/test/java/com/google/android/exoplayer2/ExoPlayerTest.java
index 6466babe66..6959c5fe4b 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/ExoPlayerTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/ExoPlayerTest.java
@@ -3526,6 +3526,7 @@ public final class ExoPlayerTest {
     assertArrayEquals(new long[] {5_000}, currentPlaybackPositions);
   }
 
+  @SuppressWarnings("deprecation")
   @Test
   public void seekTo_windowIndexIsReset_deprecated() throws Exception {
     FakeTimeline fakeTimeline = new FakeTimeline(/* windowCount= */ 1);
@@ -3542,7 +3543,6 @@ public final class ExoPlayerTest {
                 new PlayerRunnable() {
                   @Override
                   public void run(SimpleExoPlayer player) {
-                    //noinspection deprecation
                     player.prepare(mediaSource);
                     player.seekTo(/* positionMs= */ 5000);
                   }