From 5052980400e244000ade57043a1f13016847f6b1 Mon Sep 17 00:00:00 2001 From: Justin Ruggles Date: Mon, 16 Apr 2012 21:21:30 -0400 Subject: [PATCH] FATE: replace the acodec-pcm_s24daud test with an enc_dec_pcm checksum test This avoids resampling and channel mixing by using a source with the correct channel layout and sample rate. --- tests/codec-regression.sh | 3 --- tests/fate/pcm.mak | 5 +++++ tests/ref/acodec/pcm_s24daud | 4 ---- tests/ref/fate/dcinema-encode | 1 + tests/ref/seek/pcm_s24daud_302 | 27 --------------------------- 5 files changed, 6 insertions(+), 34 deletions(-) delete mode 100644 tests/ref/acodec/pcm_s24daud create mode 100644 tests/ref/fate/dcinema-encode delete mode 100644 tests/ref/seek/pcm_s24daud_302 diff --git a/tests/codec-regression.sh b/tests/codec-regression.sh index e2bc8dbbe6..80dd269126 100755 --- a/tests/codec-regression.sh +++ b/tests/codec-regression.sh @@ -419,6 +419,3 @@ fi if [ -n "$do_pcm_f64le" ] ; then do_audio_enc_dec wav dbl pcm_f64le fi -if [ -n "$do_pcm_s24daud" ] ; then -do_audio_enc_dec 302 s16 pcm_s24daud "-ac 6 -ar 96000" -fi diff --git a/tests/fate/pcm.mak b/tests/fate/pcm.mak index 3ce04f9cea..4b271346f6 100644 --- a/tests/fate/pcm.mak +++ b/tests/fate/pcm.mak @@ -25,5 +25,10 @@ fate-pcm_u8-stereo: CMD = md5 -i $(SAMPLES)/qt-surge-suite/surge-2-8-raw.mov -f FATE_PCM += fate-w64 fate-w64: CMD = crc -i $(SAMPLES)/w64/w64-pcm16.w64 +FATE_PCM += fate-dcinema-encode +fate-dcinema-encode: tests/data/asynth-96000-6.wav +fate-dcinema-encode: SRC = tests/data/asynth-96000-6.wav +fate-dcinema-encode: CMD = enc_dec_pcm daud md5 s16le $(SRC) -c:a pcm_s24daud + FATE_TESTS += $(FATE_PCM) fate-pcm: $(FATE_PCM) diff --git a/tests/ref/acodec/pcm_s24daud b/tests/ref/acodec/pcm_s24daud deleted file mode 100644 index fb7cad1d89..0000000000 --- a/tests/ref/acodec/pcm_s24daud +++ /dev/null @@ -1,4 +0,0 @@ -8168a5c1343553ef027541830f2cb879 *./tests/data/acodec/pcm_s24daud.302 -10368730 ./tests/data/acodec/pcm_s24daud.302 -7ce988d6c5b2bf0ebf0216ba15bc5cee *./tests/data/pcm_s24daud.acodec.out.wav -stddev: 9416.28 PSNR: 16.85 MAXDIFF:42744 bytes: 6911796/ 1058400 diff --git a/tests/ref/fate/dcinema-encode b/tests/ref/fate/dcinema-encode new file mode 100644 index 0000000000..8aeb21526c --- /dev/null +++ b/tests/ref/fate/dcinema-encode @@ -0,0 +1 @@ +MD5=2d7c6897c315493647db159f4bfd6edc diff --git a/tests/ref/seek/pcm_s24daud_302 b/tests/ref/seek/pcm_s24daud_302 deleted file mode 100644 index 5c9b6d976b..0000000000 --- a/tests/ref/seek/pcm_s24daud_302 +++ /dev/null @@ -1,27 +0,0 @@ -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 4 size: 39816 -ret:-1 st:-1 flags:0 ts:-1.000000 -ret:-1 st:-1 flags:1 ts: 1.894167 -ret:-1 st: 0 flags:0 ts: 0.788333 -ret:-1 st: 0 flags:1 ts:-0.317500 -ret:-1 st:-1 flags:0 ts: 2.576668 -ret:-1 st:-1 flags:1 ts: 1.470835 -ret:-1 st: 0 flags:0 ts: 0.365000 -ret:-1 st: 0 flags:1 ts:-0.740833 -ret:-1 st:-1 flags:0 ts: 2.153336 -ret:-1 st:-1 flags:1 ts: 1.047503 -ret:-1 st: 0 flags:0 ts:-0.058333 -ret:-1 st: 0 flags:1 ts: 2.835833 -ret:-1 st:-1 flags:0 ts: 1.730004 -ret:-1 st:-1 flags:1 ts: 0.624171 -ret:-1 st: 0 flags:0 ts:-0.481667 -ret:-1 st: 0 flags:1 ts: 2.412500 -ret:-1 st:-1 flags:0 ts: 1.306672 -ret:-1 st:-1 flags:1 ts: 0.200839 -ret:-1 st: 0 flags:0 ts:-0.904989 -ret:-1 st: 0 flags:1 ts: 1.989178 -ret:-1 st:-1 flags:0 ts: 0.883340 -ret:-1 st:-1 flags:1 ts:-0.222493 -ret:-1 st: 0 flags:0 ts: 2.671678 -ret:-1 st: 0 flags:1 ts: 1.565844 -ret:-1 st:-1 flags:0 ts: 0.460008 -ret:-1 st:-1 flags:1 ts:-0.645825