diff options
| author | Michael Niedermayer | 2014-02-06 00:26:18 +0100 |
|---|---|---|
| committer | Michael Niedermayer | 2014-02-06 00:35:05 +0100 |
| commit | 927696aab258c7184ceac9765a305b5f91eef8dc (patch) | |
| tree | 309d7998698b88ac531d8bc6967cedd22388063f /tests | |
| parent | a3be0c334e8ba7e447a734aa2be862815e5daf85 (diff) | |
| parent | 5a0bccd2810d22b1dd515e650911212a310300de (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
fate: force the simple idct for xvid custom matrix test
Conflicts:
tests/fate/xvid.mak
tests/ref/fate/xvid-custom-matrix
See: ef034cbf185e1938000a117bd16aa6b33046f479
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/fate/xvid.mak | 5 | ||||
| -rw-r--r-- | tests/ref/fate/xvid-idctmmx | 25 |
2 files changed, 29 insertions, 1 deletions
diff --git a/tests/fate/xvid.mak b/tests/fate/xvid.mak index 2b593b59fb..68f01b5827 100644 --- a/tests/fate/xvid.mak +++ b/tests/fate/xvid.mak @@ -1,6 +1,9 @@ -fate-xvid-custom-matrix: CMD = framemd5 -flags +bitexact -idct simple -i $(TARGET_SAMPLES)/mpeg4/xvid_vlc_trac7411.h263 +fate-xvid-custom-matrix: CMD = framemd5 -flags +bitexact -idct simple -i $(TARGET_SAMPLES)/mpeg4/xvid_vlc_trac7411.h263 +fate-xvid-idctmmx: CMD = framemd5 -flags +bitexact -cpuflags all -i $(TARGET_SAMPLES)/mpeg4/xvid_vlc_trac7411.h263 FATE_XVID-$(call DEMDEC, M4V, MPEG4) += fate-xvid-custom-matrix +FATE_XVID-$(filter $(HAVE_MMX_INLINE), $(call DEMDEC, M4V, MPEG4)) += fate-xvid-idctmmx + FATE_SAMPLES_AVCONV += $(FATE_XVID-yes) fate-xvid: $(FATE_XVID-yes) diff --git a/tests/ref/fate/xvid-idctmmx b/tests/ref/fate/xvid-idctmmx new file mode 100644 index 0000000000..2fc93ee684 --- /dev/null +++ b/tests/ref/fate/xvid-idctmmx @@ -0,0 +1,25 @@ +#format: frame checksums +#version: 1 +#hash: MD5 +#tb 0: 1/25 +#stream#, dts, pts, duration, size, hash +0, 0, 0, 1, 622080, 8fe318df973b5d7669e6d28ebf03b229 +0, 1, 1, 1, 622080, 3568d92074e0298a2027f990004fe1a6 +0, 2, 2, 1, 622080, 4781afb6ba38318738e26a98ace4061b +0, 3, 3, 1, 622080, bd29a005b8392005ef30211f185ca049 +0, 4, 4, 1, 622080, fc50b441ee9256883edba5a584000d66 +0, 5, 5, 1, 622080, 5fce9fb7e66c9d0773ff9c7482cb8307 +0, 6, 6, 1, 622080, 2e0ad7b1ba39e60cdd7a65ed1ed57c30 +0, 7, 7, 1, 622080, b91cfdb91751dabd6691d3c34221b636 +0, 8, 8, 1, 622080, f65507bc00043e8fe345c542f0861a64 +0, 9, 9, 1, 622080, 2e4ee4ea4ec761c2298acced17f63f35 +0, 10, 10, 1, 622080, e7945bd07296205d1549c8edf843af48 +0, 11, 11, 1, 622080, 52fed0ec02c57a138de7dc0e0c804de8 +0, 12, 12, 1, 622080, 3ee2848d0d70795e14765127111a677c +0, 13, 13, 1, 622080, 42cb0929406b10b95817ffaa2da47335 +0, 14, 14, 1, 622080, 523986866b6cf729e130ea43feacb0a2 +0, 15, 15, 1, 622080, 5d1e4becddf728e93bbcb428de1f02ae +0, 16, 16, 1, 622080, 0a1453df21e4547447ec8f27a0d4d5ec +0, 17, 17, 1, 622080, d3495686e769df299b1732326fa3f17e +0, 18, 18, 1, 622080, 602e9020397b1e82b58b1ff6b9733d21 +0, 21, 21, 1, 622080, 759bd3f739a3b99309efa5c1a697e34d |