From: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
To: ffmpeg-devel@ffmpeg.org
Cc: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
Subject: [FFmpeg-devel] [PATCH 10/11] fate/matroska: Add test for stereo 3D
Date: Sat, 12 Aug 2023 00:58:10 +0200
Message-ID: <AS8P250MB0744DB48B9163F7262583AF08F10A@AS8P250MB0744.EURP250.PROD.OUTLOOK.COM> (raw)
In-Reply-To: <AS8P250MB07441DD2024A768DE773EEFA8F10A@AS8P250MB0744.EURP250.PROD.OUTLOOK.COM>
Just mark a non-stereo file as stereo to test the code.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
This test would not pass on master as-is due to the anaglyph modes
which are broken on master. I intend to apply it before 4/9
so that fixing the anaglyph modes is visible in the changes to FATE.
tests/fate/matroska.mak | 23 ++++
tests/ref/fate/matroska-stereo_mode | 195 ++++++++++++++++++++++++++++
2 files changed, 218 insertions(+)
create mode 100644 tests/ref/fate/matroska-stereo_mode
diff --git a/tests/fate/matroska.mak b/tests/fate/matroska.mak
index 1d68be81c8..16285a2dc8 100644
--- a/tests/fate/matroska.mak
+++ b/tests/fate/matroska.mak
@@ -215,6 +215,29 @@ fate-matroska-dvbsub-remux: CMD = transcode mpegts $(TARGET_SAMPLES)/sub/dvbsubt
FATE_MATROSKA_FFPROBE-$(call ALLYES, MATROSKA_DEMUXER) += fate-matroska-spherical-mono
fate-matroska-spherical-mono: CMD = run ffprobe$(PROGSSUF)$(EXESUF) -show_entries stream_side_data_list -select_streams v -v 0 $(TARGET_SAMPLES)/mkv/spherical.mkv
+# This test tests the handling of AVStereo3D information, in particular
+# the ability to set it via metadata in the muxer (the file itself is
+# actually an ordinary file with a single view). It also tests
+# correctly writing the display dimensions in the presence of stereo metadata.
+# The test also covers reformatting Theora extradata as well as testing
+# default_mode infer in the presence of tracks already marked as default.
+# It furthermore tests tag languages as well as stream languages,
+# in particular in their various forms (e.g. de vs deu vs ger for German)
+# and also the language-country code form.
+FATE_MATROSKA_FFMPEG_FFPROBE-$(call REMUX, MATROSKA, OGG_DEMUXER THEORA_DECODER) += fate-matroska-stereo_mode
+fate-matroska-stereo_mode: CMD = transcode ogg $(TARGET_SAMPLES)/vp3/offset_test.ogv matroska \
+ "-c copy -write_crc32 0 -default_mode infer \
+ -map 0 -disposition:s:0 +original+dub -metadata:s:0 language=ger \
+ -map 0 -metadata:s:1 stereo_mode=left_right -metadata:s:1 language=ger-at -metadata:s:1 description-ger=Deutsch -metadata:s:1 description-fre=Français \
+ -map 0 -metadata:s:2 stereo_mode=bottom_top -metadata:s:2 language=eng -metadata:s:2 description-de=Deutsch -metadata:s:2 description-fra=Français \
+ -map 0 -metadata:s:3 stereo_mode=row_interleaved_rl -sar:3 3:1 -disposition:3 +default -metadata:s:3 language=deu-at \
+ -map 0 -metadata:s:4 stereo_mode=col_interleaved_rl -sar:4 16:9 -metadata:s:4 language=fre -metadata:s:4 description-deu-at=Österreichisch \
+ -map 0 -metadata:s:5 stereo_mode=anaglyph_cyan_red -sar:5 16:9 -disposition:5 +default -metadata:s:5 language=fra \
+ -map 0 -metadata:s:6 stereo_mode=12 -sar:6 2:1 -metadata:s:6 language=de -metadata:s:6 description-deu=Deutsch" \
+ "-map 0 -c copy" \
+ "-show_entries stream_disposition=default,original,dub:stream_tags:stream_side_data_list"
+
+
# The following test tests the various flavours of WebVTT in WebM.
# It also tests that dispositions not supported by WebM are not written
# (and therefore lost). It moreover tests that the muxer writes CuePoints
diff --git a/tests/ref/fate/matroska-stereo_mode b/tests/ref/fate/matroska-stereo_mode
new file mode 100644
index 0000000000..745c294576
--- /dev/null
+++ b/tests/ref/fate/matroska-stereo_mode
@@ -0,0 +1,195 @@
+cbfda33da837da47bdb9f7d2568ab626 *tests/data/fate/matroska-stereo_mode.matroska
+1470766 tests/data/fate/matroska-stereo_mode.matroska
+#extradata 0: 3510, 0x560c3919
+#extradata 1: 3510, 0x560c3919
+#extradata 2: 3510, 0x560c3919
+#extradata 3: 3510, 0x560c3919
+#extradata 4: 3510, 0x560c3919
+#extradata 5: 3510, 0x560c3919
+#extradata 6: 3510, 0x560c3919
+#tb 0: 1/1000
+#media_type 0: video
+#codec_id 0: theora
+#dimensions 0: 512x512
+#sar 0: 0/1
+#tb 1: 1/1000
+#media_type 1: video
+#codec_id 1: theora
+#dimensions 1: 512x512
+#sar 1: 1/1
+#tb 2: 1/1000
+#media_type 2: video
+#codec_id 2: theora
+#dimensions 2: 512x512
+#sar 2: 1/1
+#tb 3: 1/1000
+#media_type 3: video
+#codec_id 3: theora
+#dimensions 3: 512x512
+#sar 3: 3/1
+#tb 4: 1/1000
+#media_type 4: video
+#codec_id 4: theora
+#dimensions 4: 512x512
+#sar 4: 455/256
+#tb 5: 1/1000
+#media_type 5: video
+#codec_id 5: theora
+#dimensions 5: 512x512
+#sar 5: 16/9
+#tb 6: 1/1000
+#media_type 6: video
+#codec_id 6: theora
+#dimensions 6: 512x512
+#sar 6: 2/1
+0, 0, 0, 1000, 206173, 0x95af7455
+1, 0, 0, 1000, 206173, 0x95af7455, S=1, 12
+2, 0, 0, 1000, 206173, 0x95af7455, S=1, 12
+3, 0, 0, 1000, 206173, 0x95af7455, S=1, 12
+4, 0, 0, 1000, 206173, 0x95af7455, S=1, 12
+5, 0, 0, 1000, 206173, 0x95af7455
+6, 0, 0, 1000, 206173, 0x95af7455
+0, 1000, 1000, 1000, 36, 0x34891010, F=0x0
+1, 1000, 1000, 1000, 36, 0x34891010, F=0x0
+2, 1000, 1000, 1000, 36, 0x34891010, F=0x0
+3, 1000, 1000, 1000, 36, 0x34891010, F=0x0
+4, 1000, 1000, 1000, 36, 0x34891010, F=0x0
+5, 1000, 1000, 1000, 36, 0x34891010, F=0x0
+6, 1000, 1000, 1000, 36, 0x34891010, F=0x0
+0, 2000, 2000, 1000, 9, 0x17e5047e, F=0x0
+1, 2000, 2000, 1000, 9, 0x17e5047e, F=0x0
+2, 2000, 2000, 1000, 9, 0x17e5047e, F=0x0
+3, 2000, 2000, 1000, 9, 0x17e5047e, F=0x0
+4, 2000, 2000, 1000, 9, 0x17e5047e, F=0x0
+5, 2000, 2000, 1000, 9, 0x17e5047e, F=0x0
+6, 2000, 2000, 1000, 9, 0x17e5047e, F=0x0
+0, 3000, 3000, 1000, 9, 0x17e5047e, F=0x0
+1, 3000, 3000, 1000, 9, 0x17e5047e, F=0x0
+2, 3000, 3000, 1000, 9, 0x17e5047e, F=0x0
+3, 3000, 3000, 1000, 9, 0x17e5047e, F=0x0
+4, 3000, 3000, 1000, 9, 0x17e5047e, F=0x0
+5, 3000, 3000, 1000, 9, 0x17e5047e, F=0x0
+6, 3000, 3000, 1000, 9, 0x17e5047e, F=0x0
+0, 4000, 4000, 1000, 9, 0x17e5047e, F=0x0
+1, 4000, 4000, 1000, 9, 0x17e5047e, F=0x0
+2, 4000, 4000, 1000, 9, 0x17e5047e, F=0x0
+3, 4000, 4000, 1000, 9, 0x17e5047e, F=0x0
+4, 4000, 4000, 1000, 9, 0x17e5047e, F=0x0
+5, 4000, 4000, 1000, 9, 0x17e5047e, F=0x0
+6, 4000, 4000, 1000, 9, 0x17e5047e, F=0x0
+0, 5000, 5000, 1000, 9, 0x17e5047e, F=0x0
+1, 5000, 5000, 1000, 9, 0x17e5047e, F=0x0
+2, 5000, 5000, 1000, 9, 0x17e5047e, F=0x0
+3, 5000, 5000, 1000, 9, 0x17e5047e, F=0x0
+4, 5000, 5000, 1000, 9, 0x17e5047e, F=0x0
+5, 5000, 5000, 1000, 9, 0x17e5047e, F=0x0
+6, 5000, 5000, 1000, 9, 0x17e5047e, F=0x0
+0, 6000, 6000, 1000, 9, 0x17e5047e, F=0x0
+1, 6000, 6000, 1000, 9, 0x17e5047e, F=0x0
+2, 6000, 6000, 1000, 9, 0x17e5047e, F=0x0
+3, 6000, 6000, 1000, 9, 0x17e5047e, F=0x0
+4, 6000, 6000, 1000, 9, 0x17e5047e, F=0x0
+5, 6000, 6000, 1000, 9, 0x17e5047e, F=0x0
+6, 6000, 6000, 1000, 9, 0x17e5047e, F=0x0
+0, 7000, 7000, 1000, 9, 0x17e5047e, F=0x0
+1, 7000, 7000, 1000, 9, 0x17e5047e, F=0x0
+2, 7000, 7000, 1000, 9, 0x17e5047e, F=0x0
+3, 7000, 7000, 1000, 9, 0x17e5047e, F=0x0
+4, 7000, 7000, 1000, 9, 0x17e5047e, F=0x0
+5, 7000, 7000, 1000, 9, 0x17e5047e, F=0x0
+6, 7000, 7000, 1000, 9, 0x17e5047e, F=0x0
+0, 8000, 8000, 1000, 9, 0x17e5047e, F=0x0
+1, 8000, 8000, 1000, 9, 0x17e5047e, F=0x0
+2, 8000, 8000, 1000, 9, 0x17e5047e, F=0x0
+3, 8000, 8000, 1000, 9, 0x17e5047e, F=0x0
+4, 8000, 8000, 1000, 9, 0x17e5047e, F=0x0
+5, 8000, 8000, 1000, 9, 0x17e5047e, F=0x0
+6, 8000, 8000, 1000, 9, 0x17e5047e, F=0x0
+0, 9000, 9000, 1000, 9, 0x17e5047e, F=0x0
+1, 9000, 9000, 1000, 9, 0x17e5047e, F=0x0
+2, 9000, 9000, 1000, 9, 0x17e5047e, F=0x0
+3, 9000, 9000, 1000, 9, 0x17e5047e, F=0x0
+4, 9000, 9000, 1000, 9, 0x17e5047e, F=0x0
+5, 9000, 9000, 1000, 9, 0x17e5047e, F=0x0
+6, 9000, 9000, 1000, 9, 0x17e5047e, F=0x0
+[STREAM]
+DISPOSITION:default=0
+DISPOSITION:dub=0
+DISPOSITION:original=0
+TAG:language=ger
+TAG:DURATION=00:00:10.000000000
+[/STREAM]
+[STREAM]
+DISPOSITION:default=0
+DISPOSITION:dub=0
+DISPOSITION:original=0
+TAG:language=ger-at
+TAG:stereo_mode=left_right
+TAG:DESCRIPTION-ger=Deutsch
+TAG:DESCRIPTION-fre=Français
+TAG:DURATION=00:00:10.000000000
+[SIDE_DATA]
+side_data_type=Stereo 3D
+type=side by side
+inverted=0
+[/SIDE_DATA]
+[/STREAM]
+[STREAM]
+DISPOSITION:default=0
+DISPOSITION:dub=0
+DISPOSITION:original=0
+TAG:language=eng
+TAG:stereo_mode=bottom_top
+TAG:DESCRIPTION-ger=Deutsch
+TAG:DESCRIPTION-fre=Français
+TAG:DURATION=00:00:10.000000000
+[SIDE_DATA]
+side_data_type=Stereo 3D
+type=top and bottom
+inverted=1
+[/SIDE_DATA]
+[/STREAM]
+[STREAM]
+DISPOSITION:default=1
+DISPOSITION:dub=0
+DISPOSITION:original=0
+TAG:language=deu-at
+TAG:stereo_mode=row_interleaved_rl
+TAG:DURATION=00:00:10.000000000
+[SIDE_DATA]
+side_data_type=Stereo 3D
+type=interleaved lines
+inverted=1
+[/SIDE_DATA]
+[/STREAM]
+[STREAM]
+DISPOSITION:default=0
+DISPOSITION:dub=0
+DISPOSITION:original=0
+TAG:language=fre
+TAG:stereo_mode=col_interleaved_rl
+TAG:DESCRIPTION-DEU-AT=Österreichisch
+TAG:DURATION=00:00:10.000000000
+[SIDE_DATA]
+side_data_type=Stereo 3D
+type=interleaved columns
+inverted=1
+[/SIDE_DATA]
+[/STREAM]
+[STREAM]
+DISPOSITION:default=1
+DISPOSITION:dub=0
+DISPOSITION:original=0
+TAG:language=fra
+TAG:stereo_mode=anaglyph_cyan_red
+TAG:DURATION=00:00:10.000000000
+[/STREAM]
+[STREAM]
+DISPOSITION:default=0
+DISPOSITION:dub=0
+DISPOSITION:original=0
+TAG:language=de
+TAG:stereo_mode=anaglyph_green_magenta
+TAG:DESCRIPTION-ger=Deutsch
+TAG:DURATION=00:00:10.000000000
+[/STREAM]
--
2.34.1
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
next prev parent reply other threads:[~2023-08-11 22:57 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-11 10:34 [FFmpeg-devel] [PATCH 1/9] avformat/matroskaenc: Avoid atoi() Andreas Rheinhardt
2023-08-11 10:43 ` [FFmpeg-devel] [PATCH 2/9] avformat/matroska: Move ff_matroska_video_stereo_plane to demuxer Andreas Rheinhardt
2023-08-11 10:43 ` [FFmpeg-devel] [PATCH 3/9] avformat/matroska: Add macro for stereomode<->AVStereo3D correspondence Andreas Rheinhardt
2023-08-11 10:43 ` [FFmpeg-devel] [PATCH 4/9] avformat/matroskaenc: Don't add side-data to input stream Andreas Rheinhardt
2023-08-11 10:43 ` [FFmpeg-devel] [PATCH 5/9] avformat/matroskaenc: Improve message for WebM-incompatible StereoModes Andreas Rheinhardt
2023-08-11 10:43 ` [FFmpeg-devel] [PATCH 6/9] avformat/matroska: Move ff_mkv_stereo3d_conv() to demuxer Andreas Rheinhardt
2023-08-11 10:43 ` [FFmpeg-devel] [PATCH 7/9] avformat/matroskadec: Replace switch with array Andreas Rheinhardt
2023-08-11 10:43 ` [FFmpeg-devel] [PATCH 8/9] avformat/matroskadec: Use named constants instead of their value Andreas Rheinhardt
2023-08-11 13:20 ` Paul B Mahol
2023-08-11 10:43 ` [FFmpeg-devel] [PATCH 9/9] avformat/riffdec: Pass logctx as void* instead of AVFormatContext* Andreas Rheinhardt
2023-08-11 22:58 ` Andreas Rheinhardt [this message]
2023-08-12 16:27 ` [FFmpeg-devel] [PATCH 10/11] fate/matroska: Add test for stereo 3D Andreas Rheinhardt
2023-08-11 22:58 ` [FFmpeg-devel] [PATCH 11/11] fate/matroska: Fix requirements of fate-matroska-alac-remux test Andreas Rheinhardt
2023-08-13 23:00 ` [FFmpeg-devel] [PATCH 1/9] avformat/matroskaenc: Avoid atoi() Andreas Rheinhardt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=AS8P250MB0744DB48B9163F7262583AF08F10A@AS8P250MB0744.EURP250.PROD.OUTLOOK.COM \
--to=andreas.rheinhardt@outlook.com \
--cc=ffmpeg-devel@ffmpeg.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
This inbox may be cloned and mirrored by anyone:
git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
ffmpegdev@gitmailbox.com
public-inbox-index ffmpegdev
Example config snippet for mirrors.
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git