From 0480bc31a8fbec2aed354bee14e8f15e7fe9012a Mon Sep 17 00:00:00 2001 From: tofunmi Date: Mon, 26 Feb 2024 08:37:49 -0800 Subject: [PATCH] Rename media/bitmap out of media and rename PiperOrigin-RevId: 610418418 --- .../AlphaScaleShaderProgramPixelTest.java | 6 ++-- .../media3/effect/ContrastPixelTest.java | 8 ++--- .../androidx/media3/effect/CropPixelTest.java | 6 ++-- .../effect/DefaultShaderProgramPixelTest.java | 8 ++--- ...deoFrameProcessorImageFrameOutputTest.java | 6 ++-- .../DefaultVideoFrameProcessorPixelTest.java | 28 +++++++++--------- .../media3/effect/EffectPlaybackTest.java | 2 +- .../androidx/media3/effect/FrameDropTest.java | 2 +- .../media3/effect/GaussianBlurTest.java | 2 +- .../GaussianBlurWithFrameOverlaidTest.java | 3 +- .../media3/effect/HslAdjustmentPixelTest.java | 16 +++++----- .../effect/OverlayShaderProgramPixelTest.java | 24 +++++++-------- .../media3/effect/PresentationPixelTest.java | 14 ++++----- .../media3/effect/RgbAdjustmentPixelTest.java | 8 ++--- .../media3/effect/RgbFilterPixelTest.java | 6 ++-- .../effect/SingleColorLutPixelTest.java | 17 ++++++----- .../media3/effect/SpeedChangeEffectTest.java | 2 +- .../effect/ThumbnailStripEffectPixelTest.java | 4 +-- .../media3/effect/SingleColorLut.java | 3 +- .../input_grayscale_0s.png | Bin .../input_rotate180_1s.png | Bin .../input_transparent.png | Bin .../CompositorTestTimestamps/output_0s_0s.png | Bin .../CompositorTestTimestamps/output_0s_1s.png | Bin .../output_0s_1s_0s.png | Bin .../output_0s_1s_transparent.png | Bin .../output_0s_transparent_1s.png | Bin .../CompositorTestTimestamps/output_1s_0s.png | Bin .../CompositorTestTimestamps/output_1s_1s.png | Bin .../output_1s_1s_0s.png | Bin .../CompositorTestTimestamps/output_2s_0s.png | Bin .../CompositorTestTimestamps/output_2s_1s.png | Bin .../output_2s_1s_2s.png | Bin .../CompositorTestTimestamps/output_2s_2s.png | Bin .../CompositorTestTimestamps/output_3s_0s.png | Bin .../CompositorTestTimestamps/output_3s_2s.png | Bin .../CompositorTestTimestamps/output_3s_3s.png | Bin .../CompositorTestTimestamps/output_4s_0s.png | Bin .../CompositorTestTimestamps/output_4s_4s.png | Bin .../output_different_dimensions.png | Bin .../output_grayscale_opaque_0s.png | Bin .../output_grayscale_opaque_1s.png | Bin .../output_grayscale_opaque_2s.png | Bin .../output_picture_in_picture.png | Bin .../output_stacked.png | Bin .../ExoPlayerPlaybackTest/first_frame.png | Bin .../FrameDropTest/pts_0.png | Bin .../FrameDropTest/pts_32000.png | Bin .../FrameDropTest/pts_333333.png | Bin .../FrameDropTest/pts_666667.png | Bin .../FrameDropTest/pts_71000.png | Bin .../FrameDropTest/pts_750000.png | Bin .../GaussianBlurTest/pts_22000.png | Bin .../pts_32000.png | Bin .../pts_71000.png | Bin .../README.md | 0 .../lut/grayscale.png | Bin .../lut/identity.png | Bin .../lut/inverted.png | Bin .../electrical_colors/README.md | 0 .../aspect_ratio_scale_to_fit_narrow.png | Bin .../aspect_ratio_scale_to_fit_wide.png | Bin ...ct_ratio_scale_to_fit_with_crop_narrow.png | Bin ...pect_ratio_scale_to_fit_with_crop_wide.png | Bin .../aspect_ratio_stretch_to_fit_narrow.png | Bin .../aspect_ratio_stretch_to_fit_wide.png | Bin .../electrical_colors/crop_larger.png | Bin .../electrical_colors/crop_smaller.png | Bin .../crop_then_aspect_ratio.png | Bin .../electrical_colors/decrease_alpha.png | Bin .../grayscale_then_increase_red_channel.png | Bin .../electrical_colors/increase_alpha.png | Bin .../electrical_colors/increase_brightness.png | Bin .../london_image_to_video.png | Bin .../london_image_to_video_with_crop.png | Bin .../electrical_colors/original.png | Bin .../electrical_colors/original_hdr10.png | Bin .../electrical_colors/original_hlg10.png | Bin .../overlay_bitmap_FrameProcessor.png | Bin .../overlay_bitmap_anchored.png | Bin .../overlay_bitmap_default.png | Bin .../overlay_bitmap_overlayAnchored.png | Bin .../overlay_bitmap_rotated90.png | Bin .../overlay_bitmap_scaled.png | Bin .../overlay_bitmap_translucent.png | Bin .../electrical_colors/overlay_multiple.png | Bin .../electrical_colors/overlay_overlap.png | Bin .../overlay_text_default.png | Bin .../overlay_text_span_scaled.png | Bin .../overlay_text_translate.png | Bin .../request_output_height.png | Bin .../rotate45_then_scale2w.png | Bin .../electrical_colors/rotate90.png | Bin .../rotate_45_scale_to_fit.png | Bin .../rotate_then_translate.png | Bin .../electrical_colors/scale_narrow.png | Bin .../electrical_colors/scale_wide.png | Bin .../srgb_to_electrical_media3test.png | Bin .../srgb_to_electrical_original.png | Bin .../electrical_colors/tone_map_hlg_to_sdr.png | Bin .../electrical_colors/tone_map_pq_to_sdr.png | Bin .../electrical_colors/translate_right.png | Bin .../translate_then_rotate.png | Bin .../electrical_colors/zero_alpha.png | Bin .../linear_colors/README.md | 0 .../linear_colors/adjust_all_hsl_settings.png | Bin .../linear_colors/decrease_contrast.png | Bin .../linear_colors/decrease_lightness.png | Bin .../linear_colors/grayscale.png | Bin .../linear_colors/increase_brightness.png | Bin .../linear_colors/increase_contrast.png | Bin .../linear_colors/increase_lightness.png | Bin .../linear_colors/increase_red_channel.png | Bin .../linear_colors/invert.png | Bin .../linear_colors/lut_map_white_to_green.png | Bin .../linear_colors/maximum_contrast.png | Bin .../linear_colors/maximum_saturation.png | Bin .../linear_colors/minimum_saturation.png | Bin .../linear_colors/only_red_channel.png | Bin .../linear_colors/original.png | Bin .../rotate_hue_by_60_degrees.png | Bin .../rotate_hue_by_negative_90_degrees.png | Bin .../linear_colors/two_thumbnails_strip.png | Bin ...esEachWithOneVideoMediaItem_succeeds_0.png | Bin ...cesOneWithVideoOneWithImage_succeeds_0.png | Bin ...WithVideoCompositorSettings_succeeds_0.png | Bin .../export_withBt601AndBt709MediaItems_0.png | Bin .../export_withBt601AndBt709MediaItems_1.png | Bin ...ithBt601VideoAndBt709ImageMediaItems_0.png | Bin ...ithBt601VideoAndBt709ImageMediaItems_1.png | Bin ...onAndNoVideoEffectsForFirstMediaItem_0.png | Bin ...onAndNoVideoEffectsForFirstMediaItem_1.png | Bin ...ositionPresentationAndNoVideoEffects_0.png | Bin ...ositionPresentationAndNoVideoEffects_1.png | Bin ...ositionPresentationAndNoVideoEffects_2.png | Bin ...ositionPresentationAndNoVideoEffects_3.png | Bin ...esentationAndWithPerMediaItemEffects_0.png | Bin ...esentationAndWithPerMediaItemEffects_1.png | Bin ...esentationAndWithPerMediaItemEffects_2.png | Bin ...esentationAndWithPerMediaItemEffects_3.png | Bin ...HdrThenSdr_whenHdrEditingUnsupported_0.png | Bin ...HdrThenSdr_whenHdrEditingUnsupported_1.png | Bin ...HdrThenSdr_whenHdrEditingUnsupported_2.png | Bin ...esentationAndWithPerMediaItemEffects_0.png | Bin ...esentationAndWithPerMediaItemEffects_1.png | Bin ...esentationAndWithPerMediaItemEffects_2.png | Bin ...esentationAndWithPerMediaItemEffects_3.png | Bin .../export_withSdrThenHdr_0.png | Bin .../export_withSdrThenHdr_1.png | Bin .../export_withSdrThenHdr_2.png | Bin .../test/utils/MssimCalculatorTest.java | 14 +++++---- .../DefaultVideoCompositorPixelTest.java | 2 +- .../transformer/SequenceEffectTestUtil.java | 3 +- ...ansformerMultiSequenceCompositionTest.java | 2 +- ...ocessorMultipleTextureOutputPixelTest.java | 6 ++-- ...oFrameProcessorTextureOutputPixelTest.java | 8 ++--- .../ToneMapHdrToSdrUsingOpenGlPixelTest.java | 4 +-- 157 files changed, 107 insertions(+), 97 deletions(-) rename libraries/test_data/src/test/assets/{media/bitmap => test-generated-goldens}/CompositorTestTimestamps/input_grayscale_0s.png (100%) rename libraries/test_data/src/test/assets/{media/bitmap => test-generated-goldens}/CompositorTestTimestamps/input_rotate180_1s.png (100%) rename libraries/test_data/src/test/assets/{media/bitmap => test-generated-goldens}/CompositorTestTimestamps/input_transparent.png (100%) rename libraries/test_data/src/test/assets/{media/bitmap => test-generated-goldens}/CompositorTestTimestamps/output_0s_0s.png (100%) rename libraries/test_data/src/test/assets/{media/bitmap => test-generated-goldens}/CompositorTestTimestamps/output_0s_1s.png (100%) rename libraries/test_data/src/test/assets/{media/bitmap => test-generated-goldens}/CompositorTestTimestamps/output_0s_1s_0s.png (100%) rename libraries/test_data/src/test/assets/{media/bitmap => test-generated-goldens}/CompositorTestTimestamps/output_0s_1s_transparent.png (100%) rename libraries/test_data/src/test/assets/{media/bitmap => test-generated-goldens}/CompositorTestTimestamps/output_0s_transparent_1s.png (100%) rename libraries/test_data/src/test/assets/{media/bitmap => test-generated-goldens}/CompositorTestTimestamps/output_1s_0s.png (100%) rename libraries/test_data/src/test/assets/{media/bitmap => test-generated-goldens}/CompositorTestTimestamps/output_1s_1s.png (100%) rename libraries/test_data/src/test/assets/{media/bitmap => test-generated-goldens}/CompositorTestTimestamps/output_1s_1s_0s.png (100%) rename libraries/test_data/src/test/assets/{media/bitmap => test-generated-goldens}/CompositorTestTimestamps/output_2s_0s.png (100%) rename libraries/test_data/src/test/assets/{media/bitmap => test-generated-goldens}/CompositorTestTimestamps/output_2s_1s.png (100%) rename libraries/test_data/src/test/assets/{media/bitmap => test-generated-goldens}/CompositorTestTimestamps/output_2s_1s_2s.png (100%) rename libraries/test_data/src/test/assets/{media/bitmap => test-generated-goldens}/CompositorTestTimestamps/output_2s_2s.png (100%) rename libraries/test_data/src/test/assets/{media/bitmap => test-generated-goldens}/CompositorTestTimestamps/output_3s_0s.png (100%) rename libraries/test_data/src/test/assets/{media/bitmap => test-generated-goldens}/CompositorTestTimestamps/output_3s_2s.png (100%) rename libraries/test_data/src/test/assets/{media/bitmap => test-generated-goldens}/CompositorTestTimestamps/output_3s_3s.png (100%) rename libraries/test_data/src/test/assets/{media/bitmap => test-generated-goldens}/CompositorTestTimestamps/output_4s_0s.png (100%) rename libraries/test_data/src/test/assets/{media/bitmap => test-generated-goldens}/CompositorTestTimestamps/output_4s_4s.png (100%) rename libraries/test_data/src/test/assets/{media/bitmap => test-generated-goldens}/CompositorTestTimestamps/output_different_dimensions.png (100%) rename libraries/test_data/src/test/assets/{media/bitmap => test-generated-goldens}/CompositorTestTimestamps/output_grayscale_opaque_0s.png (100%) rename libraries/test_data/src/test/assets/{media/bitmap => test-generated-goldens}/CompositorTestTimestamps/output_grayscale_opaque_1s.png (100%) rename libraries/test_data/src/test/assets/{media/bitmap => test-generated-goldens}/CompositorTestTimestamps/output_grayscale_opaque_2s.png (100%) rename libraries/test_data/src/test/assets/{media/bitmap => test-generated-goldens}/CompositorTestTimestamps/output_picture_in_picture.png (100%) rename libraries/test_data/src/test/assets/{media/bitmap => test-generated-goldens}/CompositorTestTimestamps/output_stacked.png (100%) rename libraries/test_data/src/test/assets/{media/bitmap => test-generated-goldens}/ExoPlayerPlaybackTest/first_frame.png (100%) rename libraries/test_data/src/test/assets/{media/bitmap => test-generated-goldens}/FrameDropTest/pts_0.png (100%) rename libraries/test_data/src/test/assets/{media/bitmap => test-generated-goldens}/FrameDropTest/pts_32000.png (100%) rename libraries/test_data/src/test/assets/{media/bitmap => test-generated-goldens}/FrameDropTest/pts_333333.png (100%) rename libraries/test_data/src/test/assets/{media/bitmap => test-generated-goldens}/FrameDropTest/pts_666667.png (100%) rename libraries/test_data/src/test/assets/{media/bitmap => test-generated-goldens}/FrameDropTest/pts_71000.png (100%) rename libraries/test_data/src/test/assets/{media/bitmap => test-generated-goldens}/FrameDropTest/pts_750000.png (100%) rename libraries/test_data/src/test/assets/{media/bitmap => test-generated-goldens}/GaussianBlurTest/pts_22000.png (100%) rename libraries/test_data/src/test/assets/{media/bitmap => test-generated-goldens}/GaussianBlurWithFrameOverlaidTest/pts_32000.png (100%) rename libraries/test_data/src/test/assets/{media/bitmap => test-generated-goldens}/GaussianBlurWithFrameOverlaidTest/pts_71000.png (100%) rename libraries/test_data/src/test/assets/{media/bitmap => test-generated-goldens}/README.md (100%) rename libraries/test_data/src/test/assets/{media/bitmap => test-generated-goldens}/lut/grayscale.png (100%) rename libraries/test_data/src/test/assets/{media/bitmap => test-generated-goldens}/lut/identity.png (100%) rename libraries/test_data/src/test/assets/{media/bitmap => test-generated-goldens}/lut/inverted.png (100%) rename libraries/test_data/src/test/assets/{media/bitmap => test-generated-goldens}/sample_mp4_first_frame/electrical_colors/README.md (100%) rename libraries/test_data/src/test/assets/{media/bitmap => test-generated-goldens}/sample_mp4_first_frame/electrical_colors/aspect_ratio_scale_to_fit_narrow.png (100%) rename libraries/test_data/src/test/assets/{media/bitmap => test-generated-goldens}/sample_mp4_first_frame/electrical_colors/aspect_ratio_scale_to_fit_wide.png (100%) rename libraries/test_data/src/test/assets/{media/bitmap => test-generated-goldens}/sample_mp4_first_frame/electrical_colors/aspect_ratio_scale_to_fit_with_crop_narrow.png (100%) rename libraries/test_data/src/test/assets/{media/bitmap => test-generated-goldens}/sample_mp4_first_frame/electrical_colors/aspect_ratio_scale_to_fit_with_crop_wide.png (100%) rename libraries/test_data/src/test/assets/{media/bitmap => test-generated-goldens}/sample_mp4_first_frame/electrical_colors/aspect_ratio_stretch_to_fit_narrow.png (100%) rename libraries/test_data/src/test/assets/{media/bitmap => test-generated-goldens}/sample_mp4_first_frame/electrical_colors/aspect_ratio_stretch_to_fit_wide.png (100%) rename libraries/test_data/src/test/assets/{media/bitmap => test-generated-goldens}/sample_mp4_first_frame/electrical_colors/crop_larger.png (100%) rename libraries/test_data/src/test/assets/{media/bitmap => test-generated-goldens}/sample_mp4_first_frame/electrical_colors/crop_smaller.png (100%) rename libraries/test_data/src/test/assets/{media/bitmap => test-generated-goldens}/sample_mp4_first_frame/electrical_colors/crop_then_aspect_ratio.png (100%) rename libraries/test_data/src/test/assets/{media/bitmap => test-generated-goldens}/sample_mp4_first_frame/electrical_colors/decrease_alpha.png (100%) rename libraries/test_data/src/test/assets/{media/bitmap => test-generated-goldens}/sample_mp4_first_frame/electrical_colors/grayscale_then_increase_red_channel.png (100%) rename libraries/test_data/src/test/assets/{media/bitmap => test-generated-goldens}/sample_mp4_first_frame/electrical_colors/increase_alpha.png (100%) rename libraries/test_data/src/test/assets/{media/bitmap => test-generated-goldens}/sample_mp4_first_frame/electrical_colors/increase_brightness.png (100%) rename libraries/test_data/src/test/assets/{media/bitmap => test-generated-goldens}/sample_mp4_first_frame/electrical_colors/london_image_to_video.png (100%) rename libraries/test_data/src/test/assets/{media/bitmap => test-generated-goldens}/sample_mp4_first_frame/electrical_colors/london_image_to_video_with_crop.png (100%) rename libraries/test_data/src/test/assets/{media/bitmap => test-generated-goldens}/sample_mp4_first_frame/electrical_colors/original.png (100%) rename libraries/test_data/src/test/assets/{media/bitmap => test-generated-goldens}/sample_mp4_first_frame/electrical_colors/original_hdr10.png (100%) rename libraries/test_data/src/test/assets/{media/bitmap => test-generated-goldens}/sample_mp4_first_frame/electrical_colors/original_hlg10.png (100%) rename libraries/test_data/src/test/assets/{media/bitmap => test-generated-goldens}/sample_mp4_first_frame/electrical_colors/overlay_bitmap_FrameProcessor.png (100%) rename libraries/test_data/src/test/assets/{media/bitmap => test-generated-goldens}/sample_mp4_first_frame/electrical_colors/overlay_bitmap_anchored.png (100%) rename libraries/test_data/src/test/assets/{media/bitmap => test-generated-goldens}/sample_mp4_first_frame/electrical_colors/overlay_bitmap_default.png (100%) rename libraries/test_data/src/test/assets/{media/bitmap => test-generated-goldens}/sample_mp4_first_frame/electrical_colors/overlay_bitmap_overlayAnchored.png (100%) rename libraries/test_data/src/test/assets/{media/bitmap => test-generated-goldens}/sample_mp4_first_frame/electrical_colors/overlay_bitmap_rotated90.png (100%) rename libraries/test_data/src/test/assets/{media/bitmap => test-generated-goldens}/sample_mp4_first_frame/electrical_colors/overlay_bitmap_scaled.png (100%) rename libraries/test_data/src/test/assets/{media/bitmap => test-generated-goldens}/sample_mp4_first_frame/electrical_colors/overlay_bitmap_translucent.png (100%) rename libraries/test_data/src/test/assets/{media/bitmap => test-generated-goldens}/sample_mp4_first_frame/electrical_colors/overlay_multiple.png (100%) rename libraries/test_data/src/test/assets/{media/bitmap => test-generated-goldens}/sample_mp4_first_frame/electrical_colors/overlay_overlap.png (100%) rename libraries/test_data/src/test/assets/{media/bitmap => test-generated-goldens}/sample_mp4_first_frame/electrical_colors/overlay_text_default.png (100%) rename libraries/test_data/src/test/assets/{media/bitmap => test-generated-goldens}/sample_mp4_first_frame/electrical_colors/overlay_text_span_scaled.png (100%) rename libraries/test_data/src/test/assets/{media/bitmap => test-generated-goldens}/sample_mp4_first_frame/electrical_colors/overlay_text_translate.png (100%) rename libraries/test_data/src/test/assets/{media/bitmap => test-generated-goldens}/sample_mp4_first_frame/electrical_colors/request_output_height.png (100%) rename libraries/test_data/src/test/assets/{media/bitmap => test-generated-goldens}/sample_mp4_first_frame/electrical_colors/rotate45_then_scale2w.png (100%) rename libraries/test_data/src/test/assets/{media/bitmap => test-generated-goldens}/sample_mp4_first_frame/electrical_colors/rotate90.png (100%) rename libraries/test_data/src/test/assets/{media/bitmap => test-generated-goldens}/sample_mp4_first_frame/electrical_colors/rotate_45_scale_to_fit.png (100%) rename libraries/test_data/src/test/assets/{media/bitmap => test-generated-goldens}/sample_mp4_first_frame/electrical_colors/rotate_then_translate.png (100%) rename libraries/test_data/src/test/assets/{media/bitmap => test-generated-goldens}/sample_mp4_first_frame/electrical_colors/scale_narrow.png (100%) rename libraries/test_data/src/test/assets/{media/bitmap => test-generated-goldens}/sample_mp4_first_frame/electrical_colors/scale_wide.png (100%) rename libraries/test_data/src/test/assets/{media/bitmap => test-generated-goldens}/sample_mp4_first_frame/electrical_colors/srgb_to_electrical_media3test.png (100%) rename libraries/test_data/src/test/assets/{media/bitmap => test-generated-goldens}/sample_mp4_first_frame/electrical_colors/srgb_to_electrical_original.png (100%) rename libraries/test_data/src/test/assets/{media/bitmap => test-generated-goldens}/sample_mp4_first_frame/electrical_colors/tone_map_hlg_to_sdr.png (100%) rename libraries/test_data/src/test/assets/{media/bitmap => test-generated-goldens}/sample_mp4_first_frame/electrical_colors/tone_map_pq_to_sdr.png (100%) rename libraries/test_data/src/test/assets/{media/bitmap => test-generated-goldens}/sample_mp4_first_frame/electrical_colors/translate_right.png (100%) rename libraries/test_data/src/test/assets/{media/bitmap => test-generated-goldens}/sample_mp4_first_frame/electrical_colors/translate_then_rotate.png (100%) rename libraries/test_data/src/test/assets/{media/bitmap => test-generated-goldens}/sample_mp4_first_frame/electrical_colors/zero_alpha.png (100%) rename libraries/test_data/src/test/assets/{media/bitmap => test-generated-goldens}/sample_mp4_first_frame/linear_colors/README.md (100%) rename libraries/test_data/src/test/assets/{media/bitmap => test-generated-goldens}/sample_mp4_first_frame/linear_colors/adjust_all_hsl_settings.png (100%) rename libraries/test_data/src/test/assets/{media/bitmap => test-generated-goldens}/sample_mp4_first_frame/linear_colors/decrease_contrast.png (100%) rename libraries/test_data/src/test/assets/{media/bitmap => test-generated-goldens}/sample_mp4_first_frame/linear_colors/decrease_lightness.png (100%) rename libraries/test_data/src/test/assets/{media/bitmap => test-generated-goldens}/sample_mp4_first_frame/linear_colors/grayscale.png (100%) rename libraries/test_data/src/test/assets/{media/bitmap => test-generated-goldens}/sample_mp4_first_frame/linear_colors/increase_brightness.png (100%) rename libraries/test_data/src/test/assets/{media/bitmap => test-generated-goldens}/sample_mp4_first_frame/linear_colors/increase_contrast.png (100%) rename libraries/test_data/src/test/assets/{media/bitmap => test-generated-goldens}/sample_mp4_first_frame/linear_colors/increase_lightness.png (100%) rename libraries/test_data/src/test/assets/{media/bitmap => test-generated-goldens}/sample_mp4_first_frame/linear_colors/increase_red_channel.png (100%) rename libraries/test_data/src/test/assets/{media/bitmap => test-generated-goldens}/sample_mp4_first_frame/linear_colors/invert.png (100%) rename libraries/test_data/src/test/assets/{media/bitmap => test-generated-goldens}/sample_mp4_first_frame/linear_colors/lut_map_white_to_green.png (100%) rename libraries/test_data/src/test/assets/{media/bitmap => test-generated-goldens}/sample_mp4_first_frame/linear_colors/maximum_contrast.png (100%) rename libraries/test_data/src/test/assets/{media/bitmap => test-generated-goldens}/sample_mp4_first_frame/linear_colors/maximum_saturation.png (100%) rename libraries/test_data/src/test/assets/{media/bitmap => test-generated-goldens}/sample_mp4_first_frame/linear_colors/minimum_saturation.png (100%) rename libraries/test_data/src/test/assets/{media/bitmap => test-generated-goldens}/sample_mp4_first_frame/linear_colors/only_red_channel.png (100%) rename libraries/test_data/src/test/assets/{media/bitmap => test-generated-goldens}/sample_mp4_first_frame/linear_colors/original.png (100%) rename libraries/test_data/src/test/assets/{media/bitmap => test-generated-goldens}/sample_mp4_first_frame/linear_colors/rotate_hue_by_60_degrees.png (100%) rename libraries/test_data/src/test/assets/{media/bitmap => test-generated-goldens}/sample_mp4_first_frame/linear_colors/rotate_hue_by_negative_90_degrees.png (100%) rename libraries/test_data/src/test/assets/{media/bitmap => test-generated-goldens}/sample_mp4_first_frame/linear_colors/two_thumbnails_strip.png (100%) rename libraries/test_data/src/test/assets/{media/bitmap => test-generated-goldens}/transformer_multi_sequence_composition_test/export_withTwoSequencesEachWithOneVideoMediaItem_succeeds_0.png (100%) rename libraries/test_data/src/test/assets/{media/bitmap => test-generated-goldens}/transformer_multi_sequence_composition_test/export_withTwoSequencesOneWithVideoOneWithImage_succeeds_0.png (100%) rename libraries/test_data/src/test/assets/{media/bitmap => test-generated-goldens}/transformer_multi_sequence_composition_test/export_withTwoSequencesWithVideoCompositorSettings_succeeds_0.png (100%) rename libraries/test_data/src/test/assets/{media/bitmap => test-generated-goldens}/transformer_sequence_effect_test/export_withBt601AndBt709MediaItems_0.png (100%) rename libraries/test_data/src/test/assets/{media/bitmap => test-generated-goldens}/transformer_sequence_effect_test/export_withBt601AndBt709MediaItems_1.png (100%) rename libraries/test_data/src/test/assets/{media/bitmap => test-generated-goldens}/transformer_sequence_effect_test/export_withBt601VideoAndBt709ImageMediaItems_0.png (100%) rename libraries/test_data/src/test/assets/{media/bitmap => test-generated-goldens}/transformer_sequence_effect_test/export_withBt601VideoAndBt709ImageMediaItems_1.png (100%) rename libraries/test_data/src/test/assets/{media/bitmap => test-generated-goldens}/transformer_sequence_effect_test/export_withCompositionPresentationAndNoVideoEffectsForFirstMediaItem_0.png (100%) rename libraries/test_data/src/test/assets/{media/bitmap => test-generated-goldens}/transformer_sequence_effect_test/export_withCompositionPresentationAndNoVideoEffectsForFirstMediaItem_1.png (100%) rename libraries/test_data/src/test/assets/{media/bitmap => test-generated-goldens}/transformer_sequence_effect_test/export_withCompositionPresentationAndNoVideoEffects_0.png (100%) rename libraries/test_data/src/test/assets/{media/bitmap => test-generated-goldens}/transformer_sequence_effect_test/export_withCompositionPresentationAndNoVideoEffects_1.png (100%) rename libraries/test_data/src/test/assets/{media/bitmap => test-generated-goldens}/transformer_sequence_effect_test/export_withCompositionPresentationAndNoVideoEffects_2.png (100%) rename libraries/test_data/src/test/assets/{media/bitmap => test-generated-goldens}/transformer_sequence_effect_test/export_withCompositionPresentationAndNoVideoEffects_3.png (100%) rename libraries/test_data/src/test/assets/{media/bitmap => test-generated-goldens}/transformer_sequence_effect_test/export_withCompositionPresentationAndWithPerMediaItemEffects_0.png (100%) rename libraries/test_data/src/test/assets/{media/bitmap => test-generated-goldens}/transformer_sequence_effect_test/export_withCompositionPresentationAndWithPerMediaItemEffects_1.png (100%) rename libraries/test_data/src/test/assets/{media/bitmap => test-generated-goldens}/transformer_sequence_effect_test/export_withCompositionPresentationAndWithPerMediaItemEffects_2.png (100%) rename libraries/test_data/src/test/assets/{media/bitmap => test-generated-goldens}/transformer_sequence_effect_test/export_withCompositionPresentationAndWithPerMediaItemEffects_3.png (100%) rename libraries/test_data/src/test/assets/{media/bitmap => test-generated-goldens}/transformer_sequence_effect_test/export_withHdrThenSdr_whenHdrEditingUnsupported_0.png (100%) rename libraries/test_data/src/test/assets/{media/bitmap => test-generated-goldens}/transformer_sequence_effect_test/export_withHdrThenSdr_whenHdrEditingUnsupported_1.png (100%) rename libraries/test_data/src/test/assets/{media/bitmap => test-generated-goldens}/transformer_sequence_effect_test/export_withHdrThenSdr_whenHdrEditingUnsupported_2.png (100%) rename libraries/test_data/src/test/assets/{media/bitmap => test-generated-goldens}/transformer_sequence_effect_test/export_withNoCompositionPresentationAndWithPerMediaItemEffects_0.png (100%) rename libraries/test_data/src/test/assets/{media/bitmap => test-generated-goldens}/transformer_sequence_effect_test/export_withNoCompositionPresentationAndWithPerMediaItemEffects_1.png (100%) rename libraries/test_data/src/test/assets/{media/bitmap => test-generated-goldens}/transformer_sequence_effect_test/export_withNoCompositionPresentationAndWithPerMediaItemEffects_2.png (100%) rename libraries/test_data/src/test/assets/{media/bitmap => test-generated-goldens}/transformer_sequence_effect_test/export_withNoCompositionPresentationAndWithPerMediaItemEffects_3.png (100%) rename libraries/test_data/src/test/assets/{media/bitmap => test-generated-goldens}/transformer_sequence_effect_test/export_withSdrThenHdr_0.png (100%) rename libraries/test_data/src/test/assets/{media/bitmap => test-generated-goldens}/transformer_sequence_effect_test/export_withSdrThenHdr_1.png (100%) rename libraries/test_data/src/test/assets/{media/bitmap => test-generated-goldens}/transformer_sequence_effect_test/export_withSdrThenHdr_2.png (100%) diff --git a/libraries/effect/src/androidTest/java/androidx/media3/effect/AlphaScaleShaderProgramPixelTest.java b/libraries/effect/src/androidTest/java/androidx/media3/effect/AlphaScaleShaderProgramPixelTest.java index be65164b04..59d1690bde 100644 --- a/libraries/effect/src/androidTest/java/androidx/media3/effect/AlphaScaleShaderProgramPixelTest.java +++ b/libraries/effect/src/androidTest/java/androidx/media3/effect/AlphaScaleShaderProgramPixelTest.java @@ -62,11 +62,11 @@ public final class AlphaScaleShaderProgramPixelTest { // color transfer, which can make alpha tests more difficult to debug. private static final String ORIGINAL_PNG_ASSET_PATH = "media/png/media3test_srgb.png"; private static final String DECREASE_ALPHA_PNG_ASSET_PATH = - "media/bitmap/sample_mp4_first_frame/electrical_colors/decrease_alpha.png"; + "test-generated-goldens/sample_mp4_first_frame/electrical_colors/decrease_alpha.png"; private static final String INCREASE_ALPHA_PNG_ASSET_PATH = - "media/bitmap/sample_mp4_first_frame/electrical_colors/increase_alpha.png"; + "test-generated-goldens/sample_mp4_first_frame/electrical_colors/increase_alpha.png"; private static final String ZERO_ALPHA_PNG_ASSET_PATH = - "media/bitmap/sample_mp4_first_frame/electrical_colors/zero_alpha.png"; + "test-generated-goldens/sample_mp4_first_frame/electrical_colors/zero_alpha.png"; private final Context context = getApplicationContext(); diff --git a/libraries/effect/src/androidTest/java/androidx/media3/effect/ContrastPixelTest.java b/libraries/effect/src/androidTest/java/androidx/media3/effect/ContrastPixelTest.java index 333d46427f..fec746ab0d 100644 --- a/libraries/effect/src/androidTest/java/androidx/media3/effect/ContrastPixelTest.java +++ b/libraries/effect/src/androidTest/java/androidx/media3/effect/ContrastPixelTest.java @@ -61,13 +61,13 @@ public class ContrastPixelTest { @Rule public final TestName testName = new TestName(); private static final String ORIGINAL_PNG_ASSET_PATH = - "media/bitmap/sample_mp4_first_frame/linear_colors/original.png"; + "test-generated-goldens/sample_mp4_first_frame/linear_colors/original.png"; private static final String INCREASE_CONTRAST_PNG_ASSET_PATH = - "media/bitmap/sample_mp4_first_frame/linear_colors/increase_contrast.png"; + "test-generated-goldens/sample_mp4_first_frame/linear_colors/increase_contrast.png"; private static final String DECREASE_CONTRAST_PNG_ASSET_PATH = - "media/bitmap/sample_mp4_first_frame/linear_colors/decrease_contrast.png"; + "test-generated-goldens/sample_mp4_first_frame/linear_colors/decrease_contrast.png"; private static final String MAXIMUM_CONTRAST_PNG_ASSET_PATH = - "media/bitmap/sample_mp4_first_frame/linear_colors/maximum_contrast.png"; + "test-generated-goldens/sample_mp4_first_frame/linear_colors/maximum_contrast.png"; // OpenGL uses floats in [0, 1] and maps 0.5f to 128 = 256 / 2. private static final int OPENGL_NEUTRAL_RGB_VALUE = 128; diff --git a/libraries/effect/src/androidTest/java/androidx/media3/effect/CropPixelTest.java b/libraries/effect/src/androidTest/java/androidx/media3/effect/CropPixelTest.java index 5824667455..5e990d3b49 100644 --- a/libraries/effect/src/androidTest/java/androidx/media3/effect/CropPixelTest.java +++ b/libraries/effect/src/androidTest/java/androidx/media3/effect/CropPixelTest.java @@ -59,11 +59,11 @@ public final class CropPixelTest { @Rule public final TestName testName = new TestName(); private static final String ORIGINAL_PNG_ASSET_PATH = - "media/bitmap/sample_mp4_first_frame/electrical_colors/original.png"; + "test-generated-goldens/sample_mp4_first_frame/electrical_colors/original.png"; private static final String CROP_SMALLER_PNG_ASSET_PATH = - "media/bitmap/sample_mp4_first_frame/electrical_colors/crop_smaller.png"; + "test-generated-goldens/sample_mp4_first_frame/electrical_colors/crop_smaller.png"; private static final String CROP_LARGER_PNG_ASSET_PATH = - "media/bitmap/sample_mp4_first_frame/electrical_colors/crop_larger.png"; + "test-generated-goldens/sample_mp4_first_frame/electrical_colors/crop_larger.png"; private final Context context = getApplicationContext(); diff --git a/libraries/effect/src/androidTest/java/androidx/media3/effect/DefaultShaderProgramPixelTest.java b/libraries/effect/src/androidTest/java/androidx/media3/effect/DefaultShaderProgramPixelTest.java index c5d93c2b1b..db10f13250 100644 --- a/libraries/effect/src/androidTest/java/androidx/media3/effect/DefaultShaderProgramPixelTest.java +++ b/libraries/effect/src/androidTest/java/androidx/media3/effect/DefaultShaderProgramPixelTest.java @@ -58,13 +58,13 @@ public final class DefaultShaderProgramPixelTest { @Rule public final TestName testName = new TestName(); private static final String ORIGINAL_PNG_ASSET_PATH = - "media/bitmap/sample_mp4_first_frame/electrical_colors/original.png"; + "test-generated-goldens/sample_mp4_first_frame/electrical_colors/original.png"; private static final String TRANSLATE_RIGHT_PNG_ASSET_PATH = - "media/bitmap/sample_mp4_first_frame/electrical_colors/translate_right.png"; + "test-generated-goldens/sample_mp4_first_frame/electrical_colors/translate_right.png"; private static final String SCALE_NARROW_PNG_ASSET_PATH = - "media/bitmap/sample_mp4_first_frame/electrical_colors/scale_narrow.png"; + "test-generated-goldens/sample_mp4_first_frame/electrical_colors/scale_narrow.png"; private static final String ROTATE_90_PNG_ASSET_PATH = - "media/bitmap/sample_mp4_first_frame/electrical_colors/rotate90.png"; + "test-generated-goldens/sample_mp4_first_frame/electrical_colors/rotate90.png"; private final Context context = getApplicationContext(); diff --git a/libraries/effect/src/androidTest/java/androidx/media3/effect/DefaultVideoFrameProcessorImageFrameOutputTest.java b/libraries/effect/src/androidTest/java/androidx/media3/effect/DefaultVideoFrameProcessorImageFrameOutputTest.java index b197a6dac8..def9ce73cb 100644 --- a/libraries/effect/src/androidTest/java/androidx/media3/effect/DefaultVideoFrameProcessorImageFrameOutputTest.java +++ b/libraries/effect/src/androidTest/java/androidx/media3/effect/DefaultVideoFrameProcessorImageFrameOutputTest.java @@ -45,11 +45,11 @@ public class DefaultVideoFrameProcessorImageFrameOutputTest { @Rule public final TestName testName = new TestName(); private static final String ORIGINAL_PNG_ASSET_PATH = - "media/bitmap/sample_mp4_first_frame/electrical_colors/original.png"; + "test-generated-goldens/sample_mp4_first_frame/electrical_colors/original.png"; private static final String SCALE_WIDE_PNG_ASSET_PATH = - "media/bitmap/sample_mp4_first_frame/electrical_colors/scale_wide.png"; + "test-generated-goldens/sample_mp4_first_frame/electrical_colors/scale_wide.png"; private static final String BITMAP_OVERLAY_PNG_ASSET_PATH = - "media/bitmap/sample_mp4_first_frame/electrical_colors/overlay_bitmap_FrameProcessor.png"; + "test-generated-goldens/sample_mp4_first_frame/electrical_colors/overlay_bitmap_FrameProcessor.png"; private @MonotonicNonNull String testId; private @MonotonicNonNull VideoFrameProcessorTestRunner videoFrameProcessorTestRunner; 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 8c73107eb3..3527b5ca4c 100644 --- a/libraries/effect/src/androidTest/java/androidx/media3/effect/DefaultVideoFrameProcessorPixelTest.java +++ b/libraries/effect/src/androidTest/java/androidx/media3/effect/DefaultVideoFrameProcessorPixelTest.java @@ -59,35 +59,35 @@ public final class DefaultVideoFrameProcessorPixelTest { @Rule public final TestName testName = new TestName(); private static final String ORIGINAL_PNG_ASSET_PATH = - "media/bitmap/sample_mp4_first_frame/electrical_colors/original.png"; + "test-generated-goldens/sample_mp4_first_frame/electrical_colors/original.png"; private static final String OVERLAY_PNG_ASSET_PATH = "media/png/media3test.png"; 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"; + "test-generated-goldens/sample_mp4_first_frame/electrical_colors/london_image_to_video.png"; private static final String IMAGE_TO_CROPPED_VIDEO_PNG_ASSET_PATH = - "media/bitmap/sample_mp4_first_frame/electrical_colors/london_image_to_video_with_crop.png"; + "test-generated-goldens/sample_mp4_first_frame/electrical_colors/london_image_to_video_with_crop.png"; private static final String BITMAP_OVERLAY_PNG_ASSET_PATH = - "media/bitmap/sample_mp4_first_frame/electrical_colors/overlay_bitmap_FrameProcessor.png"; + "test-generated-goldens/sample_mp4_first_frame/electrical_colors/overlay_bitmap_FrameProcessor.png"; private static final String SCALE_WIDE_PNG_ASSET_PATH = - "media/bitmap/sample_mp4_first_frame/electrical_colors/scale_wide.png"; + "test-generated-goldens/sample_mp4_first_frame/electrical_colors/scale_wide.png"; private static final String TRANSLATE_RIGHT_PNG_ASSET_PATH = - "media/bitmap/sample_mp4_first_frame/electrical_colors/translate_right.png"; + "test-generated-goldens/sample_mp4_first_frame/electrical_colors/translate_right.png"; private static final String ROTATE_THEN_TRANSLATE_PNG_ASSET_PATH = - "media/bitmap/sample_mp4_first_frame/electrical_colors/rotate_then_translate.png"; + "test-generated-goldens/sample_mp4_first_frame/electrical_colors/rotate_then_translate.png"; private static final String ROTATE_THEN_SCALE_PNG_ASSET_PATH = - "media/bitmap/sample_mp4_first_frame/electrical_colors/rotate45_then_scale2w.png"; + "test-generated-goldens/sample_mp4_first_frame/electrical_colors/rotate45_then_scale2w.png"; private static final String TRANSLATE_THEN_ROTATE_PNG_ASSET_PATH = - "media/bitmap/sample_mp4_first_frame/electrical_colors/translate_then_rotate.png"; + "test-generated-goldens/sample_mp4_first_frame/electrical_colors/translate_then_rotate.png"; private static final String REQUEST_OUTPUT_HEIGHT_PNG_ASSET_PATH = - "media/bitmap/sample_mp4_first_frame/electrical_colors/request_output_height.png"; + "test-generated-goldens/sample_mp4_first_frame/electrical_colors/request_output_height.png"; private static final String CROP_THEN_ASPECT_RATIO_PNG_ASSET_PATH = - "media/bitmap/sample_mp4_first_frame/electrical_colors/crop_then_aspect_ratio.png"; + "test-generated-goldens/sample_mp4_first_frame/electrical_colors/crop_then_aspect_ratio.png"; private static final String ROTATE45_SCALE_TO_FIT_PNG_ASSET_PATH = - "media/bitmap/sample_mp4_first_frame/electrical_colors/rotate_45_scale_to_fit.png"; + "test-generated-goldens/sample_mp4_first_frame/electrical_colors/rotate_45_scale_to_fit.png"; private static final String INCREASE_BRIGHTNESS_PNG_ASSET_PATH = - "media/bitmap/sample_mp4_first_frame/electrical_colors/increase_brightness.png"; + "test-generated-goldens/sample_mp4_first_frame/electrical_colors/increase_brightness.png"; private static final String GRAYSCALE_THEN_INCREASE_RED_CHANNEL_PNG_ASSET_PATH = - "media/bitmap/sample_mp4_first_frame/electrical_colors/grayscale_then_increase_red_channel.png"; + "test-generated-goldens/sample_mp4_first_frame/electrical_colors/grayscale_then_increase_red_channel.png"; /** Input video of which we only use the first frame. */ private static final String INPUT_SDR_MP4_ASSET_STRING = "media/mp4/sample.mp4"; diff --git a/libraries/effect/src/androidTest/java/androidx/media3/effect/EffectPlaybackTest.java b/libraries/effect/src/androidTest/java/androidx/media3/effect/EffectPlaybackTest.java index 8e6a2bbe07..7a4a01615a 100644 --- a/libraries/effect/src/androidTest/java/androidx/media3/effect/EffectPlaybackTest.java +++ b/libraries/effect/src/androidTest/java/androidx/media3/effect/EffectPlaybackTest.java @@ -64,7 +64,7 @@ import org.junit.runners.Parameterized.Parameters; @RunWith(Parameterized.class) public class EffectPlaybackTest { - private static final String TEST_DIRECTORY = "media/bitmap/ExoPlayerPlaybackTest/"; + private static final String TEST_DIRECTORY = "test-generated-goldens/ExoPlayerPlaybackTest/"; private static final String MP4_ASSET_URI_STRING = "asset:///media/mp4/sample.mp4"; private static final Format MP4_ASSET_FORMAT = new Format.Builder() diff --git a/libraries/effect/src/androidTest/java/androidx/media3/effect/FrameDropTest.java b/libraries/effect/src/androidTest/java/androidx/media3/effect/FrameDropTest.java index 2be1e91bac..4a119b3b51 100644 --- a/libraries/effect/src/androidTest/java/androidx/media3/effect/FrameDropTest.java +++ b/libraries/effect/src/androidTest/java/androidx/media3/effect/FrameDropTest.java @@ -44,7 +44,7 @@ import org.junit.runner.RunWith; public class FrameDropTest { @Rule public final TestName testName = new TestName(); - private static final String ASSET_PATH = "media/bitmap/FrameDropTest"; + private static final String ASSET_PATH = "test-generated-goldens/FrameDropTest"; private @MonotonicNonNull TextureBitmapReader textureBitmapReader; private @MonotonicNonNull String testId; diff --git a/libraries/effect/src/androidTest/java/androidx/media3/effect/GaussianBlurTest.java b/libraries/effect/src/androidTest/java/androidx/media3/effect/GaussianBlurTest.java index b59d11f549..a5f066a31d 100644 --- a/libraries/effect/src/androidTest/java/androidx/media3/effect/GaussianBlurTest.java +++ b/libraries/effect/src/androidTest/java/androidx/media3/effect/GaussianBlurTest.java @@ -44,7 +44,7 @@ import org.junit.runner.RunWith; public class GaussianBlurTest { @Rule public final TestName testName = new TestName(); - private static final String ASSET_PATH = "media/bitmap/GaussianBlurTest"; + private static final String ASSET_PATH = "test-generated-goldens/GaussianBlurTest"; private static final int BLANK_FRAME_WIDTH = 200; private static final int BLANK_FRAME_HEIGHT = 100; private static final Consumer TEXT_SPAN_CONSUMER = diff --git a/libraries/effect/src/androidTest/java/androidx/media3/effect/GaussianBlurWithFrameOverlaidTest.java b/libraries/effect/src/androidTest/java/androidx/media3/effect/GaussianBlurWithFrameOverlaidTest.java index 83ceff86c7..ae64634547 100644 --- a/libraries/effect/src/androidTest/java/androidx/media3/effect/GaussianBlurWithFrameOverlaidTest.java +++ b/libraries/effect/src/androidTest/java/androidx/media3/effect/GaussianBlurWithFrameOverlaidTest.java @@ -46,7 +46,8 @@ import org.junit.runner.RunWith; public class GaussianBlurWithFrameOverlaidTest { @Rule public final TestName testName = new TestName(); - private static final String ASSET_PATH = "media/bitmap/GaussianBlurWithFrameOverlaidTest"; + private static final String ASSET_PATH = + "test-generated-goldens/GaussianBlurWithFrameOverlaidTest"; private static final int BLANK_FRAME_WIDTH = 200; private static final int BLANK_FRAME_HEIGHT = 100; private static final Consumer TEXT_SPAN_CONSUMER = diff --git a/libraries/effect/src/androidTest/java/androidx/media3/effect/HslAdjustmentPixelTest.java b/libraries/effect/src/androidTest/java/androidx/media3/effect/HslAdjustmentPixelTest.java index 01933a1c38..dd8ffecc38 100644 --- a/libraries/effect/src/androidTest/java/androidx/media3/effect/HslAdjustmentPixelTest.java +++ b/libraries/effect/src/androidTest/java/androidx/media3/effect/HslAdjustmentPixelTest.java @@ -57,21 +57,21 @@ import org.junit.runner.RunWith; @RunWith(AndroidJUnit4.class) public final class HslAdjustmentPixelTest { private static final String ORIGINAL_PNG_ASSET_PATH = - "media/bitmap/sample_mp4_first_frame/linear_colors/original.png"; + "test-generated-goldens/sample_mp4_first_frame/linear_colors/original.png"; private static final String MINIMUM_SATURATION_PNG_ASSET_PATH = - "media/bitmap/sample_mp4_first_frame/linear_colors/minimum_saturation.png"; + "test-generated-goldens/sample_mp4_first_frame/linear_colors/minimum_saturation.png"; private static final String MAXIMUM_SATURATION_PNG_ASSET_PATH = - "media/bitmap/sample_mp4_first_frame/linear_colors/maximum_saturation.png"; + "test-generated-goldens/sample_mp4_first_frame/linear_colors/maximum_saturation.png"; private static final String ROTATE_HUE_BY_NEGATIVE_90_DEGREES_PNG_ASSET_PATH = - "media/bitmap/sample_mp4_first_frame/linear_colors/rotate_hue_by_negative_90_degrees.png"; + "test-generated-goldens/sample_mp4_first_frame/linear_colors/rotate_hue_by_negative_90_degrees.png"; private static final String ROTATE_HUE_BY_60_DEGREES_PNG_ASSET_PATH = - "media/bitmap/sample_mp4_first_frame/linear_colors/rotate_hue_by_60_degrees.png"; + "test-generated-goldens/sample_mp4_first_frame/linear_colors/rotate_hue_by_60_degrees.png"; private static final String DECREASE_LIGHTNESS_PNG_ASSET_PATH = - "media/bitmap/sample_mp4_first_frame/linear_colors/decrease_lightness.png"; + "test-generated-goldens/sample_mp4_first_frame/linear_colors/decrease_lightness.png"; private static final String INCREASE_LIGHTNESS_PNG_ASSET_PATH = - "media/bitmap/sample_mp4_first_frame/linear_colors/increase_lightness.png"; + "test-generated-goldens/sample_mp4_first_frame/linear_colors/increase_lightness.png"; private static final String ADJUST_ALL_HSL_SETTINGS_PNG_ASSET_PATH = - "media/bitmap/sample_mp4_first_frame/linear_colors/adjust_all_hsl_settings.png"; + "test-generated-goldens/sample_mp4_first_frame/linear_colors/adjust_all_hsl_settings.png"; private final Context context = getApplicationContext(); @Rule public final TestName testName = new TestName(); diff --git a/libraries/effect/src/androidTest/java/androidx/media3/effect/OverlayShaderProgramPixelTest.java b/libraries/effect/src/androidTest/java/androidx/media3/effect/OverlayShaderProgramPixelTest.java index 92748eecca..9394f80a77 100644 --- a/libraries/effect/src/androidTest/java/androidx/media3/effect/OverlayShaderProgramPixelTest.java +++ b/libraries/effect/src/androidTest/java/androidx/media3/effect/OverlayShaderProgramPixelTest.java @@ -66,30 +66,30 @@ public class OverlayShaderProgramPixelTest { 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"; + "test-generated-goldens/sample_mp4_first_frame/electrical_colors/original.png"; private static final String OVERLAY_BITMAP_DEFAULT = - "media/bitmap/sample_mp4_first_frame/electrical_colors/overlay_bitmap_default.png"; + "test-generated-goldens/sample_mp4_first_frame/electrical_colors/overlay_bitmap_default.png"; private static final String OVERLAY_BITMAP_DOUBLY_ANCHORED = - "media/bitmap/sample_mp4_first_frame/electrical_colors/overlay_bitmap_anchored.png"; + "test-generated-goldens/sample_mp4_first_frame/electrical_colors/overlay_bitmap_anchored.png"; private static final String OVERLAY_BITMAP_OVERLAY_ANCHORED = - "media/bitmap/sample_mp4_first_frame/electrical_colors/overlay_bitmap_overlayAnchored.png"; + "test-generated-goldens/sample_mp4_first_frame/electrical_colors/overlay_bitmap_overlayAnchored.png"; private static final String OVERLAY_BITMAP_SCALED = - "media/bitmap/sample_mp4_first_frame/electrical_colors/overlay_bitmap_scaled.png"; + "test-generated-goldens/sample_mp4_first_frame/electrical_colors/overlay_bitmap_scaled.png"; private static final String OVERLAY_BITMAP_ROTATED90 = - "media/bitmap/sample_mp4_first_frame/electrical_colors/overlay_bitmap_rotated90.png"; + "test-generated-goldens/sample_mp4_first_frame/electrical_colors/overlay_bitmap_rotated90.png"; private static final String OVERLAY_BITMAP_TRANSLUCENT = - "media/bitmap/sample_mp4_first_frame/electrical_colors/overlay_bitmap_translucent.png"; + "test-generated-goldens/sample_mp4_first_frame/electrical_colors/overlay_bitmap_translucent.png"; private static final String OVERLAY_TEXT_DEFAULT = - "media/bitmap/sample_mp4_first_frame/electrical_colors/overlay_text_default.png"; + "test-generated-goldens/sample_mp4_first_frame/electrical_colors/overlay_text_default.png"; private static final String OVERLAY_TEXT_SPAN_SCALED = - "media/bitmap/sample_mp4_first_frame/electrical_colors/overlay_text_span_scaled.png"; + "test-generated-goldens/sample_mp4_first_frame/electrical_colors/overlay_text_span_scaled.png"; private static final String OVERLAY_TEXT_TRANSLATE = - "media/bitmap/sample_mp4_first_frame/electrical_colors/overlay_text_translate.png"; + "test-generated-goldens/sample_mp4_first_frame/electrical_colors/overlay_text_translate.png"; private static final String OVERLAY_MULTIPLE = - "media/bitmap/sample_mp4_first_frame/electrical_colors/overlay_multiple.png"; + "test-generated-goldens/sample_mp4_first_frame/electrical_colors/overlay_multiple.png"; private static final String OVERLAY_OVERLAP = - "media/bitmap/sample_mp4_first_frame/electrical_colors/overlay_overlap.png"; + "test-generated-goldens/sample_mp4_first_frame/electrical_colors/overlay_overlap.png"; private final Context context = getApplicationContext(); diff --git a/libraries/effect/src/androidTest/java/androidx/media3/effect/PresentationPixelTest.java b/libraries/effect/src/androidTest/java/androidx/media3/effect/PresentationPixelTest.java index 7e3eea6e8e..15f7e76cbb 100644 --- a/libraries/effect/src/androidTest/java/androidx/media3/effect/PresentationPixelTest.java +++ b/libraries/effect/src/androidTest/java/androidx/media3/effect/PresentationPixelTest.java @@ -60,19 +60,19 @@ public final class PresentationPixelTest { @Rule public final TestName testName = new TestName(); private static final String ORIGINAL_PNG_ASSET_PATH = - "media/bitmap/sample_mp4_first_frame/electrical_colors/original.png"; + "test-generated-goldens/sample_mp4_first_frame/electrical_colors/original.png"; private static final String ASPECT_RATIO_SCALE_TO_FIT_NARROW_PNG_ASSET_PATH = - "media/bitmap/sample_mp4_first_frame/electrical_colors/aspect_ratio_scale_to_fit_narrow.png"; + "test-generated-goldens/sample_mp4_first_frame/electrical_colors/aspect_ratio_scale_to_fit_narrow.png"; private static final String ASPECT_RATIO_SCALE_TO_FIT_WIDE_PNG_ASSET_PATH = - "media/bitmap/sample_mp4_first_frame/electrical_colors/aspect_ratio_scale_to_fit_wide.png"; + "test-generated-goldens/sample_mp4_first_frame/electrical_colors/aspect_ratio_scale_to_fit_wide.png"; private static final String ASPECT_RATIO_SCALE_TO_FIT_WITH_CROP_NARROW_PNG_ASSET_PATH = - "media/bitmap/sample_mp4_first_frame/electrical_colors/aspect_ratio_scale_to_fit_with_crop_narrow.png"; + "test-generated-goldens/sample_mp4_first_frame/electrical_colors/aspect_ratio_scale_to_fit_with_crop_narrow.png"; private static final String ASPECT_RATIO_SCALE_TO_FIT_WITH_CROP_WIDE_PNG_ASSET_PATH = - "media/bitmap/sample_mp4_first_frame/electrical_colors/aspect_ratio_scale_to_fit_with_crop_wide.png"; + "test-generated-goldens/sample_mp4_first_frame/electrical_colors/aspect_ratio_scale_to_fit_with_crop_wide.png"; private static final String ASPECT_RATIO_STRETCH_TO_FIT_NARROW_PNG_ASSET_PATH = - "media/bitmap/sample_mp4_first_frame/electrical_colors/aspect_ratio_stretch_to_fit_narrow.png"; + "test-generated-goldens/sample_mp4_first_frame/electrical_colors/aspect_ratio_stretch_to_fit_narrow.png"; private static final String ASPECT_RATIO_STRETCH_TO_FIT_WIDE_PNG_ASSET_PATH = - "media/bitmap/sample_mp4_first_frame/electrical_colors/aspect_ratio_stretch_to_fit_wide.png"; + "test-generated-goldens/sample_mp4_first_frame/electrical_colors/aspect_ratio_stretch_to_fit_wide.png"; private final Context context = getApplicationContext(); diff --git a/libraries/effect/src/androidTest/java/androidx/media3/effect/RgbAdjustmentPixelTest.java b/libraries/effect/src/androidTest/java/androidx/media3/effect/RgbAdjustmentPixelTest.java index 24233dcd44..4bf3bb886e 100644 --- a/libraries/effect/src/androidTest/java/androidx/media3/effect/RgbAdjustmentPixelTest.java +++ b/libraries/effect/src/androidTest/java/androidx/media3/effect/RgbAdjustmentPixelTest.java @@ -63,13 +63,13 @@ public final class RgbAdjustmentPixelTest { @Rule public final TestName testName = new TestName(); private static final String ORIGINAL_PNG_ASSET_PATH = - "media/bitmap/sample_mp4_first_frame/linear_colors/original.png"; + "test-generated-goldens/sample_mp4_first_frame/linear_colors/original.png"; private static final String ONLY_RED_CHANNEL_PNG_ASSET_PATH = - "media/bitmap/sample_mp4_first_frame/linear_colors/only_red_channel.png"; + "test-generated-goldens/sample_mp4_first_frame/linear_colors/only_red_channel.png"; private static final String INCREASE_RED_CHANNEL_PNG_ASSET_PATH = - "media/bitmap/sample_mp4_first_frame/linear_colors/increase_red_channel.png"; + "test-generated-goldens/sample_mp4_first_frame/linear_colors/increase_red_channel.png"; private static final String INCREASE_BRIGHTNESS_PNG_ASSET_PATH = - "media/bitmap/sample_mp4_first_frame/linear_colors/increase_brightness.png"; + "test-generated-goldens/sample_mp4_first_frame/linear_colors/increase_brightness.png"; private final Context context = getApplicationContext(); diff --git a/libraries/effect/src/androidTest/java/androidx/media3/effect/RgbFilterPixelTest.java b/libraries/effect/src/androidTest/java/androidx/media3/effect/RgbFilterPixelTest.java index e29f08413e..8d0304d604 100644 --- a/libraries/effect/src/androidTest/java/androidx/media3/effect/RgbFilterPixelTest.java +++ b/libraries/effect/src/androidTest/java/androidx/media3/effect/RgbFilterPixelTest.java @@ -60,11 +60,11 @@ public final class RgbFilterPixelTest { @Rule public final TestName testName = new TestName(); private static final String ORIGINAL_PNG_ASSET_PATH = - "media/bitmap/sample_mp4_first_frame/linear_colors/original.png"; + "test-generated-goldens/sample_mp4_first_frame/linear_colors/original.png"; private static final String GRAYSCALE_PNG_ASSET_PATH = - "media/bitmap/sample_mp4_first_frame/linear_colors/grayscale.png"; + "test-generated-goldens/sample_mp4_first_frame/linear_colors/grayscale.png"; private static final String INVERT_PNG_ASSET_PATH = - "media/bitmap/sample_mp4_first_frame/linear_colors/invert.png"; + "test-generated-goldens/sample_mp4_first_frame/linear_colors/invert.png"; private final Context context = getApplicationContext(); diff --git a/libraries/effect/src/androidTest/java/androidx/media3/effect/SingleColorLutPixelTest.java b/libraries/effect/src/androidTest/java/androidx/media3/effect/SingleColorLutPixelTest.java index 1962ff296a..3a9ac027cc 100644 --- a/libraries/effect/src/androidTest/java/androidx/media3/effect/SingleColorLutPixelTest.java +++ b/libraries/effect/src/androidTest/java/androidx/media3/effect/SingleColorLutPixelTest.java @@ -60,16 +60,19 @@ public class SingleColorLutPixelTest { @Rule public final TestName testName = new TestName(); private static final String ORIGINAL_PNG_ASSET_PATH = - "media/bitmap/sample_mp4_first_frame/linear_colors/original.png"; + "test-generated-goldens/sample_mp4_first_frame/linear_colors/original.png"; private static final String LUT_MAP_WHITE_TO_GREEN_ASSET_PATH = - "media/bitmap/sample_mp4_first_frame/linear_colors/lut_map_white_to_green.png"; + "test-generated-goldens/sample_mp4_first_frame/linear_colors/lut_map_white_to_green.png"; private static final String GRAYSCALE_PNG_ASSET_PATH = - "media/bitmap/sample_mp4_first_frame/linear_colors/grayscale.png"; + "test-generated-goldens/sample_mp4_first_frame/linear_colors/grayscale.png"; private static final String INVERT_PNG_ASSET_PATH = - "media/bitmap/sample_mp4_first_frame/linear_colors/invert.png"; - private static final String VERTICAL_HALD_IDENTITY_LUT = "media/bitmap/lut/identity.png"; - private static final String VERTICAL_HALD_GRAYSCALE_LUT = "media/bitmap/lut/grayscale.png"; - private static final String VERTICAL_HALD_INVERTED_LUT = "media/bitmap/lut/inverted.png"; + "test-generated-goldens/sample_mp4_first_frame/linear_colors/invert.png"; + private static final String VERTICAL_HALD_IDENTITY_LUT = + "test-generated-goldens/lut/identity.png"; + private static final String VERTICAL_HALD_GRAYSCALE_LUT = + "test-generated-goldens/lut/grayscale.png"; + private static final String VERTICAL_HALD_INVERTED_LUT = + "test-generated-goldens/lut/inverted.png"; private final Context context = getApplicationContext(); diff --git a/libraries/effect/src/androidTest/java/androidx/media3/effect/SpeedChangeEffectTest.java b/libraries/effect/src/androidTest/java/androidx/media3/effect/SpeedChangeEffectTest.java index 8dc3cac885..2da6d0febe 100644 --- a/libraries/effect/src/androidTest/java/androidx/media3/effect/SpeedChangeEffectTest.java +++ b/libraries/effect/src/androidTest/java/androidx/media3/effect/SpeedChangeEffectTest.java @@ -45,7 +45,7 @@ public class SpeedChangeEffectTest { @Rule public final TestName testName = new TestName(); private static final String IMAGE_PATH = - "media/bitmap/sample_mp4_first_frame/electrical_colors/original.png"; + "test-generated-goldens/sample_mp4_first_frame/electrical_colors/original.png"; @Test public void increaseSpeed_outputsFramesAtTheCorrectPresentationTimesUs() throws Exception { diff --git a/libraries/effect/src/androidTest/java/androidx/media3/effect/ThumbnailStripEffectPixelTest.java b/libraries/effect/src/androidTest/java/androidx/media3/effect/ThumbnailStripEffectPixelTest.java index 87a1b68dc4..f3777af5b7 100644 --- a/libraries/effect/src/androidTest/java/androidx/media3/effect/ThumbnailStripEffectPixelTest.java +++ b/libraries/effect/src/androidTest/java/androidx/media3/effect/ThumbnailStripEffectPixelTest.java @@ -49,9 +49,9 @@ import org.junit.runner.RunWith; @RunWith(AndroidJUnit4.class) public final class ThumbnailStripEffectPixelTest { private static final String ORIGINAL_PNG_ASSET_PATH = - "media/bitmap/sample_mp4_first_frame/linear_colors/original.png"; + "test-generated-goldens/sample_mp4_first_frame/linear_colors/original.png"; private static final String TWO_THUMBNAILS_STRIP_PNG_ASSET_PATH = - "media/bitmap/sample_mp4_first_frame/linear_colors/two_thumbnails_strip.png"; + "test-generated-goldens/sample_mp4_first_frame/linear_colors/two_thumbnails_strip.png"; @Rule public final TestName testName = new TestName(); private final Context context = getApplicationContext(); diff --git a/libraries/effect/src/main/java/androidx/media3/effect/SingleColorLut.java b/libraries/effect/src/main/java/androidx/media3/effect/SingleColorLut.java index b182a25683..4ea15bffef 100644 --- a/libraries/effect/src/main/java/androidx/media3/effect/SingleColorLut.java +++ b/libraries/effect/src/main/java/androidx/media3/effect/SingleColorLut.java @@ -104,7 +104,8 @@ public final class SingleColorLut implements ColorLut { // [(0, 1, 0), (0, 1, 1)], // [(1, 0, 0), (1, 0, 1)], // [(1, 1, 0), (1, 1, 1)]]; - // media/bitmap/lut/identity.png is an example of how a 32x32x32 3D LUT looks like as an + // test-generated-goldens/lut/identity.png is an example of how a 32x32x32 3D LUT looks like as + // an // 32x32^2 bitmap. int length = cube.length; int[] bitmapColorsArray = new int[length * length * length]; diff --git a/libraries/test_data/src/test/assets/media/bitmap/CompositorTestTimestamps/input_grayscale_0s.png b/libraries/test_data/src/test/assets/test-generated-goldens/CompositorTestTimestamps/input_grayscale_0s.png similarity index 100% rename from libraries/test_data/src/test/assets/media/bitmap/CompositorTestTimestamps/input_grayscale_0s.png rename to libraries/test_data/src/test/assets/test-generated-goldens/CompositorTestTimestamps/input_grayscale_0s.png diff --git a/libraries/test_data/src/test/assets/media/bitmap/CompositorTestTimestamps/input_rotate180_1s.png b/libraries/test_data/src/test/assets/test-generated-goldens/CompositorTestTimestamps/input_rotate180_1s.png similarity index 100% rename from libraries/test_data/src/test/assets/media/bitmap/CompositorTestTimestamps/input_rotate180_1s.png rename to libraries/test_data/src/test/assets/test-generated-goldens/CompositorTestTimestamps/input_rotate180_1s.png diff --git a/libraries/test_data/src/test/assets/media/bitmap/CompositorTestTimestamps/input_transparent.png b/libraries/test_data/src/test/assets/test-generated-goldens/CompositorTestTimestamps/input_transparent.png similarity index 100% rename from libraries/test_data/src/test/assets/media/bitmap/CompositorTestTimestamps/input_transparent.png rename to libraries/test_data/src/test/assets/test-generated-goldens/CompositorTestTimestamps/input_transparent.png diff --git a/libraries/test_data/src/test/assets/media/bitmap/CompositorTestTimestamps/output_0s_0s.png b/libraries/test_data/src/test/assets/test-generated-goldens/CompositorTestTimestamps/output_0s_0s.png similarity index 100% rename from libraries/test_data/src/test/assets/media/bitmap/CompositorTestTimestamps/output_0s_0s.png rename to libraries/test_data/src/test/assets/test-generated-goldens/CompositorTestTimestamps/output_0s_0s.png diff --git a/libraries/test_data/src/test/assets/media/bitmap/CompositorTestTimestamps/output_0s_1s.png b/libraries/test_data/src/test/assets/test-generated-goldens/CompositorTestTimestamps/output_0s_1s.png similarity index 100% rename from libraries/test_data/src/test/assets/media/bitmap/CompositorTestTimestamps/output_0s_1s.png rename to libraries/test_data/src/test/assets/test-generated-goldens/CompositorTestTimestamps/output_0s_1s.png diff --git a/libraries/test_data/src/test/assets/media/bitmap/CompositorTestTimestamps/output_0s_1s_0s.png b/libraries/test_data/src/test/assets/test-generated-goldens/CompositorTestTimestamps/output_0s_1s_0s.png similarity index 100% rename from libraries/test_data/src/test/assets/media/bitmap/CompositorTestTimestamps/output_0s_1s_0s.png rename to libraries/test_data/src/test/assets/test-generated-goldens/CompositorTestTimestamps/output_0s_1s_0s.png diff --git a/libraries/test_data/src/test/assets/media/bitmap/CompositorTestTimestamps/output_0s_1s_transparent.png b/libraries/test_data/src/test/assets/test-generated-goldens/CompositorTestTimestamps/output_0s_1s_transparent.png similarity index 100% rename from libraries/test_data/src/test/assets/media/bitmap/CompositorTestTimestamps/output_0s_1s_transparent.png rename to libraries/test_data/src/test/assets/test-generated-goldens/CompositorTestTimestamps/output_0s_1s_transparent.png diff --git a/libraries/test_data/src/test/assets/media/bitmap/CompositorTestTimestamps/output_0s_transparent_1s.png b/libraries/test_data/src/test/assets/test-generated-goldens/CompositorTestTimestamps/output_0s_transparent_1s.png similarity index 100% rename from libraries/test_data/src/test/assets/media/bitmap/CompositorTestTimestamps/output_0s_transparent_1s.png rename to libraries/test_data/src/test/assets/test-generated-goldens/CompositorTestTimestamps/output_0s_transparent_1s.png diff --git a/libraries/test_data/src/test/assets/media/bitmap/CompositorTestTimestamps/output_1s_0s.png b/libraries/test_data/src/test/assets/test-generated-goldens/CompositorTestTimestamps/output_1s_0s.png similarity index 100% rename from libraries/test_data/src/test/assets/media/bitmap/CompositorTestTimestamps/output_1s_0s.png rename to libraries/test_data/src/test/assets/test-generated-goldens/CompositorTestTimestamps/output_1s_0s.png diff --git a/libraries/test_data/src/test/assets/media/bitmap/CompositorTestTimestamps/output_1s_1s.png b/libraries/test_data/src/test/assets/test-generated-goldens/CompositorTestTimestamps/output_1s_1s.png similarity index 100% rename from libraries/test_data/src/test/assets/media/bitmap/CompositorTestTimestamps/output_1s_1s.png rename to libraries/test_data/src/test/assets/test-generated-goldens/CompositorTestTimestamps/output_1s_1s.png diff --git a/libraries/test_data/src/test/assets/media/bitmap/CompositorTestTimestamps/output_1s_1s_0s.png b/libraries/test_data/src/test/assets/test-generated-goldens/CompositorTestTimestamps/output_1s_1s_0s.png similarity index 100% rename from libraries/test_data/src/test/assets/media/bitmap/CompositorTestTimestamps/output_1s_1s_0s.png rename to libraries/test_data/src/test/assets/test-generated-goldens/CompositorTestTimestamps/output_1s_1s_0s.png diff --git a/libraries/test_data/src/test/assets/media/bitmap/CompositorTestTimestamps/output_2s_0s.png b/libraries/test_data/src/test/assets/test-generated-goldens/CompositorTestTimestamps/output_2s_0s.png similarity index 100% rename from libraries/test_data/src/test/assets/media/bitmap/CompositorTestTimestamps/output_2s_0s.png rename to libraries/test_data/src/test/assets/test-generated-goldens/CompositorTestTimestamps/output_2s_0s.png diff --git a/libraries/test_data/src/test/assets/media/bitmap/CompositorTestTimestamps/output_2s_1s.png b/libraries/test_data/src/test/assets/test-generated-goldens/CompositorTestTimestamps/output_2s_1s.png similarity index 100% rename from libraries/test_data/src/test/assets/media/bitmap/CompositorTestTimestamps/output_2s_1s.png rename to libraries/test_data/src/test/assets/test-generated-goldens/CompositorTestTimestamps/output_2s_1s.png diff --git a/libraries/test_data/src/test/assets/media/bitmap/CompositorTestTimestamps/output_2s_1s_2s.png b/libraries/test_data/src/test/assets/test-generated-goldens/CompositorTestTimestamps/output_2s_1s_2s.png similarity index 100% rename from libraries/test_data/src/test/assets/media/bitmap/CompositorTestTimestamps/output_2s_1s_2s.png rename to libraries/test_data/src/test/assets/test-generated-goldens/CompositorTestTimestamps/output_2s_1s_2s.png diff --git a/libraries/test_data/src/test/assets/media/bitmap/CompositorTestTimestamps/output_2s_2s.png b/libraries/test_data/src/test/assets/test-generated-goldens/CompositorTestTimestamps/output_2s_2s.png similarity index 100% rename from libraries/test_data/src/test/assets/media/bitmap/CompositorTestTimestamps/output_2s_2s.png rename to libraries/test_data/src/test/assets/test-generated-goldens/CompositorTestTimestamps/output_2s_2s.png diff --git a/libraries/test_data/src/test/assets/media/bitmap/CompositorTestTimestamps/output_3s_0s.png b/libraries/test_data/src/test/assets/test-generated-goldens/CompositorTestTimestamps/output_3s_0s.png similarity index 100% rename from libraries/test_data/src/test/assets/media/bitmap/CompositorTestTimestamps/output_3s_0s.png rename to libraries/test_data/src/test/assets/test-generated-goldens/CompositorTestTimestamps/output_3s_0s.png diff --git a/libraries/test_data/src/test/assets/media/bitmap/CompositorTestTimestamps/output_3s_2s.png b/libraries/test_data/src/test/assets/test-generated-goldens/CompositorTestTimestamps/output_3s_2s.png similarity index 100% rename from libraries/test_data/src/test/assets/media/bitmap/CompositorTestTimestamps/output_3s_2s.png rename to libraries/test_data/src/test/assets/test-generated-goldens/CompositorTestTimestamps/output_3s_2s.png diff --git a/libraries/test_data/src/test/assets/media/bitmap/CompositorTestTimestamps/output_3s_3s.png b/libraries/test_data/src/test/assets/test-generated-goldens/CompositorTestTimestamps/output_3s_3s.png similarity index 100% rename from libraries/test_data/src/test/assets/media/bitmap/CompositorTestTimestamps/output_3s_3s.png rename to libraries/test_data/src/test/assets/test-generated-goldens/CompositorTestTimestamps/output_3s_3s.png diff --git a/libraries/test_data/src/test/assets/media/bitmap/CompositorTestTimestamps/output_4s_0s.png b/libraries/test_data/src/test/assets/test-generated-goldens/CompositorTestTimestamps/output_4s_0s.png similarity index 100% rename from libraries/test_data/src/test/assets/media/bitmap/CompositorTestTimestamps/output_4s_0s.png rename to libraries/test_data/src/test/assets/test-generated-goldens/CompositorTestTimestamps/output_4s_0s.png diff --git a/libraries/test_data/src/test/assets/media/bitmap/CompositorTestTimestamps/output_4s_4s.png b/libraries/test_data/src/test/assets/test-generated-goldens/CompositorTestTimestamps/output_4s_4s.png similarity index 100% rename from libraries/test_data/src/test/assets/media/bitmap/CompositorTestTimestamps/output_4s_4s.png rename to libraries/test_data/src/test/assets/test-generated-goldens/CompositorTestTimestamps/output_4s_4s.png diff --git a/libraries/test_data/src/test/assets/media/bitmap/CompositorTestTimestamps/output_different_dimensions.png b/libraries/test_data/src/test/assets/test-generated-goldens/CompositorTestTimestamps/output_different_dimensions.png similarity index 100% rename from libraries/test_data/src/test/assets/media/bitmap/CompositorTestTimestamps/output_different_dimensions.png rename to libraries/test_data/src/test/assets/test-generated-goldens/CompositorTestTimestamps/output_different_dimensions.png diff --git a/libraries/test_data/src/test/assets/media/bitmap/CompositorTestTimestamps/output_grayscale_opaque_0s.png b/libraries/test_data/src/test/assets/test-generated-goldens/CompositorTestTimestamps/output_grayscale_opaque_0s.png similarity index 100% rename from libraries/test_data/src/test/assets/media/bitmap/CompositorTestTimestamps/output_grayscale_opaque_0s.png rename to libraries/test_data/src/test/assets/test-generated-goldens/CompositorTestTimestamps/output_grayscale_opaque_0s.png diff --git a/libraries/test_data/src/test/assets/media/bitmap/CompositorTestTimestamps/output_grayscale_opaque_1s.png b/libraries/test_data/src/test/assets/test-generated-goldens/CompositorTestTimestamps/output_grayscale_opaque_1s.png similarity index 100% rename from libraries/test_data/src/test/assets/media/bitmap/CompositorTestTimestamps/output_grayscale_opaque_1s.png rename to libraries/test_data/src/test/assets/test-generated-goldens/CompositorTestTimestamps/output_grayscale_opaque_1s.png diff --git a/libraries/test_data/src/test/assets/media/bitmap/CompositorTestTimestamps/output_grayscale_opaque_2s.png b/libraries/test_data/src/test/assets/test-generated-goldens/CompositorTestTimestamps/output_grayscale_opaque_2s.png similarity index 100% rename from libraries/test_data/src/test/assets/media/bitmap/CompositorTestTimestamps/output_grayscale_opaque_2s.png rename to libraries/test_data/src/test/assets/test-generated-goldens/CompositorTestTimestamps/output_grayscale_opaque_2s.png diff --git a/libraries/test_data/src/test/assets/media/bitmap/CompositorTestTimestamps/output_picture_in_picture.png b/libraries/test_data/src/test/assets/test-generated-goldens/CompositorTestTimestamps/output_picture_in_picture.png similarity index 100% rename from libraries/test_data/src/test/assets/media/bitmap/CompositorTestTimestamps/output_picture_in_picture.png rename to libraries/test_data/src/test/assets/test-generated-goldens/CompositorTestTimestamps/output_picture_in_picture.png diff --git a/libraries/test_data/src/test/assets/media/bitmap/CompositorTestTimestamps/output_stacked.png b/libraries/test_data/src/test/assets/test-generated-goldens/CompositorTestTimestamps/output_stacked.png similarity index 100% rename from libraries/test_data/src/test/assets/media/bitmap/CompositorTestTimestamps/output_stacked.png rename to libraries/test_data/src/test/assets/test-generated-goldens/CompositorTestTimestamps/output_stacked.png diff --git a/libraries/test_data/src/test/assets/media/bitmap/ExoPlayerPlaybackTest/first_frame.png b/libraries/test_data/src/test/assets/test-generated-goldens/ExoPlayerPlaybackTest/first_frame.png similarity index 100% rename from libraries/test_data/src/test/assets/media/bitmap/ExoPlayerPlaybackTest/first_frame.png rename to libraries/test_data/src/test/assets/test-generated-goldens/ExoPlayerPlaybackTest/first_frame.png diff --git a/libraries/test_data/src/test/assets/media/bitmap/FrameDropTest/pts_0.png b/libraries/test_data/src/test/assets/test-generated-goldens/FrameDropTest/pts_0.png similarity index 100% rename from libraries/test_data/src/test/assets/media/bitmap/FrameDropTest/pts_0.png rename to libraries/test_data/src/test/assets/test-generated-goldens/FrameDropTest/pts_0.png diff --git a/libraries/test_data/src/test/assets/media/bitmap/FrameDropTest/pts_32000.png b/libraries/test_data/src/test/assets/test-generated-goldens/FrameDropTest/pts_32000.png similarity index 100% rename from libraries/test_data/src/test/assets/media/bitmap/FrameDropTest/pts_32000.png rename to libraries/test_data/src/test/assets/test-generated-goldens/FrameDropTest/pts_32000.png diff --git a/libraries/test_data/src/test/assets/media/bitmap/FrameDropTest/pts_333333.png b/libraries/test_data/src/test/assets/test-generated-goldens/FrameDropTest/pts_333333.png similarity index 100% rename from libraries/test_data/src/test/assets/media/bitmap/FrameDropTest/pts_333333.png rename to libraries/test_data/src/test/assets/test-generated-goldens/FrameDropTest/pts_333333.png diff --git a/libraries/test_data/src/test/assets/media/bitmap/FrameDropTest/pts_666667.png b/libraries/test_data/src/test/assets/test-generated-goldens/FrameDropTest/pts_666667.png similarity index 100% rename from libraries/test_data/src/test/assets/media/bitmap/FrameDropTest/pts_666667.png rename to libraries/test_data/src/test/assets/test-generated-goldens/FrameDropTest/pts_666667.png diff --git a/libraries/test_data/src/test/assets/media/bitmap/FrameDropTest/pts_71000.png b/libraries/test_data/src/test/assets/test-generated-goldens/FrameDropTest/pts_71000.png similarity index 100% rename from libraries/test_data/src/test/assets/media/bitmap/FrameDropTest/pts_71000.png rename to libraries/test_data/src/test/assets/test-generated-goldens/FrameDropTest/pts_71000.png diff --git a/libraries/test_data/src/test/assets/media/bitmap/FrameDropTest/pts_750000.png b/libraries/test_data/src/test/assets/test-generated-goldens/FrameDropTest/pts_750000.png similarity index 100% rename from libraries/test_data/src/test/assets/media/bitmap/FrameDropTest/pts_750000.png rename to libraries/test_data/src/test/assets/test-generated-goldens/FrameDropTest/pts_750000.png diff --git a/libraries/test_data/src/test/assets/media/bitmap/GaussianBlurTest/pts_22000.png b/libraries/test_data/src/test/assets/test-generated-goldens/GaussianBlurTest/pts_22000.png similarity index 100% rename from libraries/test_data/src/test/assets/media/bitmap/GaussianBlurTest/pts_22000.png rename to libraries/test_data/src/test/assets/test-generated-goldens/GaussianBlurTest/pts_22000.png diff --git a/libraries/test_data/src/test/assets/media/bitmap/GaussianBlurWithFrameOverlaidTest/pts_32000.png b/libraries/test_data/src/test/assets/test-generated-goldens/GaussianBlurWithFrameOverlaidTest/pts_32000.png similarity index 100% rename from libraries/test_data/src/test/assets/media/bitmap/GaussianBlurWithFrameOverlaidTest/pts_32000.png rename to libraries/test_data/src/test/assets/test-generated-goldens/GaussianBlurWithFrameOverlaidTest/pts_32000.png diff --git a/libraries/test_data/src/test/assets/media/bitmap/GaussianBlurWithFrameOverlaidTest/pts_71000.png b/libraries/test_data/src/test/assets/test-generated-goldens/GaussianBlurWithFrameOverlaidTest/pts_71000.png similarity index 100% rename from libraries/test_data/src/test/assets/media/bitmap/GaussianBlurWithFrameOverlaidTest/pts_71000.png rename to libraries/test_data/src/test/assets/test-generated-goldens/GaussianBlurWithFrameOverlaidTest/pts_71000.png diff --git a/libraries/test_data/src/test/assets/media/bitmap/README.md b/libraries/test_data/src/test/assets/test-generated-goldens/README.md similarity index 100% rename from libraries/test_data/src/test/assets/media/bitmap/README.md rename to libraries/test_data/src/test/assets/test-generated-goldens/README.md diff --git a/libraries/test_data/src/test/assets/media/bitmap/lut/grayscale.png b/libraries/test_data/src/test/assets/test-generated-goldens/lut/grayscale.png similarity index 100% rename from libraries/test_data/src/test/assets/media/bitmap/lut/grayscale.png rename to libraries/test_data/src/test/assets/test-generated-goldens/lut/grayscale.png diff --git a/libraries/test_data/src/test/assets/media/bitmap/lut/identity.png b/libraries/test_data/src/test/assets/test-generated-goldens/lut/identity.png similarity index 100% rename from libraries/test_data/src/test/assets/media/bitmap/lut/identity.png rename to libraries/test_data/src/test/assets/test-generated-goldens/lut/identity.png diff --git a/libraries/test_data/src/test/assets/media/bitmap/lut/inverted.png b/libraries/test_data/src/test/assets/test-generated-goldens/lut/inverted.png similarity index 100% rename from libraries/test_data/src/test/assets/media/bitmap/lut/inverted.png rename to libraries/test_data/src/test/assets/test-generated-goldens/lut/inverted.png diff --git a/libraries/test_data/src/test/assets/media/bitmap/sample_mp4_first_frame/electrical_colors/README.md b/libraries/test_data/src/test/assets/test-generated-goldens/sample_mp4_first_frame/electrical_colors/README.md similarity index 100% rename from libraries/test_data/src/test/assets/media/bitmap/sample_mp4_first_frame/electrical_colors/README.md rename to libraries/test_data/src/test/assets/test-generated-goldens/sample_mp4_first_frame/electrical_colors/README.md diff --git a/libraries/test_data/src/test/assets/media/bitmap/sample_mp4_first_frame/electrical_colors/aspect_ratio_scale_to_fit_narrow.png b/libraries/test_data/src/test/assets/test-generated-goldens/sample_mp4_first_frame/electrical_colors/aspect_ratio_scale_to_fit_narrow.png similarity index 100% rename from libraries/test_data/src/test/assets/media/bitmap/sample_mp4_first_frame/electrical_colors/aspect_ratio_scale_to_fit_narrow.png rename to libraries/test_data/src/test/assets/test-generated-goldens/sample_mp4_first_frame/electrical_colors/aspect_ratio_scale_to_fit_narrow.png diff --git a/libraries/test_data/src/test/assets/media/bitmap/sample_mp4_first_frame/electrical_colors/aspect_ratio_scale_to_fit_wide.png b/libraries/test_data/src/test/assets/test-generated-goldens/sample_mp4_first_frame/electrical_colors/aspect_ratio_scale_to_fit_wide.png similarity index 100% rename from libraries/test_data/src/test/assets/media/bitmap/sample_mp4_first_frame/electrical_colors/aspect_ratio_scale_to_fit_wide.png rename to libraries/test_data/src/test/assets/test-generated-goldens/sample_mp4_first_frame/electrical_colors/aspect_ratio_scale_to_fit_wide.png diff --git a/libraries/test_data/src/test/assets/media/bitmap/sample_mp4_first_frame/electrical_colors/aspect_ratio_scale_to_fit_with_crop_narrow.png b/libraries/test_data/src/test/assets/test-generated-goldens/sample_mp4_first_frame/electrical_colors/aspect_ratio_scale_to_fit_with_crop_narrow.png similarity index 100% rename from libraries/test_data/src/test/assets/media/bitmap/sample_mp4_first_frame/electrical_colors/aspect_ratio_scale_to_fit_with_crop_narrow.png rename to libraries/test_data/src/test/assets/test-generated-goldens/sample_mp4_first_frame/electrical_colors/aspect_ratio_scale_to_fit_with_crop_narrow.png diff --git a/libraries/test_data/src/test/assets/media/bitmap/sample_mp4_first_frame/electrical_colors/aspect_ratio_scale_to_fit_with_crop_wide.png b/libraries/test_data/src/test/assets/test-generated-goldens/sample_mp4_first_frame/electrical_colors/aspect_ratio_scale_to_fit_with_crop_wide.png similarity index 100% rename from libraries/test_data/src/test/assets/media/bitmap/sample_mp4_first_frame/electrical_colors/aspect_ratio_scale_to_fit_with_crop_wide.png rename to libraries/test_data/src/test/assets/test-generated-goldens/sample_mp4_first_frame/electrical_colors/aspect_ratio_scale_to_fit_with_crop_wide.png diff --git a/libraries/test_data/src/test/assets/media/bitmap/sample_mp4_first_frame/electrical_colors/aspect_ratio_stretch_to_fit_narrow.png b/libraries/test_data/src/test/assets/test-generated-goldens/sample_mp4_first_frame/electrical_colors/aspect_ratio_stretch_to_fit_narrow.png similarity index 100% rename from libraries/test_data/src/test/assets/media/bitmap/sample_mp4_first_frame/electrical_colors/aspect_ratio_stretch_to_fit_narrow.png rename to libraries/test_data/src/test/assets/test-generated-goldens/sample_mp4_first_frame/electrical_colors/aspect_ratio_stretch_to_fit_narrow.png diff --git a/libraries/test_data/src/test/assets/media/bitmap/sample_mp4_first_frame/electrical_colors/aspect_ratio_stretch_to_fit_wide.png b/libraries/test_data/src/test/assets/test-generated-goldens/sample_mp4_first_frame/electrical_colors/aspect_ratio_stretch_to_fit_wide.png similarity index 100% rename from libraries/test_data/src/test/assets/media/bitmap/sample_mp4_first_frame/electrical_colors/aspect_ratio_stretch_to_fit_wide.png rename to libraries/test_data/src/test/assets/test-generated-goldens/sample_mp4_first_frame/electrical_colors/aspect_ratio_stretch_to_fit_wide.png diff --git a/libraries/test_data/src/test/assets/media/bitmap/sample_mp4_first_frame/electrical_colors/crop_larger.png b/libraries/test_data/src/test/assets/test-generated-goldens/sample_mp4_first_frame/electrical_colors/crop_larger.png similarity index 100% rename from libraries/test_data/src/test/assets/media/bitmap/sample_mp4_first_frame/electrical_colors/crop_larger.png rename to libraries/test_data/src/test/assets/test-generated-goldens/sample_mp4_first_frame/electrical_colors/crop_larger.png diff --git a/libraries/test_data/src/test/assets/media/bitmap/sample_mp4_first_frame/electrical_colors/crop_smaller.png b/libraries/test_data/src/test/assets/test-generated-goldens/sample_mp4_first_frame/electrical_colors/crop_smaller.png similarity index 100% rename from libraries/test_data/src/test/assets/media/bitmap/sample_mp4_first_frame/electrical_colors/crop_smaller.png rename to libraries/test_data/src/test/assets/test-generated-goldens/sample_mp4_first_frame/electrical_colors/crop_smaller.png diff --git a/libraries/test_data/src/test/assets/media/bitmap/sample_mp4_first_frame/electrical_colors/crop_then_aspect_ratio.png b/libraries/test_data/src/test/assets/test-generated-goldens/sample_mp4_first_frame/electrical_colors/crop_then_aspect_ratio.png similarity index 100% rename from libraries/test_data/src/test/assets/media/bitmap/sample_mp4_first_frame/electrical_colors/crop_then_aspect_ratio.png rename to libraries/test_data/src/test/assets/test-generated-goldens/sample_mp4_first_frame/electrical_colors/crop_then_aspect_ratio.png diff --git a/libraries/test_data/src/test/assets/media/bitmap/sample_mp4_first_frame/electrical_colors/decrease_alpha.png b/libraries/test_data/src/test/assets/test-generated-goldens/sample_mp4_first_frame/electrical_colors/decrease_alpha.png similarity index 100% rename from libraries/test_data/src/test/assets/media/bitmap/sample_mp4_first_frame/electrical_colors/decrease_alpha.png rename to libraries/test_data/src/test/assets/test-generated-goldens/sample_mp4_first_frame/electrical_colors/decrease_alpha.png diff --git a/libraries/test_data/src/test/assets/media/bitmap/sample_mp4_first_frame/electrical_colors/grayscale_then_increase_red_channel.png b/libraries/test_data/src/test/assets/test-generated-goldens/sample_mp4_first_frame/electrical_colors/grayscale_then_increase_red_channel.png similarity index 100% rename from libraries/test_data/src/test/assets/media/bitmap/sample_mp4_first_frame/electrical_colors/grayscale_then_increase_red_channel.png rename to libraries/test_data/src/test/assets/test-generated-goldens/sample_mp4_first_frame/electrical_colors/grayscale_then_increase_red_channel.png diff --git a/libraries/test_data/src/test/assets/media/bitmap/sample_mp4_first_frame/electrical_colors/increase_alpha.png b/libraries/test_data/src/test/assets/test-generated-goldens/sample_mp4_first_frame/electrical_colors/increase_alpha.png similarity index 100% rename from libraries/test_data/src/test/assets/media/bitmap/sample_mp4_first_frame/electrical_colors/increase_alpha.png rename to libraries/test_data/src/test/assets/test-generated-goldens/sample_mp4_first_frame/electrical_colors/increase_alpha.png diff --git a/libraries/test_data/src/test/assets/media/bitmap/sample_mp4_first_frame/electrical_colors/increase_brightness.png b/libraries/test_data/src/test/assets/test-generated-goldens/sample_mp4_first_frame/electrical_colors/increase_brightness.png similarity index 100% rename from libraries/test_data/src/test/assets/media/bitmap/sample_mp4_first_frame/electrical_colors/increase_brightness.png rename to libraries/test_data/src/test/assets/test-generated-goldens/sample_mp4_first_frame/electrical_colors/increase_brightness.png 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/test-generated-goldens/sample_mp4_first_frame/electrical_colors/london_image_to_video.png similarity index 100% rename from libraries/test_data/src/test/assets/media/bitmap/sample_mp4_first_frame/electrical_colors/london_image_to_video.png rename to libraries/test_data/src/test/assets/test-generated-goldens/sample_mp4_first_frame/electrical_colors/london_image_to_video.png 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/test-generated-goldens/sample_mp4_first_frame/electrical_colors/london_image_to_video_with_crop.png similarity index 100% rename from libraries/test_data/src/test/assets/media/bitmap/sample_mp4_first_frame/electrical_colors/london_image_to_video_with_crop.png rename to libraries/test_data/src/test/assets/test-generated-goldens/sample_mp4_first_frame/electrical_colors/london_image_to_video_with_crop.png diff --git a/libraries/test_data/src/test/assets/media/bitmap/sample_mp4_first_frame/electrical_colors/original.png b/libraries/test_data/src/test/assets/test-generated-goldens/sample_mp4_first_frame/electrical_colors/original.png similarity index 100% rename from libraries/test_data/src/test/assets/media/bitmap/sample_mp4_first_frame/electrical_colors/original.png rename to libraries/test_data/src/test/assets/test-generated-goldens/sample_mp4_first_frame/electrical_colors/original.png diff --git a/libraries/test_data/src/test/assets/media/bitmap/sample_mp4_first_frame/electrical_colors/original_hdr10.png b/libraries/test_data/src/test/assets/test-generated-goldens/sample_mp4_first_frame/electrical_colors/original_hdr10.png similarity index 100% rename from libraries/test_data/src/test/assets/media/bitmap/sample_mp4_first_frame/electrical_colors/original_hdr10.png rename to libraries/test_data/src/test/assets/test-generated-goldens/sample_mp4_first_frame/electrical_colors/original_hdr10.png diff --git a/libraries/test_data/src/test/assets/media/bitmap/sample_mp4_first_frame/electrical_colors/original_hlg10.png b/libraries/test_data/src/test/assets/test-generated-goldens/sample_mp4_first_frame/electrical_colors/original_hlg10.png similarity index 100% rename from libraries/test_data/src/test/assets/media/bitmap/sample_mp4_first_frame/electrical_colors/original_hlg10.png rename to libraries/test_data/src/test/assets/test-generated-goldens/sample_mp4_first_frame/electrical_colors/original_hlg10.png diff --git a/libraries/test_data/src/test/assets/media/bitmap/sample_mp4_first_frame/electrical_colors/overlay_bitmap_FrameProcessor.png b/libraries/test_data/src/test/assets/test-generated-goldens/sample_mp4_first_frame/electrical_colors/overlay_bitmap_FrameProcessor.png similarity index 100% rename from libraries/test_data/src/test/assets/media/bitmap/sample_mp4_first_frame/electrical_colors/overlay_bitmap_FrameProcessor.png rename to libraries/test_data/src/test/assets/test-generated-goldens/sample_mp4_first_frame/electrical_colors/overlay_bitmap_FrameProcessor.png diff --git a/libraries/test_data/src/test/assets/media/bitmap/sample_mp4_first_frame/electrical_colors/overlay_bitmap_anchored.png b/libraries/test_data/src/test/assets/test-generated-goldens/sample_mp4_first_frame/electrical_colors/overlay_bitmap_anchored.png similarity index 100% rename from libraries/test_data/src/test/assets/media/bitmap/sample_mp4_first_frame/electrical_colors/overlay_bitmap_anchored.png rename to libraries/test_data/src/test/assets/test-generated-goldens/sample_mp4_first_frame/electrical_colors/overlay_bitmap_anchored.png diff --git a/libraries/test_data/src/test/assets/media/bitmap/sample_mp4_first_frame/electrical_colors/overlay_bitmap_default.png b/libraries/test_data/src/test/assets/test-generated-goldens/sample_mp4_first_frame/electrical_colors/overlay_bitmap_default.png similarity index 100% rename from libraries/test_data/src/test/assets/media/bitmap/sample_mp4_first_frame/electrical_colors/overlay_bitmap_default.png rename to libraries/test_data/src/test/assets/test-generated-goldens/sample_mp4_first_frame/electrical_colors/overlay_bitmap_default.png diff --git a/libraries/test_data/src/test/assets/media/bitmap/sample_mp4_first_frame/electrical_colors/overlay_bitmap_overlayAnchored.png b/libraries/test_data/src/test/assets/test-generated-goldens/sample_mp4_first_frame/electrical_colors/overlay_bitmap_overlayAnchored.png similarity index 100% rename from libraries/test_data/src/test/assets/media/bitmap/sample_mp4_first_frame/electrical_colors/overlay_bitmap_overlayAnchored.png rename to libraries/test_data/src/test/assets/test-generated-goldens/sample_mp4_first_frame/electrical_colors/overlay_bitmap_overlayAnchored.png diff --git a/libraries/test_data/src/test/assets/media/bitmap/sample_mp4_first_frame/electrical_colors/overlay_bitmap_rotated90.png b/libraries/test_data/src/test/assets/test-generated-goldens/sample_mp4_first_frame/electrical_colors/overlay_bitmap_rotated90.png similarity index 100% rename from libraries/test_data/src/test/assets/media/bitmap/sample_mp4_first_frame/electrical_colors/overlay_bitmap_rotated90.png rename to libraries/test_data/src/test/assets/test-generated-goldens/sample_mp4_first_frame/electrical_colors/overlay_bitmap_rotated90.png diff --git a/libraries/test_data/src/test/assets/media/bitmap/sample_mp4_first_frame/electrical_colors/overlay_bitmap_scaled.png b/libraries/test_data/src/test/assets/test-generated-goldens/sample_mp4_first_frame/electrical_colors/overlay_bitmap_scaled.png similarity index 100% rename from libraries/test_data/src/test/assets/media/bitmap/sample_mp4_first_frame/electrical_colors/overlay_bitmap_scaled.png rename to libraries/test_data/src/test/assets/test-generated-goldens/sample_mp4_first_frame/electrical_colors/overlay_bitmap_scaled.png diff --git a/libraries/test_data/src/test/assets/media/bitmap/sample_mp4_first_frame/electrical_colors/overlay_bitmap_translucent.png b/libraries/test_data/src/test/assets/test-generated-goldens/sample_mp4_first_frame/electrical_colors/overlay_bitmap_translucent.png similarity index 100% rename from libraries/test_data/src/test/assets/media/bitmap/sample_mp4_first_frame/electrical_colors/overlay_bitmap_translucent.png rename to libraries/test_data/src/test/assets/test-generated-goldens/sample_mp4_first_frame/electrical_colors/overlay_bitmap_translucent.png diff --git a/libraries/test_data/src/test/assets/media/bitmap/sample_mp4_first_frame/electrical_colors/overlay_multiple.png b/libraries/test_data/src/test/assets/test-generated-goldens/sample_mp4_first_frame/electrical_colors/overlay_multiple.png similarity index 100% rename from libraries/test_data/src/test/assets/media/bitmap/sample_mp4_first_frame/electrical_colors/overlay_multiple.png rename to libraries/test_data/src/test/assets/test-generated-goldens/sample_mp4_first_frame/electrical_colors/overlay_multiple.png diff --git a/libraries/test_data/src/test/assets/media/bitmap/sample_mp4_first_frame/electrical_colors/overlay_overlap.png b/libraries/test_data/src/test/assets/test-generated-goldens/sample_mp4_first_frame/electrical_colors/overlay_overlap.png similarity index 100% rename from libraries/test_data/src/test/assets/media/bitmap/sample_mp4_first_frame/electrical_colors/overlay_overlap.png rename to libraries/test_data/src/test/assets/test-generated-goldens/sample_mp4_first_frame/electrical_colors/overlay_overlap.png diff --git a/libraries/test_data/src/test/assets/media/bitmap/sample_mp4_first_frame/electrical_colors/overlay_text_default.png b/libraries/test_data/src/test/assets/test-generated-goldens/sample_mp4_first_frame/electrical_colors/overlay_text_default.png similarity index 100% rename from libraries/test_data/src/test/assets/media/bitmap/sample_mp4_first_frame/electrical_colors/overlay_text_default.png rename to libraries/test_data/src/test/assets/test-generated-goldens/sample_mp4_first_frame/electrical_colors/overlay_text_default.png diff --git a/libraries/test_data/src/test/assets/media/bitmap/sample_mp4_first_frame/electrical_colors/overlay_text_span_scaled.png b/libraries/test_data/src/test/assets/test-generated-goldens/sample_mp4_first_frame/electrical_colors/overlay_text_span_scaled.png similarity index 100% rename from libraries/test_data/src/test/assets/media/bitmap/sample_mp4_first_frame/electrical_colors/overlay_text_span_scaled.png rename to libraries/test_data/src/test/assets/test-generated-goldens/sample_mp4_first_frame/electrical_colors/overlay_text_span_scaled.png diff --git a/libraries/test_data/src/test/assets/media/bitmap/sample_mp4_first_frame/electrical_colors/overlay_text_translate.png b/libraries/test_data/src/test/assets/test-generated-goldens/sample_mp4_first_frame/electrical_colors/overlay_text_translate.png similarity index 100% rename from libraries/test_data/src/test/assets/media/bitmap/sample_mp4_first_frame/electrical_colors/overlay_text_translate.png rename to libraries/test_data/src/test/assets/test-generated-goldens/sample_mp4_first_frame/electrical_colors/overlay_text_translate.png diff --git a/libraries/test_data/src/test/assets/media/bitmap/sample_mp4_first_frame/electrical_colors/request_output_height.png b/libraries/test_data/src/test/assets/test-generated-goldens/sample_mp4_first_frame/electrical_colors/request_output_height.png similarity index 100% rename from libraries/test_data/src/test/assets/media/bitmap/sample_mp4_first_frame/electrical_colors/request_output_height.png rename to libraries/test_data/src/test/assets/test-generated-goldens/sample_mp4_first_frame/electrical_colors/request_output_height.png diff --git a/libraries/test_data/src/test/assets/media/bitmap/sample_mp4_first_frame/electrical_colors/rotate45_then_scale2w.png b/libraries/test_data/src/test/assets/test-generated-goldens/sample_mp4_first_frame/electrical_colors/rotate45_then_scale2w.png similarity index 100% rename from libraries/test_data/src/test/assets/media/bitmap/sample_mp4_first_frame/electrical_colors/rotate45_then_scale2w.png rename to libraries/test_data/src/test/assets/test-generated-goldens/sample_mp4_first_frame/electrical_colors/rotate45_then_scale2w.png diff --git a/libraries/test_data/src/test/assets/media/bitmap/sample_mp4_first_frame/electrical_colors/rotate90.png b/libraries/test_data/src/test/assets/test-generated-goldens/sample_mp4_first_frame/electrical_colors/rotate90.png similarity index 100% rename from libraries/test_data/src/test/assets/media/bitmap/sample_mp4_first_frame/electrical_colors/rotate90.png rename to libraries/test_data/src/test/assets/test-generated-goldens/sample_mp4_first_frame/electrical_colors/rotate90.png diff --git a/libraries/test_data/src/test/assets/media/bitmap/sample_mp4_first_frame/electrical_colors/rotate_45_scale_to_fit.png b/libraries/test_data/src/test/assets/test-generated-goldens/sample_mp4_first_frame/electrical_colors/rotate_45_scale_to_fit.png similarity index 100% rename from libraries/test_data/src/test/assets/media/bitmap/sample_mp4_first_frame/electrical_colors/rotate_45_scale_to_fit.png rename to libraries/test_data/src/test/assets/test-generated-goldens/sample_mp4_first_frame/electrical_colors/rotate_45_scale_to_fit.png diff --git a/libraries/test_data/src/test/assets/media/bitmap/sample_mp4_first_frame/electrical_colors/rotate_then_translate.png b/libraries/test_data/src/test/assets/test-generated-goldens/sample_mp4_first_frame/electrical_colors/rotate_then_translate.png similarity index 100% rename from libraries/test_data/src/test/assets/media/bitmap/sample_mp4_first_frame/electrical_colors/rotate_then_translate.png rename to libraries/test_data/src/test/assets/test-generated-goldens/sample_mp4_first_frame/electrical_colors/rotate_then_translate.png diff --git a/libraries/test_data/src/test/assets/media/bitmap/sample_mp4_first_frame/electrical_colors/scale_narrow.png b/libraries/test_data/src/test/assets/test-generated-goldens/sample_mp4_first_frame/electrical_colors/scale_narrow.png similarity index 100% rename from libraries/test_data/src/test/assets/media/bitmap/sample_mp4_first_frame/electrical_colors/scale_narrow.png rename to libraries/test_data/src/test/assets/test-generated-goldens/sample_mp4_first_frame/electrical_colors/scale_narrow.png diff --git a/libraries/test_data/src/test/assets/media/bitmap/sample_mp4_first_frame/electrical_colors/scale_wide.png b/libraries/test_data/src/test/assets/test-generated-goldens/sample_mp4_first_frame/electrical_colors/scale_wide.png similarity index 100% rename from libraries/test_data/src/test/assets/media/bitmap/sample_mp4_first_frame/electrical_colors/scale_wide.png rename to libraries/test_data/src/test/assets/test-generated-goldens/sample_mp4_first_frame/electrical_colors/scale_wide.png diff --git a/libraries/test_data/src/test/assets/media/bitmap/sample_mp4_first_frame/electrical_colors/srgb_to_electrical_media3test.png b/libraries/test_data/src/test/assets/test-generated-goldens/sample_mp4_first_frame/electrical_colors/srgb_to_electrical_media3test.png similarity index 100% rename from libraries/test_data/src/test/assets/media/bitmap/sample_mp4_first_frame/electrical_colors/srgb_to_electrical_media3test.png rename to libraries/test_data/src/test/assets/test-generated-goldens/sample_mp4_first_frame/electrical_colors/srgb_to_electrical_media3test.png diff --git a/libraries/test_data/src/test/assets/media/bitmap/sample_mp4_first_frame/electrical_colors/srgb_to_electrical_original.png b/libraries/test_data/src/test/assets/test-generated-goldens/sample_mp4_first_frame/electrical_colors/srgb_to_electrical_original.png similarity index 100% rename from libraries/test_data/src/test/assets/media/bitmap/sample_mp4_first_frame/electrical_colors/srgb_to_electrical_original.png rename to libraries/test_data/src/test/assets/test-generated-goldens/sample_mp4_first_frame/electrical_colors/srgb_to_electrical_original.png diff --git a/libraries/test_data/src/test/assets/media/bitmap/sample_mp4_first_frame/electrical_colors/tone_map_hlg_to_sdr.png b/libraries/test_data/src/test/assets/test-generated-goldens/sample_mp4_first_frame/electrical_colors/tone_map_hlg_to_sdr.png similarity index 100% rename from libraries/test_data/src/test/assets/media/bitmap/sample_mp4_first_frame/electrical_colors/tone_map_hlg_to_sdr.png rename to libraries/test_data/src/test/assets/test-generated-goldens/sample_mp4_first_frame/electrical_colors/tone_map_hlg_to_sdr.png diff --git a/libraries/test_data/src/test/assets/media/bitmap/sample_mp4_first_frame/electrical_colors/tone_map_pq_to_sdr.png b/libraries/test_data/src/test/assets/test-generated-goldens/sample_mp4_first_frame/electrical_colors/tone_map_pq_to_sdr.png similarity index 100% rename from libraries/test_data/src/test/assets/media/bitmap/sample_mp4_first_frame/electrical_colors/tone_map_pq_to_sdr.png rename to libraries/test_data/src/test/assets/test-generated-goldens/sample_mp4_first_frame/electrical_colors/tone_map_pq_to_sdr.png diff --git a/libraries/test_data/src/test/assets/media/bitmap/sample_mp4_first_frame/electrical_colors/translate_right.png b/libraries/test_data/src/test/assets/test-generated-goldens/sample_mp4_first_frame/electrical_colors/translate_right.png similarity index 100% rename from libraries/test_data/src/test/assets/media/bitmap/sample_mp4_first_frame/electrical_colors/translate_right.png rename to libraries/test_data/src/test/assets/test-generated-goldens/sample_mp4_first_frame/electrical_colors/translate_right.png diff --git a/libraries/test_data/src/test/assets/media/bitmap/sample_mp4_first_frame/electrical_colors/translate_then_rotate.png b/libraries/test_data/src/test/assets/test-generated-goldens/sample_mp4_first_frame/electrical_colors/translate_then_rotate.png similarity index 100% rename from libraries/test_data/src/test/assets/media/bitmap/sample_mp4_first_frame/electrical_colors/translate_then_rotate.png rename to libraries/test_data/src/test/assets/test-generated-goldens/sample_mp4_first_frame/electrical_colors/translate_then_rotate.png diff --git a/libraries/test_data/src/test/assets/media/bitmap/sample_mp4_first_frame/electrical_colors/zero_alpha.png b/libraries/test_data/src/test/assets/test-generated-goldens/sample_mp4_first_frame/electrical_colors/zero_alpha.png similarity index 100% rename from libraries/test_data/src/test/assets/media/bitmap/sample_mp4_first_frame/electrical_colors/zero_alpha.png rename to libraries/test_data/src/test/assets/test-generated-goldens/sample_mp4_first_frame/electrical_colors/zero_alpha.png diff --git a/libraries/test_data/src/test/assets/media/bitmap/sample_mp4_first_frame/linear_colors/README.md b/libraries/test_data/src/test/assets/test-generated-goldens/sample_mp4_first_frame/linear_colors/README.md similarity index 100% rename from libraries/test_data/src/test/assets/media/bitmap/sample_mp4_first_frame/linear_colors/README.md rename to libraries/test_data/src/test/assets/test-generated-goldens/sample_mp4_first_frame/linear_colors/README.md diff --git a/libraries/test_data/src/test/assets/media/bitmap/sample_mp4_first_frame/linear_colors/adjust_all_hsl_settings.png b/libraries/test_data/src/test/assets/test-generated-goldens/sample_mp4_first_frame/linear_colors/adjust_all_hsl_settings.png similarity index 100% rename from libraries/test_data/src/test/assets/media/bitmap/sample_mp4_first_frame/linear_colors/adjust_all_hsl_settings.png rename to libraries/test_data/src/test/assets/test-generated-goldens/sample_mp4_first_frame/linear_colors/adjust_all_hsl_settings.png diff --git a/libraries/test_data/src/test/assets/media/bitmap/sample_mp4_first_frame/linear_colors/decrease_contrast.png b/libraries/test_data/src/test/assets/test-generated-goldens/sample_mp4_first_frame/linear_colors/decrease_contrast.png similarity index 100% rename from libraries/test_data/src/test/assets/media/bitmap/sample_mp4_first_frame/linear_colors/decrease_contrast.png rename to libraries/test_data/src/test/assets/test-generated-goldens/sample_mp4_first_frame/linear_colors/decrease_contrast.png diff --git a/libraries/test_data/src/test/assets/media/bitmap/sample_mp4_first_frame/linear_colors/decrease_lightness.png b/libraries/test_data/src/test/assets/test-generated-goldens/sample_mp4_first_frame/linear_colors/decrease_lightness.png similarity index 100% rename from libraries/test_data/src/test/assets/media/bitmap/sample_mp4_first_frame/linear_colors/decrease_lightness.png rename to libraries/test_data/src/test/assets/test-generated-goldens/sample_mp4_first_frame/linear_colors/decrease_lightness.png diff --git a/libraries/test_data/src/test/assets/media/bitmap/sample_mp4_first_frame/linear_colors/grayscale.png b/libraries/test_data/src/test/assets/test-generated-goldens/sample_mp4_first_frame/linear_colors/grayscale.png similarity index 100% rename from libraries/test_data/src/test/assets/media/bitmap/sample_mp4_first_frame/linear_colors/grayscale.png rename to libraries/test_data/src/test/assets/test-generated-goldens/sample_mp4_first_frame/linear_colors/grayscale.png diff --git a/libraries/test_data/src/test/assets/media/bitmap/sample_mp4_first_frame/linear_colors/increase_brightness.png b/libraries/test_data/src/test/assets/test-generated-goldens/sample_mp4_first_frame/linear_colors/increase_brightness.png similarity index 100% rename from libraries/test_data/src/test/assets/media/bitmap/sample_mp4_first_frame/linear_colors/increase_brightness.png rename to libraries/test_data/src/test/assets/test-generated-goldens/sample_mp4_first_frame/linear_colors/increase_brightness.png diff --git a/libraries/test_data/src/test/assets/media/bitmap/sample_mp4_first_frame/linear_colors/increase_contrast.png b/libraries/test_data/src/test/assets/test-generated-goldens/sample_mp4_first_frame/linear_colors/increase_contrast.png similarity index 100% rename from libraries/test_data/src/test/assets/media/bitmap/sample_mp4_first_frame/linear_colors/increase_contrast.png rename to libraries/test_data/src/test/assets/test-generated-goldens/sample_mp4_first_frame/linear_colors/increase_contrast.png diff --git a/libraries/test_data/src/test/assets/media/bitmap/sample_mp4_first_frame/linear_colors/increase_lightness.png b/libraries/test_data/src/test/assets/test-generated-goldens/sample_mp4_first_frame/linear_colors/increase_lightness.png similarity index 100% rename from libraries/test_data/src/test/assets/media/bitmap/sample_mp4_first_frame/linear_colors/increase_lightness.png rename to libraries/test_data/src/test/assets/test-generated-goldens/sample_mp4_first_frame/linear_colors/increase_lightness.png diff --git a/libraries/test_data/src/test/assets/media/bitmap/sample_mp4_first_frame/linear_colors/increase_red_channel.png b/libraries/test_data/src/test/assets/test-generated-goldens/sample_mp4_first_frame/linear_colors/increase_red_channel.png similarity index 100% rename from libraries/test_data/src/test/assets/media/bitmap/sample_mp4_first_frame/linear_colors/increase_red_channel.png rename to libraries/test_data/src/test/assets/test-generated-goldens/sample_mp4_first_frame/linear_colors/increase_red_channel.png diff --git a/libraries/test_data/src/test/assets/media/bitmap/sample_mp4_first_frame/linear_colors/invert.png b/libraries/test_data/src/test/assets/test-generated-goldens/sample_mp4_first_frame/linear_colors/invert.png similarity index 100% rename from libraries/test_data/src/test/assets/media/bitmap/sample_mp4_first_frame/linear_colors/invert.png rename to libraries/test_data/src/test/assets/test-generated-goldens/sample_mp4_first_frame/linear_colors/invert.png diff --git a/libraries/test_data/src/test/assets/media/bitmap/sample_mp4_first_frame/linear_colors/lut_map_white_to_green.png b/libraries/test_data/src/test/assets/test-generated-goldens/sample_mp4_first_frame/linear_colors/lut_map_white_to_green.png similarity index 100% rename from libraries/test_data/src/test/assets/media/bitmap/sample_mp4_first_frame/linear_colors/lut_map_white_to_green.png rename to libraries/test_data/src/test/assets/test-generated-goldens/sample_mp4_first_frame/linear_colors/lut_map_white_to_green.png diff --git a/libraries/test_data/src/test/assets/media/bitmap/sample_mp4_first_frame/linear_colors/maximum_contrast.png b/libraries/test_data/src/test/assets/test-generated-goldens/sample_mp4_first_frame/linear_colors/maximum_contrast.png similarity index 100% rename from libraries/test_data/src/test/assets/media/bitmap/sample_mp4_first_frame/linear_colors/maximum_contrast.png rename to libraries/test_data/src/test/assets/test-generated-goldens/sample_mp4_first_frame/linear_colors/maximum_contrast.png diff --git a/libraries/test_data/src/test/assets/media/bitmap/sample_mp4_first_frame/linear_colors/maximum_saturation.png b/libraries/test_data/src/test/assets/test-generated-goldens/sample_mp4_first_frame/linear_colors/maximum_saturation.png similarity index 100% rename from libraries/test_data/src/test/assets/media/bitmap/sample_mp4_first_frame/linear_colors/maximum_saturation.png rename to libraries/test_data/src/test/assets/test-generated-goldens/sample_mp4_first_frame/linear_colors/maximum_saturation.png diff --git a/libraries/test_data/src/test/assets/media/bitmap/sample_mp4_first_frame/linear_colors/minimum_saturation.png b/libraries/test_data/src/test/assets/test-generated-goldens/sample_mp4_first_frame/linear_colors/minimum_saturation.png similarity index 100% rename from libraries/test_data/src/test/assets/media/bitmap/sample_mp4_first_frame/linear_colors/minimum_saturation.png rename to libraries/test_data/src/test/assets/test-generated-goldens/sample_mp4_first_frame/linear_colors/minimum_saturation.png diff --git a/libraries/test_data/src/test/assets/media/bitmap/sample_mp4_first_frame/linear_colors/only_red_channel.png b/libraries/test_data/src/test/assets/test-generated-goldens/sample_mp4_first_frame/linear_colors/only_red_channel.png similarity index 100% rename from libraries/test_data/src/test/assets/media/bitmap/sample_mp4_first_frame/linear_colors/only_red_channel.png rename to libraries/test_data/src/test/assets/test-generated-goldens/sample_mp4_first_frame/linear_colors/only_red_channel.png diff --git a/libraries/test_data/src/test/assets/media/bitmap/sample_mp4_first_frame/linear_colors/original.png b/libraries/test_data/src/test/assets/test-generated-goldens/sample_mp4_first_frame/linear_colors/original.png similarity index 100% rename from libraries/test_data/src/test/assets/media/bitmap/sample_mp4_first_frame/linear_colors/original.png rename to libraries/test_data/src/test/assets/test-generated-goldens/sample_mp4_first_frame/linear_colors/original.png diff --git a/libraries/test_data/src/test/assets/media/bitmap/sample_mp4_first_frame/linear_colors/rotate_hue_by_60_degrees.png b/libraries/test_data/src/test/assets/test-generated-goldens/sample_mp4_first_frame/linear_colors/rotate_hue_by_60_degrees.png similarity index 100% rename from libraries/test_data/src/test/assets/media/bitmap/sample_mp4_first_frame/linear_colors/rotate_hue_by_60_degrees.png rename to libraries/test_data/src/test/assets/test-generated-goldens/sample_mp4_first_frame/linear_colors/rotate_hue_by_60_degrees.png diff --git a/libraries/test_data/src/test/assets/media/bitmap/sample_mp4_first_frame/linear_colors/rotate_hue_by_negative_90_degrees.png b/libraries/test_data/src/test/assets/test-generated-goldens/sample_mp4_first_frame/linear_colors/rotate_hue_by_negative_90_degrees.png similarity index 100% rename from libraries/test_data/src/test/assets/media/bitmap/sample_mp4_first_frame/linear_colors/rotate_hue_by_negative_90_degrees.png rename to libraries/test_data/src/test/assets/test-generated-goldens/sample_mp4_first_frame/linear_colors/rotate_hue_by_negative_90_degrees.png diff --git a/libraries/test_data/src/test/assets/media/bitmap/sample_mp4_first_frame/linear_colors/two_thumbnails_strip.png b/libraries/test_data/src/test/assets/test-generated-goldens/sample_mp4_first_frame/linear_colors/two_thumbnails_strip.png similarity index 100% rename from libraries/test_data/src/test/assets/media/bitmap/sample_mp4_first_frame/linear_colors/two_thumbnails_strip.png rename to libraries/test_data/src/test/assets/test-generated-goldens/sample_mp4_first_frame/linear_colors/two_thumbnails_strip.png diff --git a/libraries/test_data/src/test/assets/media/bitmap/transformer_multi_sequence_composition_test/export_withTwoSequencesEachWithOneVideoMediaItem_succeeds_0.png b/libraries/test_data/src/test/assets/test-generated-goldens/transformer_multi_sequence_composition_test/export_withTwoSequencesEachWithOneVideoMediaItem_succeeds_0.png similarity index 100% rename from libraries/test_data/src/test/assets/media/bitmap/transformer_multi_sequence_composition_test/export_withTwoSequencesEachWithOneVideoMediaItem_succeeds_0.png rename to libraries/test_data/src/test/assets/test-generated-goldens/transformer_multi_sequence_composition_test/export_withTwoSequencesEachWithOneVideoMediaItem_succeeds_0.png diff --git a/libraries/test_data/src/test/assets/media/bitmap/transformer_multi_sequence_composition_test/export_withTwoSequencesOneWithVideoOneWithImage_succeeds_0.png b/libraries/test_data/src/test/assets/test-generated-goldens/transformer_multi_sequence_composition_test/export_withTwoSequencesOneWithVideoOneWithImage_succeeds_0.png similarity index 100% rename from libraries/test_data/src/test/assets/media/bitmap/transformer_multi_sequence_composition_test/export_withTwoSequencesOneWithVideoOneWithImage_succeeds_0.png rename to libraries/test_data/src/test/assets/test-generated-goldens/transformer_multi_sequence_composition_test/export_withTwoSequencesOneWithVideoOneWithImage_succeeds_0.png diff --git a/libraries/test_data/src/test/assets/media/bitmap/transformer_multi_sequence_composition_test/export_withTwoSequencesWithVideoCompositorSettings_succeeds_0.png b/libraries/test_data/src/test/assets/test-generated-goldens/transformer_multi_sequence_composition_test/export_withTwoSequencesWithVideoCompositorSettings_succeeds_0.png similarity index 100% rename from libraries/test_data/src/test/assets/media/bitmap/transformer_multi_sequence_composition_test/export_withTwoSequencesWithVideoCompositorSettings_succeeds_0.png rename to libraries/test_data/src/test/assets/test-generated-goldens/transformer_multi_sequence_composition_test/export_withTwoSequencesWithVideoCompositorSettings_succeeds_0.png diff --git a/libraries/test_data/src/test/assets/media/bitmap/transformer_sequence_effect_test/export_withBt601AndBt709MediaItems_0.png b/libraries/test_data/src/test/assets/test-generated-goldens/transformer_sequence_effect_test/export_withBt601AndBt709MediaItems_0.png similarity index 100% rename from libraries/test_data/src/test/assets/media/bitmap/transformer_sequence_effect_test/export_withBt601AndBt709MediaItems_0.png rename to libraries/test_data/src/test/assets/test-generated-goldens/transformer_sequence_effect_test/export_withBt601AndBt709MediaItems_0.png diff --git a/libraries/test_data/src/test/assets/media/bitmap/transformer_sequence_effect_test/export_withBt601AndBt709MediaItems_1.png b/libraries/test_data/src/test/assets/test-generated-goldens/transformer_sequence_effect_test/export_withBt601AndBt709MediaItems_1.png similarity index 100% rename from libraries/test_data/src/test/assets/media/bitmap/transformer_sequence_effect_test/export_withBt601AndBt709MediaItems_1.png rename to libraries/test_data/src/test/assets/test-generated-goldens/transformer_sequence_effect_test/export_withBt601AndBt709MediaItems_1.png diff --git a/libraries/test_data/src/test/assets/media/bitmap/transformer_sequence_effect_test/export_withBt601VideoAndBt709ImageMediaItems_0.png b/libraries/test_data/src/test/assets/test-generated-goldens/transformer_sequence_effect_test/export_withBt601VideoAndBt709ImageMediaItems_0.png similarity index 100% rename from libraries/test_data/src/test/assets/media/bitmap/transformer_sequence_effect_test/export_withBt601VideoAndBt709ImageMediaItems_0.png rename to libraries/test_data/src/test/assets/test-generated-goldens/transformer_sequence_effect_test/export_withBt601VideoAndBt709ImageMediaItems_0.png diff --git a/libraries/test_data/src/test/assets/media/bitmap/transformer_sequence_effect_test/export_withBt601VideoAndBt709ImageMediaItems_1.png b/libraries/test_data/src/test/assets/test-generated-goldens/transformer_sequence_effect_test/export_withBt601VideoAndBt709ImageMediaItems_1.png similarity index 100% rename from libraries/test_data/src/test/assets/media/bitmap/transformer_sequence_effect_test/export_withBt601VideoAndBt709ImageMediaItems_1.png rename to libraries/test_data/src/test/assets/test-generated-goldens/transformer_sequence_effect_test/export_withBt601VideoAndBt709ImageMediaItems_1.png 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/test-generated-goldens/transformer_sequence_effect_test/export_withCompositionPresentationAndNoVideoEffectsForFirstMediaItem_0.png similarity index 100% rename from libraries/test_data/src/test/assets/media/bitmap/transformer_sequence_effect_test/export_withCompositionPresentationAndNoVideoEffectsForFirstMediaItem_0.png rename to libraries/test_data/src/test/assets/test-generated-goldens/transformer_sequence_effect_test/export_withCompositionPresentationAndNoVideoEffectsForFirstMediaItem_0.png 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/test-generated-goldens/transformer_sequence_effect_test/export_withCompositionPresentationAndNoVideoEffectsForFirstMediaItem_1.png similarity index 100% rename from libraries/test_data/src/test/assets/media/bitmap/transformer_sequence_effect_test/export_withCompositionPresentationAndNoVideoEffectsForFirstMediaItem_1.png rename to libraries/test_data/src/test/assets/test-generated-goldens/transformer_sequence_effect_test/export_withCompositionPresentationAndNoVideoEffectsForFirstMediaItem_1.png 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/test-generated-goldens/transformer_sequence_effect_test/export_withCompositionPresentationAndNoVideoEffects_0.png similarity index 100% rename from libraries/test_data/src/test/assets/media/bitmap/transformer_sequence_effect_test/export_withCompositionPresentationAndNoVideoEffects_0.png rename to libraries/test_data/src/test/assets/test-generated-goldens/transformer_sequence_effect_test/export_withCompositionPresentationAndNoVideoEffects_0.png 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/test-generated-goldens/transformer_sequence_effect_test/export_withCompositionPresentationAndNoVideoEffects_1.png similarity index 100% rename from libraries/test_data/src/test/assets/media/bitmap/transformer_sequence_effect_test/export_withCompositionPresentationAndNoVideoEffects_1.png rename to libraries/test_data/src/test/assets/test-generated-goldens/transformer_sequence_effect_test/export_withCompositionPresentationAndNoVideoEffects_1.png 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/test-generated-goldens/transformer_sequence_effect_test/export_withCompositionPresentationAndNoVideoEffects_2.png similarity index 100% rename from libraries/test_data/src/test/assets/media/bitmap/transformer_sequence_effect_test/export_withCompositionPresentationAndNoVideoEffects_2.png rename to libraries/test_data/src/test/assets/test-generated-goldens/transformer_sequence_effect_test/export_withCompositionPresentationAndNoVideoEffects_2.png 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/test-generated-goldens/transformer_sequence_effect_test/export_withCompositionPresentationAndNoVideoEffects_3.png similarity index 100% rename from libraries/test_data/src/test/assets/media/bitmap/transformer_sequence_effect_test/export_withCompositionPresentationAndNoVideoEffects_3.png rename to libraries/test_data/src/test/assets/test-generated-goldens/transformer_sequence_effect_test/export_withCompositionPresentationAndNoVideoEffects_3.png 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/test-generated-goldens/transformer_sequence_effect_test/export_withCompositionPresentationAndWithPerMediaItemEffects_0.png similarity index 100% rename from libraries/test_data/src/test/assets/media/bitmap/transformer_sequence_effect_test/export_withCompositionPresentationAndWithPerMediaItemEffects_0.png rename to libraries/test_data/src/test/assets/test-generated-goldens/transformer_sequence_effect_test/export_withCompositionPresentationAndWithPerMediaItemEffects_0.png 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/test-generated-goldens/transformer_sequence_effect_test/export_withCompositionPresentationAndWithPerMediaItemEffects_1.png similarity index 100% rename from libraries/test_data/src/test/assets/media/bitmap/transformer_sequence_effect_test/export_withCompositionPresentationAndWithPerMediaItemEffects_1.png rename to libraries/test_data/src/test/assets/test-generated-goldens/transformer_sequence_effect_test/export_withCompositionPresentationAndWithPerMediaItemEffects_1.png 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/test-generated-goldens/transformer_sequence_effect_test/export_withCompositionPresentationAndWithPerMediaItemEffects_2.png similarity index 100% rename from libraries/test_data/src/test/assets/media/bitmap/transformer_sequence_effect_test/export_withCompositionPresentationAndWithPerMediaItemEffects_2.png rename to libraries/test_data/src/test/assets/test-generated-goldens/transformer_sequence_effect_test/export_withCompositionPresentationAndWithPerMediaItemEffects_2.png 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/test-generated-goldens/transformer_sequence_effect_test/export_withCompositionPresentationAndWithPerMediaItemEffects_3.png similarity index 100% rename from libraries/test_data/src/test/assets/media/bitmap/transformer_sequence_effect_test/export_withCompositionPresentationAndWithPerMediaItemEffects_3.png rename to libraries/test_data/src/test/assets/test-generated-goldens/transformer_sequence_effect_test/export_withCompositionPresentationAndWithPerMediaItemEffects_3.png diff --git a/libraries/test_data/src/test/assets/media/bitmap/transformer_sequence_effect_test/export_withHdrThenSdr_whenHdrEditingUnsupported_0.png b/libraries/test_data/src/test/assets/test-generated-goldens/transformer_sequence_effect_test/export_withHdrThenSdr_whenHdrEditingUnsupported_0.png similarity index 100% rename from libraries/test_data/src/test/assets/media/bitmap/transformer_sequence_effect_test/export_withHdrThenSdr_whenHdrEditingUnsupported_0.png rename to libraries/test_data/src/test/assets/test-generated-goldens/transformer_sequence_effect_test/export_withHdrThenSdr_whenHdrEditingUnsupported_0.png diff --git a/libraries/test_data/src/test/assets/media/bitmap/transformer_sequence_effect_test/export_withHdrThenSdr_whenHdrEditingUnsupported_1.png b/libraries/test_data/src/test/assets/test-generated-goldens/transformer_sequence_effect_test/export_withHdrThenSdr_whenHdrEditingUnsupported_1.png similarity index 100% rename from libraries/test_data/src/test/assets/media/bitmap/transformer_sequence_effect_test/export_withHdrThenSdr_whenHdrEditingUnsupported_1.png rename to libraries/test_data/src/test/assets/test-generated-goldens/transformer_sequence_effect_test/export_withHdrThenSdr_whenHdrEditingUnsupported_1.png diff --git a/libraries/test_data/src/test/assets/media/bitmap/transformer_sequence_effect_test/export_withHdrThenSdr_whenHdrEditingUnsupported_2.png b/libraries/test_data/src/test/assets/test-generated-goldens/transformer_sequence_effect_test/export_withHdrThenSdr_whenHdrEditingUnsupported_2.png similarity index 100% rename from libraries/test_data/src/test/assets/media/bitmap/transformer_sequence_effect_test/export_withHdrThenSdr_whenHdrEditingUnsupported_2.png rename to libraries/test_data/src/test/assets/test-generated-goldens/transformer_sequence_effect_test/export_withHdrThenSdr_whenHdrEditingUnsupported_2.png 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/test-generated-goldens/transformer_sequence_effect_test/export_withNoCompositionPresentationAndWithPerMediaItemEffects_0.png similarity index 100% rename from libraries/test_data/src/test/assets/media/bitmap/transformer_sequence_effect_test/export_withNoCompositionPresentationAndWithPerMediaItemEffects_0.png rename to libraries/test_data/src/test/assets/test-generated-goldens/transformer_sequence_effect_test/export_withNoCompositionPresentationAndWithPerMediaItemEffects_0.png 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/test-generated-goldens/transformer_sequence_effect_test/export_withNoCompositionPresentationAndWithPerMediaItemEffects_1.png similarity index 100% rename from libraries/test_data/src/test/assets/media/bitmap/transformer_sequence_effect_test/export_withNoCompositionPresentationAndWithPerMediaItemEffects_1.png rename to libraries/test_data/src/test/assets/test-generated-goldens/transformer_sequence_effect_test/export_withNoCompositionPresentationAndWithPerMediaItemEffects_1.png 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/test-generated-goldens/transformer_sequence_effect_test/export_withNoCompositionPresentationAndWithPerMediaItemEffects_2.png similarity index 100% rename from libraries/test_data/src/test/assets/media/bitmap/transformer_sequence_effect_test/export_withNoCompositionPresentationAndWithPerMediaItemEffects_2.png rename to libraries/test_data/src/test/assets/test-generated-goldens/transformer_sequence_effect_test/export_withNoCompositionPresentationAndWithPerMediaItemEffects_2.png 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/test-generated-goldens/transformer_sequence_effect_test/export_withNoCompositionPresentationAndWithPerMediaItemEffects_3.png similarity index 100% rename from libraries/test_data/src/test/assets/media/bitmap/transformer_sequence_effect_test/export_withNoCompositionPresentationAndWithPerMediaItemEffects_3.png rename to libraries/test_data/src/test/assets/test-generated-goldens/transformer_sequence_effect_test/export_withNoCompositionPresentationAndWithPerMediaItemEffects_3.png diff --git a/libraries/test_data/src/test/assets/media/bitmap/transformer_sequence_effect_test/export_withSdrThenHdr_0.png b/libraries/test_data/src/test/assets/test-generated-goldens/transformer_sequence_effect_test/export_withSdrThenHdr_0.png similarity index 100% rename from libraries/test_data/src/test/assets/media/bitmap/transformer_sequence_effect_test/export_withSdrThenHdr_0.png rename to libraries/test_data/src/test/assets/test-generated-goldens/transformer_sequence_effect_test/export_withSdrThenHdr_0.png diff --git a/libraries/test_data/src/test/assets/media/bitmap/transformer_sequence_effect_test/export_withSdrThenHdr_1.png b/libraries/test_data/src/test/assets/test-generated-goldens/transformer_sequence_effect_test/export_withSdrThenHdr_1.png similarity index 100% rename from libraries/test_data/src/test/assets/media/bitmap/transformer_sequence_effect_test/export_withSdrThenHdr_1.png rename to libraries/test_data/src/test/assets/test-generated-goldens/transformer_sequence_effect_test/export_withSdrThenHdr_1.png diff --git a/libraries/test_data/src/test/assets/media/bitmap/transformer_sequence_effect_test/export_withSdrThenHdr_2.png b/libraries/test_data/src/test/assets/test-generated-goldens/transformer_sequence_effect_test/export_withSdrThenHdr_2.png similarity index 100% rename from libraries/test_data/src/test/assets/media/bitmap/transformer_sequence_effect_test/export_withSdrThenHdr_2.png rename to libraries/test_data/src/test/assets/test-generated-goldens/transformer_sequence_effect_test/export_withSdrThenHdr_2.png diff --git a/libraries/test_utils/src/test/java/androidx/media3/test/utils/MssimCalculatorTest.java b/libraries/test_utils/src/test/java/androidx/media3/test/utils/MssimCalculatorTest.java index 4b5f309006..4b87acbafd 100644 --- a/libraries/test_utils/src/test/java/androidx/media3/test/utils/MssimCalculatorTest.java +++ b/libraries/test_utils/src/test/java/androidx/media3/test/utils/MssimCalculatorTest.java @@ -34,7 +34,8 @@ public class MssimCalculatorTest { @Test public void calculateSsim_sameImage() throws Exception { - Bitmap bitmap = readBitmap("media/bitmap/sample_mp4_first_frame/linear_colors/original.png"); + Bitmap bitmap = + readBitmap("test-generated-goldens/sample_mp4_first_frame/linear_colors/original.png"); byte[] imageLuminosities = bitmapToLuminosityArray(bitmap); // SSIM equals 1 if the two images match. @@ -46,9 +47,11 @@ public class MssimCalculatorTest { @Test public void calculateSsim_increasedBrightness() throws Exception { - Bitmap refBitmap = readBitmap("media/bitmap/sample_mp4_first_frame/linear_colors/original.png"); + Bitmap refBitmap = + readBitmap("test-generated-goldens/sample_mp4_first_frame/linear_colors/original.png"); Bitmap distBitmap = - readBitmap("media/bitmap/sample_mp4_first_frame/linear_colors/increase_brightness.png"); + readBitmap( + "test-generated-goldens/sample_mp4_first_frame/linear_colors/increase_brightness.png"); // SSIM as calculated by ffmpeg: 0.526821 = 52% @@ -66,9 +69,10 @@ public class MssimCalculatorTest { @Test public void calculateSsim_withWindowSkipping_similarToWithout() throws Exception { Bitmap referenceBitmap = - readBitmap("media/bitmap/sample_mp4_first_frame/linear_colors/original.png"); + readBitmap("test-generated-goldens/sample_mp4_first_frame/linear_colors/original.png"); Bitmap distortedBitmap = - readBitmap("media/bitmap/sample_mp4_first_frame/linear_colors/increase_brightness.png"); + readBitmap( + "test-generated-goldens/sample_mp4_first_frame/linear_colors/increase_brightness.png"); byte[] referenceLuminosity = bitmapToLuminosityArray(referenceBitmap); byte[] distortedLuminosity = bitmapToLuminosityArray(distortedBitmap); diff --git a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/DefaultVideoCompositorPixelTest.java b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/DefaultVideoCompositorPixelTest.java index 5f87b756ec..91f39e6576 100644 --- a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/DefaultVideoCompositorPixelTest.java +++ b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/DefaultVideoCompositorPixelTest.java @@ -102,7 +102,7 @@ public final class DefaultVideoCompositorPixelTest { @Rule public final TestName testName = new TestName(); private static final String ORIGINAL_PNG_ASSET_PATH = "media/png/media3test_srgb.png"; - private static final String TEST_DIRECTORY = "media/bitmap/CompositorTestTimestamps/"; + private static final String TEST_DIRECTORY = "test-generated-goldens/CompositorTestTimestamps/"; private static final ImmutableList> TWO_INPUT_COMPOSITOR_EFFECT_LISTS = ImmutableList.of( ImmutableList.of(RgbFilter.createGrayscaleFilter(), new AlphaScale(0.7f)), diff --git a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/SequenceEffectTestUtil.java b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/SequenceEffectTestUtil.java index 77f5024794..756c614e91 100644 --- a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/SequenceEffectTestUtil.java +++ b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/SequenceEffectTestUtil.java @@ -34,7 +34,8 @@ import java.util.List; /** Utility class for checking testing {@link EditedMediaItemSequence} instances. */ public final class SequenceEffectTestUtil { - private static final String PNG_ASSET_BASE_PATH = "media/bitmap/transformer_sequence_effect_test"; + private static final String PNG_ASSET_BASE_PATH = + "test-generated-goldens/transformer_sequence_effect_test"; public static final long SINGLE_30_FPS_VIDEO_FRAME_THRESHOLD_MS = 50; private SequenceEffectTestUtil() {} diff --git a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/TransformerMultiSequenceCompositionTest.java b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/TransformerMultiSequenceCompositionTest.java index 4ec7ab66ff..2c6127bdc7 100644 --- a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/TransformerMultiSequenceCompositionTest.java +++ b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/TransformerMultiSequenceCompositionTest.java @@ -60,7 +60,7 @@ public final class TransformerMultiSequenceCompositionTest { // TODO: b/301242589 - Fix this test on the crow emulator, and re-generate bitmaps using the crow // emulator, for consistency with other pixel tests. private static final String PNG_ASSET_BASE_PATH = - "media/bitmap/transformer_multi_sequence_composition_test"; + "test-generated-goldens/transformer_multi_sequence_composition_test"; // The duration of one frame of the 30 FPS test video, in milliseconds. private static final long ONE_FRAME_DURATION_MS = 35; diff --git a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/DefaultVideoFrameProcessorMultipleTextureOutputPixelTest.java b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/DefaultVideoFrameProcessorMultipleTextureOutputPixelTest.java index 0a8455b142..40aa21fbac 100644 --- a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/DefaultVideoFrameProcessorMultipleTextureOutputPixelTest.java +++ b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/DefaultVideoFrameProcessorMultipleTextureOutputPixelTest.java @@ -53,12 +53,12 @@ import org.junit.runner.RunWith; public class DefaultVideoFrameProcessorMultipleTextureOutputPixelTest { private static final String ORIGINAL_PNG_ASSET_PATH = - "media/bitmap/sample_mp4_first_frame/electrical_colors/original.png"; + "test-generated-goldens/sample_mp4_first_frame/electrical_colors/original.png"; private static final String MEDIA3_TEST_PNG_ASSET_PATH = "media/png/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"; + "test-generated-goldens/sample_mp4_first_frame/electrical_colors/srgb_to_electrical_original.png"; private static final String SRGB_TO_ELECTRICAL_MEDIA3_TEST_PNG_ASSET_PATH = - "media/bitmap/sample_mp4_first_frame/electrical_colors/srgb_to_electrical_media3test.png"; + "test-generated-goldens/sample_mp4_first_frame/electrical_colors/srgb_to_electrical_media3test.png"; @Rule public final TestName testName = new TestName(); diff --git a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/DefaultVideoFrameProcessorTextureOutputPixelTest.java b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/DefaultVideoFrameProcessorTextureOutputPixelTest.java index 6550469c44..b913653216 100644 --- a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/DefaultVideoFrameProcessorTextureOutputPixelTest.java +++ b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/DefaultVideoFrameProcessorTextureOutputPixelTest.java @@ -71,15 +71,15 @@ import org.junit.runner.RunWith; @RunWith(AndroidJUnit4.class) public final class DefaultVideoFrameProcessorTextureOutputPixelTest { private static final String ORIGINAL_PNG_ASSET_PATH = - "media/bitmap/sample_mp4_first_frame/electrical_colors/original.png"; + "test-generated-goldens/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"; + "test-generated-goldens/sample_mp4_first_frame/electrical_colors/overlay_bitmap_FrameProcessor.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"; + "test-generated-goldens/sample_mp4_first_frame/electrical_colors/original_hlg10.png"; private static final String ORIGINAL_HDR10_PNG_ASSET_PATH = - "media/bitmap/sample_mp4_first_frame/electrical_colors/original_hdr10.png"; + "test-generated-goldens/sample_mp4_first_frame/electrical_colors/original_hdr10.png"; /** Input SDR video of which we only use the first frame. */ private static final String INPUT_SDR_MP4_ASSET_STRING = "media/mp4/sample.mp4"; diff --git a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/ToneMapHdrToSdrUsingOpenGlPixelTest.java b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/ToneMapHdrToSdrUsingOpenGlPixelTest.java index 3c764547fe..eb52060f3f 100644 --- a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/ToneMapHdrToSdrUsingOpenGlPixelTest.java +++ b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/ToneMapHdrToSdrUsingOpenGlPixelTest.java @@ -69,11 +69,11 @@ public final class ToneMapHdrToSdrUsingOpenGlPixelTest { // This file is generated on a Pixel 7, because the emulator isn't able to decode HLG to generate // this file. private static final String TONE_MAP_HLG_TO_SDR_PNG_ASSET_PATH = - "media/bitmap/sample_mp4_first_frame/electrical_colors/tone_map_hlg_to_sdr.png"; + "test-generated-goldens/sample_mp4_first_frame/electrical_colors/tone_map_hlg_to_sdr.png"; // This file is generated on a Pixel 7, because the emulator isn't able to decode PQ to generate // this file. private static final String TONE_MAP_PQ_TO_SDR_PNG_ASSET_PATH = - "media/bitmap/sample_mp4_first_frame/electrical_colors/tone_map_pq_to_sdr.png"; + "test-generated-goldens/sample_mp4_first_frame/electrical_colors/tone_map_pq_to_sdr.png"; /** Input HLG video of which we only use the first frame. */ private static final String HLG_ASSET_STRING = "media/mp4/hlg10-color-test.mp4";