[FFmpeg-devel] [PATCH 7/7] fate: add s337m decode and demux tests

ffnicolasg at sfr.fr ffnicolasg at sfr.fr
Wed Dec 4 16:14:09 EET 2024


From: Nicolas Gaullier <nicolas.gaullier at cji.paris>

Signed-off-by: Nicolas Gaullier <nicolas.gaullier at cji.paris>
---
 tests/fate/audio.mak                          | 10 ++++
 tests/fate/demux.mak                          | 15 ++++-
 tests/ref/fate/s337m-demux-mxf                | 56 +++++++++++++++++++
 .../ref/fate/{s337m-demux => s337m-demux-raw} |  0
 tests/ref/fate/s337m-demux-ts-20              | 44 +++++++++++++++
 tests/ref/fate/s337m-demux-ts-24              | 39 +++++++++++++
 tests/ref/fate/s337m-demux-wav                | 11 ++++
 tests/ref/fate/s337m-demux-wav-miss1-3-5      |  8 +++
 8 files changed, 181 insertions(+), 2 deletions(-)
 create mode 100644 tests/ref/fate/s337m-demux-mxf
 rename tests/ref/fate/{s337m-demux => s337m-demux-raw} (100%)
 create mode 100644 tests/ref/fate/s337m-demux-ts-20
 create mode 100644 tests/ref/fate/s337m-demux-ts-24
 create mode 100644 tests/ref/fate/s337m-demux-wav
 create mode 100644 tests/ref/fate/s337m-demux-wav-miss1-3-5

diff --git a/tests/fate/audio.mak b/tests/fate/audio.mak
index 421c4e12f4..805014dfbe 100644
--- a/tests/fate/audio.mak
+++ b/tests/fate/audio.mak
@@ -74,6 +74,16 @@ fate-on2avc: CMD = framecrc -i $(TARGET_SAMPLES)/vp7/potter-40.vp7 -frames 30 -v
 FATE_SAMPLES_AUDIO-$(call DEMDEC, PAF, PAF_AUDIO) += fate-paf-audio
 fate-paf-audio: CMD = framecrc -i $(TARGET_SAMPLES)/paf/hod1-partial.paf -vn
 
+FATE_S337MAUDIO-$(call PCM, S337M_24, S337M_24) += 20bit 24bit
+FATE_S337MAUDIO := $(addprefix fate-s337m-decode-, $(FATE_S337MAUDIO-yes))
+FATE_SAMPLES_AUDIO-yes += $(FATE_S337MAUDIO)
+fate-s337m-decode: $(FATE_S337MAUDIO)
+fate-s337m-decode-%: CMP = oneoff
+fate-s337m-decode-20bit: CMD = pcm -i $(TARGET_SAMPLES)/dolby_e/20-bit-s302m_20-bit_5.1_2.0_phase000750.ts
+fate-s337m-decode-20bit: REF = $(SAMPLES)/dolby_e/20-bit-s302m_20-bit_5.1_2.0_phase000750.ts.pcm
+fate-s337m-decode-24bit: CMD = pcm -i $(TARGET_SAMPLES)/dolby_e/24-bit-s302m_20-bit_5.1_2.0_phase001021.ts
+fate-s337m-decode-24bit: REF = $(SAMPLES)/dolby_e/24-bit-s302m_20-bit_5.1_2.0_phase001021.ts.pcm
+
 FATE_SAMPLES_AUDIO-$(call DEMDEC, VMD, VMDAUDIO, ARESAMPLE_FILTER) += fate-sierra-vmd-audio
 fate-sierra-vmd-audio: CMD = framecrc -i $(TARGET_SAMPLES)/vmd/12.vmd -vn -af aresample
 
diff --git a/tests/fate/demux.mak b/tests/fate/demux.mak
index f70491f158..4154969ac5 100644
--- a/tests/fate/demux.mak
+++ b/tests/fate/demux.mak
@@ -130,8 +130,19 @@ fate-qcp-demux: CMD = crc -i $(TARGET_SAMPLES)/qcp/0036580847.QCP -c:a copy
 FATE_SAMPLES_DEMUX-$(CONFIG_R3D_DEMUXER) += fate-redcode-demux
 fate-redcode-demux: CMD = framecrc -i $(TARGET_SAMPLES)/r3d/4MB-sample.r3d -c:v copy -c:a copy
 
-FATE_SAMPLES_DEMUX-$(call FRAMECRC, S337M_16,, S337M_16_PARSER FRAMECRC_MUXER) += fate-s337m-demux
-fate-s337m-demux: CMD = framecrc -i $(TARGET_SAMPLES)/dolby_e/16-11 -c copy -ss 2 -t 1
+FATE_SAMPLES_S337M_DEMUX-$(call FRAMECRC, S337M_16,, S337M_16_PARSER) += raw
+FATE_SAMPLES_S337M_DEMUX-$(call FRAMECRC, S337M_24,, S337M_24_PARSER) += $(if $(CONFIG_WAV_DEMUXER), wav wav-miss1-3-5) \
+                                                                         $(if $(CONFIG_MXF_DEMUXER), mxf) \
+                                                                         $(if $(CONFIG_MPEGTS_DEMUXER), ts-20 ts-24)
+FATE_SAMPLES_S337M_DEMUX := $(addprefix fate-s337m-demux-, $(FATE_SAMPLES_S337M_DEMUX-yes))
+FATE_SAMPLES_DEMUX += $(FATE_SAMPLES_S337M_DEMUX)
+fate-s337m-demux: $(FATE_SAMPLES_S337M_DEMUX)
+fate-s337m-demux-raw: CMD = framecrc -i $(TARGET_SAMPLES)/dolby_e/16-11 -c copy -ss 2 -t 1
+fate-s337m-demux-wav: CMD = framecrc -i $(TARGET_SAMPLES)/dolby_e/20-bit_5.1_2.0.wav -vn -c:a copy
+fate-s337m-demux-wav-miss1-3-5: CMD = framecrc -i $(TARGET_SAMPLES)/dolby_e/20-bit_5.1_2.0_miss1-3-5.wav -vn -c:a copy
+fate-s337m-demux-mxf: CMD = framecrc -i $(TARGET_SAMPLES)/dolby_e/24-bit_5.1_2.0.mxf -vn -c:a copy
+fate-s337m-demux-ts-20: CMD = framecrc -i $(TARGET_SAMPLES)/dolby_e/20-bit-s302m_20-bit_5.1_2.0_phase000750.ts -vn -c:a copy
+fate-s337m-demux-ts-24: CMD = framecrc -i $(TARGET_SAMPLES)/dolby_e/24-bit-s302m_20-bit_5.1_2.0_phase001021.ts -vn -c:a copy
 
 FATE_SAMPLES_DEMUX-$(CONFIG_SIFF_DEMUXER) += fate-siff-demux
 fate-siff-demux: CMD = framecrc -i $(TARGET_SAMPLES)/SIFF/INTRO_B.VB -c copy
diff --git a/tests/ref/fate/s337m-demux-mxf b/tests/ref/fate/s337m-demux-mxf
new file mode 100644
index 0000000000..ce6dc4c440
--- /dev/null
+++ b/tests/ref/fate/s337m-demux-mxf
@@ -0,0 +1,56 @@
+#tb 0: 1/48000
+#media_type 0: audio
+#codec_id 0: s337m_24
+#sample_rate 0: 48000
+#channel_layout_name 0: 7.1
+0,          0,          0,       30,      180, 0x00000000
+0,         30,         30,     1920,    11520, 0x985f72f4
+0,       1920,       1920,     1920,    11520, 0xbc1b27cc
+0,       3840,       3840,     1920,    11520, 0x08db3200
+0,       5760,       5760,     1920,    11520, 0x135b7c07
+0,       7680,       7680,     1920,    11520, 0x0b4647d1
+0,       9600,       9600,     1920,    11520, 0xd0fa478c
+0,      11520,      11520,     1920,    11520, 0x0a125432
+0,      13440,      13440,     1920,    11520, 0xe6739bef
+0,      15360,      15360,     1920,    11520, 0x8943609f
+0,      17280,      17280,     1920,    11520, 0x6dab62da
+0,      19200,      19200,     1920,    11520, 0x76d605ec
+0,      21120,      21120,     1920,    11520, 0xeec3726a
+0,      23040,      23040,     1920,    11520, 0x46227c58
+0,      24960,      24960,     1920,    11520, 0xcbee55de
+0,      26880,      26880,     1920,    11520, 0x04107248
+0,      28800,      28800,     1920,    11520, 0x419e3b51
+0,      30720,      30720,     1920,    11520, 0x71f5a354
+0,      32640,      32640,     1920,    11520, 0xb98478a5
+0,      34560,      34560,     1920,    11520, 0xf1bd275d
+0,      36480,      36480,     1920,    11520, 0x73aa3685
+0,      38400,      38400,     1920,    11520, 0x48693025
+0,      40320,      40320,     1920,    11520, 0x246708b0
+0,      42240,      42240,     1920,    11520, 0x9a098b2f
+0,      44160,      44160,     1920,    11520, 0x559c6ca0
+0,      46080,      46080,     1920,    11520, 0x6acb4b66
+0,      48000,      48000,     1920,    11520, 0x5e48ca15
+0,      49920,      49920,     1920,    11520, 0xea18fb15
+0,      51840,      51840,     1920,    11520, 0xa6540862
+0,      53760,      53760,     1920,    11520, 0x6d045b16
+0,      55680,      55680,     1920,    11520, 0x0e8042a1
+0,      57600,      57600,     1920,    11520, 0xe47f6275
+0,      59520,      59520,     1920,    11520, 0x00794df6
+0,      61440,      61440,     1920,    11520, 0x4ff33b97
+0,      63360,      63360,     1920,    11520, 0xc49e3d91
+0,      65280,      65280,     1920,    11520, 0xa07e1876
+0,      67200,      67200,     1920,    11520, 0x10ee915e
+0,      69120,      69120,     1920,    11520, 0x8fac8065
+0,      71040,      71040,     1920,    11520, 0x3a809cae
+0,      72960,      72960,     1920,    11520, 0xbe443fcf
+0,      74880,      74880,     1920,    11520, 0x32e7293d
+0,      76800,      76800,     1920,    11520, 0x1b61224c
+0,      78720,      78720,     1920,    11520, 0x182cc98c
+0,      80640,      80640,     1920,    11520, 0xdc145074
+0,      82560,      82560,     1920,    11520, 0xfd3b48d5
+0,      84480,      84480,     1920,    11520, 0xa17839e7
+0,      86400,      86400,     1920,    11520, 0x5fda3e6d
+0,      88320,      88320,     1920,    11520, 0xb2c8da01
+0,      90240,      90240,     1920,    11520, 0x7c8f55ea
+0,      92160,      92160,     1920,    11520, 0xbe001fed
+0,      94080,      94080,     1920,    11340, 0x180ccc36
diff --git a/tests/ref/fate/s337m-demux b/tests/ref/fate/s337m-demux-raw
similarity index 100%
rename from tests/ref/fate/s337m-demux
rename to tests/ref/fate/s337m-demux-raw
diff --git a/tests/ref/fate/s337m-demux-ts-20 b/tests/ref/fate/s337m-demux-ts-20
new file mode 100644
index 0000000000..211cbe99eb
--- /dev/null
+++ b/tests/ref/fate/s337m-demux-ts-20
@@ -0,0 +1,44 @@
+#tb 0: 1/90000
+#media_type 0: audio
+#codec_id 0: s337m_24
+#sample_rate 0: 48000
+#channel_layout_name 0: 7.1
+0,          0,          0,       67,      216, 0x00000000, S=1,        1
+0,         67,         67,     3600,    11520, 0x57af8534, S=1,        1
+0,       3600,       3600,     3600,    11520, 0x2b1f99ce, S=1,        1
+0,       7200,       7200,     3600,    11520, 0x3014d003, S=1,        1
+0,      10800,      10800,     3600,    11520, 0xe141c2a2, S=1,        1
+0,      14400,      14400,     3600,    11520, 0x8ab191d9, S=1,        1
+0,      18000,      18000,     3600,    11520, 0x7acd7b49, S=1,        1
+0,      21600,      21600,     3600,    11520, 0xed097ec0, S=1,        1
+0,      25200,      25200,     3600,    11520, 0x5c97ba4b, S=1,        1
+0,      28800,      28800,     3600,    11520, 0x19b7ad13, S=1,        1
+0,      32400,      32400,     3600,    11520, 0x58049d06, S=1,        1
+0,      36000,      36000,     3600,    11520, 0x7458b325, S=1,        1
+0,      39600,      39600,     3600,    11520, 0x9c42acd9, S=1,        1
+0,      43200,      43200,     3600,    11520, 0xe2d08c76, S=1,        1
+0,      46800,      46800,     3600,    11520, 0xe72aca35, S=1,        1
+0,      50400,      50400,     3600,    11520, 0x3932a007, S=1,        1
+0,      54000,      54000,     3600,    11520, 0x6ee2a57d, S=1,        1
+0,      57600,      57600,     3600,    11520, 0x80489d7e, S=1,        1
+0,      61200,      61200,     3600,    11520, 0x34d2bdd9, S=1,        1
+0,      64800,      64800,     3600,    11520, 0x313bcec0, S=1,        1
+0,      68400,      68400,     3600,    11520, 0x0b02bd7c, S=1,        1
+0,      72000,      72000,     3600,    11520, 0xe9587274, S=1,        1
+0,      75600,      75600,     3600,    11520, 0x8605b239, S=1,        1
+0,      79200,      79200,     3600,    11520, 0xa84f9642, S=1,        1
+0,      82800,      82800,     3600,    11520, 0x411e8c5b, S=1,        1
+0,      86400,      86400,     3600,    11520, 0x8964a9f0, S=1,        1
+0,      90000,      90000,     3600,    11520, 0xe15fdb64, S=1,        1
+0,      93600,      93600,     3600,    11520, 0x3be1d7b5, S=1,        1
+0,      97200,      97200,     3600,    11520, 0xb4b9755c, S=1,        1
+0,     100800,     100800,     3600,    11520, 0xa5c76717, S=1,        1
+0,     104400,     104400,     3600,    11520, 0x2936bedf, S=1,        1
+0,     108000,     108000,     3600,    11520, 0x379ece8b, S=1,        1
+0,     111600,     111600,     3600,    11520, 0x2122ca4d, S=1,        1
+0,     115200,     115200,     3600,    11520, 0xbd168af7, S=1,        1
+0,     118800,     118800,     3600,    11520, 0x1647aec9, S=1,        1
+0,     122400,     122400,     3600,    11520, 0xbf5a91b7, S=1,        1
+0,     126000,     126000,     3600,    11520, 0x93e26d79, S=1,        1
+0,     129600,     129600,     3600,    11520, 0x09cd76dd, S=1,        1
+0,     133200,     133200,     3600,    11304, 0x6e69abc4
diff --git a/tests/ref/fate/s337m-demux-ts-24 b/tests/ref/fate/s337m-demux-ts-24
new file mode 100644
index 0000000000..2da9b39abe
--- /dev/null
+++ b/tests/ref/fate/s337m-demux-ts-24
@@ -0,0 +1,39 @@
+#tb 0: 1/90000
+#media_type 0: audio
+#codec_id 0: s337m_24
+#sample_rate 0: 48000
+#channel_layout_name 0: 7.1
+0,          0,          0,       91,      294, 0x00000000, S=1,        1
+0,         91,         91,     3600,    11520, 0xe56d09fb, S=1,        1
+0,       3600,       3600,     3600,    11520, 0x13a7d8be, S=1,        1
+0,       7200,       7200,     3600,    11520, 0x7d3705cd, S=1,        1
+0,      10800,      10800,     3600,    11520, 0x27e2e68b, S=1,        1
+0,      14400,      14400,     3600,    11520, 0x929fa33a, S=1,        1
+0,      18000,      18000,     3600,    11520, 0xd5daa726, S=1,        1
+0,      21600,      21600,     3600,    11520, 0xb8d2978c, S=1,        1
+0,      25200,      25200,     3600,    11520, 0x1707b252, S=1,        1
+0,      28800,      28800,     3600,    11520, 0x793eac60, S=1,        1
+0,      32400,      32400,     3600,    11520, 0x11ebf899, S=1,        1
+0,      36000,      36000,     3600,    11520, 0xef6191b4, S=1,        1
+0,      39600,      39600,     3600,    11520, 0x6eb792aa, S=1,        1
+0,      43200,      43200,     3600,    11520, 0x0ff3100c, S=1,        1
+0,      46800,      46800,     3600,    11520, 0xf826926d, S=1,        1
+0,      50400,      50400,     3600,    11520, 0x6f39b74a, S=1,        1
+0,      54000,      54000,     3600,    11520, 0x0c2b6105, S=1,        1
+0,      57600,      57600,     3600,    11520, 0xb04dc21d, S=1,        1
+0,      61200,      61200,     3600,    11520, 0x13fda5da, S=1,        1
+0,      64800,      64800,     3600,    11520, 0x8951c66a, S=1,        1
+0,      68400,      68400,     3600,    11520, 0x11f19b0f, S=1,        1
+0,      72000,      72000,     3600,    11520, 0xbdbdbea6, S=1,        1
+0,      75600,      75600,     3600,    11520, 0xbd648e1e, S=1,        1
+0,      79200,      79200,     3600,    11520, 0xfb488fb1, S=1,        1
+0,      82800,      82800,     3600,    11520, 0xad2ac559, S=1,        1
+0,      86400,      86400,     3600,    11520, 0xdb1eb3a2, S=1,        1
+0,      90000,      90000,     3600,    11520, 0x57dfb174, S=1,        1
+0,      93600,      93600,     3600,    11520, 0x18e9b528, S=1,        1
+0,      97200,      97200,     3600,    11520, 0x86dd7574, S=1,        1
+0,     100800,     100800,     3600,    11520, 0x49c5ae8d, S=1,        1
+0,     104400,     104400,     3600,    11520, 0x9469cd0c, S=1,        1
+0,     108000,     108000,     3600,    11520, 0x8f77ad67, S=1,        1
+0,     111600,     111600,     3600,    11520, 0x5cb28f0a, S=1,        1
+0,     115200,     115200,     3600,    11226, 0x93f3ccfa
diff --git a/tests/ref/fate/s337m-demux-wav b/tests/ref/fate/s337m-demux-wav
new file mode 100644
index 0000000000..ab578c8a94
--- /dev/null
+++ b/tests/ref/fate/s337m-demux-wav
@@ -0,0 +1,11 @@
+#tb 0: 1/48000
+#media_type 0: audio
+#codec_id 0: s337m_24
+#sample_rate 0: 48000
+#channel_layout_name 0: 7.1
+0,          0,          0,       41,      246, 0x00000000
+0,         41,         41,     1920,    11520, 0x8710c59f
+0,       1961,       1961,     1920,    11520, 0xb584d70c
+0,       3881,       3881,     1918,    11508, 0xc7e38dab
+0,       5799,       5799,     1920,    11520, 0x00aab5f9
+0,       7719,       7719,     1922,    11286, 0x271ea420
diff --git a/tests/ref/fate/s337m-demux-wav-miss1-3-5 b/tests/ref/fate/s337m-demux-wav-miss1-3-5
new file mode 100644
index 0000000000..17e824f650
--- /dev/null
+++ b/tests/ref/fate/s337m-demux-wav-miss1-3-5
@@ -0,0 +1,8 @@
+#tb 0: 1/48000
+#media_type 0: audio
+#codec_id 0: s337m_24
+#sample_rate 0: 48000
+#channel_layout_name 0: 7.1
+0,          0,          0,     1961,    11766, 0x00000000
+0,       1961,       1961,     3838,    23028, 0xf37fd70c
+0,       5799,       5799,     5762,    22806, 0x4638b5f9
-- 
2.30.2



More information about the ffmpeg-devel mailing list