Rollback of d011c27

PiperOrigin-RevId: 787283924

Author: Googler

libraries/transformer/src/main/java/androidx/media3/transformer/CompositionPlayer.java

@@ -21,6 +21,7 @@
 import static androidx.media3.common.util.Assertions.checkState;
 import static androidx.media3.common.util.Assertions.checkStateNotNull;
 import static androidx.media3.common.util.Util.usToMs;
+import static androidx.media3.transformer.CompositionUtil.shouldRePreparePlayerForSequence;
 import static com.google.common.util.concurrent.Futures.immediateFuture;
 import static java.lang.Math.max;
 import static java.lang.Math.min;
@@ -83,7 +84,6 @@
 import androidx.media3.exoplayer.video.VideoFrameMetadataListener;
 import androidx.media3.exoplayer.video.VideoFrameReleaseControl;
 import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Iterables;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.errorprone.annotations.CanIgnoreReturnValue;
@@ -1483,75 +1483,6 @@ private static boolean shouldRePreparePlayerForComposition(
     return false;
   }
 
-  /**
-   * Returns whether the player should be re-prepared after switching {@link
-   * EditedMediaItemSequence} to the new one.
-   *
-   * <p>It returns {@code true} if the {@code oldSequence} is {@code null}.
-   *
-   * <p>Currently this method returns {@code false} when
-   *
-   * <ul>
-   *   <li>All the {@link MediaItem mediaItems} in the {@code oldSequence} match with those in the
-   *       {@code newSequence}.
-   *   <li>Changes in {@link EditedMediaItem}:
-   *       <ul>
-   *         <li>{@linkplain EditedMediaItem#effects Video effects} changed. Except when there are
-   *             speed adjustments ({@link InactiveTimestampAdjustment}).
-   *       </ul>
-   * </ul>
-   */
-  @VisibleForTesting
-  /* package */ static boolean shouldRePreparePlayerForSequence(
-      @Nullable EditedMediaItemSequence oldSequence, EditedMediaItemSequence newSequence) {
-    if (oldSequence == null) {
-      return true;
-    }
-
-    if (oldSequence.editedMediaItems.size() != newSequence.editedMediaItems.size()) {
-      return true;
-    }
-
-    for (int i = 0; i < oldSequence.editedMediaItems.size(); i++) {
-      EditedMediaItem oldEditedMediaItem = oldSequence.editedMediaItems.get(i);
-      EditedMediaItem newEditedMediaItem = newSequence.editedMediaItems.get(i);
-      if (!oldEditedMediaItem.mediaItem.equals(newEditedMediaItem.mediaItem)) {
-        // All MediaItems must match - this checks the URI and the clipping.
-        return true;
-      }
-
-      if (oldEditedMediaItem.flattenForSlowMotion != newEditedMediaItem.flattenForSlowMotion) {
-        return true;
-      }
-
-      if (oldEditedMediaItem.removeVideo != newEditedMediaItem.removeVideo) {
-        return true;
-      }
-
-      if (oldEditedMediaItem.removeAudio != newEditedMediaItem.removeAudio) {
-        return true;
-      }
-
-      if (!oldEditedMediaItem.effects.audioProcessors.equals(
-          newEditedMediaItem.effects.audioProcessors)) {
-        return true;
-      }
-
-      // TimestampAdjustment change needs to be handled separately. Player needs to be re-prepared
-      // if the timestamp adjustments change.
-      if (!Iterables.elementsEqual(
-          // Old timestamp adjustments
-          Iterables.filter(
-              oldEditedMediaItem.effects.videoEffects, InactiveTimestampAdjustment.class),
-          // New timestamp adjustments
-          Iterables.filter(
-              newEditedMediaItem.effects.videoEffects, InactiveTimestampAdjustment.class))) {
-        return true;
-      }
-    }
-    return false;
-  }
-
   private static final class GapHandlingDecoderFactory implements ImageDecoder.Factory {
     private static final String BLANK_FRAMES_MEDIA_SOURCE_TYPE = "composition_player_blank_frames";
     private static final int BLANK_IMAGE_BITMAP_WIDTH = 1;

libraries/transformer/src/main/java/androidx/media3/transformer/CompositionUtil.java

@@ -0,0 +1,93 @@
+/*
+ * Copyright 2025 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.media3.transformer;
+
+import androidx.annotation.Nullable;
+import androidx.media3.common.MediaItem;
+import com.google.common.collect.Iterables;
+
+/* package */ final class CompositionUtil {
+
+  /**
+   * Returns whether the player should be re-prepared after switching {@link
+   * EditedMediaItemSequence} to the new one.
+   *
+   * <p>It returns {@code true} if the {@code oldSequence} is {@code null}.
+   *
+   * <p>Currently this method returns {@code false} when
+   *
+   * <ul>
+   *   <li>All the {@link MediaItem mediaItems} in the {@code oldSequence} match with those in the
+   *       {@code newSequence}.
+   *   <li>Changes in {@link EditedMediaItem}:
+   *       <ul>
+   *         <li>{@linkplain EditedMediaItem#effects Video effects} changed.
+   *       </ul>
+   * </ul>
+   */
+  public static boolean shouldRePreparePlayerForSequence(
+      @Nullable EditedMediaItemSequence oldSequence, EditedMediaItemSequence newSequence) {
+    if (oldSequence == null) {
+      return true;
+    }
+
+    if (oldSequence.editedMediaItems.size() != newSequence.editedMediaItems.size()) {
+      return true;
+    }
+
+    for (int i = 0; i < oldSequence.editedMediaItems.size(); i++) {
+      EditedMediaItem oldEditedMediaItem = oldSequence.editedMediaItems.get(i);
+      EditedMediaItem newEditedMediaItem = newSequence.editedMediaItems.get(i);
+      if (!oldEditedMediaItem.mediaItem.equals(newEditedMediaItem.mediaItem)) {
+        // All MediaItems must match - this checks the URI and the clipping.
+        return true;
+      }
+
+      if (oldEditedMediaItem.flattenForSlowMotion != newEditedMediaItem.flattenForSlowMotion) {
+        return true;
+      }
+
+      if (oldEditedMediaItem.removeVideo != newEditedMediaItem.removeVideo) {
+        return true;
+      }
+
+      if (oldEditedMediaItem.removeAudio != newEditedMediaItem.removeAudio) {
+        return true;
+      }
+
+      if (!oldEditedMediaItem.effects.audioProcessors.equals(
+          newEditedMediaItem.effects.audioProcessors)) {
+        return true;
+      }
+
+      // TimestampAdjustment change needs to be handled separately. Player needs to be re-prepared
+      // if the timestamp adjustments change.
+      if (!Iterables.elementsEqual(
+          // Old timestamp adjustments
+          Iterables.filter(
+              oldEditedMediaItem.effects.videoEffects, InactiveTimestampAdjustment.class),
+          // New timestamp adjustments
+          Iterables.filter(
+              newEditedMediaItem.effects.videoEffects, InactiveTimestampAdjustment.class))) {
+        return true;
+      }
+    }
+    return false;
+  }
+
+  private CompositionUtil() {}
+}

libraries/transformer/src/test/java/androidx/media3/transformer/CompositionPlayerUtilTest.java renamed to libraries/transformer/src/test/java/androidx/media3/transformer/CompositionUtilTest.java

@@ -16,7 +16,7 @@
 
 package androidx.media3.transformer;
 
-import static androidx.media3.transformer.CompositionPlayer.shouldRePreparePlayerForSequence;
+import static androidx.media3.transformer.CompositionUtil.shouldRePreparePlayerForSequence;
 import static com.google.common.truth.Truth.assertThat;
 
 import androidx.media3.common.MediaItem;
@@ -29,9 +29,9 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-/** Unit test for util methods in {@link CompositionPlayer}. */
+/** Unit test for {@link CompositionUtil}. */
 @RunWith(AndroidJUnit4.class)
-public class CompositionPlayerUtilTest {
+public class CompositionUtilTest {
 
   private static final String URI_0 = "CompositionUtilTest_0";
   private static final String URI_1 = "CompositionUtilTest_1";