From 9e088ac2b8401c38166f09f592ce8f3675440715 Mon Sep 17 00:00:00 2001
From: shahddaghash <shahddaghash@google.com>
Date: Mon, 28 Oct 2024 08:16:36 -0700
Subject: [PATCH] Remove 7 deprecated `Transformer.Builder` methods

PiperOrigin-RevId: 690617093
---
 RELEASENOTES.md                               | 20 +++++
 .../media3/transformer/Transformer.java       | 85 -------------------
 2 files changed, 20 insertions(+), 85 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 5137ad57d5..a116698f5c 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -68,6 +68,26 @@
 *   Remove deprecated symbols:
     *   Remove deprecated `AudioMixer.create()` method. Use
         `DefaultAudioMixer.Factory().create()` instead.
+    *   Remove the following deprecated `Transformer.Builder` methods:
+        *   `setTransformationRequest()`, use `setAudioMimeType()`,
+            `setVideoMimeType()`, and `setHdrMode()` instead.
+        *   `setAudioProcessors()`, set the audio processor in an
+            `EditedMediaItem.Builder.setEffects()`, and pass it to
+            `Transformer.start()` instead.
+        *   `setVideoEffects()`, set video effect in an
+            `EditedMediaItem.Builder.setEffects()`, and pass it to
+            `Transformer.start()` instead.
+        *   `setRemoveAudio()`, use `EditedMediaItem.Builder.setRemoveAudio()`
+            to remove the audio from the `EditedMediaItem` passed to
+            `Transformer.start()` instead.
+        *   `setRemoveVideo()`, use `EditedMediaItem.Builder.setRemoveVideo()`
+            to remove the video from the `EditedMediaItem` passed to
+            `Transformer.start()` instead.
+        *   `setFlattenForSlowMotion()`, use
+            `EditedMediaItem.Builder.setFlattenForSlowMotion()` to flatten the
+            `EditedMediaItem` passed to `Transformer.start()` instead.
+        *   `setListener()`, use `addListener()`, `removeListener()` or
+            `removeAllListeners()` instead.
 
 ## 1.5
 
diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/Transformer.java b/libraries/transformer/src/main/java/androidx/media3/transformer/Transformer.java
index 0fa03e6a37..881e2a44c4 100644
--- a/libraries/transformer/src/main/java/androidx/media3/transformer/Transformer.java
+++ b/libraries/transformer/src/main/java/androidx/media3/transformer/Transformer.java
@@ -71,7 +71,6 @@ import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
-import java.util.List;
 import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
 
 /**
@@ -235,78 +234,6 @@ public final class Transformer {
       return this;
     }
 
-    /**
-     * @deprecated Use {@link #setAudioMimeType(String)}, {@link #setVideoMimeType(String)} and
-     *     {@link Composition.Builder#setHdrMode(int)} instead.
-     */
-    @Deprecated
-    @CanIgnoreReturnValue
-    public Builder setTransformationRequest(TransformationRequest transformationRequest) {
-      // TODO(b/289872787): Make TransformationRequest.Builder package private once this method is
-      //  removed.
-      this.transformationRequest = transformationRequest;
-      return this;
-    }
-
-    /**
-     * @deprecated Set the {@linkplain AudioProcessor audio processors} in an {@link
-     *     EditedMediaItem.Builder#setEffects(Effects)}, and pass it to {@link
-     *     #start(EditedMediaItem, String)} instead.
-     */
-    @CanIgnoreReturnValue
-    @Deprecated
-    public Builder setAudioProcessors(List<AudioProcessor> audioProcessors) {
-      this.audioProcessors = ImmutableList.copyOf(audioProcessors);
-      return this;
-    }
-
-    /**
-     * @deprecated Set the {@linkplain Effect video effects} in an {@link
-     *     EditedMediaItem.Builder#setEffects(Effects)}, and pass it to {@link
-     *     #start(EditedMediaItem, String)} instead.
-     */
-    @CanIgnoreReturnValue
-    @Deprecated
-    public Builder setVideoEffects(List<Effect> effects) {
-      this.videoEffects = ImmutableList.copyOf(effects);
-      return this;
-    }
-
-    /**
-     * @deprecated Use {@link EditedMediaItem.Builder#setRemoveAudio(boolean)} to remove the audio
-     *     from the {@link EditedMediaItem} passed to {@link #start(EditedMediaItem, String)}
-     *     instead.
-     */
-    @CanIgnoreReturnValue
-    @Deprecated
-    public Builder setRemoveAudio(boolean removeAudio) {
-      this.removeAudio = removeAudio;
-      return this;
-    }
-
-    /**
-     * @deprecated Use {@link EditedMediaItem.Builder#setRemoveVideo(boolean)} to remove the video
-     *     from the {@link EditedMediaItem} passed to {@link #start(EditedMediaItem, String)}
-     *     instead.
-     */
-    @CanIgnoreReturnValue
-    @Deprecated
-    public Builder setRemoveVideo(boolean removeVideo) {
-      this.removeVideo = removeVideo;
-      return this;
-    }
-
-    /**
-     * @deprecated Use {@link EditedMediaItem.Builder#setFlattenForSlowMotion(boolean)} to flatten
-     *     the {@link EditedMediaItem} passed to {@link #start(EditedMediaItem, String)} instead.
-     */
-    @CanIgnoreReturnValue
-    @Deprecated
-    public Builder setFlattenForSlowMotion(boolean flattenForSlowMotion) {
-      this.flattenForSlowMotion = flattenForSlowMotion;
-      return this;
-    }
-
     /**
      * Sets whether to attempt to optimize trims from the start of the {@link EditedMediaItem} by
      * transcoding as little of the file as possible and transmuxing the rest.
@@ -415,18 +342,6 @@ public final class Transformer {
       return this;
     }
 
-    /**
-     * @deprecated Use {@link #addListener(Listener)}, {@link #removeListener(Listener)} or {@link
-     *     #removeAllListeners()} instead.
-     */
-    @CanIgnoreReturnValue
-    @Deprecated
-    public Builder setListener(Transformer.Listener listener) {
-      this.listeners.clear();
-      this.listeners.add(listener);
-      return this;
-    }
-
     /**
      * Adds a {@link Transformer.Listener} to listen to the export events.
      *