[FFmpeg-cvslog] FATE: replace the acodec-g726 test with 4 new encode/decode tests
Justin Ruggles
git at videolan.org
Fri Apr 20 22:32:13 CEST 2012
ffmpeg | branch: master | Justin Ruggles <justin.ruggles at gmail.com> | Mon Apr 16 22:42:53 2012 -0400| [03caef1bedf3b31d933cc32c3f3b44c598fdeb21] | committer: Justin Ruggles
FATE: replace the acodec-g726 test with 4 new encode/decode tests
Avoids resampling and channel mixing. This only tests the behavior
with respect to input and output audio rather than also testing changes
to the encoder or muxer that do not affect the resulting decoded output.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=03caef1bedf3b31d933cc32c3f3b44c598fdeb21
---
tests/codec-regression.sh | 5 ---
tests/fate/voice.mak | 23 +++++++++++++++++
tests/ref/acodec/g726 | 4 ---
tests/ref/fate/g726-encode-2bit | 1 +
tests/ref/fate/g726-encode-3bit | 1 +
tests/ref/fate/g726-encode-4bit | 1 +
tests/ref/fate/g726-encode-5bit | 1 +
tests/ref/seek/g726_wav | 53 ---------------------------------------
8 files changed, 27 insertions(+), 62 deletions(-)
diff --git a/tests/codec-regression.sh b/tests/codec-regression.sh
index 50e4503..e2bc8db 100755
--- a/tests/codec-regression.sh
+++ b/tests/codec-regression.sh
@@ -311,11 +311,6 @@ do_audio_encoding ac3.ac3 "-vn -acodec ac3_fixed"
#$tiny_psnr $pcm_dst $pcm_ref 2 1024
fi
-if [ -n "$do_g726" ] ; then
-do_audio_encoding g726.wav "-b 32k -ac 1 -ar 8000 -acodec g726"
-do_audio_decoding
-fi
-
if [ -n "$do_adpcm_adx" ] ; then
do_audio_encoding adpcm_adx.adx "-acodec adpcm_adx"
do_audio_decoding
diff --git a/tests/fate/voice.mak b/tests/fate/voice.mak
index 8e5f86b..73534af 100644
--- a/tests/fate/voice.mak
+++ b/tests/fate/voice.mak
@@ -9,6 +9,29 @@ fate-g722-encode: CMD = enc_dec_pcm wav md5 s16le $(SRC) -c:a g722
FATE_TESTS += $(FATE_G722)
fate-g722: $(FATE_G722)
+FATE_G726 += fate-g726-encode-2bit
+fate-g726-encode-2bit: tests/data/asynth-8000-1.wav
+fate-g726-encode-2bit: SRC = tests/data/asynth-8000-1.wav
+fate-g726-encode-2bit: CMD = enc_dec_pcm wav md5 s16le $(SRC) -c:a g726 -b:a 16k
+
+FATE_G726 += fate-g726-encode-3bit
+fate-g726-encode-3bit: tests/data/asynth-8000-1.wav
+fate-g726-encode-3bit: SRC = tests/data/asynth-8000-1.wav
+fate-g726-encode-3bit: CMD = enc_dec_pcm wav md5 s16le $(SRC) -c:a g726 -b:a 24k
+
+FATE_G726 += fate-g726-encode-4bit
+fate-g726-encode-4bit: tests/data/asynth-8000-1.wav
+fate-g726-encode-4bit: SRC = tests/data/asynth-8000-1.wav
+fate-g726-encode-4bit: CMD = enc_dec_pcm wav md5 s16le $(SRC) -c:a g726 -b:a 32k
+
+FATE_G726 += fate-g726-encode-5bit
+fate-g726-encode-5bit: tests/data/asynth-8000-1.wav
+fate-g726-encode-5bit: SRC = tests/data/asynth-8000-1.wav
+fate-g726-encode-5bit: CMD = enc_dec_pcm wav md5 s16le $(SRC) -c:a g726 -b:a 40k
+
+FATE_TESTS += $(FATE_G726)
+fate-g726: $(FATE_G726)
+
FATE_GSM += fate-gsm-ms
fate-gsm-ms: CMD = framecrc -i $(SAMPLES)/gsm/ciao.wav
diff --git a/tests/ref/acodec/g726 b/tests/ref/acodec/g726
deleted file mode 100644
index 9abed4b..0000000
--- a/tests/ref/acodec/g726
+++ /dev/null
@@ -1,4 +0,0 @@
-64bfac75bd371304b704be5b3dbcd04a *./tests/data/acodec/g726.wav
-24054 ./tests/data/acodec/g726.wav
-79523adfec05760931fda877e1eaf7b4 *./tests/data/g726.acodec.out.wav
-stddev: 8554.55 PSNR: 17.69 MAXDIFF:29353 bytes: 95984/ 1058400
diff --git a/tests/ref/fate/g726-encode-2bit b/tests/ref/fate/g726-encode-2bit
new file mode 100644
index 0000000..26a1219
--- /dev/null
+++ b/tests/ref/fate/g726-encode-2bit
@@ -0,0 +1 @@
+MD5=215eaef5778a16e2bf4f3725a557f355
diff --git a/tests/ref/fate/g726-encode-3bit b/tests/ref/fate/g726-encode-3bit
new file mode 100644
index 0000000..f9c6940
--- /dev/null
+++ b/tests/ref/fate/g726-encode-3bit
@@ -0,0 +1 @@
+MD5=0bebd949dfd5ac0ae3f2c3ceb2e3fac1
diff --git a/tests/ref/fate/g726-encode-4bit b/tests/ref/fate/g726-encode-4bit
new file mode 100644
index 0000000..6d03517
--- /dev/null
+++ b/tests/ref/fate/g726-encode-4bit
@@ -0,0 +1 @@
+MD5=a21cfea116ab2179eabe5d84b6bfc09a
diff --git a/tests/ref/fate/g726-encode-5bit b/tests/ref/fate/g726-encode-5bit
new file mode 100644
index 0000000..459ebb3
--- /dev/null
+++ b/tests/ref/fate/g726-encode-5bit
@@ -0,0 +1 @@
+MD5=9cad98cf5205bf76d6e9d1241e56141a
diff --git a/tests/ref/seek/g726_wav b/tests/ref/seek/g726_wav
deleted file mode 100644
index 0e145a2..0000000
--- a/tests/ref/seek/g726_wav
+++ /dev/null
@@ -1,53 +0,0 @@
-ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 58 size: 4096
-ret: 0 st:-1 flags:0 ts:-1.000000
-ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 58 size: 4096
-ret: 0 st:-1 flags:1 ts: 1.894167
-ret: 0 st: 0 flags:1 dts: 1.894000 pts: 1.894000 pos: 7634 size: 4096
-ret: 0 st: 0 flags:0 ts: 0.788375
-ret: 0 st: 0 flags:1 dts: 0.788500 pts: 0.788500 pos: 3212 size: 4096
-ret: 0 st: 0 flags:1 ts:-0.317500
-ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 58 size: 4096
-ret: 0 st:-1 flags:0 ts: 2.576668
-ret: 0 st: 0 flags:1 dts: 2.576750 pts: 2.576750 pos: 10365 size: 4096
-ret: 0 st:-1 flags:1 ts: 1.470835
-ret: 0 st: 0 flags:1 dts: 1.470750 pts: 1.470750 pos: 5941 size: 4096
-ret: 0 st: 0 flags:0 ts: 0.365000
-ret: 0 st: 0 flags:1 dts: 0.365000 pts: 0.365000 pos: 1518 size: 4096
-ret: 0 st: 0 flags:1 ts:-0.740875
-ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 58 size: 4096
-ret: 0 st:-1 flags:0 ts: 2.153336
-ret: 0 st: 0 flags:1 dts: 2.153500 pts: 2.153500 pos: 8672 size: 4096
-ret: 0 st:-1 flags:1 ts: 1.047503
-ret: 0 st: 0 flags:1 dts: 1.047500 pts: 1.047500 pos: 4248 size: 4096
-ret: 0 st: 0 flags:0 ts:-0.058375
-ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 58 size: 4096
-ret: 0 st: 0 flags:1 ts: 2.835875
-ret: 0 st: 0 flags:1 dts: 2.835750 pts: 2.835750 pos: 11401 size: 4096
-ret: 0 st:-1 flags:0 ts: 1.730004
-ret: 0 st: 0 flags:1 dts: 1.730000 pts: 1.730000 pos: 6978 size: 4096
-ret: 0 st:-1 flags:1 ts: 0.624171
-ret: 0 st: 0 flags:1 dts: 0.624000 pts: 0.624000 pos: 2554 size: 4096
-ret: 0 st: 0 flags:0 ts:-0.481625
-ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 58 size: 4096
-ret: 0 st: 0 flags:1 ts: 2.412500
-ret: 0 st: 0 flags:1 dts: 2.412500 pts: 2.412500 pos: 9708 size: 4096
-ret: 0 st:-1 flags:0 ts: 1.306672
-ret: 0 st: 0 flags:1 dts: 1.306750 pts: 1.306750 pos: 5285 size: 4096
-ret: 0 st:-1 flags:1 ts: 0.200839
-ret: 0 st: 0 flags:1 dts: 0.200750 pts: 0.200750 pos: 861 size: 4096
-ret: 0 st: 0 flags:0 ts:-0.905000
-ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 58 size: 4096
-ret: 0 st: 0 flags:1 ts: 1.989125
-ret: 0 st: 0 flags:1 dts: 1.989000 pts: 1.989000 pos: 8014 size: 4096
-ret: 0 st:-1 flags:0 ts: 0.883340
-ret: 0 st: 0 flags:1 dts: 0.883500 pts: 0.883500 pos: 3592 size: 4096
-ret: 0 st:-1 flags:1 ts:-0.222493
-ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 58 size: 4096
-ret: 0 st: 0 flags:0 ts: 2.671625
-ret: 0 st: 0 flags:1 dts: 2.671750 pts: 2.671750 pos: 10745 size: 4096
-ret: 0 st: 0 flags:1 ts: 1.565875
-ret: 0 st: 0 flags:1 dts: 1.565750 pts: 1.565750 pos: 6321 size: 4096
-ret: 0 st:-1 flags:0 ts: 0.460008
-ret: 0 st: 0 flags:1 dts: 0.460000 pts: 0.460000 pos: 1898 size: 4096
-ret: 0 st:-1 flags:1 ts:-0.645825
-ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 58 size: 4096
More information about the ffmpeg-cvslog
mailing list