Commit 19c06936fd for ffmpeg
commit 19c06936fd78b9249fc65045c9d855b6c28758e1
Author: Niklas Haas <git@haasn.dev>
Date: Sun Oct 4 18:50:55 2026 +0200
tests/fate/image: add roundtrip test for JPEG Ultra HDR
Signed-off-by: Niklas Haas <git@haasn.dev>
diff --git a/tests/fate/image.mak b/tests/fate/image.mak
index c78baa8e08..a42d19861a 100644
--- a/tests/fate/image.mak
+++ b/tests/fate/image.mak
@@ -626,16 +626,19 @@ FATE_IMAGE += $(FATE_IMAGE-yes)
FATE_IMAGE_PROBE += $(FATE_IMAGE_PROBE-yes)
FATE_IMAGE_TRANSCODE += $(FATE_IMAGE_TRANSCODE-yes)
-FATE_JPEG_MPF-$(call ALLYES, LAVFI_INDEV TESTSRC2_FILTER SCALE_FILTER FORMAT_FILTER \
+FATE_JPEG_MPF-$(call ALLYES, LAVFI_INDEV WRAPPED_AVFRAME_DECODER TESTSRC2_FILTER SCALE_FILTER FORMAT_FILTER \
SPLIT_FILTER SETPARAMS_FILTER GAINMAP_FILTER MJPEG_ENCODER JPEG_MPF_MUXER \
- FILE_PROTOCOL) += fate-jpeg-mpf-gainmap
+ JPEG_MPF_DEMUXER MJPEG_DECODER RAWVIDEO_ENCODER FRAMECRC_MUXER PIPE_PROTOCOL \
+ FILE_PROTOCOL FFPROBE) += fate-jpeg-mpf-gainmap
fate-jpeg-mpf-gainmap: tests/data/filtergraphs/jpeg_mpf_gainmap
-fate-jpeg-mpf-gainmap: CMD = md5 -bitexact -sws_flags +accurate_rnd+bitexact \
- -/filter_complex $(TARGET_PATH)/tests/data/filtergraphs/jpeg_mpf_gainmap \
- -map "[base]" -map "[gain]" -stream_group "type=gain_map:st=0:st=1:el_index=1" \
- -pix_fmt yuvj444p -c:v mjpeg -dct int -f jpeg_mpf
-
-FATE_FFMPEG += $(FATE_JPEG_MPF-yes)
+fate-jpeg-mpf-gainmap: CMD = transcode lavfi testsrc2=s=64x48:r=1:d=1 jpeg_mpf \
+ "-sws_flags +accurate_rnd+bitexact \
+ -/filter_complex $(TARGET_PATH)/tests/data/filtergraphs/jpeg_mpf_gainmap \
+ -map [base] -map [gain] -stream_group type=gain_map:st=0:st=1:el_index=1 \
+ -pix_fmt yuvj444p -c:v mjpeg -dct int" "-map 0" \
+ "-show_entries stream_group=index,type,nb_streams:stream_group_stream=index:frame=stream_index:frame_side_data_list -of compact"
+
+FATE_FFMPEG_FFPROBE += $(FATE_JPEG_MPF-yes)
fate-jpeg-mpf: $(FATE_JPEG_MPF-yes)
FATE_IMG2_MUXER-$(call ALLYES, LAVFI_INDEV COLOR_FILTER FORMAT_FILTER \
diff --git a/tests/filtergraphs/jpeg_mpf_gainmap b/tests/filtergraphs/jpeg_mpf_gainmap
index 8f778501cc..d2f0007de2 100644
--- a/tests/filtergraphs/jpeg_mpf_gainmap
+++ b/tests/filtergraphs/jpeg_mpf_gainmap
@@ -1,4 +1,4 @@
-testsrc2=s=64x48:r=1:d=1,setparams=color_trc=smpte2084:color_primaries=bt2020,scale,split [a][hdr];
+[0:v] setparams=color_trc=smpte2084:color_primaries=bt2020,scale,split [a][hdr];
[a] setparams=color_trc=iec61966-2-1:color_primaries=bt709,split [b][sdr];
[b] scale [base];
[sdr][hdr] gainmap=mode=maxrgb,scale [gain]
diff --git a/tests/ref/fate/jpeg-mpf-gainmap b/tests/ref/fate/jpeg-mpf-gainmap
index c90fdd1fe1..e39f5d8d97 100644
--- a/tests/ref/fate/jpeg-mpf-gainmap
+++ b/tests/ref/fate/jpeg-mpf-gainmap
@@ -1 +1,19 @@
-7cab095419286aec7affcf4eb697f4c9
+7cab095419286aec7affcf4eb697f4c9 *tests/data/fate/jpeg-mpf-gainmap.jpeg_mpf
+5653 tests/data/fate/jpeg-mpf-gainmap.jpeg_mpf
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 64x48
+#sar 0: 1/1
+#tb 1: 1/25
+#media_type 1: video
+#codec_id 1: rawvideo
+#dimensions 1: 64x48
+#sar 1: 1/1
+0, 0, 0, 1, 9216, 0xdfa842b3
+1, 0, 0, 1, 9216, 0x662fcc6a
+frame|stream_index=0
+frame|stream_index=1|side_datum/gain_map_parameters:side_data_type=Gain map parameters|side_datum/gain_map_parameters:version=0|side_datum/gain_map_parameters:use_base_color_space=1|side_datum/gain_map_parameters:base_hdr_headroom=0/1|side_datum/gain_map_parameters:alternate_hdr_headroom=5895489/1048576|component_entry/rgb:gain_map_min=-3392315/4194304|component_entry/rgb:gain_map_max=13278945/2097152|component_entry/rgb:gamma=691797/1048576|component_entry/rgb:base_offset=1/64|component_entry/rgb:alternate_offset=1/64
+stream_group|index=0|nb_streams=2|type=Gain Map (Split base rendition and gain map)
+stream|index=0
+stream|index=1