From 57d00fcca0f11828c06a9bf4ca7cdc079183e86f Mon Sep 17 00:00:00 2001
From: tofunmi <tofunmi@google.com>
Date: Thu, 21 Dec 2023 08:53:00 -0800
Subject: [PATCH] Rename crow_emulator_transformer_output

PiperOrigin-RevId: 592873355
---
 ... internal_emulator_transformer_output.mp4} | Bin
 .../transformer/TransformerEndToEndTest.java  |  27 ++++++++----------
 2 files changed, 12 insertions(+), 15 deletions(-)
 rename libraries/test_data/src/test/assets/media/mp4/{crow_emulator_transformer_output.mp4 => internal_emulator_transformer_output.mp4} (100%)

diff --git a/libraries/test_data/src/test/assets/media/mp4/crow_emulator_transformer_output.mp4 b/libraries/test_data/src/test/assets/media/mp4/internal_emulator_transformer_output.mp4
similarity index 100%
rename from libraries/test_data/src/test/assets/media/mp4/crow_emulator_transformer_output.mp4
rename to libraries/test_data/src/test/assets/media/mp4/internal_emulator_transformer_output.mp4
diff --git a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/TransformerEndToEndTest.java b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/TransformerEndToEndTest.java
index e0f5647a7f..0cf00b3fa0 100644
--- a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/TransformerEndToEndTest.java
+++ b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/TransformerEndToEndTest.java
@@ -34,7 +34,6 @@ import static androidx.media3.transformer.ExportResult.OPTIMIZATION_FAILED_FORMA
 import static androidx.media3.transformer.ExportResult.OPTIMIZATION_SUCCEEDED;
 import static com.google.common.truth.Truth.assertThat;
 import static org.junit.Assert.assertThrows;
-import static org.junit.Assume.assumeFalse;
 import static org.junit.Assume.assumeTrue;
 
 import android.content.Context;
@@ -558,21 +557,17 @@ public class TransformerEndToEndTest {
   public void clippedMedia_trimOptimizationEnabled_completesWithOptimizationApplied()
       throws Exception {
     String testId = "clippedMedia_trimOptimizationEnabled_completesWithOptimizationApplied";
-    if (!isRunningOnEmulator()) {
-      // The trim optimization is only guaranteed to work on emulator for this file.
-      recordTestSkipped(context, testId, /* reason= */ "Emulator only test");
-      assumeTrue(false);
-    }
-    if (Util.SDK_INT == 26) {
-      // MediaCodec returns a segmentation fault fails at this SDK level on emulators.
-      recordTestSkipped(context, testId, /* reason= */ "SDK 26 not supported.");
+    if (!isRunningOnEmulator() || Util.SDK_INT != 33) {
+      // The trim optimization is only guaranteed to work on emulator for this (emulator-transcoded)
+      // file.
+      recordTestSkipped(context, testId, /* reason= */ "SDK 33 Emulator only test");
       assumeTrue(false);
     }
     Transformer transformer =
         new Transformer.Builder(context).experimentalSetTrimOptimizationEnabled(true).build();
     MediaItem mediaItem =
         new MediaItem.Builder()
-            .setUri("asset:///media/mp4/crow_emulator_transformer_output.mp4")
+            .setUri("asset:///media/mp4/internal_emulator_transformer_output.mp4")
             .setClippingConfiguration(
                 new MediaItem.ClippingConfiguration.Builder()
                     .setStartPositionMs(500)
@@ -595,13 +590,15 @@ public class TransformerEndToEndTest {
     String testId = "videoEditing_trimOptimizationEnabled_fallbackToNormalExport";
     Transformer transformer =
         new Transformer.Builder(context).experimentalSetTrimOptimizationEnabled(true).build();
-    // The trim optimization is only guaranteed to work on emulator for this file.
-    assumeTrue(isRunningOnEmulator());
-    // MediaCodec returns a segmentation fault fails at this SDK level on emulators.
-    assumeFalse(Util.SDK_INT == 26);
+    if (!isRunningOnEmulator()) {
+      // The trim optimization is only guaranteed to work on emulator for this (emulator-transcoded)
+      // file.
+      recordTestSkipped(context, testId, /* reason= */ "Emulator only test");
+      assumeTrue(false);
+    }
     MediaItem mediaItem =
         new MediaItem.Builder()
-            .setUri("asset:///media/mp4/crow_emulator_transformer_output.mp4")
+            .setUri("asset:///media/mp4/internal_emulator_transformer_output.mp4")
             .setClippingConfiguration(
                 new MediaItem.ClippingConfiguration.Builder()
                     .setStartPositionMs(500)