From 3292dc5f894c7b82cb9ff4a63a310ba607904881 Mon Sep 17 00:00:00 2001 From: Hampus Date: Mon, 12 Oct 2026 00:17:29 +0200 Subject: [PATCH] test(media-proxy): drop animated jxl fixture case (#3409) --- .../src/media_process/tests/metadata.rs | 5 ++--- .../src/media_process/tests/transform.rs | 7 +++---- fluxer_media_proxy/src/test_fixtures/images.rs | 1 - .../test_fixtures/jxl_3000_lossy_2_frames.jxl | Bin 2353 -> 0 bytes fluxer_media_proxy/src/test_fixtures/mod.rs | 10 +++++----- 5 files changed, 10 insertions(+), 13 deletions(-) delete mode 100644 fluxer_media_proxy/src/test_fixtures/jxl_3000_lossy_2_frames.jxl diff --git a/fluxer_media_proxy/src/media_process/tests/metadata.rs b/fluxer_media_proxy/src/media_process/tests/metadata.rs index 431c0e95a..12bdb817e 100644 --- a/fluxer_media_proxy/src/media_process/tests/metadata.rs +++ b/fluxer_media_proxy/src/media_process/tests/metadata.rs @@ -14,8 +14,8 @@ use crate::{ nsfw::{NSFWClient, NSFWPolicy}, output_format::OutputFormat, test_fixtures::{ - JXL_3000_LOSSY_2_FRAMES, JXL_4100_LOSSLESS_RGB16, JXL_4100_LOSSY_ALPHA, - JXL_4100_LOSSY_RGB_DEPTH, JXL_7000X4000_LOSSY_RGB, fixture_audio_mp3_with_png_cover_art, + JXL_4100_LOSSLESS_RGB16, JXL_4100_LOSSY_ALPHA, JXL_4100_LOSSY_RGB_DEPTH, + JXL_7000X4000_LOSSY_RGB, fixture_audio_mp3_with_png_cover_art, fixture_audio_mp4_with_attached_picture, fixture_audio_only_mp4, fixture_h264_mp4, fixture_mkv_with_png_video_stream, fixture_mp4_with_undecodable_video, synthetic_png, synthetic_wav, @@ -258,7 +258,6 @@ fn metadata_refuses_jxl_above_the_decode_pixel_cap() { JXL_4100_LOSSY_ALPHA, JXL_4100_LOSSY_RGB_DEPTH, JXL_4100_LOSSLESS_RGB16, - JXL_3000_LOSSY_2_FRAMES, ] { let err = tokio::runtime::Builder::new_current_thread() .build() diff --git a/fluxer_media_proxy/src/media_process/tests/transform.rs b/fluxer_media_proxy/src/media_process/tests/transform.rs index 3f106423d..3a5f986aa 100644 --- a/fluxer_media_proxy/src/media_process/tests/transform.rs +++ b/fluxer_media_proxy/src/media_process/tests/transform.rs @@ -14,9 +14,9 @@ use crate::{ mime, native, output_format::OutputFormat, test_fixtures::{ - JPEG_ROTATED_MISMATCHED_SCAN, JXL_64_LOSSY_ALPHA, JXL_3000_LOSSY_2_FRAMES, - JXL_4100_LOSSLESS_RGB16, JXL_4100_LOSSY_ALPHA, JXL_4100_LOSSY_RGB_DEPTH, - JXL_7000X4000_LOSSY_RGB, png_dimensions, synthetic_bmp, synthetic_png, + JPEG_ROTATED_MISMATCHED_SCAN, JXL_64_LOSSY_ALPHA, JXL_4100_LOSSLESS_RGB16, + JXL_4100_LOSSY_ALPHA, JXL_4100_LOSSY_RGB_DEPTH, JXL_7000X4000_LOSSY_RGB, png_dimensions, + synthetic_bmp, synthetic_png, }, }; @@ -119,7 +119,6 @@ fn refuses_jxl_above_the_decode_pixel_cap_before_decoding() { JXL_4100_LOSSY_ALPHA, JXL_4100_LOSSY_RGB_DEPTH, JXL_4100_LOSSLESS_RGB16, - JXL_3000_LOSSY_2_FRAMES, ] { for width in [None, Some(128)] { let err = transform_image( diff --git a/fluxer_media_proxy/src/test_fixtures/images.rs b/fluxer_media_proxy/src/test_fixtures/images.rs index b8b798e6c..07cf8b175 100644 --- a/fluxer_media_proxy/src/test_fixtures/images.rs +++ b/fluxer_media_proxy/src/test_fixtures/images.rs @@ -35,7 +35,6 @@ pub const JXL_64_LOSSY_ALPHA: &[u8] = include_bytes!("jxl_64_lossy_alpha.jxl"); pub const JXL_7000X4000_LOSSY_RGB: &[u8] = include_bytes!("jxl_7000x4000_lossy_rgb.jxl"); pub const JXL_4100_LOSSLESS_RGB16: &[u8] = include_bytes!("jxl_4100_lossless_rgb16.jxl"); pub const JXL_4100_LOSSY_RGB_DEPTH: &[u8] = include_bytes!("jxl_4100_lossy_rgb_depth.jxl"); -pub const JXL_3000_LOSSY_2_FRAMES: &[u8] = include_bytes!("jxl_3000_lossy_2_frames.jxl"); pub const ANIMATED_WEBP_1024_17_FRAMES: &[u8] = include_bytes!("animated_webp_1024_17_frames.webp"); pub const JPEG_ROTATED_MISMATCHED_SCAN: &[u8] = include_bytes!("jpeg_rotated_mismatched_scan.jpg"); diff --git a/fluxer_media_proxy/src/test_fixtures/jxl_3000_lossy_2_frames.jxl b/fluxer_media_proxy/src/test_fixtures/jxl_3000_lossy_2_frames.jxl deleted file mode 100644 index 914124b601d18982933ab546de7b7ff26c38327f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2353 zcmey*wJTPTM?sxIc!nJVgF^sA&w>6E$FkP-8*h`m?2wZA>~u;GFGOy`6bSPB{DE}dEV?n{A|y#X7;rU|vravT^K7-q3> zzH#K4XU2A3I=LsCQL|*mp`h*6$Kof*sIUFM&cpxQT&XSQ^4fxbj_hM!etuT@%O3mJ z59%FMIz?RWW^CK{TQneS-;ea-2MaF0e9OwvU}s%h#=_JHG?=Hugj2}+|9?(T7K7Do zZyhG7c#fh041xI{*IOM6-X=)fC(-f3BT1QzIxPaxpNrsW~geDnm6KxRT0Sp3q3wP4jt z8o^xl56ob08mBBcE_|mLfyJfRE`Y^Nz?xr18!CXfmukO3?9SZP0#?R+!wjs9ZPF4G zDL4)B41E@8?AgZ;vM|#hk*FQfww;$co`JCBy&#neI0E diff --git a/fluxer_media_proxy/src/test_fixtures/mod.rs b/fluxer_media_proxy/src/test_fixtures/mod.rs index 525fa58db..52e0255cc 100644 --- a/fluxer_media_proxy/src/test_fixtures/mod.rs +++ b/fluxer_media_proxy/src/test_fixtures/mod.rs @@ -11,11 +11,11 @@ pub use adversarial::{ pub use ffmpeg_cli::{ffmpeg_gen_media, ffmpeg_gen_mp4, ffmpeg_gen_rotated_mp4, ffmpeg_mirror_mp4}; pub use images::{ ANIMATED_WEBP_1024_17_FRAMES, JPEG_ROTATED_MISMATCHED_SCAN, JXL_64_LOSSY_ALPHA, - JXL_3000_LOSSY_2_FRAMES, JXL_4100_LOSSLESS_RGB16, JXL_4100_LOSSY_ALPHA, - JXL_4100_LOSSY_RGB_DEPTH, JXL_7000X4000_LOSSY_RGB, animated_gif_fixture, animated_gif_frames, - apng_header, first_webp_anim_frame_size, gif_frame_delays_cs, gif_loop_count, minimal_gif, - png_dimensions, synthetic_bmp, synthetic_png, webp_animation_loop_count, webp_canvas_size, - webp_chunk_payloads, webp_with_metadata_chunk, + JXL_4100_LOSSLESS_RGB16, JXL_4100_LOSSY_ALPHA, JXL_4100_LOSSY_RGB_DEPTH, + JXL_7000X4000_LOSSY_RGB, animated_gif_fixture, animated_gif_frames, apng_header, + first_webp_anim_frame_size, gif_frame_delays_cs, gif_loop_count, minimal_gif, png_dimensions, + synthetic_bmp, synthetic_png, webp_animation_loop_count, webp_canvas_size, webp_chunk_payloads, + webp_with_metadata_chunk, }; pub use media::{ fixture_audio_mp3_with_png_cover_art, fixture_audio_mp4_with_attached_picture,