From d8f84e296d75c9da14277def43673752816d8e25 Mon Sep 17 00:00:00 2001 From: Andreas Rheinhardt Date: Thu, 28 Apr 2022 17:24:29 +0200 Subject: [PATCH] fate/canopus: Fix test requirements Signed-off-by: Andreas Rheinhardt --- tests/fate/canopus.mak | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/tests/fate/canopus.mak b/tests/fate/canopus.mak index 3d664ff911..4e50716813 100644 --- a/tests/fate/canopus.mak +++ b/tests/fate/canopus.mak @@ -8,7 +8,8 @@ fate-canopus-cllc-rgb: CMD = framecrc -i $(TARGET_SAMPLES)/cllc/sample-cllc-rgb. FATE_CANOPUS_CLLC += fate-canopus-cllc-yuy2-noblock fate-canopus-cllc-yuy2-noblock: CMD = framecrc -i $(TARGET_SAMPLES)/cllc/sample-cllc-yuy2-noblock.avi -FATE_SAMPLES_FFMPEG-$(call DEMDEC, AVI, CLLC) += $(FATE_CANOPUS_CLLC) +FATE_CANOPUS_CLLC := $(if $(call FRAMECRC, AVI, CLLC), $(FATE_CANOPUS_CLLC)) +FATE_SAMPLES_FFMPEG += $(FATE_CANOPUS_CLLC) fate-canopus-cllc: $(FATE_CANOPUS_CLLC) #lossy @@ -21,7 +22,8 @@ fate-canopus-hq_hqa-hqa: CMD = framecrc -i $(TARGET_SAMPLES)/canopus/hqa.avi FATE_CANOPUS_HQ_HQA += fate-canopus-hq_hqa-inter fate-canopus-hq_hqa-inter: CMD = framecrc -i $(TARGET_SAMPLES)/canopus/hq25i.avi -FATE_SAMPLES_FFMPEG-$(call DEMDEC, AVI, HQ_HQA) += $(FATE_CANOPUS_HQ_HQA) +FATE_CANOPUS_HQ_HQA := $(if $(call FRAMECRC, AVI, HQ_HQA), $(FATE_CANOPUS_HQ_HQA)) +FATE_SAMPLES_FFMPEG += $(FATE_CANOPUS_HQ_HQA) fate-canopus-hq_hqa: $(FATE_CANOPUS_HQ_HQA) FATE_CANOPUS_HQX += fate-canopus-hqx422 @@ -30,5 +32,6 @@ fate-canopus-hqx422: CMD = framecrc -i $(TARGET_SAMPLES)/canopus/hqx422.avi -pix FATE_CANOPUS_HQX += fate-canopus-hqx422a fate-canopus-hqx422a: CMD = framecrc -i $(TARGET_SAMPLES)/canopus/hqx422a.avi -pix_fmt yuv422p16be -an -vf scale -FATE_SAMPLES_FFMPEG-$(call DEMDEC, AVI, HQX) += $(FATE_CANOPUS_HQX) +FATE_CANOPUS_HQX := $(if $(call FRAMECRC, AVI, HQX, SCALE_FILTER), $(FATE_CANOPUS_HQX)) +FATE_SAMPLES_FFMPEG += $(FATE_CANOPUS_HQX) fate-canopus-hqx: $(FATE_CANOPUS_HQX)