regtest: split wma test into wmav1 and wmav2
authorMåns Rullgård <mans@mansr.com>
Sat, 16 Jan 2010 20:18:22 +0000 (20:18 +0000)
committerMåns Rullgård <mans@mansr.com>
Sat, 16 Jan 2010 20:18:22 +0000 (20:18 +0000)
Originally committed as revision 21255 to svn://svn.ffmpeg.org/ffmpeg/trunk

Makefile
tests/codec-regression.sh
tests/ref/vsynth1/wmav1 [moved from tests/ref/vsynth1/wma with 50% similarity]
tests/ref/vsynth1/wmav2 [moved from tests/ref/vsynth2/wma with 50% similarity]
tests/ref/vsynth2/wmav1 [new file with mode: 0644]
tests/ref/vsynth2/wmav2 [new file with mode: 0644]

index 4df2791..f92736f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -188,7 +188,8 @@ CODEC_TESTS = $(addprefix regtest-,             \
         adpcm_swf                               \
         alac                                    \
         flac                                    \
-        wma                                     \
+        wmav1                                   \
+        wmav2                                   \
         pcm                                     \
     )
 
index 20e0e3c..53d1cd3 100755 (executable)
@@ -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
similarity index 50%
rename from tests/ref/vsynth1/wma
rename to tests/ref/vsynth1/wmav1
index e439d13..8fdd3ec 100644 (file)
@@ -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
similarity index 50%
rename from tests/ref/vsynth2/wma
rename to tests/ref/vsynth1/wmav2
index e439d13..ce8a74a 100644 (file)
@@ -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 (file)
index 0000000..8fdd3ec
--- /dev/null
@@ -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 (file)
index 0000000..ce8a74a
--- /dev/null
@@ -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