Signed-off-by: James Almer <jamr...@gmail.com> --- tests/fate/cbs.mak | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/tests/fate/cbs.mak b/tests/fate/cbs.mak index 02560cfc84..54b58b7a4a 100644 --- a/tests/fate/cbs.mak +++ b/tests/fate/cbs.mak @@ -24,6 +24,12 @@ fate-cbs-$(1)-discard-$2: ffprobe$(PROGSSUF)$(EXESUF) tests/data/fate/cbs-$(1)-d fate-cbs-$(1)-discard-$2: CMD = ffprobe_demux $(TARGET_PATH)/tests/data/fate/cbs-$(1)-discard-$(2).$(4) endef +FATE_CBS_DISCARD_TYPE = \ + nonref \ + bidir \ + nonintra \ + nonkey + # AV1 read/write FATE_CBS_AV1_CONFORMANCE_SAMPLES = \ @@ -79,10 +85,7 @@ $(foreach N,$(FATE_CBS_H264_SAMPLES),$(eval $(call FATE_CBS_TEST,h264,$(basename FATE_CBS_H264-$(call FATE_CBS_DEPS, H264, H264, H264, H264, H264) = $(FATE_CBS_h264) -$(eval $(call FATE_CBS_DISCARD_TEST,h264,nonref,$(TARGET_SAMPLES)/h264/interlaced_crop.mp4,mp4)) -$(eval $(call FATE_CBS_DISCARD_TEST,h264,bidir,$(TARGET_SAMPLES)/h264/interlaced_crop.mp4,mp4)) -$(eval $(call FATE_CBS_DISCARD_TEST,h264,nonintra,$(TARGET_SAMPLES)/h264/interlaced_crop.mp4,mp4)) -$(eval $(call FATE_CBS_DISCARD_TEST,h264,nonkey,$(TARGET_SAMPLES)/h264/interlaced_crop.mp4,mp4)) +$(foreach N,$(FATE_CBS_DISCARD_TYPE),$(eval $(call FATE_CBS_DISCARD_TEST,h264,$(basename $(N)),$(TARGET_SAMPLES)/h264/interlaced_crop.mp4,mp4))) FATE_CBS_H264-$(call ALLYES, H264_DEMUXER, H264_PARSER, MP4_MUXER, MOV_DEMUXER, FILTER_UNITS_BSF) += $(FATE_CBS_h264_DISCARD) @@ -153,10 +156,7 @@ $(foreach N,$(FATE_CBS_HEVC_SAMPLES),$(eval $(call FATE_CBS_TEST,hevc,$(basename FATE_CBS_HEVC-$(call FATE_CBS_DEPS, HEVC, HEVC, HEVC, HEVC, HEVC) = $(FATE_CBS_hevc) -$(eval $(call FATE_CBS_DISCARD_TEST,hevc,nonref,$(TARGET_SAMPLES)/hevc-conformance/WPP_A_ericsson_MAIN10_2.bit,mp4)) -$(eval $(call FATE_CBS_DISCARD_TEST,hevc,bidir,$(TARGET_SAMPLES)/hevc-conformance/WPP_A_ericsson_MAIN10_2.bit,mp4)) -$(eval $(call FATE_CBS_DISCARD_TEST,hevc,nonintra,$(TARGET_SAMPLES)/hevc-conformance/WPP_A_ericsson_MAIN10_2.bit,mp4)) -$(eval $(call FATE_CBS_DISCARD_TEST,hevc,nonkey,$(TARGET_SAMPLES)/hevc-conformance/WPP_A_ericsson_MAIN10_2.bit,mp4)) +$(foreach N,$(FATE_CBS_DISCARD_TYPE),$(eval $(call FATE_CBS_DISCARD_TEST,hevc,$(basename $(N)),$(TARGET_SAMPLES)/hevc-conformance/WPP_A_ericsson_MAIN10_2.bit,mp4))) FATE_CBS_HEVC-$(call ALLYES, HEVC_DEMUXER, HEVC_PARSER, MP4_MUXER, MOV_DEMUXER, FILTER_UNITS_BSF) += $(FATE_CBS_hevc_DISCARD) -- 2.41.0 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
