From e836a0b3fd6943f77f54d65ee4ac1005e71d1162 Mon Sep 17 00:00:00 2001 From: Rostislav Pehlivanov Date: Mon, 4 Dec 2017 10:50:23 +0000 Subject: [PATCH] fate-opus: update tests to use new decoder outputs Can't overwrite old ones. Signed-off-by: Rostislav Pehlivanov --- tests/fate/opus.mak | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/tests/fate/opus.mak b/tests/fate/opus.mak index 46e90168d6..36221ec265 100644 --- a/tests/fate/opus.mak +++ b/tests/fate/opus.mak @@ -2,21 +2,21 @@ # their custom format into Matroska. The reference decoded outputs are from the # newest testvectors file from RFC8251 -OPUS_CELT_SAMPLES = $(addprefix testvector, 01 07 11) tron.6ch.tinypkts +OPUS_CELT_SAMPLES = $(addprefix testvector, 11) tron.6ch.tinypkts OPUS_HYBRID_SAMPLES = $(addprefix testvector, 05 06) OPUS_SILK_SAMPLES = $(addprefix testvector, 02 03 04) -OPUS_SAMPLES = $(addprefix testvector, 08 09 10 12) +OPUS_SAMPLES = $(addprefix testvector, 08 10 12) define FATE_OPUS_TEST FATE_OPUS += fate-opus-$(1) FATE_OPUS$(2) += fate-opus-$(1) fate-opus-$(1): CMD = ffmpeg -i $(TARGET_SAMPLES)/opus/$(1).mka -f s16le - -fate-opus-$(1): REF = $(SAMPLES)/opus/$(1).dec +fate-opus-$(1): REF = $(SAMPLES)/opus/$(1)$(2).dec endef -$(foreach N,$(OPUS_CELT_SAMPLES), $(eval $(call FATE_OPUS_TEST,$(N),_CELT))) -$(foreach N,$(OPUS_HYBRID_SAMPLES),$(eval $(call FATE_OPUS_TEST,$(N),_HYBRID))) -$(foreach N,$(OPUS_SILK_SAMPLES), $(eval $(call FATE_OPUS_TEST,$(N),_SILK))) +$(foreach N,$(OPUS_CELT_SAMPLES), $(eval $(call FATE_OPUS_TEST,$(N)))) +$(foreach N,$(OPUS_HYBRID_SAMPLES),$(eval $(call FATE_OPUS_TEST,$(N),_v2))) +$(foreach N,$(OPUS_SILK_SAMPLES), $(eval $(call FATE_OPUS_TEST,$(N)))) $(foreach N,$(OPUS_SAMPLES), $(eval $(call FATE_OPUS_TEST,$(N),))) FATE_OPUS := $(sort $(FATE_OPUS)) @@ -24,7 +24,6 @@ FATE_OPUS := $(sort $(FATE_OPUS)) $(FATE_OPUS): CMP = stddev $(FATE_OPUS): CMP_UNIT = s16 $(FATE_OPUS): FUZZ = 3 -fate-opus-testvector01: CMP_TARGET = 1 fate-opus-testvector02: CMP_TARGET = 191 fate-opus-testvector03: CMP_TARGET = 139 fate-opus-testvector04: CMP_TARGET = 119