use stddev test for any sample using the silk decoder
add fate-opus-celt/hybrid/silk for tests which use one mode exclusively
---
 tests/fate/opus.mak | 28 ++++++++++++++++++++++------
 1 file changed, 22 insertions(+), 6 deletions(-)

diff --git a/tests/fate/opus.mak b/tests/fate/opus.mak
index 3182c64..6c8bc9b 100644
--- a/tests/fate/opus.mak
+++ b/tests/fate/opus.mak
@@ -5,19 +5,35 @@
 # output as reference directly, because the use of different resamplers would
 # require too high fuzz values, which can hide bugs.
 # Before adding new tests here, always make sure they pass opus_compare.
-TESTVECTORS = 01 02 03 04 05 06 07 08 09 10 11 12
-OPUS_SAMPLES = $(addprefix testvector, $(TESTVECTORS)) tron.6ch.tinypkts
+
+OPUS_CELT_SAMPLES   = $(addprefix testvector, 01 07 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)
 
 define FATE_OPUS_TEST
-FATE_OPUS += fate-opus-$(1)
+FATE_OPUS     += fate-opus-$(1)
+FATE_OPUS$(2) += fate-opus-$(1)
 fate-opus-$(1): CMD = avconv -i $(TARGET_SAMPLES)/opus/$(1).mka -f f32le -
 fate-opus-$(1): REF = $(TARGET_SAMPLES)/opus/$(1).f32
 endef
 
-$(foreach N,$(OPUS_SAMPLES),$(eval $(call FATE_OPUS_TEST,$(N))))
-$(FATE_OPUS): CMP = oneoff
+$(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_SAMPLES),       $(eval $(call FATE_OPUS_TEST,$(N),)))
+
+FATE_OPUS := $(sort $(FATE_OPUS))
+
+$(FATE_OPUS): CMP = stddev
 $(FATE_OPUS): CMP_UNIT = f32
-$(FATE_OPUS): FUZZ = 2
+$(FATE_OPUS): FUZZ = 3
+
+$(FATE_OPUS_CELT): CMP = oneoff
+$(FATE_OPUS_CELT): FUZZ = 5
 
 FATE_SAMPLES_AVCONV-$(call DEMDEC, MATROSKA, OPUS) += $(FATE_OPUS)
+fate-opus-celt: $(FATE_OPUS_CELT)
+fate-opus-hybrid: $(FATE_OPUS_HYBRID)
+fate-opus-silk: $(FATE_OPUS_SILK)
 fate-opus: $(FATE_OPUS)
-- 
1.9.2

_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel

Reply via email to