aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile3
-rwxr-xr-xtests/codec-regression.sh6
-rw-r--r--tests/ref/vsynth1/wmav1 (renamed from tests/ref/vsynth1/wma)4
-rw-r--r--tests/ref/vsynth1/wmav2 (renamed from tests/ref/vsynth2/wma)4
-rw-r--r--tests/ref/vsynth2/wmav14
-rw-r--r--tests/ref/vsynth2/wmav24
6 files changed, 13 insertions, 12 deletions
diff --git a/Makefile b/Makefile
index 4df279125b..f92736fab5 100644
--- a/Makefile
+++ b/Makefile
@@ -188,7 +188,8 @@ CODEC_TESTS = $(addprefix regtest-, \
adpcm_swf \
alac \
flac \
- wma \
+ wmav1 \
+ wmav2 \
pcm \
)
diff --git a/tests/codec-regression.sh b/tests/codec-regression.sh
index 20e0e3c43e..53d1cd316b 100755
--- a/tests/codec-regression.sh
+++ b/tests/codec-regression.sh
@@ -299,12 +299,12 @@ do_audio_encoding flac.flac "-ar 44100" "-acodec flac -compression_level 2"
do_audio_decoding
fi
-if [ -n "$do_wma" ] ; then
-# wmav1
+if [ -n "$do_wmav1" ] ; then
do_audio_encoding wmav1.asf "-ar 44100" "-acodec wmav1"
do_ffmpeg_nomd5 $pcm_dst -i $target_path/$file -f wav
$tiny_psnr $pcm_dst $pcm_ref 2 8192 >> $logfile
-# wmav2
+fi
+if [ -n "$do_wmav2" ] ; then
do_audio_encoding wmav2.asf "-ar 44100" "-acodec wmav2"
do_ffmpeg_nomd5 $pcm_dst -i $target_path/$file -f wav
$tiny_psnr $pcm_dst $pcm_ref 2 8192 >> $logfile
diff --git a/tests/ref/vsynth1/wma b/tests/ref/vsynth1/wmav1
index e439d1333d..8fdd3ec293 100644
--- a/tests/ref/vsynth1/wma
+++ b/tests/ref/vsynth1/wmav1
@@ -2,7 +2,3 @@
106004 ./tests/data/a-wmav1.asf
stddev:12245.27 PSNR: 14.57 bytes: 1065004/ 1058444
stddev: 2097.78 PSNR: 29.89 bytes: 1056812/ 1058444
-7c6c0cb692af01b312ae345723674b5f *./tests/data/a-wmav2.asf
-106044 ./tests/data/a-wmav2.asf
-stddev:12249.69 PSNR: 14.57 bytes: 1065004/ 1058444
-stddev: 2091.12 PSNR: 29.92 bytes: 1056812/ 1058444
diff --git a/tests/ref/vsynth2/wma b/tests/ref/vsynth1/wmav2
index e439d1333d..ce8a74a552 100644
--- a/tests/ref/vsynth2/wma
+++ b/tests/ref/vsynth1/wmav2
@@ -1,7 +1,3 @@
-26a7f6b0f0b7181df8df3fa589f6bf81 *./tests/data/a-wmav1.asf
-106004 ./tests/data/a-wmav1.asf
-stddev:12245.27 PSNR: 14.57 bytes: 1065004/ 1058444
-stddev: 2097.78 PSNR: 29.89 bytes: 1056812/ 1058444
7c6c0cb692af01b312ae345723674b5f *./tests/data/a-wmav2.asf
106044 ./tests/data/a-wmav2.asf
stddev:12249.69 PSNR: 14.57 bytes: 1065004/ 1058444
diff --git a/tests/ref/vsynth2/wmav1 b/tests/ref/vsynth2/wmav1
new file mode 100644
index 0000000000..8fdd3ec293
--- /dev/null
+++ b/tests/ref/vsynth2/wmav1
@@ -0,0 +1,4 @@
+26a7f6b0f0b7181df8df3fa589f6bf81 *./tests/data/a-wmav1.asf
+106004 ./tests/data/a-wmav1.asf
+stddev:12245.27 PSNR: 14.57 bytes: 1065004/ 1058444
+stddev: 2097.78 PSNR: 29.89 bytes: 1056812/ 1058444
diff --git a/tests/ref/vsynth2/wmav2 b/tests/ref/vsynth2/wmav2
new file mode 100644
index 0000000000..ce8a74a552
--- /dev/null
+++ b/tests/ref/vsynth2/wmav2
@@ -0,0 +1,4 @@
+7c6c0cb692af01b312ae345723674b5f *./tests/data/a-wmav2.asf
+106044 ./tests/data/a-wmav2.asf
+stddev:12249.69 PSNR: 14.57 bytes: 1065004/ 1058444
+stddev: 2091.12 PSNR: 29.92 bytes: 1056812/ 1058444