1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00

Merge commit '4d1229dabf7a7e3b6a7b326afd79102256c3b008'

* commit '4d1229dabf7a7e3b6a7b326afd79102256c3b008':
  g2meet: Add FATE tests for all three G2M variants

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-07-01 03:22:33 +02:00
commit 9e93e544dc
4 changed files with 228 additions and 0 deletions

View File

@ -29,6 +29,18 @@ fate-fraps-v5: CMD = framecrc -i $(TARGET_SAMPLES)/fraps/fraps-v5-bouncing-balls
FATE_SCREEN-$(call DEMDEC, AVI, FRAPS) += $(FATE_FRAPS)
fate-fraps: $(FATE_FRAPS)
FATE_G2M += fate-g2m2
fate-g2m2: CMD = framecrc -i $(TARGET_SAMPLES)/g2m/g2m2.asf -an
FATE_G2M += fate-g2m3
fate-g2m3: CMD = framecrc -i $(TARGET_SAMPLES)/g2m/g2m3.asf -frames:v 20
FATE_G2M += fate-g2m4
fate-g2m4: CMD = framecrc -i $(TARGET_SAMPLES)/g2m/g2m4.asf
FATE_SAMPLES_AVCONV-$(call DEMDEC, ASF, G2M) += $(FATE_G2M)
fate-g2m: $(FATE_G2M)
FATE_SAMPLES_AVCONV-$(call DEMDEC, ASF, TDSC) += fate-tdsc
fate-tdsc: CMD = framecrc -idct simple -i $(TARGET_SAMPLES)/tdsc/tdsc.asf -an -pix_fmt bgr24

161
tests/ref/fate/g2m2 Normal file
View File

@ -0,0 +1,161 @@
#tb 0: 1/1000
0, 47, 47, 0, 2359296, 0xb4434e4f
0, 62, 62, 0, 2359296, 0x59cb5027
0, 78, 78, 0, 2359296, 0xe9bc578d
0, 109, 109, 0, 2359296, 0x5d17554f
0, 125, 125, 0, 2359296, 0x6d685457
0, 437, 437, 0, 2359296, 0x13205420
0, 438, 438, 0, 2359296, 0xb8e15116
0, 453, 453, 0, 2359296, 0x2ca55195
0, 469, 469, 0, 2359296, 0x767d1c45
0, 484, 484, 0, 2359296, 0x0af42016
0, 500, 500, 0, 2359296, 0xa2083e69
0, 516, 516, 0, 2359296, 0xb68a1308
0, 531, 531, 0, 2359296, 0x4f334c0e
0, 547, 547, 0, 2359296, 0x98b74e4f
0, 562, 562, 0, 2359296, 0xd9de4e4f
0, 578, 578, 0, 2359296, 0xa17c4e4f
0, 594, 594, 0, 2359296, 0xa49a665d
0, 609, 609, 0, 2359296, 0xf5f87360
0, 781, 781, 0, 2359296, 0x75747360
0, 797, 797, 0, 2359296, 0x745d7360
0, 812, 812, 0, 2359296, 0x33047360
0, 828, 828, 0, 2359296, 0xf19c7360
0, 844, 844, 0, 2359296, 0xb0437360
0, 859, 859, 0, 2359296, 0xaf2c7360
0, 875, 875, 0, 2359296, 0x2ea87360
0, 891, 891, 0, 2359296, 0xee577360
0, 953, 953, 0, 2359296, 0x6dd37360
0, 1078, 1078, 0, 2359296, 0xab327965
0, 1094, 1094, 0, 2359296, 0x5f8677d0
0, 1109, 1109, 0, 2359296, 0x02135eb4
0, 1125, 1125, 0, 2359296, 0x09784e4f
0, 1141, 1141, 0, 2359296, 0xa140a62d
0, 1156, 1156, 0, 2359296, 0xa140a62d
0, 1484, 1484, 0, 2359296, 0xa140a62d
0, 1516, 1516, 0, 2359296, 0xa140a62d
0, 1547, 1547, 0, 2359296, 0xa140a62d
0, 1641, 1641, 0, 2359296, 0xa140a62d
0, 1642, 1642, 0, 2359296, 0xa140a62d
0, 1656, 1656, 0, 2359296, 0xa140a62d
0, 1657, 1657, 0, 2359296, 0xa140a62d
0, 1672, 1672, 0, 2359296, 0xa140a62d
0, 1673, 1673, 0, 2359296, 0x92024e4f
0, 1687, 1687, 0, 2359296, 0xb1754dbe
0, 1688, 1688, 0, 2359296, 0x15ee5eb4
0, 1703, 1703, 0, 2359296, 0xb1d9746e
0, 1719, 1719, 0, 2359296, 0xabe77360
0, 1734, 1734, 0, 2359296, 0xaad07360
0, 1750, 1750, 0, 2359296, 0x2a4c7360
0, 1766, 1766, 0, 2359296, 0x69777360
0, 1781, 1781, 0, 2359296, 0xe8e47360
0, 2328, 2328, 0, 2359296, 0x29357360
0, 3031, 3031, 0, 2359296, 0x69777360
0, 3078, 3078, 0, 2359296, 0xa9b97360
0, 3109, 3109, 0, 2359296, 0xd2697707
0, 3141, 3141, 0, 2359296, 0x22a07965
0, 3156, 3156, 0, 2359296, 0xf9327aa7
0, 3172, 3172, 0, 2359296, 0xa5d277d0
0, 3203, 3203, 0, 2359296, 0x97b6746e
0, 3328, 3328, 0, 2359296, 0x80bb746e
0, 4562, 4562, 0, 2359296, 0x530b719a
0, 4672, 4672, 0, 2359296, 0x4827665d
0, 4703, 4703, 0, 2359296, 0xc48c5eb4
0, 5391, 5391, 0, 2359296, 0xe6465eb4
0, 5578, 5578, 0, 2359296, 0xece455ec
0, 5594, 5594, 0, 2359296, 0xb5344dbe
0, 5609, 5609, 0, 2359296, 0xa140a62d
0, 5625, 5625, 0, 2359296, 0xa140a62d
0, 5641, 5641, 0, 2359296, 0xa140a62d
0, 5642, 5642, 0, 2359296, 0xa140a62d
0, 5656, 5656, 0, 2359296, 0xa140a62d
0, 5672, 5672, 0, 2359296, 0xa140a62d
0, 5703, 5703, 0, 2359296, 0xa140a62d
0, 5750, 5750, 0, 2359296, 0xa140a62d
0, 5766, 5766, 0, 2359296, 0xa140a62d
0, 5781, 5781, 0, 2359296, 0xa140a62d
0, 5797, 5797, 0, 2359296, 0xa140a62d
0, 5812, 5812, 0, 2359296, 0xa140a62d
0, 5875, 5875, 0, 2359296, 0xa140a62d
0, 5922, 5922, 0, 2359296, 0xa140a62d
0, 5984, 5984, 0, 2359296, 0xa140a62d
0, 6031, 6031, 0, 2359296, 0xa140a62d
0, 6047, 6047, 0, 2359296, 0xa140a62d
0, 6062, 6062, 0, 2359296, 0xa140a62d
0, 6406, 6406, 0, 2359296, 0xa140a62d
0, 6453, 6453, 0, 2359296, 0xa140a62d
0, 6469, 6469, 0, 2359296, 0xa140a62d
0, 6484, 6484, 0, 2359296, 0xa140a62d
0, 6500, 6500, 0, 2359296, 0xa140a62d
0, 6516, 6516, 0, 2359296, 0xa140a62d
0, 6531, 6531, 0, 2359296, 0xa140a62d
0, 6547, 6547, 0, 2359296, 0xa140a62d
0, 6562, 6562, 0, 2359296, 0x5c2a4cd9
0, 6578, 6578, 0, 2359296, 0x28f94e4f
0, 6594, 6594, 0, 2359296, 0x9acb4820
0, 6609, 6609, 0, 2359296, 0x9ec716e1
0, 6625, 6625, 0, 2359296, 0xaf5f3fa4
0, 6641, 6641, 0, 2359296, 0x7d633218
0, 6642, 6642, 0, 2359296, 0x34fb2016
0, 6656, 6656, 0, 2359296, 0x61351665
0, 6812, 6812, 0, 2359296, 0xb23c1039
0, 6828, 6828, 0, 2359296, 0x59290d69
0, 6844, 6844, 0, 2359296, 0x639c132d
0, 6859, 6859, 0, 2359296, 0x0b252237
0, 6875, 6875, 0, 2359296, 0xe66f2fc5
0, 6891, 6891, 0, 2359296, 0xa8b33761
0, 6906, 6906, 0, 2359296, 0x81a63f8b
0, 6969, 6969, 0, 2359296, 0x18074843
0, 6984, 6984, 0, 2359296, 0x434a5195
0, 7000, 7000, 0, 2359296, 0x6da15116
0, 7001, 7001, 0, 2359296, 0xca755420
0, 7016, 7016, 0, 2359296, 0xe6fc5457
0, 7017, 7017, 0, 2359296, 0x271d53fd
0, 7031, 7031, 0, 2359296, 0xa15b554f
0, 7281, 7281, 0, 2359296, 0x49f6578d
0, 7282, 7282, 0, 2359296, 0x2c0c4e4f
0, 7297, 7297, 0, 2359296, 0x7e924e4f
0, 7298, 7298, 0, 2359296, 0x32ff4e4f
0, 7312, 7312, 0, 2359296, 0x23ad4e4f
0, 7313, 7313, 0, 2359296, 0x7ddc4e4f
0, 7328, 7328, 0, 2359296, 0xd0624e4f
0, 7329, 7329, 0, 2359296, 0x22f74e4f
0, 7781, 7781, 0, 2359296, 0x49fa4e4f
0, 7797, 7797, 0, 2359296, 0x6a5a5027
0, 7812, 7812, 0, 2359296, 0x9f935027
0, 7828, 7828, 0, 2359296, 0xc5e55027
0, 7844, 7844, 0, 2359296, 0xd4cc5027
0, 8250, 8250, 0, 2359296, 0xd2ab5027
0, 8266, 8266, 0, 2359296, 0x68f04e4f
0, 8281, 8281, 0, 2359296, 0xd0b44e4f
0, 8297, 8297, 0, 2359296, 0xfced4e4f
0, 8298, 8298, 0, 2359296, 0x8b0d4e4f
0, 8312, 8312, 0, 2359296, 0x09db4e4f
0, 8328, 8328, 0, 2359296, 0x4d0f4e4f
0, 8329, 8329, 0, 2359296, 0xad824dbe
0, 8344, 8344, 0, 2359296, 0x9aca4dbe
0, 8345, 8345, 0, 2359296, 0x755a4dbe
0, 8359, 8359, 0, 2359296, 0xc6824d2d
0, 8360, 8360, 0, 2359296, 0x7c344c0e
0, 8375, 8375, 0, 2359296, 0x50f04c0e
0, 8391, 8391, 0, 2359296, 0xfa594c0e
0, 8406, 8406, 0, 2359296, 0x4d494c0e
0, 8422, 8422, 0, 2359296, 0xf6b24c0e
0, 8437, 8437, 0, 2359296, 0xcb6e4c0e
0, 8453, 8453, 0, 2359296, 0xbd024c0e
0, 8516, 8516, 0, 2359296, 0x245b4dbe
0, 8531, 8531, 0, 2359296, 0x47874e4f
0, 8547, 8547, 0, 2359296, 0xdead4e4f
0, 8562, 8562, 0, 2359296, 0x847e4e4f
0, 9344, 9344, 0, 2359296, 0x614ce46d
0, 9345, 9345, 0, 2359296, 0x8dece312
0, 9876, 9876, 0, 2359296, 0xbdf9e34e
0, 9922, 9922, 0, 2359296, 0x3e21e50a
0, 9938, 9938, 0, 2359296, 0xf348e4a4
0, 9954, 9954, 0, 2359296, 0x8178e415
0, 9955, 9955, 0, 2359296, 0xf0b5e199
0, 9969, 9969, 0, 2359296, 0x5a33e00e
0, 9970, 9970, 0, 2359296, 0xaceddf05
0, 9985, 9985, 0, 2359296, 0xca09e023
0, 9986, 9986, 0, 2359296, 0xeb8be0c0
0, 10001, 10001, 0, 2359296, 0x6a0fdf28

29
tests/ref/fate/g2m3 Normal file
View File

@ -0,0 +1,29 @@
#tb 0: 1001/24000
#tb 1: 1/44100
0, 0, 0, 1, 3824640, 0xf8cf3d18
1, 0, 0, 16384, 32768, 0x6b41078a
1, 14288, 14288, 16384, 32768, 0x96f7bfa2
0, 12, 12, 1, 3824640, 0x29dc2af5
0, 15, 15, 1, 3824640, 0x0ef5287b
0, 16, 16, 1, 3824640, 0x84b5283d
1, 30672, 30672, 14336, 28672, 0xfafb3922
0, 18, 18, 1, 3824640, 0xb2972f1f
0, 19, 19, 1, 3824640, 0x5f59333c
0, 21, 21, 1, 3824640, 0x94643ee6
0, 22, 22, 1, 3824640, 0x646c4e89
0, 24, 24, 1, 3824640, 0x622e6412
1, 45005, 45005, 12288, 24576, 0x32d18657
0, 25, 25, 1, 3824640, 0x6a796412
0, 30, 30, 1, 3824640, 0xf4ee6412
1, 57293, 57293, 10240, 20480, 0x7d89c440
0, 33, 33, 1, 3824640, 0xfd396412
0, 34, 34, 1, 3824640, 0x81666412
0, 36, 36, 1, 3824640, 0xcff46412
1, 67533, 67533, 12288, 24576, 0x23d44d0c
0, 37, 37, 1, 3824640, 0x64b76412
0, 39, 39, 1, 3824640, 0xbaa36412
0, 40, 40, 1, 3824640, 0x12006412
1, 79821, 79821, 12288, 24576, 0x77188395
0, 123, 123, 1, 3824640, 0x1dbe6412
0, 124, 124, 1, 3824640, 0x8f1e6412
0, 126, 126, 1, 3824640, 0x49286412

26
tests/ref/fate/g2m4 Normal file
View File

@ -0,0 +1,26 @@
#tb 0: 1/10
0, 0, 0, 1, 3932160, 0xafab48e8
0, 1, 1, 1, 3932160, 0x47a47bf9
0, 2, 2, 1, 3932160, 0x9ffb4d10
0, 3, 3, 1, 3932160, 0x5eb6786b
0, 4, 4, 1, 3932160, 0x38b6ed92
0, 5, 5, 1, 3932160, 0x7ffa3289
0, 6, 6, 1, 3932160, 0x7da7699a
0, 7, 7, 1, 3932160, 0xf26fcddd
0, 8, 8, 1, 3932160, 0xea566b0b
0, 9, 9, 1, 3932160, 0xb8f23669
0, 10, 10, 1, 3932160, 0x9738365d
0, 14, 14, 1, 3932160, 0x82051cc1
0, 30, 30, 1, 3932160, 0xd9ff1cc1
0, 31, 31, 1, 3932160, 0xb006d146
0, 32, 32, 1, 3932160, 0x79381d19
0, 33, 33, 1, 3932160, 0xefd735fc
0, 34, 34, 1, 3932160, 0x4c4983b4
0, 35, 35, 1, 3932160, 0x44dc88b7
0, 36, 36, 1, 3932160, 0xd6c86d49
0, 37, 37, 1, 3932160, 0xe288e81f
0, 38, 38, 1, 3932160, 0x0b57c172
0, 39, 39, 1, 3932160, 0x0b683895
0, 40, 40, 1, 3932160, 0xdb1e21bb
0, 41, 41, 1, 3932160, 0x25440443
0, 42, 42, 1, 3932160, 0xe07e071d