Make ExtractorMediaSource.Builder a factory for ExtractorMediaSources

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=178605481

demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/PlayerManager.java

@@ -398,7 +398,7 @@ import java.util.ArrayList;
       case DemoUtil.MIME_TYPE_HLS:
         return new HlsMediaSource.Factory(DATA_SOURCE_FACTORY).createMediaSource(uri);
       case DemoUtil.MIME_TYPE_VIDEO_MP4:
-        return new ExtractorMediaSource.Builder(uri, DATA_SOURCE_FACTORY).build();
+        return new ExtractorMediaSource.Factory(DATA_SOURCE_FACTORY).createMediaSource(uri);
       default: {
         throw new IllegalStateException("Unsupported type: " + sample.mimeType);
       }

demos/ima/src/main/java/com/google/android/exoplayer2/imademo/PlayerManager.java

@@ -70,7 +70,8 @@ import com.google.android.exoplayer2.util.Util;
     // This is the MediaSource representing the content media (i.e. not the ad).
     String contentUrl = context.getString(R.string.content_url);
     MediaSource contentMediaSource =
-        new ExtractorMediaSource.Builder(Uri.parse(contentUrl), dataSourceFactory).build();
+        new ExtractorMediaSource.Factory(dataSourceFactory)
+            .createMediaSource(Uri.parse(contentUrl));
 
     // Compose the content media source into a new AdsMediaSource with both ads and content.
     MediaSource mediaSourceWithAds = new AdsMediaSource(contentMediaSource, dataSourceFactory,

demos/main/src/main/java/com/google/android/exoplayer2/demo/PlayerActivity.java

@@ -378,9 +378,8 @@ public class PlayerActivity extends Activity implements OnClickListener,
         return new HlsMediaSource.Factory(mediaDataSourceFactory)
             .createMediaSource(uri, mainHandler, eventLogger);
       case C.TYPE_OTHER:
-        return new ExtractorMediaSource.Builder(uri, mediaDataSourceFactory)
-            .setEventListener(mainHandler, eventLogger)
-            .build();
+        return new ExtractorMediaSource.Factory(mediaDataSourceFactory)
+            .createMediaSource(uri, mainHandler, eventLogger);
       default: {
         throw new IllegalStateException("Unsupported type: " + type);
       }

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

@@ -26,6 +26,7 @@ import com.google.android.exoplayer2.Player;
 import com.google.android.exoplayer2.Renderer;
 import com.google.android.exoplayer2.extractor.mkv.MatroskaExtractor;
 import com.google.android.exoplayer2.source.ExtractorMediaSource;
+import com.google.android.exoplayer2.source.MediaSource;
 import com.google.android.exoplayer2.trackselection.DefaultTrackSelector;
 import com.google.android.exoplayer2.upstream.DefaultDataSourceFactory;
 
@@ -76,10 +77,11 @@ public class FlacPlaybackTest extends InstrumentationTestCase {
       DefaultTrackSelector trackSelector = new DefaultTrackSelector();
       player = ExoPlayerFactory.newInstance(new Renderer[] {audioRenderer}, trackSelector);
       player.addListener(this);
-      ExtractorMediaSource mediaSource = new ExtractorMediaSource.Builder(
-          uri, new DefaultDataSourceFactory(context, "ExoPlayerExtFlacTest"))
-          .setExtractorsFactory(MatroskaExtractor.FACTORY)
-          .build();
+      MediaSource mediaSource =
+          new ExtractorMediaSource.Factory(
+                  new DefaultDataSourceFactory(context, "ExoPlayerExtFlacTest"))
+              .setExtractorsFactory(MatroskaExtractor.FACTORY)
+              .createMediaSource(uri);
       player.prepare(mediaSource);
       player.setPlayWhenReady(true);
       Looper.loop();

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

@@ -26,6 +26,7 @@ import com.google.android.exoplayer2.Player;
 import com.google.android.exoplayer2.Renderer;
 import com.google.android.exoplayer2.extractor.mkv.MatroskaExtractor;
 import com.google.android.exoplayer2.source.ExtractorMediaSource;
+import com.google.android.exoplayer2.source.MediaSource;
 import com.google.android.exoplayer2.trackselection.DefaultTrackSelector;
 import com.google.android.exoplayer2.upstream.DefaultDataSourceFactory;
 
@@ -76,10 +77,11 @@ public class OpusPlaybackTest extends InstrumentationTestCase {
       DefaultTrackSelector trackSelector = new DefaultTrackSelector();
       player = ExoPlayerFactory.newInstance(new Renderer[] {audioRenderer}, trackSelector);
       player.addListener(this);
-      ExtractorMediaSource mediaSource = new ExtractorMediaSource.Builder(
-          uri, new DefaultDataSourceFactory(context, "ExoPlayerExtOpusTest"))
-          .setExtractorsFactory(MatroskaExtractor.FACTORY)
-          .build();
+      MediaSource mediaSource =
+          new ExtractorMediaSource.Factory(
+                  new DefaultDataSourceFactory(context, "ExoPlayerExtOpusTest"))
+              .setExtractorsFactory(MatroskaExtractor.FACTORY)
+              .createMediaSource(uri);
       player.prepare(mediaSource);
       player.setPlayWhenReady(true);
       Looper.loop();

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

@@ -27,6 +27,7 @@ import com.google.android.exoplayer2.Player;
 import com.google.android.exoplayer2.Renderer;
 import com.google.android.exoplayer2.extractor.mkv.MatroskaExtractor;
 import com.google.android.exoplayer2.source.ExtractorMediaSource;
+import com.google.android.exoplayer2.source.MediaSource;
 import com.google.android.exoplayer2.trackselection.DefaultTrackSelector;
 import com.google.android.exoplayer2.upstream.DefaultDataSourceFactory;
 
@@ -105,10 +106,11 @@ public class VpxPlaybackTest extends InstrumentationTestCase {
       DefaultTrackSelector trackSelector = new DefaultTrackSelector();
       player = ExoPlayerFactory.newInstance(new Renderer[] {videoRenderer}, trackSelector);
       player.addListener(this);
-      ExtractorMediaSource mediaSource = new ExtractorMediaSource.Builder(
-          uri, new DefaultDataSourceFactory(context, "ExoPlayerExtVp9Test"))
-          .setExtractorsFactory(MatroskaExtractor.FACTORY)
-          .build();
+      MediaSource mediaSource =
+          new ExtractorMediaSource.Factory(
+                  new DefaultDataSourceFactory(context, "ExoPlayerExtVp9Test"))
+              .setExtractorsFactory(MatroskaExtractor.FACTORY)
+              .createMediaSource(uri);
       player.sendMessages(new ExoPlayer.ExoPlayerMessage(videoRenderer,
           LibvpxVideoRenderer.MSG_SET_OUTPUT_BUFFER_RENDERER,
           new VpxVideoSurfaceView(context)));

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

@@ -163,7 +163,7 @@ public final class AdsMediaSource implements MediaSource {
     this.eventListener = eventListener;
     mainHandler = new Handler(Looper.getMainLooper());
     componentListener = new ComponentListener();
-    adMediaSourceFactory = new ExtractorMediaSourceFactory(dataSourceFactory);
+    adMediaSourceFactory = new ExtractorMediaSource.Factory(dataSourceFactory);
     deferredMediaPeriodByAdMediaSource = new HashMap<>();
     period = new Timeline.Period();
     adGroupMediaSources = new MediaSource[0][];
@@ -396,28 +396,4 @@ public final class AdsMediaSource implements MediaSource {
 
   }
 
-  private static final class ExtractorMediaSourceFactory implements MediaSourceFactory {
-
-    private final DataSource.Factory dataSourceFactory;
-
-    public ExtractorMediaSourceFactory(DataSource.Factory dataSourceFactory) {
-      this.dataSourceFactory = dataSourceFactory;
-    }
-
-    @Override
-    public MediaSource createMediaSource(
-        Uri uri, @Nullable Handler handler, @Nullable MediaSourceEventListener listener) {
-      return new ExtractorMediaSource.Builder(uri, dataSourceFactory)
-          .setEventListener(handler, listener)
-          .build();
-    }
-
-    @Override
-    public int[] getSupportedTypes() {
-      // Only ExtractorMediaSource is supported.
-      return new int[] {C.TYPE_OTHER};
-    }
-
-  }
-
 }