On Mon, Aug 28, 2017 at 06:08:53PM +0100, Mark Thompson wrote: > --- /dev/null > +++ b/tests/fate/cbs.mak > @@ -0,0 +1,76 @@ > + > +define FATE_CBS_SAMPLE_TEST > +FATE_CBS_$(1) += fate-cbs-$(1)-$(2) > +fate-cbs-$(1)-$(2): CMD = md5 -i $(TARGET_SAMPLES)/$(3) -c:v copy -bsf:v > $(1)_metadata -f $(1) > +endef
If you change this to -i $(TARGET_SAMPLES)/$(1)-conformance/$(3) > +$(foreach N,$(FATE_CBS_H264_SAMPLES),$(eval $(call > FATE_CBS_SAMPLE_TEST,h264,$(basename $(N)),h264-conformance/$(N)))) > + > +$(foreach N,$(FATE_CBS_HEVC_SAMPLES),$(eval $(call > FATE_CBS_SAMPLE_TEST,hevc,$(basename $(N)),hevc-conformance/$(N)))) You can drop the prefix to the third argument here. > +define FATE_CBS_ENCODE_TEST > +FATE_CBS_$(1) += fate-cbs-$(1)-$(2) > +fate-cbs-$(1)-$(2): $(3) > +fate-cbs-$(1)-$(2): CMD = md5 $(4) -i $(3) $(5) -c:v $(subst > mpeg2,mpeg2video,$(1)) -bsf:v $(1)_metadata -f $(subst mpeg2,mpeg2video,$(1)) > +endef > + > +$(eval $(call > FATE_CBS_ENCODE_TEST,mpeg2,progressive,tests/data/vsynth1.yuv,-f rawvideo -s > 352x288 -pix_fmt yuv420p,-qscale 10)) > +$(eval $(call > FATE_CBS_ENCODE_TEST,mpeg2,interlaced,tests/data/vsynth1.yuv,-f rawvideo -s > 352x288 -pix_fmt yuv420p,-qscale 10 -idct int -dct int -flags +ildct+ilme)) > +$(eval $(call FATE_CBS_ENCODE_TEST,mpeg2,yuv422,tests/data/vsynth1.yuv,-f > rawvideo -s 352x288 -pix_fmt yuv420p,-pix_fmt yuv422p -qscale 10)) The 3rd and 4th argument are always identical, so I'm not sure why you don't hardcode them above. Diego _______________________________________________ libav-devel mailing list libav-devel@libav.org https://lists.libav.org/mailman/listinfo/libav-devel