Remove most deprecated ExoPlayerFactory methods

PiperOrigin-RevId: 369442687

RELEASENOTES.md

@@ -73,6 +73,8 @@
     *   Spherical UI components moved from `video.spherical` package to
         `ui.spherical` package, and made package private.
 *   Remove deprecated symbols:
+    *   Remove `ExoPlayerFactory` methods. Use `SimpleExoPlayer.Builder`
+        instead.
     *   Remove `Player.DefaultEventListener`. Use `Player.EventListener`
         instead.
     *   Remove `DownloadNotificationUtil`. Use `DownloadNotificationHelper`

library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerFactory.java

@@ -16,17 +16,15 @@
 package com.google.android.exoplayer2;
 
 import android.content.Context;
-import android.os.Looper;
 import com.google.android.exoplayer2.analytics.AnalyticsCollector;
 import com.google.android.exoplayer2.source.DefaultMediaSourceFactory;
 import com.google.android.exoplayer2.trackselection.DefaultTrackSelector;
 import com.google.android.exoplayer2.trackselection.TrackSelector;
-import com.google.android.exoplayer2.upstream.BandwidthMeter;
 import com.google.android.exoplayer2.upstream.DefaultBandwidthMeter;
 import com.google.android.exoplayer2.util.Clock;
 import com.google.android.exoplayer2.util.Util;
 
-/** @deprecated Use {@link SimpleExoPlayer.Builder} or {@link ExoPlayer.Builder} instead. */
+/** @deprecated Use {@link SimpleExoPlayer.Builder} instead. */
 @Deprecated
 public final class ExoPlayerFactory {
 
@@ -35,35 +33,6 @@ public final class ExoPlayerFactory {
   /** @deprecated Use {@link SimpleExoPlayer.Builder} instead. */
   @Deprecated
   @SuppressWarnings("deprecation")
-  public static SimpleExoPlayer newSimpleInstance(
-      Context context,
-      TrackSelector trackSelector,
-      LoadControl loadControl,
-      @DefaultRenderersFactory.ExtensionRendererMode int extensionRendererMode) {
-    RenderersFactory renderersFactory =
-        new DefaultRenderersFactory(context).setExtensionRendererMode(extensionRendererMode);
-    return newSimpleInstance(context, renderersFactory, trackSelector, loadControl);
-  }
-
-  /** @deprecated Use {@link SimpleExoPlayer.Builder} instead. */
-  @Deprecated
-  @SuppressWarnings("deprecation")
-  public static SimpleExoPlayer newSimpleInstance(
-      Context context,
-      TrackSelector trackSelector,
-      LoadControl loadControl,
-      @DefaultRenderersFactory.ExtensionRendererMode int extensionRendererMode,
-      long allowedVideoJoiningTimeMs) {
-    RenderersFactory renderersFactory =
-        new DefaultRenderersFactory(context)
-            .setExtensionRendererMode(extensionRendererMode)
-            .setAllowedVideoJoiningTimeMs(allowedVideoJoiningTimeMs);
-    return newSimpleInstance(context, renderersFactory, trackSelector, loadControl);
-  }
-
-  /** @deprecated Use {@link SimpleExoPlayer.Builder} instead. */
-  @Deprecated
-  @SuppressWarnings("deprecation")
   public static SimpleExoPlayer newSimpleInstance(Context context) {
     return newSimpleInstance(context, new DefaultTrackSelector(context));
   }
@@ -87,172 +56,33 @@ public final class ExoPlayerFactory {
   @Deprecated
   @SuppressWarnings("deprecation")
   public static SimpleExoPlayer newSimpleInstance(
-      Context context, TrackSelector trackSelector, LoadControl loadControl) {
-    RenderersFactory renderersFactory = new DefaultRenderersFactory(context);
-    return newSimpleInstance(context, renderersFactory, trackSelector, loadControl);
-  }
-
-  /** @deprecated Use {@link SimpleExoPlayer.Builder} instead. */
-  @Deprecated
-  @SuppressWarnings("deprecation")
-  public static SimpleExoPlayer newSimpleInstance(
       Context context,
       RenderersFactory renderersFactory,
       TrackSelector trackSelector,
       LoadControl loadControl) {
-    return newSimpleInstance(
-        context, renderersFactory, trackSelector, loadControl, Util.getCurrentOrMainLooper());
-  }
-
-  /** @deprecated Use {@link SimpleExoPlayer.Builder} instead. */
-  @Deprecated
-  @SuppressWarnings("deprecation")
-  public static SimpleExoPlayer newSimpleInstance(
-      Context context,
-      RenderersFactory renderersFactory,
-      TrackSelector trackSelector,
-      LoadControl loadControl,
-      BandwidthMeter bandwidthMeter) {
-    return newSimpleInstance(
-        context,
-        renderersFactory,
-        trackSelector,
-        loadControl,
-        bandwidthMeter,
-        new AnalyticsCollector(Clock.DEFAULT),
-        Util.getCurrentOrMainLooper());
-  }
-
-  /** @deprecated Use {@link SimpleExoPlayer.Builder} instead. */
-  @Deprecated
-  @SuppressWarnings("deprecation")
-  public static SimpleExoPlayer newSimpleInstance(
-      Context context,
-      RenderersFactory renderersFactory,
-      TrackSelector trackSelector,
-      LoadControl loadControl,
-      AnalyticsCollector analyticsCollector) {
-    return newSimpleInstance(
-        context,
-        renderersFactory,
-        trackSelector,
-        loadControl,
-        analyticsCollector,
-        Util.getCurrentOrMainLooper());
-  }
-
-  /** @deprecated Use {@link SimpleExoPlayer.Builder} instead. */
-  @Deprecated
-  @SuppressWarnings("deprecation")
-  public static SimpleExoPlayer newSimpleInstance(
-      Context context,
-      RenderersFactory renderersFactory,
-      TrackSelector trackSelector,
-      LoadControl loadControl,
-      Looper applicationLooper) {
-    return newSimpleInstance(
-        context,
-        renderersFactory,
-        trackSelector,
-        loadControl,
-        new AnalyticsCollector(Clock.DEFAULT),
-        applicationLooper);
-  }
-
-  /** @deprecated Use {@link SimpleExoPlayer.Builder} instead. */
-  @Deprecated
-  @SuppressWarnings("deprecation")
-  public static SimpleExoPlayer newSimpleInstance(
-      Context context,
-      RenderersFactory renderersFactory,
-      TrackSelector trackSelector,
-      LoadControl loadControl,
-      AnalyticsCollector analyticsCollector,
-      Looper applicationLooper) {
-    return newSimpleInstance(
-        context,
-        renderersFactory,
-        trackSelector,
-        loadControl,
-        DefaultBandwidthMeter.getSingletonInstance(context),
-        analyticsCollector,
-        applicationLooper);
-  }
-
-  /** @deprecated Use {@link SimpleExoPlayer.Builder} instead. */
-  @SuppressWarnings("deprecation")
-  @Deprecated
-  public static SimpleExoPlayer newSimpleInstance(
-      Context context,
-      RenderersFactory renderersFactory,
-      TrackSelector trackSelector,
-      LoadControl loadControl,
-      BandwidthMeter bandwidthMeter,
-      AnalyticsCollector analyticsCollector,
-      Looper applicationLooper) {
     return new SimpleExoPlayer(
         context,
         renderersFactory,
         trackSelector,
         new DefaultMediaSourceFactory(context),
         loadControl,
-        bandwidthMeter,
-        analyticsCollector,
+        DefaultBandwidthMeter.getSingletonInstance(context),
+        new AnalyticsCollector(Clock.DEFAULT),
         /* useLazyPreparation= */ true,
         Clock.DEFAULT,
-        applicationLooper);
-  }
-
-  /** @deprecated Use {@link ExoPlayer.Builder} instead. */
-  @Deprecated
-  @SuppressWarnings("deprecation")
-  public static ExoPlayer newInstance(
-      Context context, Renderer[] renderers, TrackSelector trackSelector) {
-    return newInstance(context, renderers, trackSelector, new DefaultLoadControl());
+        Util.getCurrentOrMainLooper());
   }
 
-  /** @deprecated Use {@link ExoPlayer.Builder} instead. */
+  /** @deprecated Use {@link SimpleExoPlayer.Builder} instead. */
   @Deprecated
-  @SuppressWarnings("deprecation")
   public static ExoPlayer newInstance(
       Context context, Renderer[] renderers, TrackSelector trackSelector, LoadControl loadControl) {
-    return newInstance(
-        context, renderers, trackSelector, loadControl, Util.getCurrentOrMainLooper());
-  }
-
-  /** @deprecated Use {@link ExoPlayer.Builder} instead. */
-  @Deprecated
-  @SuppressWarnings("deprecation")
-  public static ExoPlayer newInstance(
-      Context context,
-      Renderer[] renderers,
-      TrackSelector trackSelector,
-      LoadControl loadControl,
-      Looper applicationLooper) {
-    return newInstance(
-        context,
-        renderers,
-        trackSelector,
-        loadControl,
-        DefaultBandwidthMeter.getSingletonInstance(context),
-        applicationLooper);
-  }
-
-  /** @deprecated Use {@link ExoPlayer.Builder} instead. */
-  @Deprecated
-  public static ExoPlayer newInstance(
-      Context context,
-      Renderer[] renderers,
-      TrackSelector trackSelector,
-      LoadControl loadControl,
-      BandwidthMeter bandwidthMeter,
-      Looper applicationLooper) {
     return new ExoPlayerImpl(
         renderers,
         trackSelector,
         new DefaultMediaSourceFactory(context),
         loadControl,
-        bandwidthMeter,
+        DefaultBandwidthMeter.getSingletonInstance(context),
         /* analyticsCollector= */ null,
         /* useLazyPreparation= */ true,
         SeekParameters.DEFAULT,
@@ -260,7 +90,7 @@ public final class ExoPlayerFactory {
         ExoPlayer.DEFAULT_RELEASE_TIMEOUT_MS,
         /* pauseAtEndOfMediaItems= */ false,
         Clock.DEFAULT,
-        applicationLooper,
+        Util.getCurrentOrMainLooper(),
         /* wrappingPlayer= */ null,
         /* additionalPermanentAvailableCommands= */ Player.Commands.EMPTY);
   }