fate/opus: Restore fate-opus-(celt|hybrid|silk)

Also fix the test requirements.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt 2022-05-29 10:47:31 +02:00
parent 415f012359
commit 120aa6173c

View File

@ -5,21 +5,18 @@
OPUS_CELT_SAMPLES = $(addprefix testvector, 01 11) tron.6ch.tinypkts
OPUS_HYBRID_SAMPLES = $(addprefix testvector, 05 06)
OPUS_SILK_SAMPLES = $(addprefix testvector, 02 03 04)
OPUS_SAMPLES = $(addprefix testvector, 07 08 09 10 12)
OPUS_OTHER_SAMPLES = $(addprefix testvector, 07 08 09 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 -af aresample -
fate-opus-$(1): REF = $(SAMPLES)/opus/$(1)$(2).dec
FATE_OPUS_$(1)-$(call FILTERDEMDECENCMUX, ARESAMPLE, MATROSKA, OPUS, PCM_S16LE, PCM_S16LE, PIPE_PROTOCOL) := $(addprefix fate-opus-,$(OPUS_$(1)_SAMPLES))
FATE_OPUS += $$(FATE_OPUS_$(1)-yes)
endef
$(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),)))
$(foreach N, CELT HYBRID SILK OTHER, $(eval $(call FATE_OPUS_TEST,$(N))))
FATE_OPUS := $(sort $(FATE_OPUS))
$(FATE_OPUS): CMD = ffmpeg -i $(TARGET_SAMPLES)/opus/$(@:fate-opus-%=%).mka -f s16le -af aresample -
$(FATE_OPUS): REF = $(SAMPLES)/opus/$(@:fate-opus-%=%).dec
$(FATE_OPUS_HYBRID-yes): REF = $(SAMPLES)/opus/$(@:fate-opus-%=%)_v2.dec
$(FATE_OPUS): CMP = stddev
$(FATE_OPUS): CMP_UNIT = s16
@ -39,11 +36,8 @@ fate-opus-testvector12: CMP_TARGET = 160
fate-opus-tron.6ch.tinypkts: CMP_SHIFT = 1440
fate-opus-tron.6ch.tinypkts: CMP_TARGET = 0
$(FATE_OPUS_CELT): CMP = oneoff
$(FATE_OPUS_CELT): FUZZ = 6
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_SAMPLES_FFMPEG += $(FATE_OPUS)
fate-opus-celt: $(FATE_OPUS_CELT-yes)
fate-opus-hybrid: $(FATE_OPUS_HYBRID-yes)
fate-opus-silk: $(FATE_OPUS_SILK-yes)
fate-opus: $(FATE_OPUS)