The codecs in this file are tested elsewhere.  The container differs
from psx-str-demux in that it has a RIFF header, which the new name
reflects.

Signed-off-by: Mans Rullgard <[email protected]>
---
 tests/fate/demux.mak              |    4 +-
 tests/ref/fate/psx-str-riff-demux |   98 +++++++++++++++++++++++++++++++++++++
 tests/ref/fate/psx-str-v3-mdec    |   60 -----------------------
 3 files changed, 100 insertions(+), 62 deletions(-)
 create mode 100644 tests/ref/fate/psx-str-riff-demux
 delete mode 100644 tests/ref/fate/psx-str-v3-mdec

diff --git a/tests/fate/demux.mak b/tests/fate/demux.mak
index e3f12e0..8654493 100644
--- a/tests/fate/demux.mak
+++ b/tests/fate/demux.mak
@@ -43,8 +43,8 @@ fate-oma-demux: CMD = crc -i 
$(SAMPLES)/oma/01-Untitled-partial.oma -acodec copy
 FATE_AVCONV += fate-psx-str-demux
 fate-psx-str-demux: CMD = framecrc -i $(SAMPLES)/psx-str/descent-partial.str 
-c copy -copyinkf
 
-FATE_AVCONV += fate-psx-str-v3-mdec
-fate-psx-str-v3-mdec: CMD = framecrc -i $(SAMPLES)/psx-str/abc000_cut.str -an
+FATE_AVCONV += fate-psx-str-riff-demux
+fate-psx-str-riff-demux: CMD = framecrc -i $(SAMPLES)/psx-str/abc000_cut.str 
-c copy -copyinkf
 
 FATE_AVCONV += fate-pva-demux
 fate-pva-demux: CMD = framecrc -idct simple -i 
$(SAMPLES)/pva/PVA_test-partial.pva -t 0.6 -acodec copy -vn
diff --git a/tests/ref/fate/psx-str-riff-demux 
b/tests/ref/fate/psx-str-riff-demux
new file mode 100644
index 0000000..c8f510d
--- /dev/null
+++ b/tests/ref/fate/psx-str-riff-demux
@@ -0,0 +1,98 @@
+#tb 0: 1/15
+#tb 1: 4/75
+0,          0,          0,        1,      964, 0xd6fe8707
+1,          0,          0,        1,     2304, 0xd4aaba7c
+1,          1,          1,        1,     2304, 0x4704624a
+0,          1,          1,        1,     5900, 0x3e5d3ef4
+1,          2,          2,        1,     2304, 0x057e0fe1
+0,          2,          2,        1,     8416, 0x70601c6a
+1,          3,          3,        1,     2304, 0x1f54acd5
+0,          3,          3,        1,     5900, 0x3e5d3ef4
+1,          4,          4,        1,     2304, 0x0d31d426
+0,          4,          4,        1,     4728, 0x7f9f3719
+1,          5,          5,        1,     2304, 0x032ede32
+1,          6,          6,        1,     2304, 0x11ce0f01
+0,          5,          5,        1,     8452, 0x5d68342e
+1,          7,          7,        1,     2304, 0x2753868a
+0,          6,          6,        1,     2608, 0x17d858c1
+1,          8,          8,        1,     2304, 0x8401cab7
+0,          7,          7,        1,     2608, 0x17d858c1
+1,          9,          9,        1,     2304, 0x20dae5d9
+0,          8,          8,        1,     1268, 0x3c450361
+1,         10,         10,        1,     2304, 0x59905b60
+1,         11,         11,        1,     2304, 0x5719b19a
+0,          9,          9,        1,     1268, 0x3c450361
+1,         12,         12,        1,     2304, 0x6631a0ef
+0,         10,         10,        1,      880, 0xf45444d0
+1,         13,         13,        1,     2304, 0x9b7f7f7b
+0,         11,         11,        1,      880, 0xf45444d0
+1,         14,         14,        1,     2304, 0x5f0cbbba
+0,         12,         12,        1,      784, 0xda631e2d
+1,         15,         15,        1,     2304, 0x3616a5fd
+1,         16,         16,        1,     2304, 0x7273aa51
+0,         13,         13,        1,      784, 0xda631e2d
+1,         17,         17,        1,     2304, 0x0c2c9c4a
+0,         14,         14,        1,      752, 0xfd8a0795
+1,         18,         18,        1,     2304, 0x01678aaf
+0,         15,         15,        1,      752, 0xfd8a0795
+1,         19,         19,        1,     2304, 0x715081c5
+0,         16,         16,        1,      712, 0xa5cde69b
+1,         20,         20,        1,     2304, 0x250cbac2
+1,         21,         21,        1,     2304, 0x4710b34d
+0,         17,         17,        1,      712, 0xa5cde69b
+1,         22,         22,        1,     2304, 0x74c5a6e7
+0,         18,         18,        1,     1200, 0xf170ae66
+1,         23,         23,        1,     2304, 0x5707dde9
+0,         19,         19,        1,     1588, 0x3c65499a
+1,         24,         24,        1,     2304, 0x7f63a068
+0,         20,         20,        1,     1884, 0x5ac97fa1
+1,         25,         25,        1,     2304, 0xbb46ca3d
+1,         26,         26,        1,     2304, 0x75c99d60
+0,         21,         21,        1,     2112, 0xf6d5c360
+1,         27,         27,        1,     2304, 0x45acb73e
+0,         22,         22,        1,     2288, 0x0afa072b
+1,         28,         28,        1,     2304, 0x1883b58f
+0,         23,         23,        1,     2456, 0xafd1357a
+1,         29,         29,        1,     2304, 0x9e62c20b
+0,         24,         24,        1,     2596, 0x4e47540d
+1,         30,         30,        1,     2304, 0x2d6e995e
+1,         31,         31,        1,     2304, 0x9b8091fa
+0,         25,         25,        1,     2716, 0xcfb6993d
+1,         32,         32,        1,     2304, 0x28098aa2
+0,         26,         26,        1,     2824, 0x802e98e0
+1,         33,         33,        1,     2304, 0x9e6e952a
+0,         27,         27,        1,     2948, 0x6166b8a3
+1,         34,         34,        1,     2304, 0x909e6227
+0,         28,         28,        1,     3044, 0xf54ff1d4
+1,         35,         35,        1,     2304, 0xc072ba5f
+1,         36,         36,        1,     2304, 0x9402915d
+0,         29,         29,        1,     3132, 0x42bee962
+0,         30,         30,        1,     3176, 0x7c6a03c5
+0,         31,         31,        1,     3220, 0xdc4dfc31
+0,         32,         32,        1,     3228, 0xc1a1ff61
+0,         33,         33,        1,     3228, 0xc1a1ff61
+0,         34,         34,        1,     3228, 0xc1a1ff61
+0,         35,         35,        1,     3228, 0xc1a1ff61
+0,         36,         36,        1,     3228, 0xc1a1ff61
+0,         37,         37,        1,     3228, 0xc1a1ff61
+0,         38,         38,        1,     3228, 0xc1a1ff61
+0,         39,         39,        1,     3228, 0xc1a1ff61
+0,         40,         40,        1,     3228, 0xc1a1ff61
+0,         41,         41,        1,     3228, 0xc1a1ff61
+0,         42,         42,        1,     3228, 0xc1a1ff61
+0,         43,         43,        1,     3228, 0xc1a1ff61
+0,         44,         44,        1,     3228, 0xc1a1ff61
+0,         45,         45,        1,     3228, 0xc1a1ff61
+0,         46,         46,        1,     3228, 0xc1a1ff61
+0,         47,         47,        1,     3228, 0xc1a1ff61
+0,         48,         48,        1,     3256, 0xfec11215
+0,         49,         49,        1,     3324, 0x7f483281
+0,         50,         50,        1,     3460, 0x6a8b840c
+0,         51,         51,        1,     3440, 0x284288fe
+0,         52,         52,        1,     3556, 0x1536accc
+0,         53,         53,        1,     3776, 0x88d924c5
+0,         54,         54,        1,     3852, 0x3cc1375a
+0,         55,         55,        1,     3900, 0x4b9041d5
+0,         56,         56,        1,     3944, 0xa61f5ee6
+0,         57,         57,        1,     4048, 0x410e88aa
+0,         58,         58,        1,     4064, 0x6c929608
diff --git a/tests/ref/fate/psx-str-v3-mdec b/tests/ref/fate/psx-str-v3-mdec
deleted file mode 100644
index 7e4bbdb..0000000
--- a/tests/ref/fate/psx-str-v3-mdec
+++ /dev/null
@@ -1,60 +0,0 @@
-#tb 0: 1/15
-0,          0,          0,        1,    76800, 0x2677be82
-0,          1,          1,        1,    76800, 0x1f323c75
-0,          2,          2,        1,    76800, 0xc8be3be9
-0,          3,          3,        1,    76800, 0x1f323c75
-0,          4,          4,        1,    76800, 0x7e484488
-0,          5,          5,        1,    76800, 0x8bd644aa
-0,          6,          6,        1,    76800, 0xaa62e7b8
-0,          7,          7,        1,    76800, 0xaa62e7b8
-0,          8,          8,        1,    76800, 0x53fadb39
-0,          9,          9,        1,    76800, 0x53fadb39
-0,         10,         10,        1,    76800, 0x1ff9d964
-0,         11,         11,        1,    76800, 0x1ff9d964
-0,         12,         12,        1,    76800, 0xd8c8d947
-0,         13,         13,        1,    76800, 0xd8c8d947
-0,         14,         14,        1,    76800, 0x6d0bd94c
-0,         15,         15,        1,    76800, 0x6d0bd94c
-0,         16,         16,        1,    76800, 0x7e66d948
-0,         17,         17,        1,    76800, 0x7e66d948
-0,         18,         18,        1,    76800, 0x8eecfd72
-0,         19,         19,        1,    76800, 0xb15f29ab
-0,         20,         20,        1,    76800, 0x08e5502e
-0,         21,         21,        1,    76800, 0xaa58796d
-0,         22,         22,        1,    76800, 0xe254a27c
-0,         23,         23,        1,    76800, 0xeec8cf68
-0,         24,         24,        1,    76800, 0x812bf8ee
-0,         25,         25,        1,    76800, 0x929922ef
-0,         26,         26,        1,    76800, 0xe1174e06
-0,         27,         27,        1,    76800, 0x2da77bf1
-0,         28,         28,        1,    76800, 0xd0f6a727
-0,         29,         29,        1,    76800, 0x31bfd168
-0,         30,         30,        1,    76800, 0xb87af225
-0,         31,         31,        1,    76800, 0xd0080859
-0,         32,         32,        1,    76800, 0x99ab15ba
-0,         33,         33,        1,    76800, 0x99ab15ba
-0,         34,         34,        1,    76800, 0x99ab15ba
-0,         35,         35,        1,    76800, 0x99ab15ba
-0,         36,         36,        1,    76800, 0x99ab15ba
-0,         37,         37,        1,    76800, 0x99ab15ba
-0,         38,         38,        1,    76800, 0x99ab15ba
-0,         39,         39,        1,    76800, 0x99ab15ba
-0,         40,         40,        1,    76800, 0x99ab15ba
-0,         41,         41,        1,    76800, 0x99ab15ba
-0,         42,         42,        1,    76800, 0x99ab15ba
-0,         43,         43,        1,    76800, 0x99ab15ba
-0,         44,         44,        1,    76800, 0x99ab15ba
-0,         45,         45,        1,    76800, 0x99ab15ba
-0,         46,         46,        1,    76800, 0x99ab15ba
-0,         47,         47,        1,    76800, 0x99ab15ba
-0,         48,         48,        1,    76800, 0x0c1617d5
-0,         49,         49,        1,    76800, 0xb1c81b5d
-0,         50,         50,        1,    76800, 0xb4e41e44
-0,         51,         51,        1,    76800, 0x765725e2
-0,         52,         52,        1,    76800, 0x25cd3109
-0,         53,         53,        1,    76800, 0xa42b5291
-0,         54,         54,        1,    76800, 0x15bb6ee4
-0,         55,         55,        1,    76800, 0xb33c9f50
-0,         56,         56,        1,    76800, 0x1ca1b874
-0,         57,         57,        1,    76800, 0x7506e92a
-0,         58,         58,        1,    76800, 0x97c9030a
-- 
1.7.10

_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel

Reply via email to