From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id DD70C464B8 for ; Mon, 19 Jun 2023 14:16:00 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D909268C00B; Mon, 19 Jun 2023 17:15:43 +0300 (EEST) Received: from mail-oa1-f53.google.com (mail-oa1-f53.google.com [209.85.160.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E0B3868BF90 for ; Mon, 19 Jun 2023 17:15:36 +0300 (EEST) Received: by mail-oa1-f53.google.com with SMTP id 586e51a60fabf-1aa30191d08so470765fac.0 for ; Mon, 19 Jun 2023 07:15:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687184135; x=1689776135; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=w1gRhsFRKmw4V2ucU/XU8Azh07gIs/s56sjbSLN1/k4=; b=fnHshqt5qmjrsShINfDaQVaniH/QDRduM+wkNAJ917IsLaFakxoGw5QI6tpfBQoRKO OoSHz4/JZfBavfRmtN+qLT77aVYBhwDFyZlq+XXpnefHbrg94a7/iBdhi5diVywsvFj3 d+/0bGGA1h8Ju+U5DgJ+4UqoBLA7inaPhpZzijjhpwC3tH3ebjCo+nPje7TpdGhFuRC/ 7J1CUrlgjuvytxfOFEPk6FEwE7K5K4EmawsL8fKXF8D4dgY/cpJ/JznBgPqWkIlMtEtw YIoWmsEHisFq3zn2zG0suxQQeV0a0StI85Ve1zRk9GVBiUTDvcQysCLxZHllKe81zyK6 Xw6Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687184135; x=1689776135; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=w1gRhsFRKmw4V2ucU/XU8Azh07gIs/s56sjbSLN1/k4=; b=B9gc8p//hq9tYYcUZLX0IjOIsKJ2EkisjYStAOgMflgER/sA6ROtStk6RLC2pBx/Mh n2V05v/Mtaw53sk9Dk9SW3aWCKOYKvCni1H6Rh6CREBC4tFnxzhaITXHwwiE7Xzq3BPk hn1tmFr+Su5ynLlYLvk/ZvDPb1u5RE5rmpEzAmTvDbXAnhq5aHkjd/z3WAbbBdL2OOmE r0vjgCLd3Q97EIxw9aSeN3SkBTKRubsK/0qya9okdaOJNbNCnSgkPNjkLL8OOCbl1jcp 6mNM5shfDTY1IcsLq+8K7aKE3dTMtEhuMGZmLjHCnR3Aw3kKp2P+4W3T2t4x7qXc98Dc +F7g== X-Gm-Message-State: AC+VfDznyQOBv+ps5jFrXJjM+IcvLTK2VD1BROyH9bs/lsBaEXtWSDCu 7HaDqIWPVmck41AYI8IdZE4xmn8L90A= X-Google-Smtp-Source: ACHHUZ7PBi6kzVC+Ln+UTCwFgt4Ku61hyuuaxIRzT1PW/dY/ntTPjsMxgXwIvqp/FnZkDuqeBkj8kw== X-Received: by 2002:a05:6870:8a28:b0:196:5d42:b979 with SMTP id p40-20020a0568708a2800b001965d42b979mr4061104oaq.3.1687184135157; Mon, 19 Jun 2023 07:15:35 -0700 (PDT) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id ge8-20020a056870668800b001a6ce511fa2sm2396141oab.2.2023.06.19.07.15.33 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Jun 2023 07:15:34 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 19 Jun 2023 11:15:28 -0300 Message-ID: <20230619141528.5382-3-jamrial@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230619141528.5382-1-jamrial@gmail.com> References: <20230619141528.5382-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/3] fate/cbs: simplify calling discard tests X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Signed-off-by: James Almer --- 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".