Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit 'f91fe24e9bd6912c29bbb03d8afe878e045f9721'

Browse Source 
* commit 'f91fe24e9bd6912c29bbb03d8afe878e045f9721':
  g2meet: force simple idct for identical results over all fate configs

Conflicts:
	tests/ref/fate/g2m3
	tests/ref/fate/g2m4

Merged-by: Michael Niedermayer <michaelni@gmx.at>
pull/267/head
Michael Niedermayer 10 years ago
parent 17e6d7b400 f91fe24e9b
commit 5142963b7d
4 changed files with 60 additions and 60 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      tests/fate/screen.mak
  2. 24
      tests/ref/fate/g2m2
  3. 40
      tests/ref/fate/g2m3
  4. 50
      tests/ref/fate/g2m4

6
tests/fate/screen.mak
Unescape View File

@ -30,13 +30,13 @@ FATE_SCREEN-$(call DEMDEC, AVI, FRAPS) += $(FATE_FRAPS)
fate-fraps: $(FATE_FRAPS) fate-fraps: $(FATE_FRAPS)
FATE_G2M += fate-g2m2 FATE_G2M += fate-g2m2
fate-g2m2: CMD = framecrc -i $(TARGET_SAMPLES)/g2m/g2m2.asf -an fate-g2m2: CMD = framecrc -idct simple -i $(TARGET_SAMPLES)/g2m/g2m2.asf -an
FATE_G2M += fate-g2m3 FATE_G2M += fate-g2m3
fate-g2m3: CMD = framecrc -i $(TARGET_SAMPLES)/g2m/g2m3.asf -frames:v 20 fate-g2m3: CMD = framecrc -idct simple -i $(TARGET_SAMPLES)/g2m/g2m3.asf -frames:v 20
FATE_G2M += fate-g2m4 FATE_G2M += fate-g2m4
fate-g2m4: CMD = framecrc -i $(TARGET_SAMPLES)/g2m/g2m4.asf fate-g2m4: CMD = framecrc -idct simple -i $(TARGET_SAMPLES)/g2m/g2m4.asf
FATE_SAMPLES_AVCONV-$(call DEMDEC, ASF, G2M) += $(FATE_G2M) FATE_SAMPLES_AVCONV-$(call DEMDEC, ASF, G2M) += $(FATE_G2M)
fate-g2m: $(FATE_G2M) fate-g2m: $(FATE_G2M)

24
tests/ref/fate/g2m2
Unescape View File

@ -147,15 +147,15 @@
0, 8531, 8531, 0, 2359296, 0x47874e4f 0, 8531, 8531, 0, 2359296, 0x47874e4f
0, 8547, 8547, 0, 2359296, 0xdead4e4f 0, 8547, 8547, 0, 2359296, 0xdead4e4f
0, 8562, 8562, 0, 2359296, 0x847e4e4f 0, 8562, 8562, 0, 2359296, 0x847e4e4f
0, 9344, 9344, 0, 2359296, 0x614ce46d 0, 9344, 9344, 0, 2359296, 0x1a13e47c
0, 9345, 9345, 0, 2359296, 0x8dece312 0, 9345, 9345, 0, 2359296, 0x46b3e321
0, 9876, 9876, 0, 2359296, 0xbdf9e34e 0, 9876, 9876, 0, 2359296, 0x76c0e35d
0, 9922, 9922, 0, 2359296, 0x3e21e50a 0, 9922, 9922, 0, 2359296, 0xf6d9e519
0, 9938, 9938, 0, 2359296, 0xf348e4a4 0, 9938, 9938, 0, 2359296, 0xac0fe4b3
0, 9954, 9954, 0, 2359296, 0x8178e415 0, 9954, 9954, 0, 2359296, 0x3a3fe424
0, 9955, 9955, 0, 2359296, 0xf0b5e199 0, 9955, 9955, 0, 2359296, 0xa97ce1a8
0, 9969, 9969, 0, 2359296, 0x5a33e00e 0, 9969, 9969, 0, 2359296, 0x12fae01d
0, 9970, 9970, 0, 2359296, 0xaceddf05 0, 9970, 9970, 0, 2359296, 0x65b4df14
0, 9985, 9985, 0, 2359296, 0xca09e023 0, 9985, 9985, 0, 2359296, 0x82d0e032
0, 9986, 9986, 0, 2359296, 0xeb8be0c0 0, 9986, 9986, 0, 2359296, 0xa452e0cf
0, 10001, 10001, 0, 2359296, 0x6a0fdf28 0, 10001, 10001, 0, 2359296, 0x22d6df37

40
tests/ref/fate/g2m3
Unescape View File

@ -1,29 +1,29 @@
#tb 0: 1001/24000 #tb 0: 1001/24000
#tb 1: 1/44100 #tb 1: 1/44100
0, 0, 0, 1, 3824640, 0xf8cf3d18 0, 0, 0, 1, 3824640, 0x9a253d29
1, 0, 0, 16384, 32768, 0x6b41078a 1, 0, 0, 16384, 32768, 0x6b41078a
1, 14288, 14288, 16384, 32768, 0x96f7bfa2 1, 14288, 14288, 16384, 32768, 0x96f7bfa2
0, 12, 12, 1, 3824640, 0x29dc2af5 0, 12, 12, 1, 3824640, 0xcb232b06
0, 15, 15, 1, 3824640, 0x0ef5287b 0, 15, 15, 1, 3824640, 0xb03c288c
0, 16, 16, 1, 3824640, 0x84b5283d 0, 16, 16, 1, 3824640, 0x260b284e
1, 30672, 30672, 14336, 28672, 0xfafb3922 1, 30672, 30672, 14336, 28672, 0xfafb3922
0, 18, 18, 1, 3824640, 0xb2972f1f 0, 18, 18, 1, 3824640, 0x53ed2f30
0, 19, 19, 1, 3824640, 0x5f59333c 0, 19, 19, 1, 3824640, 0x00af334d
0, 21, 21, 1, 3824640, 0x94643ee6 0, 21, 21, 1, 3824640, 0x35ba3ef7
0, 22, 22, 1, 3824640, 0x646c4e89 0, 22, 22, 1, 3824640, 0x05c24e9a
0, 24, 24, 1, 3824640, 0x622e6412 0, 24, 24, 1, 3824640, 0x03846423
1, 45005, 45005, 12288, 24576, 0x32d18657 1, 45005, 45005, 12288, 24576, 0x32d18657
0, 25, 25, 1, 3824640, 0x6a796412 0, 25, 25, 1, 3824640, 0x0bcf6423
0, 30, 30, 1, 3824640, 0xf4ee6412 0, 30, 30, 1, 3824640, 0x96446423
1, 57293, 57293, 10240, 20480, 0x7d89c440 1, 57293, 57293, 10240, 20480, 0x7d89c440
0, 33, 33, 1, 3824640, 0xfd396412 0, 33, 33, 1, 3824640, 0x9e8f6423
0, 34, 34, 1, 3824640, 0x81666412 0, 34, 34, 1, 3824640, 0x22bc6423
0, 36, 36, 1, 3824640, 0xcff46412 0, 36, 36, 1, 3824640, 0x714a6423
1, 67533, 67533, 12288, 24576, 0x23d44d0c 1, 67533, 67533, 12288, 24576, 0x23d44d0c
0, 37, 37, 1, 3824640, 0x64b76412 0, 37, 37, 1, 3824640, 0x060d6423
0, 39, 39, 1, 3824640, 0xbaa36412 0, 39, 39, 1, 3824640, 0x5bf96423
0, 40, 40, 1, 3824640, 0x12006412 0, 40, 40, 1, 3824640, 0xb3476423
1, 79821, 79821, 12288, 24576, 0x77188395 1, 79821, 79821, 12288, 24576, 0x77188395
0, 123, 123, 1, 3824640, 0x1dbe6412 0, 123, 123, 1, 3824640, 0xbf056423
0, 124, 124, 1, 3824640, 0x8f1e6412 0, 124, 124, 1, 3824640, 0x30746423
0, 126, 126, 1, 3824640, 0x49286412 0, 126, 126, 1, 3824640, 0xea6f6423

50
tests/ref/fate/g2m4
Unescape View File

@ -1,26 +1,26 @@
#tb 0: 1/10 #tb 0: 1/10
0, 0, 0, 1, 3932160, 0xafab48e8 0, 0, 0, 1, 3932160, 0x109148ee
0, 1, 1, 1, 3932160, 0x47a47bf9 0, 1, 1, 1, 3932160, 0xa87b7bff
0, 2, 2, 1, 3932160, 0x9ffb4d10 0, 2, 2, 1, 3932160, 0x00e14d16
0, 3, 3, 1, 3932160, 0x5eb6786b 0, 3, 3, 1, 3932160, 0xbf8d7871
0, 4, 4, 1, 3932160, 0x38b6ed92 0, 4, 4, 1, 3932160, 0x998ded98
0, 5, 5, 1, 3932160, 0x7ffa3289 0, 5, 5, 1, 3932160, 0xe0d1328f
0, 6, 6, 1, 3932160, 0x7da7699a 0, 6, 6, 1, 3932160, 0xde7e69a0
0, 7, 7, 1, 3932160, 0xf26fcddd 0, 7, 7, 1, 3932160, 0x5355cde3
0, 8, 8, 1, 3932160, 0xea566b0b 0, 8, 8, 1, 3932160, 0x4b3c6b11
0, 9, 9, 1, 3932160, 0xb8f23669 0, 9, 9, 1, 3932160, 0x19d8366f
0, 10, 10, 1, 3932160, 0x9738365d 0, 10, 10, 1, 3932160, 0xf80f3663
0, 14, 14, 1, 3932160, 0x82051cc1 0, 14, 14, 1, 3932160, 0xe2dc1cc7
0, 30, 30, 1, 3932160, 0xd9ff1cc1 0, 30, 30, 1, 3932160, 0x3ae51cc7
0, 31, 31, 1, 3932160, 0xb006d146 0, 31, 31, 1, 3932160, 0x10ecd14c
0, 32, 32, 1, 3932160, 0x79381d19 0, 32, 32, 1, 3932160, 0xda0f1d1f
0, 33, 33, 1, 3932160, 0xefd735fc 0, 33, 33, 1, 3932160, 0x50bd3602
0, 34, 34, 1, 3932160, 0x4c4983b4 0, 34, 34, 1, 3932160, 0xad2083ba
0, 35, 35, 1, 3932160, 0x44dc88b7 0, 35, 35, 1, 3932160, 0xa5b388bd
0, 36, 36, 1, 3932160, 0xd6c86d49 0, 36, 36, 1, 3932160, 0x37ae6d4f
0, 37, 37, 1, 3932160, 0xe288e81f 0, 37, 37, 1, 3932160, 0x436ee825
0, 38, 38, 1, 3932160, 0x0b57c172 0, 38, 38, 1, 3932160, 0x6c2ec178
0, 39, 39, 1, 3932160, 0x0b683895 0, 39, 39, 1, 3932160, 0x6c3f389b
0, 40, 40, 1, 3932160, 0xdb1e21bb 0, 40, 40, 1, 3932160, 0x3c0421c1
0, 41, 41, 1, 3932160, 0x25440443 0, 41, 41, 1, 3932160, 0x861b0449
0, 42, 42, 1, 3932160, 0xe07e071d 0, 42, 42, 1, 3932160, 0x41640723

Write Preview
Loading…
Cancel
Save