[FFmpeg-devel] [PATCH 1/6] fate/opus: Restore fate-opus-(celt|hybrid|silk)

[FFmpeg-devel] [PATCH 1/6] fate/opus: Restore fate-opus-(celt|hybrid|silk)

[Andreas Rheinhardt]

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".

[FFmpeg-devel] [PATCH 2/5] avcodec/wavpack: Remove redundant av_channel_layout_uninit()

[Andreas Rheinhardt]

av_channel_layout_copy() will uninit the dst channel layout
before copying the new one.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
 libavcodec/wavpack.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/libavcodec/wavpack.c b/libavcodec/wavpack.c
index efd9e0fdd0..8bfbb654e8 100644
--- a/libavcodec/wavpack.c
+++ b/libavcodec/wavpack.c
@@ -1541,7 +1541,6 @@ static int wavpack_decode_block(AVCodecContext *avctx, int block_no,
             }
             ff_thread_release_ext_buffer(avctx, &wc->curr_frame);
         }
-        av_channel_layout_uninit(&avctx->ch_layout);
         av_channel_layout_copy(&avctx->ch_layout, &new_ch_layout);
         avctx->sample_rate         = new_samplerate;
         avctx->sample_fmt          = sample_fmt;
-- 
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".

[FFmpeg-devel] [PATCH 3/5] fate/wavpack: Fix test requirements

[Andreas Rheinhardt]

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
 tests/fate/wavpack.mak | 66 ++++++++++++++++++++++--------------------
 1 file changed, 35 insertions(+), 31 deletions(-)

diff --git a/tests/fate/wavpack.mak b/tests/fate/wavpack.mak
index 8a15e536cc..dc9cc29268 100644
--- a/tests/fate/wavpack.mak
+++ b/tests/fate/wavpack.mak
@@ -1,102 +1,106 @@
-FATE_WAVPACK-$(call DEMDEC, WV, WAVPACK) += $(FATE_WAVPACK)
-
 # lossless
 
-FATE_WAVPACK-$(call DEMDEC, WV, WAVPACK) += fate-wavpack-lossless-8bit
+FATE_WAVPACK_S8 += fate-wavpack-lossless-8bit
 fate-wavpack-lossless-8bit: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/lossless/8bit-partial.wv -f s8 -af aresample
 
-FATE_WAVPACK-$(call DEMDEC, WV, WAVPACK) += fate-wavpack-lossless-12bit
+FATE_WAVPACK_S16 += fate-wavpack-lossless-12bit
 fate-wavpack-lossless-12bit: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/lossless/12bit-partial.wv -f s16le -af aresample
 
-FATE_WAVPACK-$(call DEMDEC, WV, WAVPACK) += fate-wavpack-lossless-16bit
+FATE_WAVPACK_S16 += fate-wavpack-lossless-16bit
 fate-wavpack-lossless-16bit: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/lossless/16bit-partial.wv -f s16le -af aresample
 
-FATE_WAVPACK-$(call DEMDEC, WV, WAVPACK) += fate-wavpack-lossless-24bit
+FATE_WAVPACK_S24 += fate-wavpack-lossless-24bit
 fate-wavpack-lossless-24bit: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/lossless/24bit-partial.wv -f s24le -af aresample
 
-FATE_WAVPACK-$(call DEMDEC, WV, WAVPACK) += fate-wavpack-lossless-32bit
+FATE_WAVPACK_S32 += fate-wavpack-lossless-32bit
 fate-wavpack-lossless-32bit: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/lossless/32bit_int-partial.wv -f s32le -af aresample
 
-FATE_WAVPACK-$(call DEMDEC, WV, WAVPACK) += fate-wavpack-lossless-float
+FATE_WAVPACK_F32 += fate-wavpack-lossless-float
 fate-wavpack-lossless-float: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/lossless/32bit_float-partial.wv -f f32le -af aresample
 
 # lossy
 
-FATE_WAVPACK-$(call DEMDEC, WV, WAVPACK) += fate-wavpack-lossy-8bit
+FATE_WAVPACK_S8 += fate-wavpack-lossy-8bit
 fate-wavpack-lossy-8bit: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/lossy/4.0_8-bit.wv -f s8 -af aresample
 
-FATE_WAVPACK-$(call DEMDEC, WV, WAVPACK) += fate-wavpack-lossy-16bit
+FATE_WAVPACK_S16 += fate-wavpack-lossy-16bit
 fate-wavpack-lossy-16bit: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/lossy/4.0_16-bit.wv -f s16le -af aresample
 
-FATE_WAVPACK-$(call DEMDEC, WV, WAVPACK) += fate-wavpack-lossy-24bit
+FATE_WAVPACK_S24 += fate-wavpack-lossy-24bit
 fate-wavpack-lossy-24bit: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/lossy/4.0_24-bit.wv -f s24le -af aresample
 
-FATE_WAVPACK-$(call DEMDEC, WV, WAVPACK) += fate-wavpack-lossy-32bit
+FATE_WAVPACK_S32 += fate-wavpack-lossy-32bit
 fate-wavpack-lossy-32bit: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/lossy/4.0_32-bit_int.wv -f s32le -af aresample
 
-FATE_WAVPACK-$(call DEMDEC, WV, WAVPACK) += fate-wavpack-lossy-float
+FATE_WAVPACK_F32 += fate-wavpack-lossy-float
 fate-wavpack-lossy-float: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/lossy/2.0_32-bit_float.wv -f f32le -af aresample
 
 # channel configurations
 
-FATE_WAVPACK-$(call DEMDEC, WV, WAVPACK) += fate-wavpack-channels-monofloat
+FATE_WAVPACK_F32 += fate-wavpack-channels-monofloat
 fate-wavpack-channels-monofloat: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/num_channels/mono_float-partial.wv -f f32le -af aresample
 
-FATE_WAVPACK-$(call DEMDEC, WV, WAVPACK) += fate-wavpack-channels-monoint
+FATE_WAVPACK_S16 += fate-wavpack-channels-monoint
 fate-wavpack-channels-monoint: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/num_channels/mono_16bit_int.wv -f s16le -af aresample
 
-FATE_WAVPACK-$(call DEMDEC, WV, WAVPACK) += fate-wavpack-channels-4.0
+FATE_WAVPACK_S16 += fate-wavpack-channels-4.0
 fate-wavpack-channels-4.0: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/num_channels/edward_4.0_16bit-partial.wv -f s16le -af aresample
 
-FATE_WAVPACK-$(call DEMDEC, WV, WAVPACK) += fate-wavpack-channels-5.1
+FATE_WAVPACK_S16 += fate-wavpack-channels-5.1
 fate-wavpack-channels-5.1: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/num_channels/panslab_sample_5.1_16bit-partial.wv -f s16le -af aresample
 
-FATE_WAVPACK-$(call DEMDEC, WV, WAVPACK) += fate-wavpack-channels-6.1
+FATE_WAVPACK_S16 += fate-wavpack-channels-6.1
 fate-wavpack-channels-6.1: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/num_channels/eva_2.22_6.1_16bit-partial.wv -f s16le -af aresample
 
-FATE_WAVPACK-$(call DEMDEC, WV, WAVPACK) += fate-wavpack-channels-7.1
+FATE_WAVPACK_S16 += fate-wavpack-channels-7.1
 fate-wavpack-channels-7.1: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/num_channels/panslab_sample_7.1_16bit-partial.wv -f s16le -af aresample
 
 # speed modes
 
-FATE_WAVPACK-$(call DEMDEC, WV, WAVPACK) += fate-wavpack-speed-default
+FATE_WAVPACK_S16 += fate-wavpack-speed-default
 fate-wavpack-speed-default: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/speed_modes/default-partial.wv  -f s16le -af aresample
 
-FATE_WAVPACK-$(call DEMDEC, WV, WAVPACK) += fate-wavpack-speed-fast
+FATE_WAVPACK_S16 += fate-wavpack-speed-fast
 fate-wavpack-speed-fast: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/speed_modes/fast-partial.wv  -f s16le -af aresample
 
-FATE_WAVPACK-$(call DEMDEC, WV, WAVPACK) += fate-wavpack-speed-high
+FATE_WAVPACK_S16 += fate-wavpack-speed-high
 fate-wavpack-speed-high: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/speed_modes/high-partial.wv  -f s16le -af aresample
 
-FATE_WAVPACK-$(call DEMDEC, WV, WAVPACK) += fate-wavpack-speed-vhigh
+FATE_WAVPACK_S16 += fate-wavpack-speed-vhigh
 fate-wavpack-speed-vhigh: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/speed_modes/vhigh-partial.wv  -f s16le -af aresample
 
 # special cases
 
-FATE_WAVPACK-$(call DEMDEC, WV, WAVPACK) += fate-wavpack-clipping
+FATE_WAVPACK_S16 += fate-wavpack-clipping
 fate-wavpack-clipping: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/special/clipping.wv -f s16le -af aresample
 
-FATE_WAVPACK-$(call DEMDEC, WV, WAVPACK) += fate-wavpack-cuesheet
+FATE_WAVPACK_S16 += fate-wavpack-cuesheet
 fate-wavpack-cuesheet: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/special/cue_sheet.wv -f s16le -af aresample
 
-FATE_WAVPACK-$(call DEMDEC, WV, WAVPACK) += fate-wavpack-falsestereo
+FATE_WAVPACK_S16 += fate-wavpack-falsestereo
 fate-wavpack-falsestereo: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/special/false_stereo.wv -f s16le -af aresample
 
-FATE_WAVPACK-$(call DEMDEC, WV, WAVPACK) += fate-wavpack-zerolsbs
+FATE_WAVPACK_S16 += fate-wavpack-zerolsbs
 fate-wavpack-zerolsbs: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/special/zero_lsbs.wv -f s16le -af aresample
 
-FATE_WAVPACK-$(call DEMDEC, MATROSKA, WAVPACK) += fate-wavpack-matroskamode
+FATE_WAVPACK-$(call FILTERDEMDECENCMUX, ARESAMPLE, MATROSKA, WAVPACK, PCM_S16LE, PCM_S16LE) += fate-wavpack-matroskamode
 fate-wavpack-matroskamode: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/special/matroska_mode.mka -f s16le -af aresample
 
-FATE_WAVPACK-$(call DEMMUX, WV, MATROSKA) += fate-wavpack-matroska_mux-mono
+FATE_WAVPACK-$(call DEMMUX, WV, MATROSKA, MD5_PROTOCOL) += fate-wavpack-matroska_mux-mono
 fate-wavpack-matroska_mux-mono: CMD = md5pipe -i $(TARGET_SAMPLES)/wavpack/num_channels/mono_16bit_int.wv -c copy -fflags +bitexact -f matroska
 fate-wavpack-matroska_mux-mono: CMP = oneline
 fate-wavpack-matroska_mux-mono: REF = 5863eb94f7583aa9c5fded17474f2e7c
 
-FATE_WAVPACK-$(call DEMMUX, WV, MATROSKA) += fate-wavpack-matroska_mux-61
+FATE_WAVPACK-$(call DEMMUX, WV, MATROSKA, MD5_PROTOCOL) += fate-wavpack-matroska_mux-61
 fate-wavpack-matroska_mux-61: CMD = md5pipe -i $(TARGET_SAMPLES)/wavpack/num_channels/eva_2.22_6.1_16bit-partial.wv -c copy -fflags +bitexact -f matroska
 fate-wavpack-matroska_mux-61: CMP = oneline
 fate-wavpack-matroska_mux-61: REF = 2bbb393d060fa841f1172028f2c69b3a
 
-FATE_SAMPLES_AVCONV += $(FATE_WAVPACK-yes)
+FATE_WAVPACK-$(call FILTERDEMDECENCMUX, ARESAMPLE, WV, WAVPACK, PCM_S8,    PCM_S8)    += $(FATE_WAVPACK_S8)
+FATE_WAVPACK-$(call FILTERDEMDECENCMUX, ARESAMPLE, WV, WAVPACK, PCM_S16LE, PCM_S16LE) += $(FATE_WAVPACK_S16)
+FATE_WAVPACK-$(call FILTERDEMDECENCMUX, ARESAMPLE, WV, WAVPACK, PCM_S24LE, PCM_S24LE) += $(FATE_WAVPACK_S24)
+FATE_WAVPACK-$(call FILTERDEMDECENCMUX, ARESAMPLE, WV, WAVPACK, PCM_S32LE, PCM_S32LE) += $(FATE_WAVPACK_S32)
+FATE_WAVPACK-$(call FILTERDEMDECENCMUX, ARESAMPLE, WV, WAVPACK, PCM_F32LE, PCM_F32LE) += $(FATE_WAVPACK_F32)
+
+FATE_SAMPLES_FFMPEG += $(FATE_WAVPACK-yes)
 fate-wavpack: $(FATE_WAVPACK-yes)
-- 
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".

[FFmpeg-devel] [PATCH 4/5] fate/wavpack: Avoid temp files

[Andreas Rheinhardt]

Use the md5 protocol instead of creating a file just to calculate
its MD5 checksum. This is possible because there are no output seeks
involved in any of these tests.

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

diff --git a/tests/fate/wavpack.mak b/tests/fate/wavpack.mak
index dc9cc29268..900e509aba 100644
--- a/tests/fate/wavpack.mak
+++ b/tests/fate/wavpack.mak
@@ -1,90 +1,90 @@
 # lossless
 
 FATE_WAVPACK_S8 += fate-wavpack-lossless-8bit
-fate-wavpack-lossless-8bit: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/lossless/8bit-partial.wv -f s8 -af aresample
+fate-wavpack-lossless-8bit: CMD = md5pipe -i $(TARGET_SAMPLES)/wavpack/lossless/8bit-partial.wv -f s8 -af aresample
 
 FATE_WAVPACK_S16 += fate-wavpack-lossless-12bit
-fate-wavpack-lossless-12bit: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/lossless/12bit-partial.wv -f s16le -af aresample
+fate-wavpack-lossless-12bit: CMD = md5pipe -i $(TARGET_SAMPLES)/wavpack/lossless/12bit-partial.wv -f s16le -af aresample
 
 FATE_WAVPACK_S16 += fate-wavpack-lossless-16bit
-fate-wavpack-lossless-16bit: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/lossless/16bit-partial.wv -f s16le -af aresample
+fate-wavpack-lossless-16bit: CMD = md5pipe -i $(TARGET_SAMPLES)/wavpack/lossless/16bit-partial.wv -f s16le -af aresample
 
 FATE_WAVPACK_S24 += fate-wavpack-lossless-24bit
-fate-wavpack-lossless-24bit: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/lossless/24bit-partial.wv -f s24le -af aresample
+fate-wavpack-lossless-24bit: CMD = md5pipe -i $(TARGET_SAMPLES)/wavpack/lossless/24bit-partial.wv -f s24le -af aresample
 
 FATE_WAVPACK_S32 += fate-wavpack-lossless-32bit
-fate-wavpack-lossless-32bit: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/lossless/32bit_int-partial.wv -f s32le -af aresample
+fate-wavpack-lossless-32bit: CMD = md5pipe -i $(TARGET_SAMPLES)/wavpack/lossless/32bit_int-partial.wv -f s32le -af aresample
 
 FATE_WAVPACK_F32 += fate-wavpack-lossless-float
-fate-wavpack-lossless-float: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/lossless/32bit_float-partial.wv -f f32le -af aresample
+fate-wavpack-lossless-float: CMD = md5pipe -i $(TARGET_SAMPLES)/wavpack/lossless/32bit_float-partial.wv -f f32le -af aresample
 
 # lossy
 
 FATE_WAVPACK_S8 += fate-wavpack-lossy-8bit
-fate-wavpack-lossy-8bit: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/lossy/4.0_8-bit.wv -f s8 -af aresample
+fate-wavpack-lossy-8bit: CMD = md5pipe -i $(TARGET_SAMPLES)/wavpack/lossy/4.0_8-bit.wv -f s8 -af aresample
 
 FATE_WAVPACK_S16 += fate-wavpack-lossy-16bit
-fate-wavpack-lossy-16bit: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/lossy/4.0_16-bit.wv -f s16le -af aresample
+fate-wavpack-lossy-16bit: CMD = md5pipe -i $(TARGET_SAMPLES)/wavpack/lossy/4.0_16-bit.wv -f s16le -af aresample
 
 FATE_WAVPACK_S24 += fate-wavpack-lossy-24bit
-fate-wavpack-lossy-24bit: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/lossy/4.0_24-bit.wv -f s24le -af aresample
+fate-wavpack-lossy-24bit: CMD = md5pipe -i $(TARGET_SAMPLES)/wavpack/lossy/4.0_24-bit.wv -f s24le -af aresample
 
 FATE_WAVPACK_S32 += fate-wavpack-lossy-32bit
-fate-wavpack-lossy-32bit: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/lossy/4.0_32-bit_int.wv -f s32le -af aresample
+fate-wavpack-lossy-32bit: CMD = md5pipe -i $(TARGET_SAMPLES)/wavpack/lossy/4.0_32-bit_int.wv -f s32le -af aresample
 
 FATE_WAVPACK_F32 += fate-wavpack-lossy-float
-fate-wavpack-lossy-float: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/lossy/2.0_32-bit_float.wv -f f32le -af aresample
+fate-wavpack-lossy-float: CMD = md5pipe -i $(TARGET_SAMPLES)/wavpack/lossy/2.0_32-bit_float.wv -f f32le -af aresample
 
 # channel configurations
 
 FATE_WAVPACK_F32 += fate-wavpack-channels-monofloat
-fate-wavpack-channels-monofloat: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/num_channels/mono_float-partial.wv -f f32le -af aresample
+fate-wavpack-channels-monofloat: CMD = md5pipe -i $(TARGET_SAMPLES)/wavpack/num_channels/mono_float-partial.wv -f f32le -af aresample
 
 FATE_WAVPACK_S16 += fate-wavpack-channels-monoint
-fate-wavpack-channels-monoint: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/num_channels/mono_16bit_int.wv -f s16le -af aresample
+fate-wavpack-channels-monoint: CMD = md5pipe -i $(TARGET_SAMPLES)/wavpack/num_channels/mono_16bit_int.wv -f s16le -af aresample
 
 FATE_WAVPACK_S16 += fate-wavpack-channels-4.0
-fate-wavpack-channels-4.0: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/num_channels/edward_4.0_16bit-partial.wv -f s16le -af aresample
+fate-wavpack-channels-4.0: CMD = md5pipe -i $(TARGET_SAMPLES)/wavpack/num_channels/edward_4.0_16bit-partial.wv -f s16le -af aresample
 
 FATE_WAVPACK_S16 += fate-wavpack-channels-5.1
-fate-wavpack-channels-5.1: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/num_channels/panslab_sample_5.1_16bit-partial.wv -f s16le -af aresample
+fate-wavpack-channels-5.1: CMD = md5pipe -i $(TARGET_SAMPLES)/wavpack/num_channels/panslab_sample_5.1_16bit-partial.wv -f s16le -af aresample
 
 FATE_WAVPACK_S16 += fate-wavpack-channels-6.1
-fate-wavpack-channels-6.1: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/num_channels/eva_2.22_6.1_16bit-partial.wv -f s16le -af aresample
+fate-wavpack-channels-6.1: CMD = md5pipe -i $(TARGET_SAMPLES)/wavpack/num_channels/eva_2.22_6.1_16bit-partial.wv -f s16le -af aresample
 
 FATE_WAVPACK_S16 += fate-wavpack-channels-7.1
-fate-wavpack-channels-7.1: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/num_channels/panslab_sample_7.1_16bit-partial.wv -f s16le -af aresample
+fate-wavpack-channels-7.1: CMD = md5pipe -i $(TARGET_SAMPLES)/wavpack/num_channels/panslab_sample_7.1_16bit-partial.wv -f s16le -af aresample
 
 # speed modes
 
 FATE_WAVPACK_S16 += fate-wavpack-speed-default
-fate-wavpack-speed-default: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/speed_modes/default-partial.wv  -f s16le -af aresample
+fate-wavpack-speed-default: CMD = md5pipe -i $(TARGET_SAMPLES)/wavpack/speed_modes/default-partial.wv  -f s16le -af aresample
 
 FATE_WAVPACK_S16 += fate-wavpack-speed-fast
-fate-wavpack-speed-fast: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/speed_modes/fast-partial.wv  -f s16le -af aresample
+fate-wavpack-speed-fast: CMD = md5pipe -i $(TARGET_SAMPLES)/wavpack/speed_modes/fast-partial.wv  -f s16le -af aresample
 
 FATE_WAVPACK_S16 += fate-wavpack-speed-high
-fate-wavpack-speed-high: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/speed_modes/high-partial.wv  -f s16le -af aresample
+fate-wavpack-speed-high: CMD = md5pipe -i $(TARGET_SAMPLES)/wavpack/speed_modes/high-partial.wv  -f s16le -af aresample
 
 FATE_WAVPACK_S16 += fate-wavpack-speed-vhigh
-fate-wavpack-speed-vhigh: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/speed_modes/vhigh-partial.wv  -f s16le -af aresample
+fate-wavpack-speed-vhigh: CMD = md5pipe -i $(TARGET_SAMPLES)/wavpack/speed_modes/vhigh-partial.wv  -f s16le -af aresample
 
 # special cases
 
 FATE_WAVPACK_S16 += fate-wavpack-clipping
-fate-wavpack-clipping: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/special/clipping.wv -f s16le -af aresample
+fate-wavpack-clipping: CMD = md5pipe -i $(TARGET_SAMPLES)/wavpack/special/clipping.wv -f s16le -af aresample
 
 FATE_WAVPACK_S16 += fate-wavpack-cuesheet
-fate-wavpack-cuesheet: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/special/cue_sheet.wv -f s16le -af aresample
+fate-wavpack-cuesheet: CMD = md5pipe -i $(TARGET_SAMPLES)/wavpack/special/cue_sheet.wv -f s16le -af aresample
 
 FATE_WAVPACK_S16 += fate-wavpack-falsestereo
-fate-wavpack-falsestereo: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/special/false_stereo.wv -f s16le -af aresample
+fate-wavpack-falsestereo: CMD = md5pipe -i $(TARGET_SAMPLES)/wavpack/special/false_stereo.wv -f s16le -af aresample
 
 FATE_WAVPACK_S16 += fate-wavpack-zerolsbs
-fate-wavpack-zerolsbs: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/special/zero_lsbs.wv -f s16le -af aresample
+fate-wavpack-zerolsbs: CMD = md5pipe -i $(TARGET_SAMPLES)/wavpack/special/zero_lsbs.wv -f s16le -af aresample
 
-FATE_WAVPACK-$(call FILTERDEMDECENCMUX, ARESAMPLE, MATROSKA, WAVPACK, PCM_S16LE, PCM_S16LE) += fate-wavpack-matroskamode
-fate-wavpack-matroskamode: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/special/matroska_mode.mka -f s16le -af aresample
+FATE_WAVPACK-$(call FILTERDEMDECENCMUX, ARESAMPLE, MATROSKA, WAVPACK, PCM_S16LE, PCM_S16LE, MD5_PROTOCOL) += fate-wavpack-matroskamode
+fate-wavpack-matroskamode: CMD = md5pipe -i $(TARGET_SAMPLES)/wavpack/special/matroska_mode.mka -f s16le -af aresample
 
 FATE_WAVPACK-$(call DEMMUX, WV, MATROSKA, MD5_PROTOCOL) += fate-wavpack-matroska_mux-mono
 fate-wavpack-matroska_mux-mono: CMD = md5pipe -i $(TARGET_SAMPLES)/wavpack/num_channels/mono_16bit_int.wv -c copy -fflags +bitexact -f matroska
@@ -96,11 +96,11 @@ fate-wavpack-matroska_mux-61: CMD = md5pipe -i $(TARGET_SAMPLES)/wavpack/num_cha
 fate-wavpack-matroska_mux-61: CMP = oneline
 fate-wavpack-matroska_mux-61: REF = 2bbb393d060fa841f1172028f2c69b3a
 
-FATE_WAVPACK-$(call FILTERDEMDECENCMUX, ARESAMPLE, WV, WAVPACK, PCM_S8,    PCM_S8)    += $(FATE_WAVPACK_S8)
-FATE_WAVPACK-$(call FILTERDEMDECENCMUX, ARESAMPLE, WV, WAVPACK, PCM_S16LE, PCM_S16LE) += $(FATE_WAVPACK_S16)
-FATE_WAVPACK-$(call FILTERDEMDECENCMUX, ARESAMPLE, WV, WAVPACK, PCM_S24LE, PCM_S24LE) += $(FATE_WAVPACK_S24)
-FATE_WAVPACK-$(call FILTERDEMDECENCMUX, ARESAMPLE, WV, WAVPACK, PCM_S32LE, PCM_S32LE) += $(FATE_WAVPACK_S32)
-FATE_WAVPACK-$(call FILTERDEMDECENCMUX, ARESAMPLE, WV, WAVPACK, PCM_F32LE, PCM_F32LE) += $(FATE_WAVPACK_F32)
+FATE_WAVPACK-$(call FILTERDEMDECENCMUX, ARESAMPLE, WV, WAVPACK, PCM_S8,    PCM_S8,    MD5_PROTOCOL) += $(FATE_WAVPACK_S8)
+FATE_WAVPACK-$(call FILTERDEMDECENCMUX, ARESAMPLE, WV, WAVPACK, PCM_S16LE, PCM_S16LE, MD5_PROTOCOL) += $(FATE_WAVPACK_S16)
+FATE_WAVPACK-$(call FILTERDEMDECENCMUX, ARESAMPLE, WV, WAVPACK, PCM_S24LE, PCM_S24LE, MD5_PROTOCOL) += $(FATE_WAVPACK_S24)
+FATE_WAVPACK-$(call FILTERDEMDECENCMUX, ARESAMPLE, WV, WAVPACK, PCM_S32LE, PCM_S32LE, MD5_PROTOCOL) += $(FATE_WAVPACK_S32)
+FATE_WAVPACK-$(call FILTERDEMDECENCMUX, ARESAMPLE, WV, WAVPACK, PCM_F32LE, PCM_F32LE, MD5_PROTOCOL) += $(FATE_WAVPACK_F32)
 
 FATE_SAMPLES_FFMPEG += $(FATE_WAVPACK-yes)
 fate-wavpack: $(FATE_WAVPACK-yes)
-- 
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".

[FFmpeg-devel] [PATCH 5/5] fate/wavpack: Test APE cuesheet tags

[Andreas Rheinhardt]

The cue_sheet.wv sample contains a cue sheet as APE tags,
yet this is not really covered by fate-wavpack-cuesheet
because the metadata does not affect the output of said test.
So add a proper test for this.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
 tests/fate/wavpack.mak               |  7 +-
 tests/ref/fate/wavpack-cuesheet-tags | 98 ++++++++++++++++++++++++++++
 2 files changed, 104 insertions(+), 1 deletion(-)
 create mode 100644 tests/ref/fate/wavpack-cuesheet-tags

diff --git a/tests/fate/wavpack.mak b/tests/fate/wavpack.mak
index 900e509aba..c684d93f99 100644
--- a/tests/fate/wavpack.mak
+++ b/tests/fate/wavpack.mak
@@ -77,6 +77,10 @@ fate-wavpack-clipping: CMD = md5pipe -i $(TARGET_SAMPLES)/wavpack/special/clippi
 FATE_WAVPACK_S16 += fate-wavpack-cuesheet
 fate-wavpack-cuesheet: CMD = md5pipe -i $(TARGET_SAMPLES)/wavpack/special/cue_sheet.wv -f s16le -af aresample
 
+# The sample file has APE tags containing a cuesheet.
+FATE_WAVPACK_FFPROBE-$(call ALLYES, WV_DEMUXER FILE_PROTOCOL) += fate-wavpack-cuesheet-tags
+fate-wavpack-cuesheet-tags: CMD = probetags $(TARGET_SAMPLES)/wavpack/special/cue_sheet.wv
+
 FATE_WAVPACK_S16 += fate-wavpack-falsestereo
 fate-wavpack-falsestereo: CMD = md5pipe -i $(TARGET_SAMPLES)/wavpack/special/false_stereo.wv -f s16le -af aresample
 
@@ -102,5 +106,6 @@ FATE_WAVPACK-$(call FILTERDEMDECENCMUX, ARESAMPLE, WV, WAVPACK, PCM_S24LE, PCM_S
 FATE_WAVPACK-$(call FILTERDEMDECENCMUX, ARESAMPLE, WV, WAVPACK, PCM_S32LE, PCM_S32LE, MD5_PROTOCOL) += $(FATE_WAVPACK_S32)
 FATE_WAVPACK-$(call FILTERDEMDECENCMUX, ARESAMPLE, WV, WAVPACK, PCM_F32LE, PCM_F32LE, MD5_PROTOCOL) += $(FATE_WAVPACK_F32)
 
+FATE_SAMPLES_FFPROBE += $(FATE_WAVPACK_FFPROBE-yes)
 FATE_SAMPLES_FFMPEG += $(FATE_WAVPACK-yes)
-fate-wavpack: $(FATE_WAVPACK-yes)
+fate-wavpack: $(FATE_WAVPACK-yes) $(FATE_WAVPACK_FFPROBE-yes)
diff --git a/tests/ref/fate/wavpack-cuesheet-tags b/tests/ref/fate/wavpack-cuesheet-tags
new file mode 100644
index 0000000000..be6b694ae5
--- /dev/null
+++ b/tests/ref/fate/wavpack-cuesheet-tags
@@ -0,0 +1,98 @@
+[FORMAT]
+TAG:Cuesheet=REM GENRE Zydeco/Cajun
+REM DATE 1997
+PERFORMER "BeauSoliel"
+TITLE "L'Amour ou la Folie"
+REM REPLAYGAIN_ALBUM_GAIN -6.54 dB
+REM REPLAYGAIN_ALBUM_PEAK 0.972900
+FILE "CDImage.wv" WAVE
+  TRACK 01 AUDIO
+    TITLE "Newz Reel"
+    REM REPLAYGAIN_TRACK_GAIN -6.47 dB
+    REM REPLAYGAIN_TRACK_PEAK 0.972900
+    INDEX 00 00:00:00
+    INDEX 01 00:00:32
+  TRACK 02 AUDIO
+    TITLE "Les Blues de Crève de Faim"
+    REM REPLAYGAIN_TRACK_GAIN -4.56 dB
+    REM REPLAYGAIN_TRACK_PEAK 0.972900
+    INDEX 00 02:18:58
+    INDEX 01 02:21:30
+  TRACK 03 AUDIO
+    TITLE "L'Amour ou la Folie"
+    REM REPLAYGAIN_TRACK_GAIN -7.06 dB
+    REM REPLAYGAIN_TRACK_PEAK 0.972900
+    INDEX 00 06:08:40
+    INDEX 01 06:10:47
+  TRACK 04 AUDIO
+    TITLE "It's A Sin To Tell A Lie (C'est un Péché de Dire un Menterie)"
+    REM REPLAYGAIN_TRACK_GAIN -5.28 dB
+    REM REPLAYGAIN_TRACK_PEAK 0.972900
+    INDEX 00 11:29:30
+    INDEX 01 11:31:40
+  TRACK 05 AUDIO
+    TITLE "Eunice Two-Step"
+    REM REPLAYGAIN_TRACK_GAIN -7.72 dB
+    REM REPLAYGAIN_TRACK_PEAK 0.972900
+    INDEX 00 16:18:13
+    INDEX 01 16:21:10
+  TRACK 06 AUDIO
+    TITLE "Charivari"
+    REM REPLAYGAIN_TRACK_GAIN -5.47 dB
+    REM REPLAYGAIN_TRACK_PEAK 0.972900
+    INDEX 00 20:57:53
+    INDEX 01 21:00:37
+  TRACK 07 AUDIO
+    TITLE "Boudreaux"
+    REM REPLAYGAIN_TRACK_GAIN -4.71 dB
+    REM REPLAYGAIN_TRACK_PEAK 0.972900
+    INDEX 00 26:23:25
+    INDEX 01 26:25:65
+  TRACK 08 AUDIO
+    TITLE "Valse à Pop"
+    REM REPLAYGAIN_TRACK_GAIN -5.20 dB
+    REM REPLAYGAIN_TRACK_PEAK 0.972900
+    INDEX 00 29:25:33
+    INDEX 01 29:27:12
+  TRACK 09 AUDIO
+    TITLE "Can't You See (Tu Vas Voir)"
+    REM REPLAYGAIN_TRACK_GAIN -6.17 dB
+    REM REPLAYGAIN_TRACK_PEAK 0.972900
+    INDEX 00 32:50:25
+    INDEX 01 32:53:10
+  TRACK 10 AUDIO
+    TITLE "Les Blues de la Prison"
+    REM REPLAYGAIN_TRACK_GAIN -5.44 dB
+    REM REPLAYGAIN_TRACK_PEAK 0.972900
+    INDEX 00 35:59:05
+    INDEX 01 36:01:62
+  TRACK 11 AUDIO
+    TITLE "Danse Caribe"
+    REM REPLAYGAIN_TRACK_GAIN -7.46 dB
+    REM REPLAYGAIN_TRACK_PEAK 0.972900
+    INDEX 00 39:26:73
+    INDEX 01 39:29:47
+  TRACK 12 AUDIO
+    TITLE "Valse J'Aime"
+    REM REPLAYGAIN_TRACK_GAIN -7.92 dB
+    REM REPLAYGAIN_TRACK_PEAK 0.972900
+    INDEX 00 43:35:25
+    INDEX 01 43:38:15
+  TRACK 13 AUDIO
+    TITLE "Courir avec Walker"
+    REM REPLAYGAIN_TRACK_GAIN -5.19 dB
+    REM REPLAYGAIN_TRACK_PEAK 0.972900
+    INDEX 00 47:30:05
+    INDEX 01 47:32:70
+  TRACK 14 AUDIO
+    TITLE "Ma Vie S'est Arrêtée"
+    REM REPLAYGAIN_TRACK_GAIN -5.60 dB
+    REM REPLAYGAIN_TRACK_PEAK 0.972900
+    INDEX 00 51:31:08
+    INDEX 01 51:33:72
+
+TAG:Artist=BeauSoliel
+TAG:Album=L'Amour ou la Folie
+TAG:Year=1997
+TAG:Genre=Zydeco/Cajun
+[/FORMAT]
-- 
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".