aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMans Rullgard <mans@mansr.com>2012-05-11 15:36:57 +0100
committerMans Rullgard <mans@mansr.com>2012-05-14 12:55:33 +0100
commit95939bf5650c7194ecbf779ae594d818ce99e89e (patch)
tree3ecd653ab0104dc8151a00a882afb2801ab74890
parent88ae6178b1dc4d59081d59b66a7456b8bf1c8457 (diff)
downloadffmpeg-95939bf5650c7194ecbf779ae594d818ce99e89e.tar.gz
fate: split off adpcm-ima-ws test from vqa-cc
Signed-off-by: Mans Rullgard <mans@mansr.com>
-rw-r--r--tests/fate/adpcm.mak3
-rw-r--r--tests/fate/video.mak2
-rw-r--r--tests/ref/fate/adpcm-ima-ws41
-rw-r--r--tests/ref/fate/vqa-cc41
4 files changed, 45 insertions, 42 deletions
diff --git a/tests/fate/adpcm.mak b/tests/fate/adpcm.mak
index 9bcad90f6a..c3dfbe921c 100644
--- a/tests/fate/adpcm.mak
+++ b/tests/fate/adpcm.mak
@@ -49,6 +49,9 @@ fate-adpcm-ima-smjpeg: CMD = framecrc -i $(SAMPLES)/smjpeg/scenwin.mjpg -vn
FATE_ADPCM += fate-adpcm-ima_wav-stereo
fate-adpcm-ima_wav-stereo: CMD = md5 -i $(SAMPLES)/qt-surge-suite/surge-2-16-L-ms11.mov -f s16le
+FATE_ADPCM += fate-adpcm-ima-ws
+fate-adpcm-ima-ws: CMD = framecrc -i $(SAMPLES)/vqa/cc-demo1-partial.vqa -vn
+
FATE_ADPCM += fate-adpcm-psx-str-v3
fate-adpcm-psx-str-v3: CMD = framecrc -i $(SAMPLES)/psx-str/abc000_cut.str -vn
diff --git a/tests/fate/video.mak b/tests/fate/video.mak
index f238601a07..3bddb126fc 100644
--- a/tests/fate/video.mak
+++ b/tests/fate/video.mak
@@ -217,7 +217,7 @@ FATE_AVCONV += fate-videoxl
fate-videoxl: CMD = framecrc -i $(SAMPLES)/vixl/pig-vixl.avi
FATE_AVCONV += fate-vqa-cc
-fate-vqa-cc: CMD = framecrc -i $(SAMPLES)/vqa/cc-demo1-partial.vqa -pix_fmt rgb24
+fate-vqa-cc: CMD = framecrc -i $(SAMPLES)/vqa/cc-demo1-partial.vqa -pix_fmt rgb24 -an
FATE_AVCONV += fate-wc3movie-xan
fate-wc3movie-xan: CMD = framecrc -i $(SAMPLES)/wc3movie/SC_32-part.MVE -pix_fmt rgb24
diff --git a/tests/ref/fate/adpcm-ima-ws b/tests/ref/fate/adpcm-ima-ws
new file mode 100644
index 0000000000..61e0def729
--- /dev/null
+++ b/tests/ref/fate/adpcm-ima-ws
@@ -0,0 +1,41 @@
+#tb 0: 1/22050
+0, 0, 0, 11024, 22048, 0x0665d7f4
+0, 11024, 11024, 1470, 2940, 0x0f3c64cb
+0, 12494, 12494, 1470, 2940, 0xc90b9e78
+0, 13964, 13964, 1470, 2940, 0x146246a3
+0, 15434, 15434, 1470, 2940, 0xd22c714e
+0, 16904, 16904, 1470, 2940, 0xd86b681e
+0, 18374, 18374, 1470, 2940, 0x12ec8186
+0, 19844, 19844, 1470, 2940, 0x69aa85b6
+0, 21314, 21314, 1470, 2940, 0xb24d33b0
+0, 22784, 22784, 1470, 2940, 0x3f7b0f0d
+0, 24254, 24254, 1470, 2940, 0x64f10f7e
+0, 25724, 25724, 1470, 2940, 0xd6ea379a
+0, 27194, 27194, 1470, 2940, 0x7c38e830
+0, 28664, 28664, 1470, 2940, 0xc28ff132
+0, 30134, 30134, 1470, 2940, 0xe7b11629
+0, 31604, 31604, 1470, 2940, 0xeb86fdcb
+0, 33074, 33074, 1470, 2940, 0x5508f586
+0, 34544, 34544, 1470, 2940, 0xf4fa1f1b
+0, 36014, 36014, 1470, 2940, 0x9e5ff976
+0, 37484, 37484, 1470, 2940, 0xcfc4e08f
+0, 38954, 38954, 1470, 2940, 0x74bde7ed
+0, 40424, 40424, 1470, 2940, 0x3e4ae245
+0, 41894, 41894, 1470, 2940, 0x4c6a8e56
+0, 43364, 43364, 1470, 2940, 0xa09d86ab
+0, 44834, 44834, 1470, 2940, 0xc8531912
+0, 46304, 46304, 1470, 2940, 0xa5f266aa
+0, 47774, 47774, 1470, 2940, 0x587a4187
+0, 49244, 49244, 1470, 2940, 0x14752d45
+0, 50714, 50714, 1470, 2940, 0x558cde10
+0, 52184, 52184, 1470, 2940, 0x735fee38
+0, 53654, 53654, 1470, 2940, 0xac8bb6c8
+0, 55124, 55124, 1470, 2940, 0xa503c73b
+0, 56594, 56594, 1470, 2940, 0x7cd588a3
+0, 58064, 58064, 1470, 2940, 0xa6974b04
+0, 59534, 59534, 1470, 2940, 0xbf448241
+0, 61004, 61004, 1470, 2940, 0x2a5c2759
+0, 62474, 62474, 1470, 2940, 0xd0de5ce0
+0, 63944, 63944, 1470, 2940, 0xc0486649
+0, 65414, 65414, 1470, 2940, 0x48b040af
+0, 66884, 66884, 1470, 2940, 0x82a338a9
diff --git a/tests/ref/fate/vqa-cc b/tests/ref/fate/vqa-cc
index 97ae71d5c4..d3c5e6a8e1 100644
--- a/tests/ref/fate/vqa-cc
+++ b/tests/ref/fate/vqa-cc
@@ -1,7 +1,5 @@
#tb 0: 1/15
-#tb 1: 1/22050
0, 0, 0, 1, 192000, 0x00000000
-1, 0, 0, 11024, 22048, 0x0665d7f4
0, 1, 1, 1, 192000, 0x00000000
0, 2, 2, 1, 192000, 0x00000000
0, 3, 3, 1, 192000, 0x00000000
@@ -9,72 +7,33 @@
0, 5, 5, 1, 192000, 0xfd496438
0, 6, 6, 1, 192000, 0x965f0bf3
0, 7, 7, 1, 192000, 0x378fca5f
-1, 11024, 11024, 1470, 2940, 0x0f3c64cb
0, 8, 8, 1, 192000, 0x5ccd8966
-1, 12494, 12494, 1470, 2940, 0xc90b9e78
0, 9, 9, 1, 192000, 0x859676f9
-1, 13964, 13964, 1470, 2940, 0x146246a3
0, 10, 10, 1, 192000, 0x820bfb1c
-1, 15434, 15434, 1470, 2940, 0xd22c714e
0, 11, 11, 1, 192000, 0x7570cc05
-1, 16904, 16904, 1470, 2940, 0xd86b681e
0, 12, 12, 1, 192000, 0xf38bdb06
-1, 18374, 18374, 1470, 2940, 0x12ec8186
0, 13, 13, 1, 192000, 0x9b0cbb44
-1, 19844, 19844, 1470, 2940, 0x69aa85b6
0, 14, 14, 1, 192000, 0x0ed70665
-1, 21314, 21314, 1470, 2940, 0xb24d33b0
0, 15, 15, 1, 192000, 0xd16de7fc
-1, 22784, 22784, 1470, 2940, 0x3f7b0f0d
0, 16, 16, 1, 192000, 0x97afb484
-1, 24254, 24254, 1470, 2940, 0x64f10f7e
0, 17, 17, 1, 192000, 0x012893f3
-1, 25724, 25724, 1470, 2940, 0xd6ea379a
0, 18, 18, 1, 192000, 0x742a4b43
-1, 27194, 27194, 1470, 2940, 0x7c38e830
0, 19, 19, 1, 192000, 0x309dcd75
-1, 28664, 28664, 1470, 2940, 0xc28ff132
0, 20, 20, 1, 192000, 0xed7814ac
-1, 30134, 30134, 1470, 2940, 0xe7b11629
0, 21, 21, 1, 192000, 0xdb7de3d7
-1, 31604, 31604, 1470, 2940, 0xeb86fdcb
0, 22, 22, 1, 192000, 0xe18679a3
-1, 33074, 33074, 1470, 2940, 0x5508f586
0, 23, 23, 1, 192000, 0xb1f213f4
-1, 34544, 34544, 1470, 2940, 0xf4fa1f1b
0, 24, 24, 1, 192000, 0x33c99b5c
-1, 36014, 36014, 1470, 2940, 0x9e5ff976
0, 25, 25, 1, 192000, 0xf66c0c91
-1, 37484, 37484, 1470, 2940, 0xcfc4e08f
0, 26, 26, 1, 192000, 0x929cdc73
-1, 38954, 38954, 1470, 2940, 0x74bde7ed
0, 27, 27, 1, 192000, 0xa723fc3b
-1, 40424, 40424, 1470, 2940, 0x3e4ae245
0, 28, 28, 1, 192000, 0xe6395ccc
-1, 41894, 41894, 1470, 2940, 0x4c6a8e56
0, 29, 29, 1, 192000, 0x147fbf74
-1, 43364, 43364, 1470, 2940, 0xa09d86ab
0, 30, 30, 1, 192000, 0x3ec62d28
-1, 44834, 44834, 1470, 2940, 0xc8531912
0, 31, 31, 1, 192000, 0x22104ffb
-1, 46304, 46304, 1470, 2940, 0xa5f266aa
0, 32, 32, 1, 192000, 0x91f25f58
-1, 47774, 47774, 1470, 2940, 0x587a4187
0, 33, 33, 1, 192000, 0xc91b0e4e
-1, 49244, 49244, 1470, 2940, 0x14752d45
0, 34, 34, 1, 192000, 0x4683df56
-1, 50714, 50714, 1470, 2940, 0x558cde10
0, 35, 35, 1, 192000, 0x8ef8932a
-1, 52184, 52184, 1470, 2940, 0x735fee38
0, 36, 36, 1, 192000, 0xce6c0ec0
-1, 53654, 53654, 1470, 2940, 0xac8bb6c8
0, 37, 37, 1, 192000, 0xcc10e2a0
-1, 55124, 55124, 1470, 2940, 0xa503c73b
-1, 56594, 56594, 1470, 2940, 0x7cd588a3
-1, 58064, 58064, 1470, 2940, 0xa6974b04
-1, 59534, 59534, 1470, 2940, 0xbf448241
-1, 61004, 61004, 1470, 2940, 0x2a5c2759
-1, 62474, 62474, 1470, 2940, 0xd0de5ce0
-1, 63944, 63944, 1470, 2940, 0xc0486649
-1, 65414, 65414, 1470, 2940, 0x48b040af
-1, 66884, 66884, 1470, 2940, 0x82a338a9