From e0be4c2ff497769a16acc8a47e6a1968dfb56ca0 Mon Sep 17 00:00:00 2001
From: Googler <noreply@google.com>
Date: Fri, 26 Jan 2024 17:43:11 -0800
Subject: [PATCH] Rollback of
 https://github.com/androidx/media/commit/4d5f844c61d6dafc098053465c2272f2939e62b1

PiperOrigin-RevId: 601910682
---
 .../java/androidx/media3/transformer/Transformer.java     | 8 ++++----
 .../media3/transformer/TransmuxTranscodeHelper.java       | 8 +-------
 2 files changed, 5 insertions(+), 11 deletions(-)

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 d962c3edc7..cf99fc5d69 100644
--- a/libraries/transformer/src/main/java/androidx/media3/transformer/Transformer.java
+++ b/libraries/transformer/src/main/java/androidx/media3/transformer/Transformer.java
@@ -27,7 +27,7 @@ import static androidx.media3.transformer.ExportResult.OPTIMIZATION_FAILED_EXTRA
 import static androidx.media3.transformer.ExportResult.OPTIMIZATION_FAILED_FORMAT_MISMATCH;
 import static androidx.media3.transformer.TransformerUtil.shouldTranscodeAudio;
 import static androidx.media3.transformer.TransformerUtil.shouldTranscodeVideo;
-import static androidx.media3.transformer.TransmuxTranscodeHelper.buildUponCompositionForTrimOptimization;
+import static androidx.media3.transformer.TransmuxTranscodeHelper.buildNewCompositionWithClipTimes;
 import static java.lang.Math.round;
 import static java.lang.annotation.ElementType.TYPE_USE;
 
@@ -1397,7 +1397,7 @@ public final class Transformer {
             if (mp4Info.firstSyncSampleTimestampUsAfterTimeUs - trimStartTimeUs
                 <= maxEncodedAudioBufferDurationUs) {
               Transformer.this.composition =
-                  buildUponCompositionForTrimOptimization(
+                  buildNewCompositionWithClipTimes(
                       composition,
                       mp4Info.firstSyncSampleTimestampUsAfterTimeUs,
                       firstMediaItem.clippingConfiguration.endPositionUs,
@@ -1438,7 +1438,7 @@ public final class Transformer {
             }
             Transformer.this.mediaItemInfo = mp4Info;
             Composition trancodeComposition =
-                buildUponCompositionForTrimOptimization(
+                buildNewCompositionWithClipTimes(
                     composition,
                     trimStartTimeUs,
                     mp4Info.firstSyncSampleTimestampUsAfterTimeUs,
@@ -1476,7 +1476,7 @@ public final class Transformer {
     long trimStartTimeUs = firstEditedMediaItem.mediaItem.clippingConfiguration.startPositionUs;
     long trimEndTimeUs = firstEditedMediaItem.mediaItem.clippingConfiguration.endPositionUs;
     Composition transmuxComposition =
-        buildUponCompositionForTrimOptimization(
+        buildNewCompositionWithClipTimes(
             composition,
             mediaItemInfo.firstSyncSampleTimestampUsAfterTimeUs,
             trimEndTimeUs,
diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/TransmuxTranscodeHelper.java b/libraries/transformer/src/main/java/androidx/media3/transformer/TransmuxTranscodeHelper.java
index 128e424e38..cf4e50993e 100644
--- a/libraries/transformer/src/main/java/androidx/media3/transformer/TransmuxTranscodeHelper.java
+++ b/libraries/transformer/src/main/java/androidx/media3/transformer/TransmuxTranscodeHelper.java
@@ -75,11 +75,7 @@ import java.util.List;
     return mp4InfoSettableFuture;
   }
 
-  /**
-   * Changes the clip times of the {@link MediaItem} in the {@link Composition} and removes any
-   * video effects that shouldn't be applied during transcoding or transmuxing.
-   */
-  public static Composition buildUponCompositionForTrimOptimization(
+  public static Composition buildNewCompositionWithClipTimes(
       Composition oldComposition,
       long startTimeUs,
       long endTimeUs,
@@ -105,8 +101,6 @@ import java.util.List;
             .buildUpon()
             .setMediaItem(mediaItem)
             .setDurationUs(mediaDurationUs)
-            .setEffects(
-                new Effects(firstEditedMediaItem.effects.audioProcessors, ImmutableList.of()))
             .build();
 
     return oldComposition