From: James Almer <jamrial@gmail.com>
To: ffmpeg-devel@ffmpeg.org
Subject: [FFmpeg-devel] [PATCH 3/3] fate/cbs: simplify calling discard tests
Date: Mon, 19 Jun 2023 11:15:28 -0300
Message-ID: <20230619141528.5382-3-jamrial@gmail.com> (raw)
In-Reply-To: <20230619141528.5382-1-jamrial@gmail.com>
Signed-off-by: James Almer <jamrial@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-request@ffmpeg.org with subject "unsubscribe".
prev parent reply other threads:[~2023-06-19 14:16 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-19 14:15 [FFmpeg-devel] [PATCH 1/3] fate/cbs: remove unnecessary remuxing step on hevc-discard tests James Almer
2023-06-19 14:15 ` [FFmpeg-devel] [PATCH 2/3] fate/cbs: fix h264-discard dependencies James Almer
2023-06-19 14:15 ` James Almer [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230619141528.5382-3-jamrial@gmail.com \
--to=jamrial@gmail.com \
--cc=ffmpeg-devel@ffmpeg.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
This inbox may be cloned and mirrored by anyone:
git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
ffmpegdev@gitmailbox.com
public-inbox-index ffmpegdev
Example config snippet for mirrors.
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git