diff --git a/libraries/effect/src/androidTest/java/androidx/media3/effect/DefaultVideoFrameProcessorPixelTest.java b/libraries/effect/src/androidTest/java/androidx/media3/effect/DefaultVideoFrameProcessorPixelTest.java index 233c0d26d1..3c6249eb2b 100644 --- a/libraries/effect/src/androidTest/java/androidx/media3/effect/DefaultVideoFrameProcessorPixelTest.java +++ b/libraries/effect/src/androidTest/java/androidx/media3/effect/DefaultVideoFrameProcessorPixelTest.java @@ -62,7 +62,7 @@ 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 IMAGE_PNG_ASSET_PATH = "media/bitmap/input_images/london.jpg"; + private static final String IMAGE_JPG_ASSET_PATH = "media/bitmap/input_images/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 = @@ -173,7 +173,7 @@ public final class DefaultVideoFrameProcessorPixelTest { getDefaultFrameProcessorTestRunnerBuilder(testId) .setInputColorInfo(ColorInfo.SRGB_BT709_FULL) .build(); - Bitmap originalBitmap = readBitmap(IMAGE_PNG_ASSET_PATH); + Bitmap originalBitmap = readBitmap(IMAGE_JPG_ASSET_PATH); Bitmap expectedBitmap = readBitmap(IMAGE_TO_VIDEO_PNG_ASSET_PATH); videoFrameProcessorTestRunner.queueInputBitmap( @@ -201,7 +201,7 @@ public final class DefaultVideoFrameProcessorPixelTest { /* bottom= */ -0.5f, /* top= */ 0.5f))) .build(); - Bitmap originalBitmap = readBitmap(IMAGE_PNG_ASSET_PATH); + Bitmap originalBitmap = readBitmap(IMAGE_JPG_ASSET_PATH); Bitmap expectedBitmap = readBitmap(IMAGE_TO_CROPPED_VIDEO_PNG_ASSET_PATH); videoFrameProcessorTestRunner.queueInputBitmap( @@ -228,7 +228,7 @@ public final class DefaultVideoFrameProcessorPixelTest { .setInputColorInfo(ColorInfo.SRGB_BT709_FULL) .setEffects(NO_OP_EFFECT) .build(); - Bitmap originalBitmap = readBitmap(IMAGE_PNG_ASSET_PATH); + Bitmap originalBitmap = readBitmap(IMAGE_JPG_ASSET_PATH); videoFrameProcessorTestRunner.queueInputBitmap( originalBitmap, C.MICROS_PER_SECOND, /* offsetToAddUs= */ 0L, /* frameRate= */ 1); diff --git a/libraries/test_data/src/test/assets/media/bitmap/input_images/london.jpg b/libraries/test_data/src/test/assets/media/bitmap/input_images/london.jpg index bae040f73d..1256e7e07e 100644 Binary files a/libraries/test_data/src/test/assets/media/bitmap/input_images/london.jpg and b/libraries/test_data/src/test/assets/media/bitmap/input_images/london.jpg differ diff --git a/libraries/test_data/src/test/assets/media/bitmap/sample_mp4_first_frame/electrical_colors/london_image_to_video.png b/libraries/test_data/src/test/assets/media/bitmap/sample_mp4_first_frame/electrical_colors/london_image_to_video.png index 017c26c601..2108f7e86d 100644 Binary files a/libraries/test_data/src/test/assets/media/bitmap/sample_mp4_first_frame/electrical_colors/london_image_to_video.png and b/libraries/test_data/src/test/assets/media/bitmap/sample_mp4_first_frame/electrical_colors/london_image_to_video.png differ diff --git a/libraries/test_data/src/test/assets/media/bitmap/sample_mp4_first_frame/electrical_colors/london_image_to_video_with_crop.png b/libraries/test_data/src/test/assets/media/bitmap/sample_mp4_first_frame/electrical_colors/london_image_to_video_with_crop.png index 5b3327afed..426a3c64ba 100644 Binary files a/libraries/test_data/src/test/assets/media/bitmap/sample_mp4_first_frame/electrical_colors/london_image_to_video_with_crop.png and b/libraries/test_data/src/test/assets/media/bitmap/sample_mp4_first_frame/electrical_colors/london_image_to_video_with_crop.png differ diff --git a/libraries/test_data/src/test/assets/media/bitmap/transformer_sequence_effect_test/export_withCompositionPresentationAndNoVideoEffects_0.png b/libraries/test_data/src/test/assets/media/bitmap/transformer_sequence_effect_test/export_withCompositionPresentationAndNoVideoEffects_0.png index 3fbf73f2e6..61c9dfb6be 100644 Binary files a/libraries/test_data/src/test/assets/media/bitmap/transformer_sequence_effect_test/export_withCompositionPresentationAndNoVideoEffects_0.png and b/libraries/test_data/src/test/assets/media/bitmap/transformer_sequence_effect_test/export_withCompositionPresentationAndNoVideoEffects_0.png differ diff --git a/libraries/test_data/src/test/assets/media/bitmap/transformer_sequence_effect_test/export_withCompositionPresentationAndWithPerMediaItemEffects_0.png b/libraries/test_data/src/test/assets/media/bitmap/transformer_sequence_effect_test/export_withCompositionPresentationAndWithPerMediaItemEffects_0.png index 9feaf41ff7..150d1c5220 100644 Binary files a/libraries/test_data/src/test/assets/media/bitmap/transformer_sequence_effect_test/export_withCompositionPresentationAndWithPerMediaItemEffects_0.png and b/libraries/test_data/src/test/assets/media/bitmap/transformer_sequence_effect_test/export_withCompositionPresentationAndWithPerMediaItemEffects_0.png differ diff --git a/libraries/test_data/src/test/assets/media/bitmap/transformer_sequence_effect_test/export_withCompositionPresentationAndWithPerMediaItemEffects_1.png b/libraries/test_data/src/test/assets/media/bitmap/transformer_sequence_effect_test/export_withCompositionPresentationAndWithPerMediaItemEffects_1.png index 733860109d..ef2453dee1 100644 Binary files a/libraries/test_data/src/test/assets/media/bitmap/transformer_sequence_effect_test/export_withCompositionPresentationAndWithPerMediaItemEffects_1.png and b/libraries/test_data/src/test/assets/media/bitmap/transformer_sequence_effect_test/export_withCompositionPresentationAndWithPerMediaItemEffects_1.png differ diff --git a/libraries/test_data/src/test/assets/media/bitmap/transformer_sequence_effect_test/export_withNoCompositionPresentationAndWithPerMediaItemEffects_1.png b/libraries/test_data/src/test/assets/media/bitmap/transformer_sequence_effect_test/export_withNoCompositionPresentationAndWithPerMediaItemEffects_1.png index b68aea2d9e..0c0c6938cb 100644 Binary files a/libraries/test_data/src/test/assets/media/bitmap/transformer_sequence_effect_test/export_withNoCompositionPresentationAndWithPerMediaItemEffects_1.png and b/libraries/test_data/src/test/assets/media/bitmap/transformer_sequence_effect_test/export_withNoCompositionPresentationAndWithPerMediaItemEffects_1.png differ diff --git a/libraries/test_data/src/test/assets/media/bitmap/transformer_sequence_effect_test/export_withNoCompositionPresentationAndWithPerMediaItemEffects_2.png b/libraries/test_data/src/test/assets/media/bitmap/transformer_sequence_effect_test/export_withNoCompositionPresentationAndWithPerMediaItemEffects_2.png index d0d5c283c8..23557f4b69 100644 Binary files a/libraries/test_data/src/test/assets/media/bitmap/transformer_sequence_effect_test/export_withNoCompositionPresentationAndWithPerMediaItemEffects_2.png and b/libraries/test_data/src/test/assets/media/bitmap/transformer_sequence_effect_test/export_withNoCompositionPresentationAndWithPerMediaItemEffects_2.png differ diff --git a/libraries/test_data/src/test/assets/media/bitmap/transformer_sequence_effect_test/export_withNoCompositionPresentationAndWithPerMediaItemEffects_3.png b/libraries/test_data/src/test/assets/media/bitmap/transformer_sequence_effect_test/export_withNoCompositionPresentationAndWithPerMediaItemEffects_3.png index 657b6d94ba..51515abb2b 100644 Binary files a/libraries/test_data/src/test/assets/media/bitmap/transformer_sequence_effect_test/export_withNoCompositionPresentationAndWithPerMediaItemEffects_3.png and b/libraries/test_data/src/test/assets/media/bitmap/transformer_sequence_effect_test/export_withNoCompositionPresentationAndWithPerMediaItemEffects_3.png differ diff --git a/libraries/test_utils/src/main/java/androidx/media3/test/utils/BitmapPixelTestUtil.java b/libraries/test_utils/src/main/java/androidx/media3/test/utils/BitmapPixelTestUtil.java index 4c9950ca6f..86ca36fa20 100644 --- a/libraries/test_utils/src/main/java/androidx/media3/test/utils/BitmapPixelTestUtil.java +++ b/libraries/test_utils/src/main/java/androidx/media3/test/utils/BitmapPixelTestUtil.java @@ -337,7 +337,7 @@ public class BitmapPixelTestUtil { public static void maybeSaveTestBitmap( String testId, String bitmapLabel, Bitmap bitmap, @Nullable String path) { String fileName = testId + (bitmapLabel.isEmpty() ? "" : "_" + bitmapLabel) + ".png"; - File file = null; + File file; if (path != null) { File folder = new File(path);