aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-05-25 01:56:13 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-05-28 23:12:46 +0200
commitd228271813ab2c2a3196dcff813cee93c791dbda (patch)
treebdf68b0ca2549c2f650d1af599803922fb3de967
parentc3ee6e3153c30d01e120a9fbcd167c435ea6a70f (diff)
downloadffmpeg-d228271813ab2c2a3196dcff813cee93c791dbda.tar.gz
tests/fate/opus: change test to use the official reference samples
The official samples are 50% smaller Avoid having reference samples which are strongly linked to the used resampler implementation. (which for example would require new samples to be used if this implementation changes) Also its more correct to use the official samples instead of the current decoder output also enable tests The tests also fully pass as well with the previous samples. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--tests/fate/opus.mak16
1 files changed, 12 insertions, 4 deletions
diff --git a/tests/fate/opus.mak b/tests/fate/opus.mak
index ad9ec57096..8470e64e04 100644
--- a/tests/fate/opus.mak
+++ b/tests/fate/opus.mak
@@ -14,8 +14,8 @@ OPUS_SAMPLES = $(addprefix testvector, 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 f32le -
-fate-opus-$(1): REF = $(TARGET_SAMPLES)/opus/$(1).f32
+fate-opus-$(1): CMD = ffmpeg -i $(TARGET_SAMPLES)/opus/$(1).mka -f s16le -
+fate-opus-$(1): REF = $(TARGET_SAMPLES)/opus/$(1).dec
endef
$(foreach N,$(OPUS_CELT_SAMPLES), $(eval $(call FATE_OPUS_TEST,$(N),_CELT)))
@@ -26,13 +26,21 @@ $(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): CMP_UNIT = s16
$(FATE_OPUS): FUZZ = 3
+fate-opus-testvector02: CMP_TARGET = 191
+fate-opus-testvector03: CMP_TARGET = 139
+fate-opus-testvector04: CMP_TARGET = 119
+fate-opus-testvector05: CMP_TARGET = 108
+fate-opus-testvector06: CMP_TARGET = 106
+fate-opus-testvector08: CMP_TARGET = 6
+fate-opus-testvector10: CMP_TARGET = 38
+fate-opus-testvector12: CMP_TARGET = 160
$(FATE_OPUS_CELT): CMP = oneoff
$(FATE_OPUS_CELT): FUZZ = 6
-#FATE_SAMPLES_AVCONV-$(call DEMDEC, MATROSKA, OPUS) += $(FATE_OPUS)
+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)