summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVivia Nikolaidou <vivia@ahiru.eu>2020-06-30 22:13:12 +0300
committerVivia Nikolaidou <vivia@ahiru.eu>2020-07-03 07:54:26 +0000
commit024fba6543f9d6127864e8ce76eccb61abf960c8 (patch)
tree0bcbeb5c610cda13c54e5a195fba75d70240ae66
parent7b1f310caf35ad043836d4ffe558e1a9cf02f4d7 (diff)
validate: Update for false-positive bt601
As of https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/merge_requests/724 , we write the correct transfer function for bt601. instead of the (functionally identical but different ISO code) transfer function for bt709. Files created using GStreamer prior to that commit write the wrong transfer function for bt601 and are, strictly speaking, 2:4:5:4 instead. This commit changes those expected values to 2:4:5:4.
-rw-r--r--medias/defaults/matroska/test5.mkv.media_info2
-rw-r--r--medias/defaults/mp4/mp3_h265.0.mp4.media_info2
-rw-r--r--medias/defaults/mp4/qtdemux-test-frag-basic_zero_dur_no_mehd.mp4.media_info2
-rw-r--r--medias/defaults/online-streams-infos/hls/hls.bibbop.stream_info2
-rw-r--r--medias/defaults/webm/vorbis_vp9.webm.media_info2
-rw-r--r--testsuites/validate/h265parse/trickmode_predicted.seek_trickmode_predicted/flow-expectations/log-parse-src-expected2
6 files changed, 6 insertions, 6 deletions
diff --git a/medias/defaults/matroska/test5.mkv.media_info b/medias/defaults/matroska/test5.mkv.media_info
index 2281a89..53881e6 100644
--- a/medias/defaults/matroska/test5.mkv.media_info
+++ b/medias/defaults/matroska/test5.mkv.media_info
@@ -1,6 +1,6 @@
<file duration="46665000000" frame-detection="1" skip-parsers="0" uri="file:///home/vivia/home/jan/gst-validate/gst-integration-testsuites/medias/defaults/matroska/test5.mkv" seekable="true">
<streams caps="video/x-matroska">
- <stream type="video" caps="video/x-h264, level=(string)3.1, profile=(string)main, codec_data=(buffer)014d401fffe10014274d401fa918080093600d418041adb0ad7bdf0101000428ce09c8, stream-format=(string)avc, alignment=(string)au, width=(int)1024, height=(int)576, pixel-aspect-ratio=(fraction)1/1, framerate=(fraction)24/1, chroma-format=(string)4:2:0, bit-depth-luma=(uint)8, bit-depth-chroma=(uint)8, colorimetry=(string)bt601, parsed=(boolean)true" id="2a4151039bc8ab4f83ef5faa140015c88891842bb11aee356dd2f05d9af38a3d/001:1258329745">
+ <stream type="video" caps="video/x-h264, level=(string)3.1, profile=(string)main, codec_data=(buffer)014d401fffe10014274d401fa918080093600d418041adb0ad7bdf0101000428ce09c8, stream-format=(string)avc, alignment=(string)au, width=(int)1024, height=(int)576, pixel-aspect-ratio=(fraction)1/1, framerate=(fraction)24/1, chroma-format=(string)4:2:0, bit-depth-luma=(uint)8, bit-depth-chroma=(uint)8, colorimetry=(string)2:4:5:4, parsed=(boolean)true" id="2a4151039bc8ab4f83ef5faa140015c88891842bb11aee356dd2f05d9af38a3d/001:1258329745">
<segments>
<segment next-frame-id="0" flags="0" rate="1.000000" applied-rate="1.000000" format="3" base="0" offset="0" start="0" stop="18446744073709551615" time="0" position="0" duration="46665000000"/>
</segments>
diff --git a/medias/defaults/mp4/mp3_h265.0.mp4.media_info b/medias/defaults/mp4/mp3_h265.0.mp4.media_info
index e7f2983..966c732 100644
--- a/medias/defaults/mp4/mp3_h265.0.mp4.media_info
+++ b/medias/defaults/mp4/mp3_h265.0.mp4.media_info
@@ -392,7 +392,7 @@
<tag content="taglist, audio-codec=(string)&quot;MPEG-1\ audio&quot;, bitrate=(uint)32620, description=(string)&quot;audiotest\ wave&quot;, datetime=(datetime)2019-07-15T17:28:39Z, container-format=(string)&quot;ISO\ MP4/M4A&quot;, has-crc=(boolean)false, channel-mode=(string)mono, nominal-bitrate=(uint)224000;"/>
</tags>
</stream>
- <stream type="video" caps="video/x-h265, stream-format=(string)hvc1, alignment=(string)au, level=(string)2.1, tier=(string)main, profile=(string)main-10, codec_data=(buffer)0102200000009000000000003ff000fcfdfafa00000f03200001001840010c01ffff02200000030090000003000003003f959009210001002e42010102200000030090000003000003003fa00a080f136595924932bffc0004000404000003000400000300782022000100074401c172b46240, width=(int)320, height=(int)240, framerate=(fraction)30/1, pixel-aspect-ratio=(fraction)1/1, colorimetry=(string)bt601, chroma-format=(string)4:2:0, bit-depth-luma=(uint)10, bit-depth-chroma=(uint)10, parsed=(boolean)true" id="dfd351e1cb33c7d5374d2528a0244a494066860825c9352c55263f5717b8e96e/002">
+ <stream type="video" caps="video/x-h265, stream-format=(string)hvc1, alignment=(string)au, level=(string)2.1, tier=(string)main, profile=(string)main-10, codec_data=(buffer)0102200000009000000000003ff000fcfdfafa00000f03200001001840010c01ffff02200000030090000003000003003f959009210001002e42010102200000030090000003000003003fa00a080f136595924932bffc0004000404000003000400000300782022000100074401c172b46240, width=(int)320, height=(int)240, framerate=(fraction)30/1, pixel-aspect-ratio=(fraction)1/1, colorimetry=(string)2:4:5:4, chroma-format=(string)4:2:0, bit-depth-luma=(uint)10, bit-depth-chroma=(uint)10, parsed=(boolean)true" id="dfd351e1cb33c7d5374d2528a0244a494066860825c9352c55263f5717b8e96e/002">
<segments>
<segment next-frame-id="0" flags="0" rate="1.000000" applied-rate="1.000000" format="3" base="0" offset="0" start="66666666" stop="10066666666" time="0" position="66666666" duration="18446744073709551615"/>
</segments>
diff --git a/medias/defaults/mp4/qtdemux-test-frag-basic_zero_dur_no_mehd.mp4.media_info b/medias/defaults/mp4/qtdemux-test-frag-basic_zero_dur_no_mehd.mp4.media_info
index 2068bba..43b761c 100644
--- a/medias/defaults/mp4/qtdemux-test-frag-basic_zero_dur_no_mehd.mp4.media_info
+++ b/medias/defaults/mp4/qtdemux-test-frag-basic_zero_dur_no_mehd.mp4.media_info
@@ -1,6 +1,6 @@
<file duration="2000000000" frame-detection="1" skip-parsers="1" uri="file:///home/thiblahute/gst-validate/gst-integration-testsuites/medias/defaults/mp4/qtdemux-test-frag-basic_zero_dur_no_mehd.mp4" seekable="true">
<streams caps="video/quicktime, variant=(string)iso">
- <stream type="video" caps="video/x-h264, stream-format=(string)avc, alignment=(string)au, level=(string)1.1, profile=(string)high, codec_data=(buffer)0164000bffe1001d6764000bace40507ec05a830082d280000030008000003003478a1489001000568ebecb22c, width=(int)320, height=(int)240, framerate=(fraction)3/1, pixel-aspect-ratio=(fraction)1/1, colorimetry=(string)bt601, chroma-format=(string)4:2:0, bit-depth-luma=(uint)8, bit-depth-chroma=(uint)8, parsed=(boolean)true" id="47fdce73c9aca9f0a61c30337384e56a8c2018d5cd6fe4d3aaaac1227b4901a1/001">
+ <stream type="video" caps="video/x-h264, stream-format=(string)avc, alignment=(string)au, level=(string)1.1, profile=(string)high, codec_data=(buffer)0164000bffe1001d6764000bace40507ec05a830082d280000030008000003003478a1489001000568ebecb22c, width=(int)320, height=(int)240, framerate=(fraction)3/1, pixel-aspect-ratio=(fraction)1/1, colorimetry=(string)2:4:5:4, chroma-format=(string)4:2:0, bit-depth-luma=(uint)8, bit-depth-chroma=(uint)8, parsed=(boolean)true" id="47fdce73c9aca9f0a61c30337384e56a8c2018d5cd6fe4d3aaaac1227b4901a1/001">
<segments>
<segment next-frame-id="0" flags="0" rate="1.000000" applied-rate="1.000000" format="3" base="0" offset="0" start="333333333" stop="18446744073709551615" time="0" position="333333333" duration="18446744073709551615"/>
</segments>
diff --git a/medias/defaults/online-streams-infos/hls/hls.bibbop.stream_info b/medias/defaults/online-streams-infos/hls/hls.bibbop.stream_info
index 82eb2e3..e73d508 100644
--- a/medias/defaults/online-streams-infos/hls/hls.bibbop.stream_info
+++ b/medias/defaults/online-streams-infos/hls/hls.bibbop.stream_info
@@ -5,7 +5,7 @@
<tag content="taglist, audio-codec=(string)&quot;MPEG-2\ AAC&quot;;"/>
</tags>
</stream>
- <stream type="video" caps="video/x-h264, stream-format=(string)avc, alignment=(string)au, width=(int)192, height=(int)144, framerate=(fraction)0/1, parsed=(boolean)true, chroma-format=(string)4:2:0, bit-depth-luma=(uint)8, bit-depth-chroma=(uint)8, colorimetry=(string)bt601, profile=(string)constrained-baseline, level=(string)1.1, codec_data=(buffer)0142e00bffe100132742e00ba918609d8035060106b6c2b5ef7c0401000428de0988" id="416447fa2e64c485da43250005767c64e121359134c5cb010c8a5c3dc77d12a4/src_0:1/00000102">
+ <stream type="video" caps="video/x-h264, stream-format=(string)avc, alignment=(string)au, width=(int)192, height=(int)144, framerate=(fraction)0/1, parsed=(boolean)true, chroma-format=(string)4:2:0, bit-depth-luma=(uint)8, bit-depth-chroma=(uint)8, colorimetry=(string)2:4:5:4, profile=(string)constrained-baseline, level=(string)1.1, codec_data=(buffer)0142e00bffe100132742e00ba918609d8035060106b6c2b5ef7c0401000428de0988" id="416447fa2e64c485da43250005767c64e121359134c5cb010c8a5c3dc77d12a4/src_0:1/00000102">
<tags>
<tag content="taglist, video-codec=(string)H.264;"/>
</tags>
diff --git a/medias/defaults/webm/vorbis_vp9.webm.media_info b/medias/defaults/webm/vorbis_vp9.webm.media_info
index 1adebf0..5fb4d7e 100644
--- a/medias/defaults/webm/vorbis_vp9.webm.media_info
+++ b/medias/defaults/webm/vorbis_vp9.webm.media_info
@@ -1,6 +1,6 @@
<file duration="5000000000" frame-detection="1" skip-parsers="0" uri="file:///home/thiblahute/devel/gstreamer/gst-build/gst-integration-testsuites/medias/defaults/webm/vorbis_vp9.webm" seekable="true">
<streams caps="video/webm">
- <stream type="video" caps="video/x-vp9, width=(int)320, height=(int)240, framerate=(fraction)30/1, interlace-mode=(string)progressive, colorimetry=(string)bt601" id="c2299285c7b5d2c2306fcc5729f7be93f2964a91b716a6ec3b07152946d1fa13/001:3742416710685218976">
+ <stream type="video" caps="video/x-vp9, width=(int)320, height=(int)240, framerate=(fraction)30/1, interlace-mode=(string)progressive, colorimetry=(string)2:4:5:4" id="c2299285c7b5d2c2306fcc5729f7be93f2964a91b716a6ec3b07152946d1fa13/001:3742416710685218976">
<segments>
<segment next-frame-id="0" flags="0" rate="1.000000" applied-rate="1.000000" format="3" base="0" offset="0" start="0" stop="18446744073709551615" time="0" position="0" duration="5000000000"/>
</segments>
diff --git a/testsuites/validate/h265parse/trickmode_predicted.seek_trickmode_predicted/flow-expectations/log-parse-src-expected b/testsuites/validate/h265parse/trickmode_predicted.seek_trickmode_predicted/flow-expectations/log-parse-src-expected
index c80545b..a868845 100644
--- a/testsuites/validate/h265parse/trickmode_predicted.seek_trickmode_predicted/flow-expectations/log-parse-src-expected
+++ b/testsuites/validate/h265parse/trickmode_predicted.seek_trickmode_predicted/flow-expectations/log-parse-src-expected
@@ -1,5 +1,5 @@
event stream-start: GstEventStreamStart, flags=(GstStreamFlags)GST_STREAM_FLAG_NONE, group-id=(uint)1;
-event caps: video/x-h265, stream-format=(string)hvc1, alignment=(string)au, level=(string)2.1, tier=(string)main, profile=(string)main-10, codec_data=(buffer)0102200000009000000000003ff000fcfdfafa00000f03200001001840010c01ffff02200000030090000003000003003f959009210001002e42010102200000030090000003000003003fa00a080f136595924932bffc0004000404000003000400000300782022000100074401c172b46240, width=(int)320, height=(int)240, framerate=(fraction)30/1, pixel-aspect-ratio=(fraction)1/1, colorimetry=(string)bt601, chroma-format=(string)4:2:0, bit-depth-luma=(uint)10, bit-depth-chroma=(uint)10, parsed=(boolean)true;
+event caps: video/x-h265, stream-format=(string)hvc1, alignment=(string)au, level=(string)2.1, tier=(string)main, profile=(string)main-10, codec_data=(buffer)0102200000009000000000003ff000fcfdfafa00000f03200001001840010c01ffff02200000030090000003000003003f959009210001002e42010102200000030090000003000003003fa00a080f136595924932bffc0004000404000003000400000300782022000100074401c172b46240, width=(int)320, height=(int)240, framerate=(fraction)30/1, pixel-aspect-ratio=(fraction)1/1, colorimetry=(string)2:4:5:4, chroma-format=(string)4:2:0, bit-depth-luma=(uint)10, bit-depth-chroma=(uint)10, parsed=(boolean)true;
event segment: format=TIME, start=0:00:00.066666666, offset=0:00:00.000000000, stop=0:00:10.066666666, time=0:00:00.000000000, base=0:00:00.000000000, position=0:00:00.066666666
event tag: GstTagList-stream, taglist=(taglist)"taglist\,\ video-codec\=\(string\)\"H.265\\\ /\\\ HEVC\"\,\ encoder\=\(string\)x265\,\ bitrate\=\(uint\)1547698\;";
event tag: GstTagList-global, taglist=(taglist)"taglist\,\ datetime\=\(datetime\)2019-07-15T17:28:39Z\,\ container-format\=\(string\)\"ISO\\\ MP4/M4A\"\;";