aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorReimar Döffinger <Reimar.Doeffinger@gmx.de>2012-04-07 13:19:35 +0200
committerReimar Döffinger <Reimar.Doeffinger@gmx.de>2012-04-08 02:43:56 +0200
commit58c25724b7f921fdf3657fcb011b3bb3b7b353d4 (patch)
treed9e60664610ee8433fca0756f45344bb6dfc2071
parente9841505d2f17addc651d65322c31351d271798d (diff)
downloadffmpeg-58c25724b7f921fdf3657fcb011b3bb3b7b353d4.tar.gz
Add nellymoser "fuzzy" FATE test.
Since we cannot specify decode parameters (and also because it is better in principle) the 1-channel reference file needs to be enabled, too. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
-rw-r--r--tests/Makefile2
-rwxr-xr-xtests/codec-regression.sh1
-rw-r--r--tests/fate/audio.mak11
-rw-r--r--tests/ref/acodec/aref2
-rwxr-xr-xtests/regression-funcs.sh2
5 files changed, 16 insertions, 2 deletions
diff --git a/tests/Makefile b/tests/Makefile
index 2674b18c2f..7757d84b32 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -5,7 +5,7 @@ VREF = fate-vsynth1-vref fate-vsynth2-vref
REFS = $(AREF) $(VREF)
$(VREF): ffmpeg$(EXESUF) tests/vsynth1/00.pgm tests/vsynth2/00.pgm
-$(AREF): ffmpeg$(EXESUF) tests/data/asynth1.sw
+$(AREF): ffmpeg$(EXESUF) tests/data/asynth1.sw tests/data/asynth-16000-1.sw
$(AREF): CMP=
ffservertest: ffserver$(EXESUF) tests/vsynth1/00.pgm tests/data/asynth1.sw
diff --git a/tests/codec-regression.sh b/tests/codec-regression.sh
index 0a84f0feec..3bf7edfcea 100755
--- a/tests/codec-regression.sh
+++ b/tests/codec-regression.sh
@@ -17,6 +17,7 @@ do_avconv $raw_ref -f image2 -vcodec pgmyuv -i $raw_src -an -f rawvideo
fi
if [ -n "$do_aref" ]; then
do_avconv $pcm_ref -b 128k -ac 2 -ar 44100 -f s16le -i $pcm_src -f wav
+do_avconv $pcm_ref_1ch -b 128k -ac 1 -ar 16000 -f s16le -i $pcm_src_1ch -f wav
fi
if [ -n "$do_cljr" ] ; then
diff --git a/tests/fate/audio.mak b/tests/fate/audio.mak
index f694cb9bc3..ae598bac7b 100644
--- a/tests/fate/audio.mak
+++ b/tests/fate/audio.mak
@@ -28,8 +28,17 @@ fate-nellymoser: CMD = pcm -i $(SAMPLES)/nellymoser/nellymoser.flv
fate-nellymoser: CMP = oneoff
fate-nellymoser: REF = $(SAMPLES)/nellymoser/nellymoser.pcm
+FATE_AUDIO += fate-nellymoser-aref-encode
+fate-nellymoser-aref-encode: $(AREF)
+fate-nellymoser-aref-encode: CMD = enc_dec_pcm flv s16le -c:a nellymoser
+fate-nellymoser-aref-encode: CMP = stddev
+fate-nellymoser-aref-encode: REF = ./tests/data/acodec-16000-1.ref.wav
+fate-nellymoser-aref-encode: CMP_SHIFT = -1172
+fate-nellymoser-aref-encode: CMP_TARGET = 9617
+fate-nellymoser-aref-encode: SIZE_TOLERANCE = 268
+
FATE_AUDIO += fate-ws_snd
fate-ws_snd: CMD = md5 -i $(SAMPLES)/vqa/ws_snd.vqa -f s16le
FATE_TESTS += $(FATE_AUDIO)
-fate-audio: $(FATE_AUDIO) \ No newline at end of file
+fate-audio: $(FATE_AUDIO)
diff --git a/tests/ref/acodec/aref b/tests/ref/acodec/aref
index cd89a632e6..d70876d9d9 100644
--- a/tests/ref/acodec/aref
+++ b/tests/ref/acodec/aref
@@ -1,2 +1,4 @@
64151e4bcc2b717aa5a8454d424d6a1f *./tests/data/acodec.ref.wav
1058446 ./tests/data/acodec.ref.wav
+ce524631c2ad0a40aaab46e3a80a1176 *./tests/data/acodec-16000-1.ref.wav
+192046 ./tests/data/acodec-16000-1.ref.wav
diff --git a/tests/regression-funcs.sh b/tests/regression-funcs.sh
index d14071aab6..51e7ac4d39 100755
--- a/tests/regression-funcs.sh
+++ b/tests/regression-funcs.sh
@@ -28,6 +28,8 @@ raw_ref="$datadir/$test_ref.ref.yuv"
pcm_src="$target_datadir/asynth1.sw"
pcm_dst="$datadir/$this.out.wav"
pcm_ref="$datadir/$test_ref.ref.wav"
+pcm_src_1ch="$target_datadir/asynth-16000-1.sw"
+pcm_ref_1ch="$datadir/$test_ref-16000-1.ref.wav"
crcfile="$datadir/$this.crc"
target_crcfile="$target_datadir/$this.crc"