diff options
| author | Mans Rullgard <mans@mansr.com> | 2012-05-11 20:59:58 +0100 |
|---|---|---|
| committer | Mans Rullgard <mans@mansr.com> | 2012-05-14 13:05:07 +0100 |
| commit | b809991a3101bc36a631ea6e4fe56d365fbc6c76 (patch) | |
| tree | 17463564b060d87d94ec2a61af06f1c1fb11ce57 | |
| parent | 0bbb330ee3ca23b952a58a3a80d100e694bb4720 (diff) | |
| download | ffmpeg-b809991a3101bc36a631ea6e4fe56d365fbc6c76.tar.gz | |
fate: film-cvid: drop pcm audio and rename test
Signed-off-by: Mans Rullgard <mans@mansr.com>
| -rw-r--r-- | tests/fate/pcm.mak | 3 | ||||
| -rw-r--r-- | tests/fate/video.mak | 3 | ||||
| -rw-r--r-- | tests/ref/fate/film-cvid (renamed from tests/ref/fate/film-cvid-pcm-stereo-8bit) | 30 |
3 files changed, 3 insertions, 33 deletions
diff --git a/tests/fate/pcm.mak b/tests/fate/pcm.mak index 536fb3e6d6..d4eb24fa51 100644 --- a/tests/fate/pcm.mak +++ b/tests/fate/pcm.mak @@ -1,6 +1,3 @@ -FATE_PCM += fate-film-cvid-pcm-stereo-8bit -fate-film-cvid-pcm-stereo-8bit: CMD = framecrc -i $(SAMPLES)/film/logo-capcom.cpk - FATE_PCM += fate-iff-pcm fate-iff-pcm: CMD = md5 -i $(SAMPLES)/iff/Bells -f s16le diff --git a/tests/fate/video.mak b/tests/fate/video.mak index a6829ab6f3..1fdd240b2b 100644 --- a/tests/fate/video.mak +++ b/tests/fate/video.mak @@ -97,6 +97,9 @@ fate-dxa-scummvm: CMD = framecrc -i $(SAMPLES)/dxa/scummvm.dxa -pix_fmt rgb24 FATE_AVCONV += $(FATE_DXA) fate-dxa: $(FATE_DXA) +FATE_PCM += fate-film-cvid +fate-film-cvid: CMD = framecrc -i $(SAMPLES)/film/logo-capcom.cpk -an + FATE_FLIC += fate-flic-af11-palette-change fate-flic-af11-palette-change: CMD = framecrc -i $(SAMPLES)/fli/fli-engines.fli -t 3.3 -pix_fmt rgb24 diff --git a/tests/ref/fate/film-cvid-pcm-stereo-8bit b/tests/ref/fate/film-cvid index 40851e263d..12b1f1cdcb 100644 --- a/tests/ref/fate/film-cvid-pcm-stereo-8bit +++ b/tests/ref/fate/film-cvid @@ -1,7 +1,5 @@ #tb 0: 1/30 -#tb 1: 1/44100 0, 0, 0, 1, 107520, 0xa6c9fdd2 -1, 0, 0, 22048, 88192, 0x23bb50ae 0, 2, 2, 1, 107520, 0x61eb28c1 0, 4, 4, 1, 107520, 0x45e20af7 0, 6, 6, 1, 107520, 0x366970fc @@ -9,133 +7,105 @@ 0, 10, 10, 1, 107520, 0xcf7bac98 0, 12, 12, 1, 107520, 0x222eba53 0, 14, 14, 1, 107520, 0x74e255a1 -1, 22048, 22048, 11028, 44112, 0x79600f01 0, 16, 16, 1, 107520, 0xc19eec6f 0, 18, 18, 1, 107520, 0xa3880681 0, 20, 20, 1, 107520, 0x957878db 0, 22, 22, 1, 107520, 0x18340692 -1, 33076, 33076, 11024, 44096, 0x09dbf7aa 0, 24, 24, 1, 107520, 0x9970f24d 0, 26, 26, 1, 107520, 0xf08618aa 0, 28, 28, 1, 107520, 0xee7324f0 0, 30, 30, 1, 107520, 0xe15025b3 -1, 44100, 44100, 11028, 44112, 0x18fed048 0, 32, 32, 1, 107520, 0x8afa312e 0, 34, 34, 1, 107520, 0x717a7d0f 0, 36, 36, 1, 107520, 0x355c6e23 -1, 55128, 55128, 11028, 44112, 0x030d35ef 0, 38, 38, 1, 107520, 0x7015a50f 0, 40, 40, 1, 107520, 0xcdfc1a16 0, 42, 42, 1, 107520, 0x38d929e7 0, 44, 44, 1, 107520, 0x52913423 -1, 66156, 66156, 11028, 44112, 0xc23154d5 0, 46, 46, 1, 107520, 0xe2c91c10 0, 48, 48, 1, 107520, 0x85516e9c 0, 50, 50, 1, 107520, 0xd1626030 0, 52, 52, 1, 107520, 0xea7b16de -1, 77184, 77184, 11016, 44064, 0xe4713ee7 0, 54, 54, 1, 107520, 0xa33eaa0d 0, 56, 56, 1, 107520, 0x8e3be6a6 0, 58, 58, 1, 107520, 0x14147bd6 0, 60, 60, 1, 107520, 0x07d54bec -1, 88200, 88200, 11028, 44112, 0xddc19d91 0, 62, 62, 1, 107520, 0xe287a0a7 0, 64, 64, 1, 107520, 0xc023a14d 0, 66, 66, 1, 107520, 0x2437085d -1, 99228, 99228, 11028, 44112, 0x9591522d 0, 68, 68, 1, 107520, 0x63823918 0, 70, 70, 1, 107520, 0xbc17e198 0, 72, 72, 1, 107520, 0x9d99bc81 0, 74, 74, 1, 107520, 0x7e4ec71e -1, 110256, 110256, 11028, 44112, 0x90deb013 0, 76, 76, 1, 107520, 0x55b98376 0, 78, 78, 1, 107520, 0x356d8e9e 0, 80, 80, 1, 107520, 0xf77e8a61 0, 82, 82, 1, 107520, 0x5ae7c8c7 -1, 121284, 121284, 11016, 44064, 0x3842d420 0, 84, 84, 1, 107520, 0x8acf9322 0, 86, 86, 1, 107520, 0x40a9177e 0, 88, 88, 1, 107520, 0x3e0e4d8d 0, 90, 90, 1, 107520, 0xd268865b -1, 132300, 132300, 11028, 44112, 0x99c8c3d9 0, 92, 92, 1, 107520, 0x89a4efeb 0, 94, 94, 1, 107520, 0x70ca2478 0, 96, 96, 1, 107520, 0xcc9ec981 -1, 143328, 143328, 11028, 44112, 0xffaf3824 0, 98, 98, 1, 107520, 0xf0648459 0, 100, 100, 1, 107520, 0x7e4a4cca 0, 102, 102, 1, 107520, 0xb315dc65 0, 104, 104, 1, 107520, 0x2aecc7b4 -1, 154356, 154356, 11028, 44112, 0x3dbe1aef 0, 106, 106, 1, 107520, 0x81742f51 0, 108, 108, 1, 107520, 0x3a1d7571 0, 110, 110, 1, 107520, 0x3a1d7571 0, 112, 112, 1, 107520, 0x3a1d7571 -1, 165384, 165384, 11016, 44064, 0xed2c7dfb 0, 114, 114, 1, 107520, 0x3a1d7571 0, 116, 116, 1, 107520, 0x3a1d7571 0, 118, 118, 1, 107520, 0x3a1d7571 0, 120, 120, 1, 107520, 0x3a1d7571 -1, 176400, 176400, 11028, 44112, 0x9e475274 0, 122, 122, 1, 107520, 0xe974733e 0, 124, 124, 1, 107520, 0x999c6fbf 0, 126, 126, 1, 107520, 0x26b56b6e -1, 187428, 187428, 11028, 44112, 0x541f05d4 0, 128, 128, 1, 107520, 0xc9f9647b 0, 130, 130, 1, 107520, 0x6d025d00 0, 132, 132, 1, 107520, 0xf9c056c1 0, 134, 134, 1, 107520, 0xa5cc4d0b -1, 198456, 198456, 11028, 44112, 0x09e39025 0, 136, 136, 1, 107520, 0x1a4c4236 0, 138, 138, 1, 107520, 0xa9d538b6 0, 140, 140, 1, 107520, 0x14682d00 0, 142, 142, 1, 107520, 0x6236204f -1, 209484, 209484, 11016, 44064, 0xdc111087 0, 144, 144, 1, 107520, 0x303e14aa 0, 146, 146, 1, 107520, 0x943b0837 0, 148, 148, 1, 107520, 0xfce5fd07 0, 150, 150, 1, 107520, 0xd993f193 -1, 220500, 220500, 11028, 44112, 0xb8f86e48 0, 152, 152, 1, 107520, 0x4d48e7b4 0, 154, 154, 1, 107520, 0x61ccdf83 0, 156, 156, 1, 107520, 0xfb4fd608 -1, 231528, 231528, 11028, 44112, 0xa1e0c75c 0, 158, 158, 1, 107520, 0x5efdcdb3 0, 160, 160, 1, 107520, 0xb03ec886 0, 162, 162, 1, 107520, 0xf464c343 0, 164, 164, 1, 107520, 0xf464c343 -1, 242556, 242556, 11028, 44112, 0x0654dcb0 0, 166, 166, 1, 107520, 0xf464c343 0, 168, 168, 1, 107520, 0xf464c343 0, 170, 170, 1, 107520, 0xf464c343 0, 172, 172, 1, 107520, 0xf464c343 -1, 253584, 253584, 11016, 44064, 0xb921e11a 0, 174, 174, 1, 107520, 0xf464c343 0, 176, 176, 1, 107520, 0xf464c343 0, 178, 178, 1, 107520, 0xf464c343 0, 180, 180, 1, 107520, 0xf464c343 -1, 264600, 264600, 11028, 44112, 0xe0ac619f 0, 182, 182, 1, 107520, 0xf464c343 0, 184, 184, 1, 107520, 0xf2b2c712 0, 186, 186, 1, 107520, 0xf2b2c712 -1, 275628, 275628, 11028, 44112, 0xb07aa65c 0, 188, 188, 1, 107520, 0xf2b2c712 0, 190, 190, 1, 107520, 0xf2b2c712 0, 192, 192, 1, 107520, 0xb95e6bc8 0, 194, 194, 1, 107520, 0x33feee37 -1, 286656, 286656, 11028, 44112, 0x24610ff0 0, 196, 196, 1, 107520, 0x36ee3cd5 0, 198, 198, 1, 107520, 0x59096471 0, 200, 200, 1, 107520, 0x53b470c6 0, 202, 202, 1, 107520, 0xdb7c64ff -1, 297684, 297684, 11016, 44064, 0x00000000 0, 204, 204, 1, 107520, 0xe5a1596a 0, 206, 206, 1, 107520, 0x8c8942eb 0, 208, 208, 1, 107520, 0x5ecc379e 0, 210, 210, 1, 107520, 0xea09432a -1, 308700, 308700, 11028, 44112, 0x00000000 0, 212, 212, 1, 107520, 0xe01e6b73 0, 214, 214, 1, 107520, 0x1d13bba8 0, 216, 216, 1, 107520, 0x3a993a6c -1, 319728, 319728, 2200, 8800, 0x00000000 0, 218, 218, 1, 107520, 0x2ede041a |