remove media/bitmap/input_images

move the images into the respective places in the file extension directory so they file the pre-existing structure

PiperOrigin-RevId: 609744673

libraries/effect/src/androidTest/java/androidx/media3/effect/AlphaScaleShaderProgramPixelTest.java

@@ -60,8 +60,7 @@ public final class AlphaScaleShaderProgramPixelTest {
   // TODO: b/262694346 - Use media3test_srgb instead of media3test, throughout our tests. This is
   //  this test image is intended to be interpreted as sRGB, but media3test is stored in a niche
   //  color transfer, which can make alpha tests more difficult to debug.
-  private static final String ORIGINAL_PNG_ASSET_PATH =
+  private static final String ORIGINAL_PNG_ASSET_PATH = "media/png/media3test_srgb.png";
-      "media/bitmap/input_images/media3test_srgb.png";
   private static final String DECREASE_ALPHA_PNG_ASSET_PATH =
       "media/bitmap/sample_mp4_first_frame/electrical_colors/decrease_alpha.png";
   private static final String INCREASE_ALPHA_PNG_ASSET_PATH =

libraries/effect/src/androidTest/java/androidx/media3/effect/DefaultVideoFrameProcessorFlushTest.java

@@ -38,8 +38,7 @@ import org.junit.runner.RunWith;
 /** Test for {@link DefaultVideoFrameProcessor} flushing. */
 @RunWith(AndroidJUnit4.class)
 public class DefaultVideoFrameProcessorFlushTest {
-  private static final String ORIGINAL_PNG_ASSET_PATH =
+  private static final String ORIGINAL_PNG_ASSET_PATH = "media/png/media3test_srgb.png";
-      "media/bitmap/input_images/media3test_srgb.png";
 
   @Rule public final TestName testName = new TestName();
 

libraries/effect/src/androidTest/java/androidx/media3/effect/DefaultVideoFrameProcessorPixelTest.java

@@ -60,8 +60,8 @@ public final class DefaultVideoFrameProcessorPixelTest {
 
   private static final String ORIGINAL_PNG_ASSET_PATH =
       "media/bitmap/sample_mp4_first_frame/electrical_colors/original.png";
-  private static final String OVERLAY_PNG_ASSET_PATH = "media/bitmap/input_images/media3test.png";
+  private static final String OVERLAY_PNG_ASSET_PATH = "media/png/media3test.png";
-  private static final String IMAGE_JPG_ASSET_PATH = "media/bitmap/input_images/london.jpg";
+  private static final String IMAGE_JPG_ASSET_PATH = "media/jpeg/london.jpg";
   private static final String IMAGE_TO_VIDEO_PNG_ASSET_PATH =
       "media/bitmap/sample_mp4_first_frame/electrical_colors/london_image_to_video.png";
   private static final String IMAGE_TO_CROPPED_VIDEO_PNG_ASSET_PATH =

libraries/effect/src/androidTest/java/androidx/media3/effect/OverlayShaderProgramPixelTest.java

@@ -64,7 +64,7 @@ import org.junit.runner.RunWith;
 public class OverlayShaderProgramPixelTest {
   @Rule public final TestName testName = new TestName();
 
-  private static final String OVERLAY_PNG_ASSET_PATH = "media/bitmap/input_images/media3test.png";
+  private static final String OVERLAY_PNG_ASSET_PATH = "media/png/media3test.png";
   private static final String ORIGINAL_PNG_ASSET_PATH =
       "media/bitmap/sample_mp4_first_frame/electrical_colors/original.png";
   private static final String OVERLAY_BITMAP_DEFAULT =

libraries/exoplayer/src/test/java/androidx/media3/exoplayer/e2etest/ImagePlaybackTest.java

@@ -49,7 +49,7 @@ public class ImagePlaybackTest {
     PlaybackOutput playbackOutput = PlaybackOutput.register(player, renderersFactory);
     MediaItem mediaItem1 =
         new MediaItem.Builder()
-            .setUri("asset:///media/bitmap/input_images/media3test.png")
+            .setUri("asset:///media/png/media3test.png")
             .setImageDurationMs(3000L)
             .build();
     MediaItem mediaItem2 =

libraries/exoplayer/src/test/java/androidx/media3/exoplayer/e2etest/ParameterizedImagePlaybackTest.java

@@ -60,7 +60,7 @@ public class ParameterizedImagePlaybackTest {
         Collections2.filter(
             Sets.powerSet(
                 ImmutableSet.of(
-                    "bitmap/input_images/media3test.png",
+                    "png/media3test.png",
                     "bmp/non-motion-photo-shortened-cropped.bmp",
                     "png/non-motion-photo-shortened.png",
                     "webp/ic_launcher_round.webp")),

libraries/test_data/src/test/assets/media/bitmap/input_images/README.md

@@ -1,2 +0,0 @@
-All the files are in the *sRGB color space* specified in IEC 61966-2-1 following
-the colorspace model that is supported by [android.graphics.Bitmap](https://developer.android.com/reference/android/graphics/BitmapFactory.Options#inPreferredColorSpace).

libraries/test_data/src/test/assets/playbackdumps/image/non-motion-photo-shortened-cropped.bmp+media3test.png+ic_launcher_round.webp.dump

@@ -2,10 +2,10 @@ ImageOutput:
   rendered image count = 3
   image output #1:
     presentationTimeUs = 0
-    bitmap hash = -389047680
+    bitmap hash = -1851534335
   image output #2:
     presentationTimeUs = 0
-    bitmap hash = -1851534335
+    bitmap hash = -389047680
   image output #3:
     presentationTimeUs = 0
     bitmap hash = 443865884

libraries/test_data/src/test/assets/playbackdumps/image/non-motion-photo-shortened-cropped.bmp+media3test.png+non-motion-photo-shortened.png+ic_launcher_round.webp.dump

@@ -2,10 +2,10 @@ ImageOutput:
   rendered image count = 4
   image output #1:
     presentationTimeUs = 0
-    bitmap hash = -389047680
+    bitmap hash = -1851534335
   image output #2:
     presentationTimeUs = 0
-    bitmap hash = -1851534335
+    bitmap hash = -389047680
   image output #3:
     presentationTimeUs = 0
     bitmap hash = 1367007828

libraries/test_data/src/test/assets/playbackdumps/image/non-motion-photo-shortened-cropped.bmp+media3test.png+non-motion-photo-shortened.png.dump

@@ -2,10 +2,10 @@ ImageOutput:
   rendered image count = 3
   image output #1:
     presentationTimeUs = 0
-    bitmap hash = -389047680
+    bitmap hash = -1851534335
   image output #2:
     presentationTimeUs = 0
-    bitmap hash = -1851534335
+    bitmap hash = -389047680
   image output #3:
     presentationTimeUs = 0
     bitmap hash = 1367007828

libraries/test_data/src/test/assets/playbackdumps/image/non-motion-photo-shortened-cropped.bmp+media3test.png.dump

@@ -2,7 +2,7 @@ ImageOutput:
   rendered image count = 2
   image output #1:
     presentationTimeUs = 0
-    bitmap hash = -389047680
+    bitmap hash = -1851534335
   image output #2:
     presentationTimeUs = 0
-    bitmap hash = -1851534335
+    bitmap hash = -389047680

libraries/transformer/src/androidTest/java/androidx/media3/transformer/AndroidTestUtil.java

@@ -65,11 +65,9 @@ public final class AndroidTestUtil {
           ImmutableList.of(
               new ScaleAndRotateTransformation.Builder().setRotationDegrees(45).build()));
 
-  public static final String PNG_ASSET_URI_STRING =
+  public static final String PNG_ASSET_URI_STRING = "asset:///media/png/media3test.png";
-      "asset:///media/bitmap/input_images/media3test.png";
+  public static final String JPG_ASSET_URI_STRING = "asset:///media/jpeg/london.jpg";
-  public static final String JPG_ASSET_URI_STRING = "asset:///media/bitmap/input_images/london.jpg";
+  public static final String JPG_PORTRAIT_ASSET_URI_STRING = "asset:///media/jpeg/tokyo.jpg";
-  public static final String JPG_PORTRAIT_ASSET_URI_STRING =
-      "asset:///media/bitmap/input_images/tokyo.jpg";
 
   public static final String MP4_TRIM_OPTIMIZATION_URI_STRING =
       "asset:///media/mp4/internal_emulator_transformer_output.mp4";

libraries/transformer/src/androidTest/java/androidx/media3/transformer/DefaultVideoCompositorPixelTest.java

@@ -101,8 +101,7 @@ public final class DefaultVideoCompositorPixelTest {
   @Parameterized.Parameter public boolean useSharedExecutor;
   @Rule public final TestName testName = new TestName();
 
-  private static final String ORIGINAL_PNG_ASSET_PATH =
+  private static final String ORIGINAL_PNG_ASSET_PATH = "media/png/media3test_srgb.png";
-      "media/bitmap/input_images/media3test_srgb.png";
   private static final String TEST_DIRECTORY = "media/bitmap/CompositorTestTimestamps/";
   private static final ImmutableList<ImmutableList<Effect>> TWO_INPUT_COMPOSITOR_EFFECT_LISTS =
       ImmutableList.of(

libraries/transformer/src/androidTest/java/androidx/media3/transformer/TransformerSequenceEffectTest.java

@@ -64,7 +64,7 @@ import org.junit.runner.RunWith;
 public final class TransformerSequenceEffectTest {
 
   private static final ImmutableList<Effect> NO_EFFECT = ImmutableList.of();
-  private static final String OVERLAY_PNG_ASSET_PATH = "media/bitmap/input_images/media3test.png";
+  private static final String OVERLAY_PNG_ASSET_PATH = "media/png/media3test.png";
   private static final int EXPORT_WIDTH = 360;
   private static final int EXPORT_HEIGHT = 240;
 

libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/DefaultVideoFrameProcessorMultipleTextureOutputPixelTest.java

@@ -54,8 +54,7 @@ public class DefaultVideoFrameProcessorMultipleTextureOutputPixelTest {
 
   private static final String ORIGINAL_PNG_ASSET_PATH =
       "media/bitmap/sample_mp4_first_frame/electrical_colors/original.png";
-  private static final String MEDIA3_TEST_PNG_ASSET_PATH =
+  private static final String MEDIA3_TEST_PNG_ASSET_PATH = "media/png/media3test.png";
-      "media/bitmap/input_images/media3test.png";
   private static final String SRGB_TO_ELECTRICAL_ORIGINAL_PNG_ASSET_PATH =
       "media/bitmap/sample_mp4_first_frame/electrical_colors/srgb_to_electrical_original.png";
   private static final String SRGB_TO_ELECTRICAL_MEDIA3_TEST_PNG_ASSET_PATH =

libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/DefaultVideoFrameProcessorTextureOutputPixelTest.java

@@ -74,7 +74,7 @@ public final class DefaultVideoFrameProcessorTextureOutputPixelTest {
       "media/bitmap/sample_mp4_first_frame/electrical_colors/original.png";
   private static final String BITMAP_OVERLAY_PNG_ASSET_PATH =
       "media/bitmap/sample_mp4_first_frame/electrical_colors/overlay_bitmap_FrameProcessor.png";
-  private static final String OVERLAY_PNG_ASSET_PATH = "media/bitmap/input_images/media3test.png";
+  private static final String OVERLAY_PNG_ASSET_PATH = "media/png/media3test.png";
 
   private static final String ORIGINAL_HLG10_PNG_ASSET_PATH =
       "media/bitmap/sample_mp4_first_frame/electrical_colors/original_hlg10.png";

libraries/transformer/src/test/java/androidx/media3/transformer/ImageAssetLoaderTest.java

@@ -116,8 +116,7 @@ public class ImageAssetLoaderTest {
 
   private static AssetLoader getAssetLoader(AssetLoader.Listener listener) {
     EditedMediaItem editedMediaItem =
-        new EditedMediaItem.Builder(
+        new EditedMediaItem.Builder(MediaItem.fromUri("asset:///media/png/media3test.png"))
-                MediaItem.fromUri("asset:///media/bitmap/input_images/media3test.png"))
             .setDurationUs(1_000_000)
             .setFrameRate(30)
             .build();