Migrate callers to pass MediaItem to createMediaSource()

createMediaSource(Uri) is deprecated.

PiperOrigin-RevId: 321121383

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

@@ -24,6 +24,7 @@ import android.widget.FrameLayout;
 import android.widget.Toast;
 import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.MediaItem;
 import com.google.android.exoplayer2.Player;
 import com.google.android.exoplayer2.SimpleExoPlayer;
 import com.google.android.exoplayer2.drm.DefaultDrmSessionManager;
@@ -164,12 +165,12 @@ public final class MainActivity extends Activity {
       mediaSource =
           new DashMediaSource.Factory(dataSourceFactory)
               .setDrmSessionManager(drmSessionManager)
-              .createMediaSource(uri);
+              .createMediaSource(MediaItem.fromUri(uri));
     } else if (type == C.TYPE_OTHER) {
       mediaSource =
           new ProgressiveMediaSource.Factory(dataSourceFactory)
               .setDrmSessionManager(drmSessionManager)
-              .createMediaSource(uri);
+              .createMediaSource(MediaItem.fromUri(uri));
     } else {
       throw new IllegalStateException();
     }

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

@@ -28,6 +28,7 @@ import android.widget.Button;
 import android.widget.GridLayout;
 import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.MediaItem;
 import com.google.android.exoplayer2.Player;
 import com.google.android.exoplayer2.SimpleExoPlayer;
 import com.google.android.exoplayer2.drm.DefaultDrmSessionManager;
@@ -209,12 +210,12 @@ public final class MainActivity extends Activity {
       mediaSource =
           new DashMediaSource.Factory(dataSourceFactory)
               .setDrmSessionManager(drmSessionManager)
-              .createMediaSource(uri);
+              .createMediaSource(MediaItem.fromUri(uri));
     } else if (type == C.TYPE_OTHER) {
       mediaSource =
           new ProgressiveMediaSource.Factory(dataSourceFactory)
               .setDrmSessionManager(drmSessionManager)
-              .createMediaSource(uri);
+              .createMediaSource(MediaItem.fromUri(uri));
     } else {
       throw new IllegalStateException();
     }

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

@@ -25,6 +25,7 @@ import androidx.test.core.app.ApplicationProvider;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.ExoPlaybackException;
 import com.google.android.exoplayer2.ExoPlayer;
+import com.google.android.exoplayer2.MediaItem;
 import com.google.android.exoplayer2.Player;
 import com.google.android.exoplayer2.audio.AudioProcessor;
 import com.google.android.exoplayer2.audio.AudioSink;
@@ -109,7 +110,7 @@ public class FlacPlaybackTest {
           new ProgressiveMediaSource.Factory(
                   new DefaultDataSourceFactory(context, "ExoPlayerExtFlacTest"),
                   MatroskaExtractor.FACTORY)
-              .createMediaSource(uri);
+              .createMediaSource(MediaItem.fromUri(uri));
       player.setMediaSource(mediaSource);
       player.prepare();
       player.play();

extensions/media2/src/main/java/com/google/android/exoplayer2/ext/media2/Utils.java

@@ -80,8 +80,11 @@ import com.google.android.exoplayer2.util.Util;
       dataSourceFactory =
           DataSourceCallbackDataSource.getFactory(callbackMediaItem.getDataSourceCallback());
       return new ProgressiveMediaSource.Factory(dataSourceFactory, sExtractorsFactory)
+          .createMediaSource(
+              new com.google.android.exoplayer2.MediaItem.Builder()
+                  .setUri(Uri.EMPTY)
                   .setTag(mediaItem)
-          .createMediaSource(Uri.EMPTY);
+                  .build());
     } else {
       throw new IllegalStateException();
     }
@@ -185,13 +188,16 @@ import com.google.android.exoplayer2.util.Util;
         MediaSourceFactory mediaSourceFactory =
             factoryClazz.getConstructor(DataSource.Factory.class).newInstance(dataSourceFactory);
         factoryClazz.getMethod("setTag", Object.class).invoke(mediaSourceFactory, tag);
-        return mediaSourceFactory.createMediaSource(uri);
+        return mediaSourceFactory.createMediaSource(
+            com.google.android.exoplayer2.MediaItem.fromUri(uri));
       }
       // LINT.ThenChange(../../../../../../../../../proguard-rules.txt)
     } catch (Exception e) {
       // Expected if the app was built without the corresponding module.
     }
-    return new ProgressiveMediaSource.Factory(dataSourceFactory).setTag(tag).createMediaSource(uri);
+    return new ProgressiveMediaSource.Factory(dataSourceFactory)
+        .createMediaSource(
+            new com.google.android.exoplayer2.MediaItem.Builder().setUri(uri).setTag(tag).build());
   }
 
   private Utils() {

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

@@ -25,6 +25,7 @@ import androidx.test.core.app.ApplicationProvider;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.ExoPlaybackException;
 import com.google.android.exoplayer2.ExoPlayer;
+import com.google.android.exoplayer2.MediaItem;
 import com.google.android.exoplayer2.Player;
 import com.google.android.exoplayer2.extractor.mkv.MatroskaExtractor;
 import com.google.android.exoplayer2.source.MediaSource;
@@ -93,7 +94,7 @@ public class OpusPlaybackTest {
           new ProgressiveMediaSource.Factory(
                   new DefaultDataSourceFactory(context, "ExoPlayerExtOpusTest"),
                   MatroskaExtractor.FACTORY)
-              .createMediaSource(uri);
+              .createMediaSource(MediaItem.fromUri(uri));
       player.prepare(mediaSource);
       player.play();
       Looper.loop();

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

@@ -27,6 +27,7 @@ import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.ExoPlaybackException;
 import com.google.android.exoplayer2.ExoPlayer;
+import com.google.android.exoplayer2.MediaItem;
 import com.google.android.exoplayer2.Player;
 import com.google.android.exoplayer2.extractor.mkv.MatroskaExtractor;
 import com.google.android.exoplayer2.source.MediaSource;
@@ -121,7 +122,7 @@ public class VpxPlaybackTest {
           new ProgressiveMediaSource.Factory(
                   new DefaultDataSourceFactory(context, "ExoPlayerExtVp9Test"),
                   MatroskaExtractor.FACTORY)
-              .createMediaSource(uri);
+              .createMediaSource(MediaItem.fromUri(uri));
       player
           .createMessage(videoRenderer)
           .setType(C.MSG_SET_VIDEO_DECODER_OUTPUT_BUFFER_RENDERER)

library/core/src/main/java/com/google/android/exoplayer2/source/ExtractorMediaSource.java

@@ -197,7 +197,7 @@ public final class ExtractorMediaSource extends CompositeMediaSource<Void> {
     }
 
     /**
-     * @deprecated Use {@link #createMediaSource(Uri)} and {@link #addEventListener(Handler,
+     * @deprecated Use {@link #createMediaSource(MediaItem)} and {@link #addEventListener(Handler,
      *     MediaSourceEventListener)} instead.
      */
     @Deprecated

library/core/src/main/java/com/google/android/exoplayer2/source/ads/AdsMediaSource.java

@@ -224,7 +224,8 @@ public final class AdsMediaSource extends CompositeMediaSource<MediaPeriodId> {
       AdMediaSourceHolder adMediaSourceHolder =
           adMediaSourceHolders[adGroupIndex][adIndexInAdGroup];
       if (adMediaSourceHolder == null) {
-        MediaSource adMediaSource = adMediaSourceFactory.createMediaSource(adUri);
+        MediaSource adMediaSource =
+            adMediaSourceFactory.createMediaSource(MediaItem.fromUri(adUri));
         adMediaSourceHolder = new AdMediaSourceHolder(adMediaSource);
         adMediaSourceHolders[adGroupIndex][adIndexInAdGroup] = adMediaSourceHolder;
         prepareChildSource(id, adMediaSource);

library/core/src/test/java/com/google/android/exoplayer2/source/ads/AdsMediaSourceTest.java

@@ -100,7 +100,8 @@ public final class AdsMediaSourceTest {
     contentMediaSource = new FakeMediaSource(/* timeline= */ null);
     prerollAdMediaSource = new FakeMediaSource(/* timeline= */ null);
     MediaSourceFactory adMediaSourceFactory = mock(MediaSourceFactory.class);
-    when(adMediaSourceFactory.createMediaSource(any(Uri.class))).thenReturn(prerollAdMediaSource);
+    when(adMediaSourceFactory.createMediaSource(any(MediaItem.class)))
+        .thenReturn(prerollAdMediaSource);
 
     // Prepare the AdsMediaSource and capture its ads loader listener.
     AdsLoader mockAdsLoader = mock(AdsLoader.class);

library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaSource.java

@@ -333,7 +333,7 @@ public final class DashMediaSource extends BaseMediaSource {
     }
 
     /**
-     * @deprecated Use {@link #createMediaSource(Uri)} and {@link #addEventListener(Handler,
+     * @deprecated Use {@link #createMediaSource(MediaItem)} and {@link #addEventListener(Handler,
      *     MediaSourceEventListener)} instead.
      */
     @SuppressWarnings("deprecation")

library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaSource.java

@@ -313,7 +313,7 @@ public final class HlsMediaSource extends BaseMediaSource
     }
 
     /**
-     * @deprecated Use {@link #createMediaSource(Uri)} and {@link #addEventListener(Handler,
+     * @deprecated Use {@link #createMediaSource(MediaItem)} and {@link #addEventListener(Handler,
      *     MediaSourceEventListener)} instead.
      */
     @SuppressWarnings("deprecation")

library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/SsMediaSource.java

@@ -301,7 +301,7 @@ public final class SsMediaSource extends BaseMediaSource
     }
 
     /**
-     * @deprecated Use {@link #createMediaSource(Uri)} and {@link #addEventListener(Handler,
+     * @deprecated Use {@link #createMediaSource(MediaItem)} and {@link #addEventListener(Handler,
      *     MediaSourceEventListener)} instead.
      */
     @SuppressWarnings("deprecation")