[FFmpeg-cvslog] g2meet: force simple idct for identical results over all fate configs

Janne Grunau git at videolan.org
Wed Jul 1 19:44:19 CEST 2015


ffmpeg | branch: master | Janne Grunau <janne-libav at jannau.net> | Wed Jul  1 15:33:20 2015 +0200| [f91fe24e9bd6912c29bbb03d8afe878e045f9721] | committer: Janne Grunau

g2meet: force simple idct for identical results over all fate configs

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f91fe24e9bd6912c29bbb03d8afe878e045f9721
---

 tests/fate/screen.mak |    6 +++---
 tests/ref/fate/g2m2   |   24 ++++++++++-----------
 tests/ref/fate/g2m3   |   40 +++++++++++++++++------------------
 tests/ref/fate/g2m4   |   56 ++++++++++++++++++++++++-------------------------
 4 files changed, 63 insertions(+), 63 deletions(-)

diff --git a/tests/fate/screen.mak b/tests/fate/screen.mak
index 14c5089..cc29d22 100644
--- a/tests/fate/screen.mak
+++ b/tests/fate/screen.mak
@@ -30,13 +30,13 @@ FATE_SAMPLES_AVCONV-$(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-g2m2: CMD = framecrc -idct simple -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-g2m3: CMD = framecrc -idct simple -i $(TARGET_SAMPLES)/g2m/g2m3.asf -frames:v 20
 
 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-g2m: $(FATE_G2M)
diff --git a/tests/ref/fate/g2m2 b/tests/ref/fate/g2m2
index f117b48..710dbd1 100644
--- a/tests/ref/fate/g2m2
+++ b/tests/ref/fate/g2m2
@@ -147,15 +147,15 @@
 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
+0,       9344,       9344,        0,  2359296, 0x1a13e47c
+0,       9345,       9345,        0,  2359296, 0x46b3e321
+0,       9876,       9876,        0,  2359296, 0x76c0e35d
+0,       9922,       9922,        0,  2359296, 0xf6d9e519
+0,       9938,       9938,        0,  2359296, 0xac0fe4b3
+0,       9954,       9954,        0,  2359296, 0x3a3fe424
+0,       9955,       9955,        0,  2359296, 0xa97ce1a8
+0,       9969,       9969,        0,  2359296, 0x12fae01d
+0,       9970,       9970,        0,  2359296, 0x65b4df14
+0,       9985,       9985,        0,  2359296, 0x82d0e032
+0,       9986,       9986,        0,  2359296, 0xa452e0cf
+0,      10001,      10001,        0,  2359296, 0x22d6df37
diff --git a/tests/ref/fate/g2m3 b/tests/ref/fate/g2m3
index 9956710..8866a7e 100644
--- a/tests/ref/fate/g2m3
+++ b/tests/ref/fate/g2m3
@@ -1,25 +1,25 @@
 #tb 0: 1/1000
 #tb 1: 1/44100
-0,          0,          0,        0,  3824640, 0xf8cf3d18
+0,          0,          0,        0,  3824640, 0x9a253d29
 1,          0,          0,    16384,    32768, 0x6b41078a
 1,      14288,      14288,    16384,    32768, 0x96f7bfa2
-0,        499,        499,        0,  3824640, 0x29dc2af5
-0,        624,        624,        0,  3824640, 0x0ef5287b
-0,        625,        625,        0,  3824640, 0x84b5283d
-0,        626,        626,        0,  3824640, 0xcde31cda
-0,        627,        627,        0,  3824640, 0x61cf2454
-0,        628,        628,        0,  3824640, 0xb8e32127
+0,        499,        499,        0,  3824640, 0xcb232b06
+0,        624,        624,        0,  3824640, 0xb03c288c
+0,        625,        625,        0,  3824640, 0x260b284e
+0,        626,        626,        0,  3824640, 0x6f391ceb
+0,        627,        627,        0,  3824640, 0x03252465
+0,        628,        628,        0,  3824640, 0x5a392138
 1,      30650,      30650,    14336,    28672, 0xfafb3922
-0,        749,        749,        0,  3824640, 0xb2972f1f
-0,        750,        750,        0,  3824640, 0x5f59333c
-0,        751,        751,        0,  3824640, 0x8d3529ea
-0,        752,        752,        0,  3824640, 0xceb4385f
-0,        753,        753,        0,  3824640, 0xb93139f8
-0,        754,        754,        0,  3824640, 0xfb802d6f
-0,        874,        874,        0,  3824640, 0x94643ee6
-0,        875,        875,        0,  3824640, 0x646c4e89
-0,        876,        876,        0,  3824640, 0xa65d5e7a
-0,        877,        877,        0,  3824640, 0xec2a6467
-0,        878,        878,        0,  3824640, 0x755e642e
-0,        879,        879,        0,  3824640, 0xcaff6412
-0,        880,        880,        0,  3824640, 0x9abc6412
+0,        749,        749,        0,  3824640, 0x53ed2f30
+0,        750,        750,        0,  3824640, 0x00af334d
+0,        751,        751,        0,  3824640, 0x2e8b29fb
+0,        752,        752,        0,  3824640, 0x700a3870
+0,        753,        753,        0,  3824640, 0x5a873a09
+0,        754,        754,        0,  3824640, 0x9cd62d80
+0,        874,        874,        0,  3824640, 0x35ba3ef7
+0,        875,        875,        0,  3824640, 0x05c24e9a
+0,        876,        876,        0,  3824640, 0x47b35e8b
+0,        877,        877,        0,  3824640, 0x8d806478
+0,        878,        878,        0,  3824640, 0x16b4643f
+0,        879,        879,        0,  3824640, 0x6c556423
+0,        880,        880,        0,  3824640, 0x3c126423
diff --git a/tests/ref/fate/g2m4 b/tests/ref/fate/g2m4
index 2f2bd74..c2e8f61 100644
--- a/tests/ref/fate/g2m4
+++ b/tests/ref/fate/g2m4
@@ -1,29 +1,29 @@
 #tb 0: 1/1000
-0,          0,          0,        0,  3932160, 0xafab48e8
-0,         29,         29,        0,  3932160, 0x47a47bf9
-0,        129,        129,        0,  3932160, 0x9ffb4d10
-0,        239,        239,        0,  3932160, 0x5eb6786b
-0,        240,        240,        0,  3932160, 0x38b6ed92
-0,        339,        339,        0,  3932160, 0x3ef8eaa4
-0,        439,        439,        0,  3932160, 0x7ffa3289
-0,        440,        440,        0,  3932160, 0x7da7699a
-0,        539,        539,        0,  3932160, 0x7b155d8a
-0,        540,        540,        0,  3932160, 0xf26fcddd
-0,        649,        649,        0,  3932160, 0xea566b0b
-0,        739,        739,        0,  3932160, 0x6e7f92ab
-0,        740,        740,        0,  3932160, 0xb8f23669
-0,        949,        949,        0,  3932160, 0x9738365d
-0,       1439,       1439,        0,  3932160, 0x82051cc1
-0,       3049,       3049,        0,  3932160, 0xd9ff1cc1
-0,       3050,       3050,        0,  3932160, 0xb006d146
-0,       3149,       3149,        0,  3932160, 0x79381d19
-0,       3150,       3150,        0,  3932160, 0xefd735fc
-0,       3449,       3449,        0,  3932160, 0x4c4983b4
-0,       3450,       3450,        0,  3932160, 0x44dc88b7
-0,       3549,       3549,        0,  3932160, 0xd6c86d49
-0,       3550,       3550,        0,  3932160, 0xe288e81f
-0,       3749,       3749,        0,  3932160, 0x0b57c172
-0,       3849,       3849,        0,  3932160, 0x0b683895
-0,       3850,       3850,        0,  3932160, 0xdb1e21bb
-0,       3949,       3949,        0,  3932160, 0x25440443
-0,       4049,       4049,        0,  3932160, 0xe07e071d
+0,          0,          0,        0,  3932160, 0x109148ee
+0,         29,         29,        0,  3932160, 0xa87b7bff
+0,        129,        129,        0,  3932160, 0x00e14d16
+0,        239,        239,        0,  3932160, 0xbf8d7871
+0,        240,        240,        0,  3932160, 0x998ded98
+0,        339,        339,        0,  3932160, 0x9fcfeaaa
+0,        439,        439,        0,  3932160, 0xe0d1328f
+0,        440,        440,        0,  3932160, 0xde7e69a0
+0,        539,        539,        0,  3932160, 0xdbec5d90
+0,        540,        540,        0,  3932160, 0x5355cde3
+0,        649,        649,        0,  3932160, 0x4b3c6b11
+0,        739,        739,        0,  3932160, 0xcf5692b1
+0,        740,        740,        0,  3932160, 0x19d8366f
+0,        949,        949,        0,  3932160, 0xf80f3663
+0,       1439,       1439,        0,  3932160, 0xe2dc1cc7
+0,       3049,       3049,        0,  3932160, 0x3ae51cc7
+0,       3050,       3050,        0,  3932160, 0x10ecd14c
+0,       3149,       3149,        0,  3932160, 0xda0f1d1f
+0,       3150,       3150,        0,  3932160, 0x50bd3602
+0,       3449,       3449,        0,  3932160, 0xad2083ba
+0,       3450,       3450,        0,  3932160, 0xa5b388bd
+0,       3549,       3549,        0,  3932160, 0x37ae6d4f
+0,       3550,       3550,        0,  3932160, 0x436ee825
+0,       3749,       3749,        0,  3932160, 0x6c2ec178
+0,       3849,       3849,        0,  3932160, 0x6c3f389b
+0,       3850,       3850,        0,  3932160, 0x3c0421c1
+0,       3949,       3949,        0,  3932160, 0x861b0449
+0,       4049,       4049,        0,  3932160, 0x41640723



More information about the ffmpeg-cvslog mailing list