From a632118875e15ea9335af902be37d8b52934a4fa Mon Sep 17 00:00:00 2001
From: kimvde <kimvde@google.com>
Date: Wed, 28 Jun 2023 08:46:15 +0000
Subject: [PATCH] Remove TransformationRequest.Builder deprecated methods

TransformationRequest.Builder will become package private.

PiperOrigin-RevId: 543987255
---
 RELEASENOTES.md                               |  6 ++++
 .../transformer/TransformationRequest.java    | 29 -------------------
 2 files changed, 6 insertions(+), 29 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 45b2881da8..769304f485 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -100,6 +100,12 @@
         tests and Compose UI tests. This fixes a bug where playback advances
         non-deterministically during Espresso or Compose view interactions.
 *   Remove deprecated symbols:
+    *   Remove
+        `TransformationRequest.Builder.setEnableRequestSdrToneMapping(boolean)`
+        and
+        `TransformationRequest.Builder.experimental_setEnableHdrEditing(boolean)`.
+        Use `Composition.Builder.setHdrMode(int)` and pass the `Composition` to
+        `Transformer.start(Composition, String)` instead.
 
 ## 1.1
 
diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/TransformationRequest.java b/libraries/transformer/src/main/java/androidx/media3/transformer/TransformationRequest.java
index 19fd1e5f66..801b4adb84 100644
--- a/libraries/transformer/src/main/java/androidx/media3/transformer/TransformationRequest.java
+++ b/libraries/transformer/src/main/java/androidx/media3/transformer/TransformationRequest.java
@@ -154,35 +154,6 @@ public final class TransformationRequest {
       return this;
     }
 
-    /**
-     * @deprecated This method is now a no-op if {@code false}, and sets {@code
-     *     setHdrMode(HDR_MODE_TONE_MAP_HDR_TO_SDR_USING_MEDIACODEC)} if {@code true}. Use {@link
-     *     #setHdrMode} with {@link #HDR_MODE_TONE_MAP_HDR_TO_SDR_USING_MEDIACODEC} instead.
-     */
-    @Deprecated
-    @CanIgnoreReturnValue
-    public Builder setEnableRequestSdrToneMapping(boolean enableRequestSdrToneMapping) {
-      if (enableRequestSdrToneMapping) {
-        return setHdrMode(HDR_MODE_TONE_MAP_HDR_TO_SDR_USING_MEDIACODEC);
-      }
-      return this;
-    }
-
-    /**
-     * @deprecated This method is now a no-op if {@code false}, and sets {@code
-     *     setHdrMode(HDR_MODE_KEEP_HDR)} if {@code true}. {@code
-     *     experimental_setEnableHdrEditing(true)} is now the default behavior. Use {@link
-     *     #setHdrMode} with link {@link #HDR_MODE_KEEP_HDR} instead.
-     */
-    @Deprecated
-    @CanIgnoreReturnValue
-    public Builder experimental_setEnableHdrEditing(boolean enableHdrEditing) {
-      if (enableHdrEditing) {
-        return setHdrMode(HDR_MODE_KEEP_HDR);
-      }
-      return this;
-    }
-
     @CanIgnoreReturnValue
     // TODO(b/255953153): remove this method once fallback has been refactored.
     /* package */ Builder setResolution(int outputHeight) {