fixes fate-xvid-custom-matrix on non-x86 architectures, suggestions how to avoid the ugly $(FATE_XVID-yes-yes) are welcome.
Janne ---8<--- Run the original test only when MMX is available. --- tests/fate/xvid.mak | 9 ++++++--- tests/ref/fate/xvid-custom-matrix | 40 +++++++++++++++++++-------------------- tests/ref/fate/xvid-idctmmx | 21 ++++++++++++++++++++ 3 files changed, 47 insertions(+), 23 deletions(-) create mode 100644 tests/ref/fate/xvid-idctmmx diff --git a/tests/fate/xvid.mak b/tests/fate/xvid.mak index 50ab231..7684a77 100644 --- a/tests/fate/xvid.mak +++ b/tests/fate/xvid.mak @@ -1,6 +1,9 @@ -fate-xvid-custom-matrix: CMD = framemd5 -i $(TARGET_SAMPLES)/mpeg4/xvid_vlc_trac7411.h263 +fate-xvid-custom-matrix: CMD = framemd5 -idct simple -i $(TARGET_SAMPLES)/mpeg4/xvid_vlc_trac7411.h263 +fate-xvid-idctmmx: CMD = framemd5 -i $(TARGET_SAMPLES)/mpeg4/xvid_vlc_trac7411.h263 FATE_XVID-$(call DEMDEC, M4V, MPEG4) += fate-xvid-custom-matrix -FATE_SAMPLES_AVCONV += $(FATE_XVID-yes) +FATE_XVID-$(HAVE_MMX)-$(call DEMDEC, M4V, MPEG4) += fate-xvid-idctmmx -fate-xvid: $(FATE_XVID-yes) +FATE_SAMPLES_AVCONV += $(FATE_XVID-yes) $(FATE_XVID-yes-yes) + +fate-xvid: $(FATE_XVID-yes) $(FATE_XVID-yes-yes) diff --git a/tests/ref/fate/xvid-custom-matrix b/tests/ref/fate/xvid-custom-matrix index 9ad6298..b357a5d 100644 --- a/tests/ref/fate/xvid-custom-matrix +++ b/tests/ref/fate/xvid-custom-matrix @@ -1,21 +1,21 @@ #tb 0: 1/25 -0, 1, 1, 1, 622080, fec19d49e4433046ac5f7a9f3dff2078 -0, 2, 2, 1, 622080, 77aa1a369ce3e180648eaccce95cb618 -0, 3, 3, 1, 622080, d3ff08bc77e247a4b033d37ff780c2a2 -0, 4, 4, 1, 622080, 362c6b7411f23134880b4ceeaf09aafb -0, 5, 5, 1, 622080, 52ba7f7611160ed9516a3b94dd889254 -0, 6, 6, 1, 622080, e11bf4956dfa43a760cdb8a6c46201eb -0, 7, 7, 1, 622080, 5305b5775b9481b136e84c0f1c2c52c7 -0, 8, 8, 1, 622080, 65510ff0135a41e5acc99071893c99b2 -0, 9, 9, 1, 622080, cab3a8991f0d404bb42386efb430abc7 -0, 10, 10, 1, 622080, b7a8305768527a9b54248e620a5e7117 -0, 11, 11, 1, 622080, 67adbfe7c321a2a74244d2a268de598a -0, 12, 12, 1, 622080, 9bcaed10aa15b8a5278c5c4840cfb9c8 -0, 13, 13, 1, 622080, 0e3065f441313496cb390ba1a6c92b11 -0, 14, 14, 1, 622080, f741816f762c000fc6fa77d9d1d96cdc -0, 15, 15, 1, 622080, 259686747b597c168440d5cfe75cdfbf -0, 16, 16, 1, 622080, d37341f0bea41b6d0421e984cd079673 -0, 17, 17, 1, 622080, 97428665f84e4364bdba768ad604bcdc -0, 18, 18, 1, 622080, 8c32ce967ee34df1ccbdf4e8b6aa8c8d -0, 19, 19, 1, 622080, 7fee903f21d29d6d8215fc04c8b3af34 -0, 20, 20, 1, 622080, 3d67c55cc62f0308cd4549c7ac46081a +0, 1, 1, 1, 622080, 9229a2630d7bcea68bb235b3f99e1778 +0, 2, 2, 1, 622080, 2c140b6dde552bccb201118b3ccd3ba3 +0, 3, 3, 1, 622080, 8eba2171b7e9fe370d4c3ac9e89144f6 +0, 4, 4, 1, 622080, f963d1e9d00da5ec21f489ac2cd4456f +0, 5, 5, 1, 622080, 6c5d0e8fae1767c70da70011470ca06e +0, 6, 6, 1, 622080, 612653518f6d199ccc73d676cee13e2e +0, 7, 7, 1, 622080, 259479ee0eed6f7d605f316987388ad2 +0, 8, 8, 1, 622080, 0a9c07b07b3f0cb516117e9948e1f4f7 +0, 9, 9, 1, 622080, 5bc31efdf08efb03f58babadb7c485d5 +0, 10, 10, 1, 622080, 7e93ef36e656d1a2af19977c9d2e88e4 +0, 11, 11, 1, 622080, 5573174371188016f2a2be2398b6f630 +0, 12, 12, 1, 622080, a7e6f44e75b9ea7abd43e0012a1217f4 +0, 13, 13, 1, 622080, a0aebb85ac6ec3e0a5dfa8897e41f08c +0, 14, 14, 1, 622080, cd7e2b6023460df3cd5812976f2afb84 +0, 15, 15, 1, 622080, 69839903514ae915fb87cf3ed0665f69 +0, 16, 16, 1, 622080, 67304dd1db199f38d91442b007a1160a +0, 17, 17, 1, 622080, 57e848983ffb33b1817496fbea06a859 +0, 18, 18, 1, 622080, 36b36b5d7a630b1b03c5b9333778c349 +0, 19, 19, 1, 622080, 73327e61a8fa8a2b182092f2f8d182a9 +0, 20, 20, 1, 622080, 6e146084467ab1bc21f043abb3624c3d diff --git a/tests/ref/fate/xvid-idctmmx b/tests/ref/fate/xvid-idctmmx new file mode 100644 index 0000000..9ad6298 --- /dev/null +++ b/tests/ref/fate/xvid-idctmmx @@ -0,0 +1,21 @@ +#tb 0: 1/25 +0, 1, 1, 1, 622080, fec19d49e4433046ac5f7a9f3dff2078 +0, 2, 2, 1, 622080, 77aa1a369ce3e180648eaccce95cb618 +0, 3, 3, 1, 622080, d3ff08bc77e247a4b033d37ff780c2a2 +0, 4, 4, 1, 622080, 362c6b7411f23134880b4ceeaf09aafb +0, 5, 5, 1, 622080, 52ba7f7611160ed9516a3b94dd889254 +0, 6, 6, 1, 622080, e11bf4956dfa43a760cdb8a6c46201eb +0, 7, 7, 1, 622080, 5305b5775b9481b136e84c0f1c2c52c7 +0, 8, 8, 1, 622080, 65510ff0135a41e5acc99071893c99b2 +0, 9, 9, 1, 622080, cab3a8991f0d404bb42386efb430abc7 +0, 10, 10, 1, 622080, b7a8305768527a9b54248e620a5e7117 +0, 11, 11, 1, 622080, 67adbfe7c321a2a74244d2a268de598a +0, 12, 12, 1, 622080, 9bcaed10aa15b8a5278c5c4840cfb9c8 +0, 13, 13, 1, 622080, 0e3065f441313496cb390ba1a6c92b11 +0, 14, 14, 1, 622080, f741816f762c000fc6fa77d9d1d96cdc +0, 15, 15, 1, 622080, 259686747b597c168440d5cfe75cdfbf +0, 16, 16, 1, 622080, d37341f0bea41b6d0421e984cd079673 +0, 17, 17, 1, 622080, 97428665f84e4364bdba768ad604bcdc +0, 18, 18, 1, 622080, 8c32ce967ee34df1ccbdf4e8b6aa8c8d +0, 19, 19, 1, 622080, 7fee903f21d29d6d8215fc04c8b3af34 +0, 20, 20, 1, 622080, 3d67c55cc62f0308cd4549c7ac46081a -- 1.8.5.3 _______________________________________________ libav-devel mailing list libav-devel@libav.org https://lists.libav.org/mailman/listinfo/libav-devel
