Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
 help / color / mirror / Atom feed
From: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
To: ffmpeg-devel@ffmpeg.org
Cc: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
Subject: [FFmpeg-devel] [PATCH 1/6] fate/opus: Restore fate-opus-(celt|hybrid|silk)
Date: Mon, 30 May 2022 15:59:42 +0200
Message-ID: <DB6PR0101MB2214DBC86F49EDDF15D59BC88FDD9@DB6PR0101MB2214.eurprd01.prod.exchangelabs.com> (raw)

Also fix the test requirements.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
 tests/fate/opus.mak | 28 +++++++++++-----------------
 1 file changed, 11 insertions(+), 17 deletions(-)

diff --git a/tests/fate/opus.mak b/tests/fate/opus.mak
index cf8eeb555d..573044ed15 100644
--- a/tests/fate/opus.mak
+++ b/tests/fate/opus.mak
@@ -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)
-- 
2.32.0

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

             reply	other threads:[~2022-05-30 14:00 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-05-30 13:59 Andreas Rheinhardt [this message]
2022-05-30 14:03 ` [FFmpeg-devel] [PATCH 2/5] avcodec/wavpack: Remove redundant av_channel_layout_uninit() Andreas Rheinhardt
2022-05-30 14:03 ` [FFmpeg-devel] [PATCH 3/5] fate/wavpack: Fix test requirements Andreas Rheinhardt
2022-05-30 14:03 ` [FFmpeg-devel] [PATCH 4/5] fate/wavpack: Avoid temp files Andreas Rheinhardt
2022-05-30 14:03 ` [FFmpeg-devel] [PATCH 5/5] fate/wavpack: Test APE cuesheet tags Andreas Rheinhardt

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=DB6PR0101MB2214DBC86F49EDDF15D59BC88FDD9@DB6PR0101MB2214.eurprd01.prod.exchangelabs.com \
    --to=andreas.rheinhardt@outlook.com \
    --cc=ffmpeg-devel@ffmpeg.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
		ffmpegdev@gitmailbox.com
	public-inbox-index ffmpegdev

Example config snippet for mirrors.


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git