[FFmpeg-devel] [PATCH 4/7] fate/acodec: add 20/24bit s302m tests

[ffnicolasg at sfr.fr]

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

Prepare for s302m decoder re-implementation in mpegts.

Signed-off-by: Nicolas Gaullier <nicolas.gaullier at cji.paris>
---
 tests/fate/acodec.mak        | 15 ++++++++++-----
 tests/ref/acodec/s302m       |  4 ----
 tests/ref/acodec/s302m-16bit |  4 ++++
 tests/ref/acodec/s302m-20bit |  4 ++++
 tests/ref/acodec/s302m-24bit |  4 ++++
 5 files changed, 22 insertions(+), 9 deletions(-)
 delete mode 100644 tests/ref/acodec/s302m
 create mode 100644 tests/ref/acodec/s302m-16bit
 create mode 100644 tests/ref/acodec/s302m-20bit
 create mode 100644 tests/ref/acodec/s302m-24bit

diff --git a/tests/fate/acodec.mak b/tests/fate/acodec.mak
index 7b09e3bd63..5bdb89250f 100644
--- a/tests/fate/acodec.mak
+++ b/tests/fate/acodec.mak
@@ -159,11 +159,16 @@ fate-acodec-roqaudio: CODEC = roq_dpcm
 fate-acodec-roqaudio: ENCOPTS = -af aresample=22050:tsf=s16p
 fate-acodec-roqaudio: DECOPTS = -af aresample=44100:tsf=s16p
 
-FATE_ACODEC-$(call ENCDEC, S302M, MPEGTS, ARESAMPLE_FILTER) += fate-acodec-s302m
-fate-acodec-s302m: FMT = mpegts
-fate-acodec-s302m: CODEC = s302m
-fate-acodec-s302m: ENCOPTS = -af aresample=48000:tsf=s16p -strict -2
-fate-acodec-s302m: DECOPTS = -af aresample=44100:tsf=s16p
+FATE_ACODEC_S302M-$(call ENCDEC, S302M, MPEGTS, ARESAMPLE_FILTER) += 16bit 20bit 24bit
+FATE_ACODEC_S302M := $(addprefix fate-acodec-s302m-, $(FATE_ACODEC_S302M-yes))
+FATE_ACODEC += $(FATE_ACODEC_S302M)
+fate-acodec-s302m: $(FATE_ACODEC_S302M)
+fate-acodec-s302m-%: CODEC = s302m
+fate-acodec-s302m-%: FMT = mpegts
+fate-acodec-s302m-16bit: ENCOPTS = -af aresample=48000:tsf=s16p -strict -2
+fate-acodec-s302m-16bit: DECOPTS = -af aresample=44100:tsf=s16p
+fate-acodec-s302m-20bit: ENCOPTS = -af aresample=48000:osf=s32p -bits_per_raw_sample 20 -strict -2
+fate-acodec-s302m-24bit: ENCOPTS = -af aresample=48000:osf=s32p -bits_per_raw_sample 24 -strict -2
 
 FATE_ACODEC-$(call ENCDEC, WAVPACK, WV, ARESAMPLE_FILTER) += fate-acodec-wavpack
 fate-acodec-wavpack: FMT = wv
diff --git a/tests/ref/acodec/s302m b/tests/ref/acodec/s302m
deleted file mode 100644
index bc4986cabd..0000000000
--- a/tests/ref/acodec/s302m
+++ /dev/null
@@ -1,4 +0,0 @@
-08a3bec0e1626ad8c8a13b181ee1afb5 *tests/data/fate/acodec-s302m.mpegts
-1496104 tests/data/fate/acodec-s302m.mpegts
-abc1b26737c8103c3f122539d239f6be *tests/data/fate/acodec-s302m.out.wav
-stddev:  986.15 PSNR: 36.45 MAXDIFF:18571 bytes:  1058400/  1058400
diff --git a/tests/ref/acodec/s302m-16bit b/tests/ref/acodec/s302m-16bit
new file mode 100644
index 0000000000..479c75e5cb
--- /dev/null
+++ b/tests/ref/acodec/s302m-16bit
@@ -0,0 +1,4 @@
+08a3bec0e1626ad8c8a13b181ee1afb5 *tests/data/fate/acodec-s302m-16bit.mpegts
+1496104 tests/data/fate/acodec-s302m-16bit.mpegts
+abc1b26737c8103c3f122539d239f6be *tests/data/fate/acodec-s302m-16bit.out.wav
+stddev:  986.15 PSNR: 36.45 MAXDIFF:18571 bytes:  1058400/  1058400
diff --git a/tests/ref/acodec/s302m-20bit b/tests/ref/acodec/s302m-20bit
new file mode 100644
index 0000000000..32abe210dc
--- /dev/null
+++ b/tests/ref/acodec/s302m-20bit
@@ -0,0 +1,4 @@
+3b61de99b3ffb1bd8d8e4faf0c69c898 *tests/data/fate/acodec-s302m-20bit.mpegts
+1787692 tests/data/fate/acodec-s302m-20bit.mpegts
+a2d243021a8aa0d3463a24fe2bce253e *tests/data/fate/acodec-s302m-20bit.out.wav
+stddev:11358.21 PSNR: 15.22 MAXDIFF:65498 bytes:  1058400/  1152000
diff --git a/tests/ref/acodec/s302m-24bit b/tests/ref/acodec/s302m-24bit
new file mode 100644
index 0000000000..e584cd589b
--- /dev/null
+++ b/tests/ref/acodec/s302m-24bit
@@ -0,0 +1,4 @@
+f1a59487a89575913fce360a332700f7 *tests/data/fate/acodec-s302m-24bit.mpegts
+2079280 tests/data/fate/acodec-s302m-24bit.mpegts
+a2d243021a8aa0d3463a24fe2bce253e *tests/data/fate/acodec-s302m-24bit.out.wav
+stddev:11358.21 PSNR: 15.22 MAXDIFF:65498 bytes:  1058400/  1152000
-- 
2.30.2