aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMans Rullgard <mans@mansr.com>2012-05-11 14:58:31 +0100
committerMans Rullgard <mans@mansr.com>2012-05-14 12:51:59 +0100
commit35d88a86e342ed388b09636739efcb7f780d22d5 (patch)
tree6a51dd825bccb802537226241072c284d900d582
parentbd7ac952b132adac16f02d5e30737db45dc5ee2b (diff)
downloadffmpeg-35d88a86e342ed388b09636739efcb7f780d22d5.tar.gz
fate: separate bmv audio and video tests
Signed-off-by: Mans Rullgard <mans@mansr.com>
-rw-r--r--tests/fate/audio.mak3
-rw-r--r--tests/fate/demux.mak3
-rw-r--r--tests/fate/video.mak3
-rw-r--r--tests/ref/fate/bmv44
-rw-r--r--tests/ref/fate/bmv-audio22
-rw-r--r--tests/ref/fate/bmv-video22
6 files changed, 50 insertions, 47 deletions
diff --git a/tests/fate/audio.mak b/tests/fate/audio.mak
index 804b6fdcd4..7533f20058 100644
--- a/tests/fate/audio.mak
+++ b/tests/fate/audio.mak
@@ -13,6 +13,9 @@ fate-binkaudio-rdft: FUZZ = 2
FATE_AVCONV += $(FATE_BINKAUDIO)
fate-binkaudio: $(FATE_BINKAUDIO)
+FATE_AVCONV += fate-bmv-audio
+fate-bmv-audio: CMD = framecrc -i $(SAMPLES)/bmv/SURFING-partial.BMV -vn
+
FATE_AVCONV += fate-delphine-cin-audio
fate-delphine-cin-audio: CMD = framecrc -i $(SAMPLES)/delphine-cin/LOGO-partial.CIN -vn
diff --git a/tests/fate/demux.mak b/tests/fate/demux.mak
index c67b2c4f8f..eb706de94c 100644
--- a/tests/fate/demux.mak
+++ b/tests/fate/demux.mak
@@ -7,9 +7,6 @@ fate-aea-demux: CMD = crc -i $(SAMPLES)/aea/chirp.aea -acodec copy
FATE_AVCONV += fate-bink-demux
fate-bink-demux: CMD = crc -i $(SAMPLES)/bink/Snd0a7d9b58.dee -vn -acodec copy
-FATE_AVCONV += fate-bmv
-fate-bmv: CMD = framecrc -i $(SAMPLES)/bmv/SURFING-partial.BMV -pix_fmt rgb24
-
FATE_AVCONV += fate-caf
fate-caf: CMD = crc -i $(SAMPLES)/caf/caf-pcm16.caf
diff --git a/tests/fate/video.mak b/tests/fate/video.mak
index c2b25648c1..0d1ffab48c 100644
--- a/tests/fate/video.mak
+++ b/tests/fate/video.mak
@@ -37,6 +37,9 @@ fate-bfi: CMD = framecrc -i $(SAMPLES)/bfi/2287.bfi -pix_fmt rgb24
FATE_AVCONV += fate-bink-video
fate-bink-video: CMD = framecrc -i $(SAMPLES)/bink/hol2br.bik
+FATE_AVCONV += fate-bmv-video
+fate-bmv-video: CMD = framecrc -i $(SAMPLES)/bmv/SURFING-partial.BMV -pix_fmt rgb24 -an
+
FATE_AVCONV += fate-cdgraphics
fate-cdgraphics: CMD = framecrc -i $(SAMPLES)/cdgraphics/BrotherJohn.cdg -pix_fmt rgb24 -t 1
diff --git a/tests/ref/fate/bmv b/tests/ref/fate/bmv
deleted file mode 100644
index 2ea4862ea3..0000000000
--- a/tests/ref/fate/bmv
+++ /dev/null
@@ -1,44 +0,0 @@
-#tb 0: 1/12
-#tb 1: 1/22050
-0, 0, 0, 1, 823680, 0xddb8a306
-1, 0, 0, 1856, 7424, 0x18540b36
-0, 1, 1, 1, 823680, 0xa95375c8
-1, 1856, 1856, 1824, 7296, 0x5acd2484
-0, 2, 2, 1, 823680, 0xa95375c8
-1, 3680, 3680, 1856, 7424, 0xa1bc5c5a
-0, 3, 3, 1, 823680, 0xb6f78afe
-1, 5536, 5536, 1824, 7296, 0x71a02ad1
-0, 4, 4, 1, 823680, 0xb6f78afe
-1, 7360, 7360, 1856, 7424, 0x09cc32f2
-0, 5, 5, 1, 823680, 0x45b9c8f0
-1, 9216, 9216, 1824, 7296, 0xa3451726
-0, 6, 6, 1, 823680, 0x45b9c8f0
-1, 11040, 11040, 1824, 7296, 0x1eb40a18
-0, 7, 7, 1, 823680, 0x7653d8e9
-1, 12864, 12864, 1856, 7424, 0xc55a2acf
-0, 8, 8, 1, 823680, 0x7653d8e9
-1, 14720, 14720, 1824, 7296, 0x5b9fad3f
-0, 9, 9, 1, 823680, 0xf1e2fd73
-1, 16544, 16544, 1856, 7424, 0xea651ae7
-0, 10, 10, 1, 823680, 0xf1e2fd73
-1, 18400, 18400, 1824, 7296, 0x2bd5ddb6
-0, 11, 11, 1, 823680, 0x6d2deab3
-1, 20224, 20224, 1856, 7424, 0xde4243b4
-0, 12, 12, 1, 823680, 0x6d2deab3
-1, 22080, 22080, 1824, 7296, 0x358806d3
-0, 13, 13, 1, 823680, 0x37fd33ce
-1, 23904, 23904, 1824, 7296, 0x511a144e
-0, 14, 14, 1, 823680, 0x37fd33ce
-1, 25728, 25728, 1856, 7424, 0x887a3e84
-0, 15, 15, 1, 823680, 0x0a8e0ab9
-1, 27584, 27584, 1824, 7296, 0xfeae2a0c
-0, 16, 16, 1, 823680, 0x0a8e0ab9
-1, 29408, 29408, 1856, 7424, 0xa4ea5d22
-0, 17, 17, 1, 823680, 0x991bb2b0
-1, 31264, 31264, 1824, 7296, 0xb3adf7fa
-0, 18, 18, 1, 823680, 0x991bb2b0
-1, 33088, 33088, 1856, 7424, 0xce995dcc
-0, 19, 19, 1, 823680, 0xb8397c8c
-1, 34944, 34944, 1824, 7296, 0x5b4cf574
-0, 20, 20, 1, 823680, 0xb8397c8c
-1, 36768, 36768, 1824, 7296, 0x8a70eaf0
diff --git a/tests/ref/fate/bmv-audio b/tests/ref/fate/bmv-audio
new file mode 100644
index 0000000000..746bb0cd7a
--- /dev/null
+++ b/tests/ref/fate/bmv-audio
@@ -0,0 +1,22 @@
+#tb 0: 1/22050
+0, 0, 0, 1856, 7424, 0x18540b36
+0, 1856, 1856, 1824, 7296, 0x5acd2484
+0, 3680, 3680, 1856, 7424, 0xa1bc5c5a
+0, 5536, 5536, 1824, 7296, 0x71a02ad1
+0, 7360, 7360, 1856, 7424, 0x09cc32f2
+0, 9216, 9216, 1824, 7296, 0xa3451726
+0, 11040, 11040, 1824, 7296, 0x1eb40a18
+0, 12864, 12864, 1856, 7424, 0xc55a2acf
+0, 14720, 14720, 1824, 7296, 0x5b9fad3f
+0, 16544, 16544, 1856, 7424, 0xea651ae7
+0, 18400, 18400, 1824, 7296, 0x2bd5ddb6
+0, 20224, 20224, 1856, 7424, 0xde4243b4
+0, 22080, 22080, 1824, 7296, 0x358806d3
+0, 23904, 23904, 1824, 7296, 0x511a144e
+0, 25728, 25728, 1856, 7424, 0x887a3e84
+0, 27584, 27584, 1824, 7296, 0xfeae2a0c
+0, 29408, 29408, 1856, 7424, 0xa4ea5d22
+0, 31264, 31264, 1824, 7296, 0xb3adf7fa
+0, 33088, 33088, 1856, 7424, 0xce995dcc
+0, 34944, 34944, 1824, 7296, 0x5b4cf574
+0, 36768, 36768, 1824, 7296, 0x8a70eaf0
diff --git a/tests/ref/fate/bmv-video b/tests/ref/fate/bmv-video
new file mode 100644
index 0000000000..f19cd45edc
--- /dev/null
+++ b/tests/ref/fate/bmv-video
@@ -0,0 +1,22 @@
+#tb 0: 1/12
+0, 0, 0, 1, 823680, 0xddb8a306
+0, 1, 1, 1, 823680, 0xa95375c8
+0, 2, 2, 1, 823680, 0xa95375c8
+0, 3, 3, 1, 823680, 0xb6f78afe
+0, 4, 4, 1, 823680, 0xb6f78afe
+0, 5, 5, 1, 823680, 0x45b9c8f0
+0, 6, 6, 1, 823680, 0x45b9c8f0
+0, 7, 7, 1, 823680, 0x7653d8e9
+0, 8, 8, 1, 823680, 0x7653d8e9
+0, 9, 9, 1, 823680, 0xf1e2fd73
+0, 10, 10, 1, 823680, 0xf1e2fd73
+0, 11, 11, 1, 823680, 0x6d2deab3
+0, 12, 12, 1, 823680, 0x6d2deab3
+0, 13, 13, 1, 823680, 0x37fd33ce
+0, 14, 14, 1, 823680, 0x37fd33ce
+0, 15, 15, 1, 823680, 0x0a8e0ab9
+0, 16, 16, 1, 823680, 0x0a8e0ab9
+0, 17, 17, 1, 823680, 0x991bb2b0
+0, 18, 18, 1, 823680, 0x991bb2b0
+0, 19, 19, 1, 823680, 0xb8397c8c
+0, 20, 20, 1, 823680, 0xb8397c8c