diff --git a/libraries/test_data/src/test/assets/media/bitmap/transformer_sequence_effect_test/export_withCompositionPresentationAndNoVideoEffectsForFirstMediaItem_0.png b/libraries/test_data/src/test/assets/media/bitmap/transformer_sequence_effect_test/export_withCompositionPresentationAndNoVideoEffectsForFirstMediaItem_0.png index 675f50fa77..9a6e178464 100644 Binary files a/libraries/test_data/src/test/assets/media/bitmap/transformer_sequence_effect_test/export_withCompositionPresentationAndNoVideoEffectsForFirstMediaItem_0.png and b/libraries/test_data/src/test/assets/media/bitmap/transformer_sequence_effect_test/export_withCompositionPresentationAndNoVideoEffectsForFirstMediaItem_0.png differ diff --git a/libraries/test_data/src/test/assets/media/bitmap/transformer_sequence_effect_test/export_withCompositionPresentationAndNoVideoEffectsForFirstMediaItem_1.png b/libraries/test_data/src/test/assets/media/bitmap/transformer_sequence_effect_test/export_withCompositionPresentationAndNoVideoEffectsForFirstMediaItem_1.png index bde2d35af5..6a0a6870ba 100644 Binary files a/libraries/test_data/src/test/assets/media/bitmap/transformer_sequence_effect_test/export_withCompositionPresentationAndNoVideoEffectsForFirstMediaItem_1.png and b/libraries/test_data/src/test/assets/media/bitmap/transformer_sequence_effect_test/export_withCompositionPresentationAndNoVideoEffectsForFirstMediaItem_1.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 ac71715ca9..3fbf73f2e6 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_withCompositionPresentationAndNoVideoEffects_1.png b/libraries/test_data/src/test/assets/media/bitmap/transformer_sequence_effect_test/export_withCompositionPresentationAndNoVideoEffects_1.png index c6c8af04bc..46a8bd08ac 100644 Binary files a/libraries/test_data/src/test/assets/media/bitmap/transformer_sequence_effect_test/export_withCompositionPresentationAndNoVideoEffects_1.png and b/libraries/test_data/src/test/assets/media/bitmap/transformer_sequence_effect_test/export_withCompositionPresentationAndNoVideoEffects_1.png differ diff --git a/libraries/test_data/src/test/assets/media/bitmap/transformer_sequence_effect_test/export_withCompositionPresentationAndNoVideoEffects_2.png b/libraries/test_data/src/test/assets/media/bitmap/transformer_sequence_effect_test/export_withCompositionPresentationAndNoVideoEffects_2.png index 757c4fe0f4..097c640f89 100644 Binary files a/libraries/test_data/src/test/assets/media/bitmap/transformer_sequence_effect_test/export_withCompositionPresentationAndNoVideoEffects_2.png and b/libraries/test_data/src/test/assets/media/bitmap/transformer_sequence_effect_test/export_withCompositionPresentationAndNoVideoEffects_2.png differ diff --git a/libraries/test_data/src/test/assets/media/bitmap/transformer_sequence_effect_test/export_withCompositionPresentationAndNoVideoEffects_3.png b/libraries/test_data/src/test/assets/media/bitmap/transformer_sequence_effect_test/export_withCompositionPresentationAndNoVideoEffects_3.png index cec12db625..18e6ef9869 100644 Binary files a/libraries/test_data/src/test/assets/media/bitmap/transformer_sequence_effect_test/export_withCompositionPresentationAndNoVideoEffects_3.png and b/libraries/test_data/src/test/assets/media/bitmap/transformer_sequence_effect_test/export_withCompositionPresentationAndNoVideoEffects_3.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 e4aead4264..9feaf41ff7 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 8f8e592ff8..733860109d 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_withCompositionPresentationAndWithPerMediaItemEffects_2.png b/libraries/test_data/src/test/assets/media/bitmap/transformer_sequence_effect_test/export_withCompositionPresentationAndWithPerMediaItemEffects_2.png index 5d097dfe81..91bb7df7ec 100644 Binary files a/libraries/test_data/src/test/assets/media/bitmap/transformer_sequence_effect_test/export_withCompositionPresentationAndWithPerMediaItemEffects_2.png and b/libraries/test_data/src/test/assets/media/bitmap/transformer_sequence_effect_test/export_withCompositionPresentationAndWithPerMediaItemEffects_2.png differ diff --git a/libraries/test_data/src/test/assets/media/bitmap/transformer_sequence_effect_test/export_withCompositionPresentationAndWithPerMediaItemEffects_3.png b/libraries/test_data/src/test/assets/media/bitmap/transformer_sequence_effect_test/export_withCompositionPresentationAndWithPerMediaItemEffects_3.png index 2e7e25704c..3bfd0a2dd7 100644 Binary files a/libraries/test_data/src/test/assets/media/bitmap/transformer_sequence_effect_test/export_withCompositionPresentationAndWithPerMediaItemEffects_3.png and b/libraries/test_data/src/test/assets/media/bitmap/transformer_sequence_effect_test/export_withCompositionPresentationAndWithPerMediaItemEffects_3.png differ diff --git a/libraries/test_data/src/test/assets/media/bitmap/transformer_sequence_effect_test/export_withNoCompositionPresentationAndWithPerMediaItemEffects_0.png b/libraries/test_data/src/test/assets/media/bitmap/transformer_sequence_effect_test/export_withNoCompositionPresentationAndWithPerMediaItemEffects_0.png index 675f50fa77..9a6e178464 100644 Binary files a/libraries/test_data/src/test/assets/media/bitmap/transformer_sequence_effect_test/export_withNoCompositionPresentationAndWithPerMediaItemEffects_0.png and b/libraries/test_data/src/test/assets/media/bitmap/transformer_sequence_effect_test/export_withNoCompositionPresentationAndWithPerMediaItemEffects_0.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 be6c02f3fd..b68aea2d9e 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 0cbb9403a9..d0d5c283c8 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 3beb194b64..657b6d94ba 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/transformer/src/androidTest/java/androidx/media3/transformer/TransformerSequenceEffectTest.java b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/TransformerSequenceEffectTest.java index d52982b9b5..8296e2a852 100644 --- a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/TransformerSequenceEffectTest.java +++ b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/TransformerSequenceEffectTest.java @@ -62,12 +62,11 @@ public final class TransformerSequenceEffectTest { private static final int EXPORT_HEIGHT = 240; /** - * Allowing more difference than {@link - * BitmapPixelTestUtil#MAXIMUM_AVERAGE_PIXEL_ABSOLUTE_DIFFERENCE} for YUV to RGB conversion on - * emulators. + * Maximum allowed average pixel difference between bitmaps generated from luma values. + * + * @see BitmapPixelTestUtil#MAXIMUM_AVERAGE_PIXEL_ABSOLUTE_DIFFERENCE */ - private static final float MAXIMUM_AVERAGE_PIXEL_ABSOLUTE_DIFFERENCE = - 8 * BitmapPixelTestUtil.MAXIMUM_AVERAGE_PIXEL_ABSOLUTE_DIFFERENCE; + private static final float MAXIMUM_AVERAGE_PIXEL_ABSOLUTE_DIFFERENCE_LUMA = 5.0f; private final Context context = ApplicationProvider.getApplicationContext(); @@ -258,7 +257,7 @@ public final class TransformerSequenceEffectTest { float averagePixelAbsoluteDifference = getBitmapAveragePixelAbsoluteDifferenceArgb8888(expectedBitmap, actualBitmap, subTestId); assertThat(averagePixelAbsoluteDifference) - .isAtMost(MAXIMUM_AVERAGE_PIXEL_ABSOLUTE_DIFFERENCE); + .isAtMost(MAXIMUM_AVERAGE_PIXEL_ABSOLUTE_DIFFERENCE_LUMA); } } }