On Wed, Feb 05, 2014 at 02:06:25AM +0100, Janne Grunau wrote: > On 2014-02-04 22:54:51 +0100, Diego Biurrun wrote: > > On Fri, Jan 31, 2014 at 01:09:39PM +0100, Janne Grunau wrote: > > > fixes fate-xvid-custom-matrix on non-x86 architectures, suggestions > > > how to avoid the ugly $(FATE_XVID-yes-yes) are welcome. > > > --- 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) > > > > FATE_XVID-$(call ALLYES, HAVE_MMX M4V_DEMUXER MPEG4_DECODER) += > > fate-xvid-idctmmx > > > > should avoid the yes-yes issue > > ALLYES/XYES prepends a CONFIG_ to its arguments so it won't work with > HAVE_* and I don't think it would be a good idea to move that to every > caller of ALLYES. $(filter $(HAVE_MMX), $(call DEMDEC, M4V, MPEG4)) would > avoid the -yes-yes too.
That will work, yes, though I consider it a good bit more indirect and thus magical. > --- 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 -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 Alternatively, you could make this a two-stage variable, i.e. FATE_XVID-IDCT-$(call DEMDEC, M4V, MPEG4) += fate-xvid-idctmmx FATE_XVID-$(HAVE_MMX_INLINE) += $(FATE_XVID-IDCT-yes) Choose whatever you prefer. Diego _______________________________________________ libav-devel mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-devel
