Adds schema validation for ffprobe XML output so that updating the
ffprobe.xsd file upon changes to ffprobe is not forgotten. This was
suggested by Marton Balint in:
http://ffmpeg.org/pipermail/ffmpeg-devel/2021-March/278428.html
The schema FATE test is only run if xmllint command is available.
Signed-off-by: Tobias Rapp <t.r...@noa-archive.com>
---
configure | 3 +++
tests/fate/ffprobe.mak | 6 +++++
tests/ref/fate/ffprobe_xsd | 57 ++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 66 insertions(+)
create mode 100644 tests/ref/fate/ffprobe_xsd
diff --git a/configure b/configure
index d7a3f50..b8ad7f9 100755
--- a/configure
+++ b/configure
@@ -2341,6 +2341,7 @@ HAVE_LIST="
perl
pod2man
texi2html
+ xmllint
"
# options emitted with CONFIG_ prefix but not available on the command line
@@ -6599,6 +6600,7 @@ disabled makeinfo_html && texi2html --help 2> /dev/null |
grep -q 'init-file' &&
perl -v > /dev/null 2>&1 && enable perl || disable perl
pod2man --help > /dev/null 2>&1 && enable pod2man || disable pod2man
rsync --help 2> /dev/null | grep -q 'contimeout' && enable rsync_contimeout ||
disable rsync_contimeout
+xmllint --version > /dev/null 2>&1 && enable xmllint || disable xmllint
# check V4L2 codecs available in the API
if enabled v4l2_m2m; then
@@ -7365,6 +7367,7 @@ echo "perl enabled ${perl-no}"
echo "pod2man enabled ${pod2man-no}"
echo "makeinfo enabled ${makeinfo-no}"
echo "makeinfo supports HTML ${makeinfo_html-no}"
+echo "xmllint enabled ${xmllint-no}"
test -n "$random_seed" &&
echo "random seed ${random_seed}"
echo
diff --git a/tests/fate/ffprobe.mak b/tests/fate/ffprobe.mak
index c867beb..d2abe8a 100644
--- a/tests/fate/ffprobe.mak
+++ b/tests/fate/ffprobe.mak
@@ -29,6 +29,12 @@ FATE_FFPROBE-$(CONFIG_AVDEVICE) += fate-ffprobe_xml
fate-ffprobe_xml: $(FFPROBE_TEST_FILE)
fate-ffprobe_xml: CMD = run $(FFPROBE_COMMAND) -of xml
+FATE_FFPROBE_SCHEMA-$(CONFIG_AVDEVICE) += fate-ffprobe_xsd
+fate-ffprobe_xsd: $(FFPROBE_TEST_FILE)
+fate-ffprobe_xsd: CMD = run $(FFPROBE_COMMAND) -noprivate -of xml=q=1:x=1 | \
+ xmllint --schema $(SRC_PATH)/doc/ffprobe.xsd -
+
+FATE_FFPROBE-$(HAVE_XMLLINT) += $(FATE_FFPROBE_SCHEMA-yes)
FATE_FFPROBE += $(FATE_FFPROBE-yes)
fate-ffprobe: $(FATE_FFPROBE)
diff --git a/tests/ref/fate/ffprobe_xsd b/tests/ref/fate/ffprobe_xsd
new file mode 100644
index 0000000..cb3413e
--- /dev/null
+++ b/tests/ref/fate/ffprobe_xsd
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ffprobe:ffprobe xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns:ffprobe="http://www.ffmpeg.org/schema/ffprobe";
xsi:schemaLocation="http://www.ffmpeg.org/schema/ffprobe ffprobe.xsd">
+ <packets_and_frames>
+ <packet codec_type="audio" stream_index="0" pts="0"
pts_time="0.000000" dts="0" dts_time="0.000000" duration="1024"
duration_time="0.023220" size="2048" pos="647" flags="K_"/>
+ <frame media_type="audio" stream_index="0" key_frame="1" pkt_pts="0"
pkt_pts_time="0.000000" pkt_dts="0" pkt_dts_time="0.000000"
best_effort_timestamp="0" best_effort_timestamp_time="0.000000"
pkt_duration="1024" pkt_duration_time="0.023220" pkt_pos="647" pkt_size="2048"
sample_fmt="s16" nb_samples="1024" channels="1"/>
+ <packet codec_type="video" stream_index="1" pts="0"
pts_time="0.000000" dts="0" dts_time="0.000000" duration="2048"
duration_time="0.040000" size="230400" pos="2722" flags="K_"/>
+ <frame media_type="video" stream_index="1" key_frame="1" pkt_pts="0"
pkt_pts_time="0.000000" pkt_dts="0" pkt_dts_time="0.000000"
best_effort_timestamp="0" best_effort_timestamp_time="0.000000"
pkt_duration="2048" pkt_duration_time="0.040000" pkt_pos="2722"
pkt_size="230400" width="320" height="240" pix_fmt="rgb24"
sample_aspect_ratio="1:1" pict_type="I" coded_picture_number="0"
display_picture_number="0" interlaced_frame="0" top_field_first="0"
repeat_pict="0"/>
+ <packet codec_type="video" stream_index="2" pts="0"
pts_time="0.000000" dts="0" dts_time="0.000000" duration="2048"
duration_time="0.040000" size="30000" pos="233143" flags="K_"/>
+ <frame media_type="video" stream_index="2" key_frame="1" pkt_pts="0"
pkt_pts_time="0.000000" pkt_dts="0" pkt_dts_time="0.000000"
best_effort_timestamp="0" best_effort_timestamp_time="0.000000"
pkt_duration="2048" pkt_duration_time="0.040000" pkt_pos="233143"
pkt_size="30000" width="100" height="100" pix_fmt="rgb24"
sample_aspect_ratio="1:1" pict_type="I" coded_picture_number="0"
display_picture_number="0" interlaced_frame="0" top_field_first="0"
repeat_pict="0"/>
+ <packet codec_type="audio" stream_index="0" pts="1024"
pts_time="0.023220" dts="1024" dts_time="0.023220" duration="1024"
duration_time="0.023220" size="2048" pos="263148" flags="K_"/>
+ <frame media_type="audio" stream_index="0" key_frame="1"
pkt_pts="1024" pkt_pts_time="0.023220" pkt_dts="1024" pkt_dts_time="0.023220"
best_effort_timestamp="1024" best_effort_timestamp_time="0.023220"
pkt_duration="1024" pkt_duration_time="0.023220" pkt_pos="263148"
pkt_size="2048" sample_fmt="s16" nb_samples="1024" channels="1"/>
+ <packet codec_type="video" stream_index="1" pts="2048"
pts_time="0.040000" dts="2048" dts_time="0.040000" duration="2048"
duration_time="0.040000" size="230400" pos="265226" flags="K_"/>
+ <frame media_type="video" stream_index="1" key_frame="1"
pkt_pts="2048" pkt_pts_time="0.040000" pkt_dts="2048" pkt_dts_time="0.040000"
best_effort_timestamp="2048" best_effort_timestamp_time="0.040000"
pkt_duration="2048" pkt_duration_time="0.040000" pkt_pos="265226"
pkt_size="230400" width="320" height="240" pix_fmt="rgb24"
sample_aspect_ratio="1:1" pict_type="I" coded_picture_number="0"
display_picture_number="0" interlaced_frame="0" top_field_first="0"
repeat_pict="0"/>
+ <packet codec_type="video" stream_index="2" pts="2048"
pts_time="0.040000" dts="2048" dts_time="0.040000" duration="2048"
duration_time="0.040000" size="30000" pos="495650" flags="K_"/>
+ <frame media_type="video" stream_index="2" key_frame="1"
pkt_pts="2048" pkt_pts_time="0.040000" pkt_dts="2048" pkt_dts_time="0.040000"
best_effort_timestamp="2048" best_effort_timestamp_time="0.040000"
pkt_duration="2048" pkt_duration_time="0.040000" pkt_pos="495650"
pkt_size="30000" width="100" height="100" pix_fmt="rgb24"
sample_aspect_ratio="1:1" pict_type="I" coded_picture_number="0"
display_picture_number="0" interlaced_frame="0" top_field_first="0"
repeat_pict="0"/>
+ <packet codec_type="audio" stream_index="0" pts="2048"
pts_time="0.046440" dts="2048" dts_time="0.046440" duration="1024"
duration_time="0.023220" size="2048" pos="525655" flags="K_"/>
+ <frame media_type="audio" stream_index="0" key_frame="1"
pkt_pts="2048" pkt_pts_time="0.046440" pkt_dts="2048" pkt_dts_time="0.046440"
best_effort_timestamp="2048" best_effort_timestamp_time="0.046440"
pkt_duration="1024" pkt_duration_time="0.023220" pkt_pos="525655"
pkt_size="2048" sample_fmt="s16" nb_samples="1024" channels="1"/>
+ <packet codec_type="audio" stream_index="0" pts="3072"
pts_time="0.069660" dts="3072" dts_time="0.069660" duration="1024"
duration_time="0.023220" size="2048" pos="527726" flags="K_"/>
+ <frame media_type="audio" stream_index="0" key_frame="1"
pkt_pts="3072" pkt_pts_time="0.069660" pkt_dts="3072" pkt_dts_time="0.069660"
best_effort_timestamp="3072" best_effort_timestamp_time="0.069660"
pkt_duration="1024" pkt_duration_time="0.023220" pkt_pos="527726"
pkt_size="2048" sample_fmt="s16" nb_samples="1024" channels="1"/>
+ <packet codec_type="video" stream_index="1" pts="4096"
pts_time="0.080000" dts="4096" dts_time="0.080000" duration="2048"
duration_time="0.040000" size="230400" pos="529804" flags="K_"/>
+ <frame media_type="video" stream_index="1" key_frame="1"
pkt_pts="4096" pkt_pts_time="0.080000" pkt_dts="4096" pkt_dts_time="0.080000"
best_effort_timestamp="4096" best_effort_timestamp_time="0.080000"
pkt_duration="2048" pkt_duration_time="0.040000" pkt_pos="529804"
pkt_size="230400" width="320" height="240" pix_fmt="rgb24"
sample_aspect_ratio="1:1" pict_type="I" coded_picture_number="0"
display_picture_number="0" interlaced_frame="0" top_field_first="0"
repeat_pict="0"/>
+ <packet codec_type="video" stream_index="2" pts="4096"
pts_time="0.080000" dts="4096" dts_time="0.080000" duration="2048"
duration_time="0.040000" size="30000" pos="760228" flags="K_"/>
+ <frame media_type="video" stream_index="2" key_frame="1"
pkt_pts="4096" pkt_pts_time="0.080000" pkt_dts="4096" pkt_dts_time="0.080000"
best_effort_timestamp="4096" best_effort_timestamp_time="0.080000"
pkt_duration="2048" pkt_duration_time="0.040000" pkt_pos="760228"
pkt_size="30000" width="100" height="100" pix_fmt="rgb24"
sample_aspect_ratio="1:1" pict_type="I" coded_picture_number="0"
display_picture_number="0" interlaced_frame="0" top_field_first="0"
repeat_pict="0"/>
+ <packet codec_type="audio" stream_index="0" pts="4096"
pts_time="0.092880" dts="4096" dts_time="0.092880" duration="1024"
duration_time="0.023220" size="2048" pos="790233" flags="K_"/>
+ <frame media_type="audio" stream_index="0" key_frame="1"
pkt_pts="4096" pkt_pts_time="0.092880" pkt_dts="4096" pkt_dts_time="0.092880"
best_effort_timestamp="4096" best_effort_timestamp_time="0.092880"
pkt_duration="1024" pkt_duration_time="0.023220" pkt_pos="790233"
pkt_size="2048" sample_fmt="s16" nb_samples="1024" channels="1"/>
+ <packet codec_type="audio" stream_index="0" pts="5120"
pts_time="0.116100" dts="5120" dts_time="0.116100" duration="393"
duration_time="0.008912" size="786" pos="792304" flags="K_"/>
+ <frame media_type="audio" stream_index="0" key_frame="1"
pkt_pts="5120" pkt_pts_time="0.116100" pkt_dts="5120" pkt_dts_time="0.116100"
best_effort_timestamp="5120" best_effort_timestamp_time="0.116100"
pkt_duration="393" pkt_duration_time="0.008912" pkt_pos="792304" pkt_size="786"
sample_fmt="s16" nb_samples="393" channels="1"/>
+ <packet codec_type="video" stream_index="1" pts="6144"
pts_time="0.120000" dts="6144" dts_time="0.120000" duration="2048"
duration_time="0.040000" size="230400" pos="793120" flags="K_"/>
+ <frame media_type="video" stream_index="1" key_frame="1"
pkt_pts="6144" pkt_pts_time="0.120000" pkt_dts="6144" pkt_dts_time="0.120000"
best_effort_timestamp="6144" best_effort_timestamp_time="0.120000"
pkt_duration="2048" pkt_duration_time="0.040000" pkt_pos="793120"
pkt_size="230400" width="320" height="240" pix_fmt="rgb24"
sample_aspect_ratio="1:1" pict_type="I" coded_picture_number="0"
display_picture_number="0" interlaced_frame="0" top_field_first="0"
repeat_pict="0"/>
+ <packet codec_type="video" stream_index="2" pts="6144"
pts_time="0.120000" dts="6144" dts_time="0.120000" duration="2048"
duration_time="0.040000" size="30000" pos="1023544" flags="K_"/>
+ <frame media_type="video" stream_index="2" key_frame="1"
pkt_pts="6144" pkt_pts_time="0.120000" pkt_dts="6144" pkt_dts_time="0.120000"
best_effort_timestamp="6144" best_effort_timestamp_time="0.120000"
pkt_duration="2048" pkt_duration_time="0.040000" pkt_pos="1023544"
pkt_size="30000" width="100" height="100" pix_fmt="rgb24"
sample_aspect_ratio="1:1" pict_type="I" coded_picture_number="0"
display_picture_number="0" interlaced_frame="0" top_field_first="0"
repeat_pict="0"/>
+ </packets_and_frames>
+
+ <streams>
+ <stream index="0" codec_name="pcm_s16le" codec_type="audio"
codec_tag_string="PSD[16]" codec_tag="0x10445350" sample_fmt="s16"
sample_rate="44100" channels="1" bits_per_sample="16" r_frame_rate="0/0"
avg_frame_rate="0/0" time_base="1/44100" start_pts="0" start_time="0.000000"
bit_rate="705600" nb_read_frames="6" nb_read_packets="6">
+ <disposition default="0" dub="0" original="0" comment="0"
lyrics="0" karaoke="0" forced="0" hearing_impaired="0" visual_impaired="0"
clean_effects="0" attached_pic="0" timed_thumbnails="0" captions="0"
descriptions="0" metadata="0" dependent="0" still_image="0"/>
+ <tag key="E" value="mc²"/>
+ <tag key="encoder" value="Lavc pcm_s16le"/>
+ </stream>
+ <stream index="1" codec_name="rawvideo" codec_type="video"
codec_tag_string="RGB[24]" codec_tag="0x18424752" width="320" height="240"
coded_width="320" coded_height="240" closed_captions="0" has_b_frames="0"
sample_aspect_ratio="1:1" display_aspect_ratio="4:3" pix_fmt="rgb24"
level="-99" refs="1" r_frame_rate="25/1" avg_frame_rate="25/1"
time_base="1/51200" start_pts="0" start_time="0.000000" nb_read_frames="4"
nb_read_packets="4">
+ <disposition default="0" dub="0" original="0" comment="0"
lyrics="0" karaoke="0" forced="0" hearing_impaired="0" visual_impaired="0"
clean_effects="0" attached_pic="0" timed_thumbnails="0" captions="0"
descriptions="0" metadata="0" dependent="0" still_image="0"/>
+ <tag key="title" value="foobar"/>
+ <tag key="duration_ts" value="field-and-tags-conflict-attempt"/>
+ <tag key="encoder" value="Lavc rawvideo"/>
+ </stream>
+ <stream index="2" codec_name="rawvideo" codec_type="video"
codec_tag_string="RGB[24]" codec_tag="0x18424752" width="100" height="100"
coded_width="100" coded_height="100" closed_captions="0" has_b_frames="0"
sample_aspect_ratio="1:1" display_aspect_ratio="1:1" pix_fmt="rgb24"
level="-99" refs="1" r_frame_rate="25/1" avg_frame_rate="25/1"
time_base="1/51200" start_pts="0" start_time="0.000000" nb_read_frames="4"
nb_read_packets="4">
+ <disposition default="0" dub="0" original="0" comment="0"
lyrics="0" karaoke="0" forced="0" hearing_impaired="0" visual_impaired="0"
clean_effects="0" attached_pic="0" timed_thumbnails="0" captions="0"
descriptions="0" metadata="0" dependent="0" still_image="0"/>
+ <tag key="encoder" value="Lavc rawvideo"/>
+ </stream>
+ </streams>
+
+ <format filename="tests/data/ffprobe-test.nut" nb_streams="3"
nb_programs="0" format_name="nut" start_time="0.000000" duration="0.120000"
size="1053624" bit_rate="70241600" probe_score="100">
+ <tag key="title" value="ffprobe test file"/>
+ <tag key="comment" value="'A comment with CSV, XML & JSON special
chars': <tag value="x">"/>
+ <tag key="comment2" value="I ♥ Üñîçød€"/>
+ </format>
+</ffprobe:ffprobe>
--
2.7.4
_______________________________________________
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".
