Re: [FFmpeg-devel] [PATCH 38/38] tests/fate/matroska: add tests for side data preference

2024-02-23 Thread James Almer 

On 2/23/2024 12:02 PM, Anton Khirnov wrote:

Quoting Anton Khirnov (2024-02-23 14:59:00)

+fate-matroska-side-data-pref-codec: CMD = run ffprobe$(PROGSSUF)$(EXESUF) 
$(TARGET_SAMPLES)/mkv/hdr10tags-both.mkv \


Please upload
https://ups.khirnov.net/92f7f28810e0d34af917dba853a5056d1d8001182f5ffb70c7d14fb72ec58fa4/hdr10tags-both.mkv
to mkv/hdr10tags-both.mkv

Thanks,


Done.
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".

Re: [FFmpeg-devel] [PATCH 38/38] tests/fate/matroska: add tests for side data preference

2024-02-23 Thread Anton Khirnov 
Quoting Anton Khirnov (2024-02-23 14:59:00)
> +fate-matroska-side-data-pref-codec: CMD = run ffprobe$(PROGSSUF)$(EXESUF) 
> $(TARGET_SAMPLES)/mkv/hdr10tags-both.mkv \

Please upload
https://ups.khirnov.net/92f7f28810e0d34af917dba853a5056d1d8001182f5ffb70c7d14fb72ec58fa4/hdr10tags-both.mkv
to mkv/hdr10tags-both.mkv

Thanks,
-- 
Anton Khirnov
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".

[FFmpeg-devel] [PATCH 38/38] tests/fate/matroska: add tests for side data preference

2024-02-23 Thread Anton Khirnov 
Cf. #10857
---
 tests/fate/matroska.mak   |   6 +
 tests/ref/fate/matroska-side-data-pref-codec  | 255 ++
 tests/ref/fate/matroska-side-data-pref-global | 255 ++
 3 files changed, 516 insertions(+)
 create mode 100644 tests/ref/fate/matroska-side-data-pref-codec
 create mode 100644 tests/ref/fate/matroska-side-data-pref-global

diff --git a/tests/fate/matroska.mak b/tests/fate/matroska.mak
index 9ab747184a..e9433ce730 100644
--- a/tests/fate/matroska.mak
+++ b/tests/fate/matroska.mak
@@ -264,6 +264,12 @@ FATE_MATROSKA_FFMPEG_FFPROBE-$(call REMUX, MATROSKA, 
VP9_PARSER) \
+= fate-matroska-hdr10-plus-remux
 fate-matroska-hdr10-plus-remux: CMD = transcode webm 
$(TARGET_SAMPLES)/mkv/hdr10_plus_vp9_sample.webm matroska "-map 0 -c:v copy" 
"-map 0 -c:v copy" "-show_packets"
 
+fate-matroska-side-data-pref-codec: CMD = run ffprobe$(PROGSSUF)$(EXESUF) 
$(TARGET_SAMPLES)/mkv/hdr10tags-both.mkv \
+-show_streams -show_frames -show_entries 
stream=stream_side_data:frame=frame_side_data_list
+fate-matroska-side-data-pref-global: CMD = run ffprobe$(PROGSSUF)$(EXESUF) 
$(TARGET_SAMPLES)/mkv/hdr10tags-both.mkv \
+-show_streams -show_frames -show_entries 
stream=stream_side_data:frame=frame_side_data_list -side_data_prefer_global 
mastering_display_metadata,content_light_level
+FATE_MATROSKA_FFPROBE-$(call ALLYES MATROSKA_DEMUXER HEVC_DECODER) += 
fate-matroska-side-data-pref-codec fate-matroska-side-data-pref-global
+
 FATE_SAMPLES_AVCONV += $(FATE_MATROSKA-yes)
 FATE_SAMPLES_FFPROBE += $(FATE_MATROSKA_FFPROBE-yes)
 FATE_SAMPLES_FFMPEG_FFPROBE += $(FATE_MATROSKA_FFMPEG_FFPROBE-yes)
diff --git a/tests/ref/fate/matroska-side-data-pref-codec 
b/tests/ref/fate/matroska-side-data-pref-codec
new file mode 100644
index 00..d27134d0c9
--- /dev/null
+++ b/tests/ref/fate/matroska-side-data-pref-codec
@@ -0,0 +1,255 @@
+[FRAME]
+[SIDE_DATA]
+side_data_type=H.26[45] User Data Unregistered SEI message
+[/SIDE_DATA]
+[SIDE_DATA]
+side_data_type=Content light level metadata
+max_content=1000
+max_average=300
+[/SIDE_DATA]
+[SIDE_DATA]
+side_data_type=Mastering display metadata
+red_x=35400/5
+red_y=14599/5
+green_x=8500/5
+green_y=39850/5
+blue_x=6550/5
+blue_y=2300/5
+white_point_x=15634/5
+white_point_y=16450/5
+min_luminance=10/1
+max_luminance=1000/1
+[/SIDE_DATA]
+[/FRAME]
+[FRAME]
+[SIDE_DATA]
+side_data_type=Content light level metadata
+max_content=1000
+max_average=300
+[/SIDE_DATA]
+[SIDE_DATA]
+side_data_type=Mastering display metadata
+red_x=35400/5
+red_y=14599/5
+green_x=8500/5
+green_y=39850/5
+blue_x=6550/5
+blue_y=2300/5
+white_point_x=15634/5
+white_point_y=16450/5
+min_luminance=10/1
+max_luminance=1000/1
+[/SIDE_DATA]
+[/FRAME]
+[FRAME]
+[SIDE_DATA]
+side_data_type=Content light level metadata
+max_content=1000
+max_average=300
+[/SIDE_DATA]
+[SIDE_DATA]
+side_data_type=Mastering display metadata
+red_x=35400/5
+red_y=14599/5
+green_x=8500/5
+green_y=39850/5
+blue_x=6550/5
+blue_y=2300/5
+white_point_x=15634/5
+white_point_y=16450/5
+min_luminance=10/1
+max_luminance=1000/1
+[/SIDE_DATA]
+[/FRAME]
+[FRAME]
+[SIDE_DATA]
+side_data_type=Content light level metadata
+max_content=1000
+max_average=300
+[/SIDE_DATA]
+[SIDE_DATA]
+side_data_type=Mastering display metadata
+red_x=35400/5
+red_y=14599/5
+green_x=8500/5
+green_y=39850/5
+blue_x=6550/5
+blue_y=2300/5
+white_point_x=15634/5
+white_point_y=16450/5
+min_luminance=10/1
+max_luminance=1000/1
+[/SIDE_DATA]
+[/FRAME]
+[FRAME]
+[SIDE_DATA]
+side_data_type=Content light level metadata
+max_content=1000
+max_average=300
+[/SIDE_DATA]
+[SIDE_DATA]
+side_data_type=Mastering display metadata
+red_x=35400/5
+red_y=14599/5
+green_x=8500/5
+green_y=39850/5
+blue_x=6550/5
+blue_y=2300/5
+white_point_x=15634/5
+white_point_y=16450/5
+min_luminance=10/1
+max_luminance=1000/1
+[/SIDE_DATA]
+[/FRAME]
+[FRAME]
+[SIDE_DATA]
+side_data_type=Content light level metadata
+max_content=1000
+max_average=300
+[/SIDE_DATA]
+[SIDE_DATA]
+side_data_type=Mastering display metadata
+red_x=35400/5
+red_y=14599/5
+green_x=8500/5
+green_y=39850/5
+blue_x=6550/5
+blue_y=2300/5
+white_point_x=15634/5
+white_point_y=16450/5
+min_luminance=10/1
+max_luminance=1000/1
+[/SIDE_DATA]
+[/FRAME]
+[FRAME]
+[SIDE_DATA]
+side_data_type=Content light level metadata
+max_content=1000
+max_average=300
+[/SIDE_DATA]
+[SIDE_DATA]
+side_data_type=Mastering display metadata
+red_x=35400/5
+red_y=14599/5
+green_x=8500/5
+green_y=39850/5
+blue_x=6550/5
+blue_y=2300/5
+white_point_x=15634/5
+white_point_y=16450/5
+min_luminance=10/1
+max_luminance=1000/1
+[/SIDE_DATA]
+[/FRAME]
+[FRAME]
+[SIDE_DATA]