diff --git a/tests/fate/audio.mak b/tests/fate/audio.mak index 7533f20058e599fd90a5d019673f57c57ec10844..83449c0b12ca60abbb3cb67286305273b53396cc 100644 --- a/tests/fate/audio.mak +++ b/tests/fate/audio.mak @@ -34,5 +34,8 @@ fate-nellymoser: CMD = pcm -i $(SAMPLES)/nellymoser/nellymoser.flv fate-nellymoser: CMP = oneoff fate-nellymoser: REF = $(SAMPLES)/nellymoser/nellymoser.pcm +FATE_AVCONV += fate-smacker-audio +fate-smacker-audio: CMD = framecrc -i $(SAMPLES)/smacker/wetlogo.smk -vn + FATE_AVCONV += fate-ws_snd fate-ws_snd: CMD = md5 -i $(SAMPLES)/vqa/ws_snd.vqa -f s16le diff --git a/tests/fate/video.mak b/tests/fate/video.mak index 1fdd240b2b35756aaa9d0d9a7f630e1c401a0c1f..62b5f9978152af608cef5232666feea550b8a2d0 100644 --- a/tests/fate/video.mak +++ b/tests/fate/video.mak @@ -176,8 +176,8 @@ fate-rl2: CMD = framecrc -i $(SAMPLES)/rl2/Z4915300.RL2 -pix_fmt rgb24 -an FATE_AVCONV += fate-roqvideo fate-roqvideo: CMD = framecrc -i $(SAMPLES)/idroq/idlogo.roq -an -FATE_AVCONV += fate-smacker -fate-smacker: CMD = framecrc -i $(SAMPLES)/smacker/wetlogo.smk -pix_fmt rgb24 +FATE_AVCONV += fate-smacker-video +fate-smacker-video: CMD = framecrc -i $(SAMPLES)/smacker/wetlogo.smk -pix_fmt rgb24 -an FATE_AVCONV += fate-smc fate-smc: CMD = framecrc -i $(SAMPLES)/smc/cass_schi.qt -pix_fmt rgb24 diff --git a/tests/ref/fate/smacker-audio b/tests/ref/fate/smacker-audio new file mode 100644 index 0000000000000000000000000000000000000000..442f479dd85a0aa96e021b657d8148dd6fd9d6e2 --- /dev/null +++ b/tests/ref/fate/smacker-audio @@ -0,0 +1,87 @@ +#tb 0: 1/22050 +0, 0, 0, 23620, 47240, 0x9974897c +0, 23620, 23620, 1564, 3128, 0x7e4064b4 +0, 25184, 25184, 1564, 3128, 0x80883301 +0, 26748, 26748, 1568, 3136, 0x2ad2d341 +0, 28316, 28316, 1564, 3128, 0xda8468e3 +0, 29880, 29880, 1568, 3136, 0x9d6f6cdf +0, 31448, 31448, 1564, 3128, 0x1aaa64b5 +0, 33012, 33012, 1564, 3128, 0x9182728b +0, 34576, 34576, 1568, 3136, 0xfa8e17b3 +0, 36144, 36144, 1564, 3128, 0x0dc3c1cf +0, 37708, 37708, 1568, 3136, 0x0109639d +0, 39276, 39276, 1564, 3128, 0x6d8a12d9 +0, 40840, 40840, 1564, 3128, 0x4b9a9597 +0, 42404, 42404, 1568, 3136, 0x9112710e +0, 43972, 43972, 1564, 3128, 0x8cccf522 +0, 45536, 45536, 1564, 3128, 0x6594bbf3 +0, 47100, 47100, 1568, 3136, 0xd878a7d5 +0, 48668, 48668, 1564, 3128, 0xaa6e3905 +0, 50232, 50232, 1568, 3136, 0x2a062e04 +0, 51800, 51800, 1564, 3128, 0x84e4006a +0, 53364, 53364, 1564, 3128, 0x85183633 +0, 54928, 54928, 1568, 3136, 0xb62d4b02 +0, 56496, 56496, 1564, 3128, 0xe209462a +0, 58060, 58060, 1568, 3136, 0x57c4824b +0, 59628, 59628, 1564, 3128, 0x664a9163 +0, 61192, 61192, 1564, 3128, 0xb4287874 +0, 62756, 62756, 1568, 3136, 0xde626885 +0, 64324, 64324, 1564, 3128, 0x919763c2 +0, 65888, 65888, 1564, 3128, 0xa4f664e1 +0, 67452, 67452, 1568, 3136, 0xa0bab0d4 +0, 69020, 69020, 1564, 3128, 0xe938939c +0, 70584, 70584, 1568, 3136, 0x3679bfc7 +0, 72152, 72152, 1564, 3128, 0xc96c55c3 +0, 73716, 73716, 1564, 3128, 0x119114d6 +0, 75280, 75280, 1568, 3136, 0x42f3800f +0, 76848, 76848, 1564, 3128, 0x4250c4ad +0, 78412, 78412, 1568, 3136, 0x5cdd4925 +0, 79980, 79980, 1564, 3128, 0xa4c12360 +0, 81544, 81544, 1564, 3128, 0x849f48de +0, 83108, 83108, 1568, 3136, 0x6acd8ff9 +0, 84676, 84676, 1564, 3128, 0xb2758556 +0, 86240, 86240, 1564, 3128, 0x10f2fcb1 +0, 87804, 87804, 1568, 3136, 0xf0f02b23 +0, 89372, 89372, 1564, 3128, 0x64f759c6 +0, 90936, 90936, 1568, 3136, 0x7ec075e3 +0, 92504, 92504, 1564, 3128, 0xf981d51e +0, 94068, 94068, 1564, 3128, 0xc622e8b9 +0, 95632, 95632, 1568, 3136, 0xf632e2f8 +0, 97200, 97200, 1564, 3128, 0xda561864 +0, 98764, 98764, 1568, 3136, 0x14d2e888 +0, 100332, 100332, 1564, 3128, 0x015bb869 +0, 101896, 101896, 1564, 3128, 0xedb1fb62 +0, 103460, 103460, 1568, 3136, 0xe0560c41 +0, 105028, 105028, 1564, 3128, 0x14773c9a +0, 106592, 106592, 1568, 3136, 0x850f1c82 +0, 108160, 108160, 1564, 3128, 0xb0bd5347 +0, 109724, 109724, 1564, 3128, 0x8f82edbf +0, 111288, 111288, 1568, 3136, 0x493abee2 +0, 112856, 112856, 1564, 3128, 0xf5daff3f +0, 114420, 114420, 1564, 3128, 0x78ad2690 +0, 115984, 115984, 1568, 3136, 0x490ebafc +0, 117552, 117552, 1564, 3128, 0x70333fd2 +0, 119116, 119116, 1568, 3136, 0x8cb1c350 +0, 120684, 120684, 1564, 3128, 0x8bd057cb +0, 122248, 122248, 1564, 3128, 0x161b3dbc +0, 123812, 123812, 1568, 3136, 0xb47fb88a +0, 125380, 125380, 1564, 3128, 0x474b381e +0, 126944, 126944, 1568, 3136, 0x07c519bb +0, 128512, 128512, 1564, 3128, 0x15b916c8 +0, 130076, 130076, 1564, 3128, 0x0ed7f6fb +0, 131640, 131640, 1568, 3136, 0x54d6397b +0, 133208, 133208, 1564, 3128, 0x437242bb +0, 134772, 134772, 1564, 3128, 0x38f05c4d +0, 136336, 136336, 1568, 3136, 0x5d000e59 +0, 137904, 137904, 1564, 3128, 0xdeab2d04 +0, 139468, 139468, 1568, 3136, 0x77de6880 +0, 141036, 141036, 1564, 3128, 0xbc87ef25 +0, 142600, 142600, 1564, 3128, 0xc1638ade +0, 144164, 144164, 1568, 3136, 0xcfb64a5f +0, 145732, 145732, 1564, 3128, 0x90b1b826 +0, 147296, 147296, 1568, 3136, 0x00000000 +0, 148864, 148864, 1564, 3128, 0x00000000 +0, 150428, 150428, 1564, 3128, 0x00000000 +0, 151992, 151992, 1568, 3136, 0x00000000 +0, 153560, 153560, 1564, 3128, 0x00000000 +0, 155124, 155124, 1428, 2856, 0x00000000 diff --git a/tests/ref/fate/smacker b/tests/ref/fate/smacker-video similarity index 53% rename from tests/ref/fate/smacker rename to tests/ref/fate/smacker-video index b8d4d22d019e463320f6d8268cc3dcc46b888899..8bd307159f1c828b4b924fb6ae29b31a5e1a5027 100644 --- a/tests/ref/fate/smacker +++ b/tests/ref/fate/smacker-video @@ -1,7 +1,5 @@ #tb 0: 71/1000 -#tb 1: 1/22050 0, 0, 0, 1, 192000, 0x8926d7fc -1, 0, 0, 23620, 47240, 0x9974897c 0, 1, 1, 1, 192000, 0x2506d384 0, 2, 2, 1, 192000, 0x9a8dc93a 0, 3, 3, 1, 192000, 0x4badb7f2 @@ -17,172 +15,87 @@ 0, 13, 13, 1, 192000, 0x1a3d7971 0, 14, 14, 1, 192000, 0xa1a65bd5 0, 15, 15, 1, 192000, 0x344957b9 -1, 23620, 23620, 1564, 3128, 0x7e4064b4 0, 16, 16, 1, 192000, 0xe23b5f4e -1, 25184, 25184, 1564, 3128, 0x80883301 0, 17, 17, 1, 192000, 0xb5c2710b -1, 26748, 26748, 1568, 3136, 0x2ad2d341 0, 18, 18, 1, 192000, 0x7a25938f -1, 28316, 28316, 1564, 3128, 0xda8468e3 0, 19, 19, 1, 192000, 0x0a84e4c9 -1, 29880, 29880, 1568, 3136, 0x9d6f6cdf 0, 20, 20, 1, 192000, 0x94209b0d -1, 31448, 31448, 1564, 3128, 0x1aaa64b5 0, 21, 21, 1, 192000, 0xf940e51f -1, 33012, 33012, 1564, 3128, 0x9182728b 0, 22, 22, 1, 192000, 0xb9fdec42 -1, 34576, 34576, 1568, 3136, 0xfa8e17b3 0, 23, 23, 1, 192000, 0x7b04a376 -1, 36144, 36144, 1564, 3128, 0x0dc3c1cf 0, 24, 24, 1, 192000, 0x5fe0026b -1, 37708, 37708, 1568, 3136, 0x0109639d 0, 25, 25, 1, 192000, 0x775aca39 -1, 39276, 39276, 1564, 3128, 0x6d8a12d9 0, 26, 26, 1, 192000, 0xae14fb32 -1, 40840, 40840, 1564, 3128, 0x4b9a9597 0, 27, 27, 1, 192000, 0x661106e5 -1, 42404, 42404, 1568, 3136, 0x9112710e 0, 28, 28, 1, 192000, 0xe8658dbf -1, 43972, 43972, 1564, 3128, 0x8cccf522 0, 29, 29, 1, 192000, 0x5359f0f9 -1, 45536, 45536, 1564, 3128, 0x6594bbf3 0, 30, 30, 1, 192000, 0xc1ec80f4 -1, 47100, 47100, 1568, 3136, 0xd878a7d5 0, 31, 31, 1, 192000, 0xca53806b -1, 48668, 48668, 1564, 3128, 0xaa6e3905 0, 32, 32, 1, 192000, 0xf0766b2e -1, 50232, 50232, 1568, 3136, 0x2a062e04 0, 33, 33, 1, 192000, 0x39962da8 -1, 51800, 51800, 1564, 3128, 0x84e4006a 0, 34, 34, 1, 192000, 0x4171c37f -1, 53364, 53364, 1564, 3128, 0x85183633 0, 35, 35, 1, 192000, 0x3abf3b46 -1, 54928, 54928, 1568, 3136, 0xb62d4b02 0, 36, 36, 1, 192000, 0xecc68313 -1, 56496, 56496, 1564, 3128, 0xe209462a 0, 37, 37, 1, 192000, 0xea339baf -1, 58060, 58060, 1568, 3136, 0x57c4824b 0, 38, 38, 1, 192000, 0x616b8f16 -1, 59628, 59628, 1564, 3128, 0x664a9163 0, 39, 39, 1, 192000, 0xf77a8581 -1, 61192, 61192, 1564, 3128, 0xb4287874 0, 40, 40, 1, 192000, 0xb315678b -1, 62756, 62756, 1568, 3136, 0xde626885 0, 41, 41, 1, 192000, 0x0a4a5218 -1, 64324, 64324, 1564, 3128, 0x919763c2 0, 42, 42, 1, 192000, 0x98802be4 -1, 65888, 65888, 1564, 3128, 0xa4f664e1 0, 43, 43, 1, 192000, 0xa2f0fd94 -1, 67452, 67452, 1568, 3136, 0xa0bab0d4 0, 44, 44, 1, 192000, 0x6671c84f -1, 69020, 69020, 1564, 3128, 0xe938939c 0, 45, 45, 1, 192000, 0x38327e31 -1, 70584, 70584, 1568, 3136, 0x3679bfc7 0, 46, 46, 1, 192000, 0xb85d3e08 -1, 72152, 72152, 1564, 3128, 0xc96c55c3 0, 47, 47, 1, 192000, 0xdc69eba9 -1, 73716, 73716, 1564, 3128, 0x119114d6 0, 48, 48, 1, 192000, 0x8955a0b3 -1, 75280, 75280, 1568, 3136, 0x42f3800f 0, 49, 49, 1, 192000, 0x714a548b -1, 76848, 76848, 1564, 3128, 0x4250c4ad 0, 50, 50, 1, 192000, 0xc0471de9 -1, 78412, 78412, 1568, 3136, 0x5cdd4925 0, 51, 51, 1, 192000, 0x2e16e039 -1, 79980, 79980, 1564, 3128, 0xa4c12360 0, 52, 52, 1, 192000, 0x9fa4b033 -1, 81544, 81544, 1564, 3128, 0x849f48de 0, 53, 53, 1, 192000, 0x4a0f9402 -1, 83108, 83108, 1568, 3136, 0x6acd8ff9 0, 54, 54, 1, 192000, 0x1f3e6843 -1, 84676, 84676, 1564, 3128, 0xb2758556 0, 55, 55, 1, 192000, 0x31774850 -1, 86240, 86240, 1564, 3128, 0x10f2fcb1 0, 56, 56, 1, 192000, 0x9d5336a2 -1, 87804, 87804, 1568, 3136, 0xf0f02b23 0, 57, 57, 1, 192000, 0xf7de27a2 -1, 89372, 89372, 1564, 3128, 0x64f759c6 0, 58, 58, 1, 192000, 0x98c717ce -1, 90936, 90936, 1568, 3136, 0x7ec075e3 0, 59, 59, 1, 192000, 0x615b10b8 -1, 92504, 92504, 1564, 3128, 0xf981d51e 0, 60, 60, 1, 192000, 0xd5bc0e7e -1, 94068, 94068, 1564, 3128, 0xc622e8b9 0, 61, 61, 1, 192000, 0xd5bc0e7e -1, 95632, 95632, 1568, 3136, 0xf632e2f8 0, 62, 62, 1, 192000, 0xd5bc0e7e -1, 97200, 97200, 1564, 3128, 0xda561864 0, 63, 63, 1, 192000, 0xd5bc0e7e -1, 98764, 98764, 1568, 3136, 0x14d2e888 0, 64, 64, 1, 192000, 0xd5bc0e7e -1, 100332, 100332, 1564, 3128, 0x015bb869 0, 65, 65, 1, 192000, 0xd5bc0e7e -1, 101896, 101896, 1564, 3128, 0xedb1fb62 0, 66, 66, 1, 192000, 0xd5bc0e7e -1, 103460, 103460, 1568, 3136, 0xe0560c41 0, 67, 67, 1, 192000, 0xd5bc0e7e -1, 105028, 105028, 1564, 3128, 0x14773c9a 0, 68, 68, 1, 192000, 0xd5bc0e7e -1, 106592, 106592, 1568, 3136, 0x850f1c82 0, 69, 69, 1, 192000, 0xd5bc0e7e -1, 108160, 108160, 1564, 3128, 0xb0bd5347 0, 70, 70, 1, 192000, 0xd5bc0e7e -1, 109724, 109724, 1564, 3128, 0x8f82edbf 0, 71, 71, 1, 192000, 0xd5bc0e7e -1, 111288, 111288, 1568, 3136, 0x493abee2 0, 72, 72, 1, 192000, 0xd5bc0e7e -1, 112856, 112856, 1564, 3128, 0xf5daff3f 0, 73, 73, 1, 192000, 0xd5bc0e7e -1, 114420, 114420, 1564, 3128, 0x78ad2690 0, 74, 74, 1, 192000, 0xd5bc0e7e -1, 115984, 115984, 1568, 3136, 0x490ebafc 0, 75, 75, 1, 192000, 0xd5bc0e7e -1, 117552, 117552, 1564, 3128, 0x70333fd2 0, 76, 76, 1, 192000, 0xd5bc0e7e -1, 119116, 119116, 1568, 3136, 0x8cb1c350 0, 77, 77, 1, 192000, 0xd5bc0e7e -1, 120684, 120684, 1564, 3128, 0x8bd057cb 0, 78, 78, 1, 192000, 0xd5bc0e7e -1, 122248, 122248, 1564, 3128, 0x161b3dbc 0, 79, 79, 1, 192000, 0xd5bc0e7e -1, 123812, 123812, 1568, 3136, 0xb47fb88a 0, 80, 80, 1, 192000, 0xd5bc0e7e -1, 125380, 125380, 1564, 3128, 0x474b381e 0, 81, 81, 1, 192000, 0xd5bc0e7e -1, 126944, 126944, 1568, 3136, 0x07c519bb 0, 82, 82, 1, 192000, 0xd5bc0e7e -1, 128512, 128512, 1564, 3128, 0x15b916c8 0, 83, 83, 1, 192000, 0xd5bc0e7e -1, 130076, 130076, 1564, 3128, 0x0ed7f6fb 0, 84, 84, 1, 192000, 0xd5bc0e7e -1, 131640, 131640, 1568, 3136, 0x54d6397b 0, 85, 85, 1, 192000, 0xd5bc0e7e -1, 133208, 133208, 1564, 3128, 0x437242bb 0, 86, 86, 1, 192000, 0xd5bc0e7e -1, 134772, 134772, 1564, 3128, 0x38f05c4d 0, 87, 87, 1, 192000, 0xd5bc0e7e -1, 136336, 136336, 1568, 3136, 0x5d000e59 0, 88, 88, 1, 192000, 0xd5bc0e7e -1, 137904, 137904, 1564, 3128, 0xdeab2d04 0, 89, 89, 1, 192000, 0xd5bc0e7e -1, 139468, 139468, 1568, 3136, 0x77de6880 0, 90, 90, 1, 192000, 0xd5bc0e7e -1, 141036, 141036, 1564, 3128, 0xbc87ef25 0, 91, 91, 1, 192000, 0xd5bc0e7e -1, 142600, 142600, 1564, 3128, 0xc1638ade 0, 92, 92, 1, 192000, 0xd5bc0e7e -1, 144164, 144164, 1568, 3136, 0xcfb64a5f 0, 93, 93, 1, 192000, 0xd5bc0e7e -1, 145732, 145732, 1564, 3128, 0x90b1b826 0, 94, 94, 1, 192000, 0xd5bc0e7e -1, 147296, 147296, 1568, 3136, 0x00000000 0, 95, 95, 1, 192000, 0xd5bc0e7e -1, 148864, 148864, 1564, 3128, 0x00000000 0, 96, 96, 1, 192000, 0xd5bc0e7e -1, 150428, 150428, 1564, 3128, 0x00000000 0, 97, 97, 1, 192000, 0xd5bc0e7e -1, 151992, 151992, 1568, 3136, 0x00000000 0, 98, 98, 1, 192000, 0xd5bc0e7e -1, 153560, 153560, 1564, 3128, 0x00000000 0, 99, 99, 1, 192000, 0xd5bc0e7e -1, 155124, 155124, 1428, 2856, 0x00000000