MrBesen/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit '5b1409c75563b4a3aca113c34d09e3b5442de47f'

Browse Source 
* commit '5b1409c75563b4a3aca113c34d09e3b5442de47f':
  fate: Add test for MSS1

Test was already present, see 849e55e58e.

The merge removes the audio decoding present in our version and
simplifies the rules.

Merged-by: Clément Bœsch <clement@stupeflix.com>
This commit is contained in:
Clément Bœsch 2016-06-21 12:45:58 +02:00
commit 7cf4b442ce
2 changed files with 2 additions and 202 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tests/fate/microsoft.mak
View File

@ -1,11 +1,8 @@
FATE_MICROSOFT-$(call DEMDEC, AVI, MSMPEG4V1) += fate-msmpeg4v1
fate-msmpeg4v1: CMD = framecrc -flags +bitexact -idct simple -i $(TARGET_SAMPLES)/msmpeg4v1/mpg4.avi -an
FATE_MSS1 += fate-mss1-pal
fate-mss1-pal: CMD = framecrc -i $(TARGET_SAMPLES)/mss1/screen_codec.wmv
FATE_SAMPLES_AVCONV-$(call DEMDEC, ASF, MSS1) += $(FATE_MSS1)
fate-mss1: $(FATE_MSS1)
FATE_SAMPLES_AVCONV-$(call DEMDEC, ASF, MSS1) += fate-mss1-pal
fate-mss1-pal: CMD = framecrc -i $(TARGET_SAMPLES)/mss1/screen_codec.wmv -an
FATE_MSS2 += fate-mss2-pal
fate-mss2-pal: CMD = framecrc -i $(TARGET_SAMPLES)/mss2/rlepal.wmv

197
tests/ref/fate/mss1-pal
View File

@ -3,220 +3,23 @@
#codec_id 0: rawvideo
#dimensions 0: 1024x768
#sar 0: 0/1
#tb 1: 1/8000
#media_type 1: audio
#codec_id 1: pcm_s16le
#sample_rate 1: 8000
#channel_layout 1: 4
1, 0, 0, 512, 1024, 0x00000000
1, 512, 512, 512, 1024, 0x00000000
1, 512, 512, 512, 1024, 0x00000000
1, 1024, 1024, 512, 1024, 0x00000000
1, 1536, 1536, 512, 1024, 0x00000000
1, 2048, 2048, 512, 1024, 0x00000000
1, 2560, 2560, 512, 1024, 0x00000000
1, 3072, 3072, 512, 1024, 0x00000000
1, 3584, 3584, 512, 1024, 0x00000000
1, 4096, 4096, 512, 1024, 0x00000000
0, 1, 1, 1, 787456, 0x9369daec
1, 4608, 4608, 512, 1024, 0x00000000
1, 5120, 5120, 512, 1024, 0x00000000
1, 5632, 5632, 512, 1024, 0x00000000
1, 6144, 6144, 512, 1024, 0x00000000
1, 6656, 6656, 512, 1024, 0x00000000
1, 7168, 7168, 512, 1024, 0x00000000
1, 7680, 7680, 512, 1024, 0x00000000
1, 8192, 8192, 512, 1024, 0x00000000
0, 2, 2, 1, 787456, 0x1c61a5b8
1, 8704, 8704, 512, 1024, 0x00000000
1, 9216, 9216, 512, 1024, 0x00000000
1, 9728, 9728, 512, 1024, 0x00000000
1, 10240, 10240, 512, 1024, 0x00000000
1, 10752, 10752, 512, 1024, 0x00000000
1, 11264, 11264, 512, 1024, 0x00000000
1, 11776, 11776, 512, 1024, 0x00000000
1, 12288, 12288, 512, 1024, 0x00000000
0, 3, 3, 1, 787456, 0xb9c3af1f
1, 12800, 12800, 512, 1024, 0x00000000
1, 13312, 13312, 512, 1024, 0x00000000
1, 13824, 13824, 512, 1024, 0x00000000
1, 14336, 14336, 512, 1024, 0x00000000
1, 14848, 14848, 512, 1024, 0x00000000
1, 15360, 15360, 512, 1024, 0x00000000
1, 15872, 15872, 512, 1024, 0x00000000
1, 16384, 16384, 512, 1024, 0x00000000
0, 4, 4, 1, 787456, 0xc078bec7
1, 16896, 16896, 512, 1024, 0x00000000
1, 17408, 17408, 512, 1024, 0x00000000
1, 17920, 17920, 512, 1024, 0x00000000
1, 18432, 18432, 512, 1024, 0x00000000
1, 18944, 18944, 512, 1024, 0x00000000
1, 19456, 19456, 512, 1024, 0x00000000
1, 19968, 19968, 512, 1024, 0x00000000
1, 20480, 20480, 512, 1024, 0x00000000
0, 5, 5, 1, 787456, 0x31aece7b
1, 23296, 23296, 512, 1024, 0x00000000
1, 23808, 23808, 512, 1024, 0x00000000
1, 24320, 24320, 512, 1024, 0x00000000
1, 24832, 24832, 512, 1024, 0x00000000
0, 6, 6, 1, 787456, 0x060a869e
1, 25344, 25344, 512, 1024, 0x00000000
1, 25856, 25856, 512, 1024, 0x00000000
1, 26368, 26368, 512, 1024, 0x00000000
1, 26880, 26880, 512, 1024, 0x00000000
1, 27392, 27392, 512, 1024, 0x00000000
1, 27904, 27904, 512, 1024, 0x00000000
1, 28416, 28416, 512, 1024, 0x00000000
1, 28928, 28928, 512, 1024, 0x00000000
0, 7, 7, 1, 787456, 0x12bea936
1, 29440, 29440, 512, 1024, 0x00000000
1, 29952, 29952, 512, 1024, 0x00000000
1, 30464, 30464, 512, 1024, 0x00000000
1, 30976, 30976, 512, 1024, 0x00000000
1, 31488, 31488, 512, 1024, 0x00000000
1, 32000, 32000, 512, 1024, 0x00000000
1, 32512, 32512, 512, 1024, 0x00000000
1, 33024, 33024, 512, 1024, 0x00000000
0, 8, 8, 1, 787456, 0xb493af19
1, 33536, 33536, 512, 1024, 0x00000000
1, 34048, 34048, 512, 1024, 0x00000000
1, 34560, 34560, 512, 1024, 0x00000000
1, 35072, 35072, 512, 1024, 0x00000000
1, 35584, 35584, 512, 1024, 0x00000000
1, 36096, 36096, 512, 1024, 0x00000000
1, 36608, 36608, 512, 1024, 0x00000000
1, 37120, 37120, 512, 1024, 0x00000000
0, 9, 9, 1, 787456, 0xc8f4b0cc
1, 37632, 37632, 512, 1024, 0x00000000
1, 38144, 38144, 512, 1024, 0x00000000
1, 38656, 38656, 512, 1024, 0x00000000
1, 39168, 39168, 512, 1024, 0x00000000
1, 39680, 39680, 512, 1024, 0x00000000
1, 40192, 40192, 512, 1024, 0x00000000
1, 40704, 40704, 512, 1024, 0x00000000
1, 41216, 41216, 512, 1024, 0x00000000
1, 41728, 41728, 512, 1024, 0x00000000
0, 10, 10, 1, 787456, 0x21e4aad0
1, 42240, 42240, 512, 1024, 0x00000000
1, 42752, 42752, 512, 1024, 0x00000000
1, 43264, 43264, 512, 1024, 0x00000000
1, 43776, 43776, 512, 1024, 0x00000000
1, 44288, 44288, 512, 1024, 0x00000000
1, 44800, 44800, 512, 1024, 0x00000000
1, 45312, 45312, 512, 1024, 0x00000000
1, 45824, 45824, 512, 1024, 0x00000000
0, 11, 11, 1, 787456, 0xee84b8a0
1, 46336, 46336, 512, 1024, 0x00000000
1, 46848, 46848, 512, 1024, 0x00000000
1, 47360, 47360, 512, 1024, 0x00000000
1, 47872, 47872, 512, 1024, 0x00000000
1, 48384, 48384, 512, 1024, 0x00000000
1, 48896, 48896, 512, 1024, 0x00000000
1, 49408, 49408, 512, 1024, 0x00000000
1, 49920, 49920, 512, 1024, 0x00000000
0, 12, 12, 1, 787456, 0xcec7b254
1, 50432, 50432, 512, 1024, 0x00000000
1, 50944, 50944, 512, 1024, 0x00000000
1, 51456, 51456, 512, 1024, 0x00000000
1, 51968, 51968, 512, 1024, 0x00000000
1, 52480, 52480, 512, 1024, 0x00000000
1, 52992, 52992, 512, 1024, 0x00000000
1, 53504, 53504, 512, 1024, 0x00000000
1, 54016, 54016, 512, 1024, 0x00000000
0, 13, 13, 1, 787456, 0x90b98f22
1, 54528, 54528, 512, 1024, 0x00000000
1, 55040, 55040, 512, 1024, 0x00000000
1, 55552, 55552, 512, 1024, 0x00000000
1, 56064, 56064, 512, 1024, 0x00000000
1, 56576, 56576, 512, 1024, 0x00000000
1, 57088, 57088, 512, 1024, 0x00000000
1, 57600, 57600, 512, 1024, 0x00000000
1, 58112, 58112, 512, 1024, 0x00000000
0, 14, 14, 1, 787456, 0x113ae355
1, 58624, 58624, 512, 1024, 0x00000000
1, 59136, 59136, 512, 1024, 0x00000000
1, 59648, 59648, 512, 1024, 0x00000000
1, 60160, 60160, 512, 1024, 0x00000000
1, 60672, 60672, 512, 1024, 0x00000000
1, 61184, 61184, 512, 1024, 0x00000000
1, 61696, 61696, 512, 1024, 0x00000000
1, 62208, 62208, 512, 1024, 0x00000000
0, 15, 15, 1, 787456, 0xbe1dead9
1, 62720, 62720, 512, 1024, 0x00000000
1, 63232, 63232, 512, 1024, 0x00000000
1, 63744, 63744, 512, 1024, 0x00000000
1, 64256, 64256, 512, 1024, 0x00000000
1, 64768, 64768, 512, 1024, 0x00000000
1, 65280, 65280, 512, 1024, 0x00000000
1, 65792, 65792, 512, 1024, 0x00000000
1, 66304, 66304, 512, 1024, 0x00000000
1, 66816, 66816, 512, 1024, 0x00000000
1, 67328, 67328, 512, 1024, 0x00000000
1, 67840, 67840, 512, 1024, 0x00000000
1, 68352, 68352, 512, 1024, 0x00000000
1, 68864, 68864, 512, 1024, 0x00000000
1, 69376, 69376, 512, 1024, 0x00000000
1, 69888, 69888, 512, 1024, 0x00000000
1, 70400, 70400, 512, 1024, 0x00000000
1, 70912, 70912, 512, 1024, 0x00000000
0, 17, 17, 1, 787456, 0x81167b2e
1, 71424, 71424, 512, 1024, 0x00000000
1, 71936, 71936, 512, 1024, 0x00000000
1, 72448, 72448, 512, 1024, 0x00000000
1, 72960, 72960, 512, 1024, 0x00000000
1, 73472, 73472, 512, 1024, 0x00000000
1, 73984, 73984, 512, 1024, 0x00000000
1, 74496, 74496, 512, 1024, 0x00000000
1, 75008, 75008, 512, 1024, 0x00000000
0, 18, 18, 1, 787456, 0xc6d67b2e
1, 75520, 75520, 512, 1024, 0x00000000
1, 76032, 76032, 512, 1024, 0x00000000
1, 76544, 76544, 512, 1024, 0x00000000
1, 77056, 77056, 512, 1024, 0x00000000
1, 77568, 77568, 512, 1024, 0x00000000
1, 78080, 78080, 512, 1024, 0x00000000
1, 78592, 78592, 512, 1024, 0x00000000
1, 79104, 79104, 512, 1024, 0x00000000
1, 79616, 79616, 512, 1024, 0x00000000
1, 80128, 80128, 512, 1024, 0x00000000
1, 80640, 80640, 512, 1024, 0x00000000
1, 81152, 81152, 512, 1024, 0x00000000
1, 81664, 81664, 512, 1024, 0x00000000
1, 82176, 82176, 512, 1024, 0x00000000
1, 82688, 82688, 512, 1024, 0x00000000
1, 83200, 83200, 512, 1024, 0x00000000
0, 20, 20, 1, 787456, 0xe14686ce
1, 83712, 83712, 512, 1024, 0x00000000
1, 84224, 84224, 512, 1024, 0x00000000
1, 84736, 84736, 512, 1024, 0x00000000
1, 85248, 85248, 512, 1024, 0x00000000
1, 85760, 85760, 512, 1024, 0x00000000
1, 86272, 86272, 512, 1024, 0x00000000
1, 86784, 86784, 512, 1024, 0x00000000
1, 87296, 87296, 512, 1024, 0x00000000
0, 21, 21, 1, 787456, 0xc6d67b2e
1, 87808, 87808, 512, 1024, 0x00000000
1, 88320, 88320, 512, 1024, 0x00000000
1, 88832, 88832, 512, 1024, 0x00000000
1, 89344, 89344, 512, 1024, 0x00000000
1, 89856, 89856, 512, 1024, 0x00000000
1, 90368, 90368, 512, 1024, 0x00000000
1, 90880, 90880, 512, 1024, 0x00000000
1, 91392, 91392, 512, 1024, 0x00000000
0, 22, 22, 1, 787456, 0x3ef162f6
1, 91904, 91904, 512, 1024, 0x00000000
1, 92416, 92416, 512, 1024, 0x00000000
1, 92928, 92928, 512, 1024, 0x00000000
1, 93440, 93440, 512, 1024, 0x00000000
1, 93952, 93952, 512, 1024, 0x00000000
1, 94464, 94464, 512, 1024, 0x00000000
1, 94976, 94976, 512, 1024, 0x00000000
1, 95488, 95488, 512, 1024, 0x00000000
1, 96000, 96000, 512, 1024, 0x00000000
1, 96512, 96512, 512, 1024, 0x00000000
1, 97024, 97024, 512, 1024, 0x00000000
1, 97536, 97536, 512, 1024, 0x00000000
1, 98048, 98048, 512, 1024, 0x00000000
1, 98560, 98560, 512, 1024, 0x00000000
1, 99072, 99072, 512, 1024, 0x00000000
1, 99584, 99584, 512, 1024, 0x00000000