From b357f1d1d3dd1d6672df6a397a31be425d31b6d1 Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Tue, 16 Apr 2013 16:38:02 +0200 Subject: [PATCH] fate: Split audio filters into their own separate file --- tests/Makefile | 5 +++ tests/fate/filter-audio.mak | 58 +++++++++++++++++++++++++++++++++++ tests/fate/filter.mak | 61 ------------------------------------- 3 files changed, 63 insertions(+), 61 deletions(-) create mode 100644 tests/fate/filter-audio.mak diff --git a/tests/Makefile b/tests/Makefile index 99039034ba..edb6ffccbe 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -38,6 +38,10 @@ ENCDEC2 = $(call ALLYES, $(firstword $(1))_ENCODER $(lastword $(1))_DECODER \ DEMDEC = $(call ALLYES, $(1)_DEMUXER $(2:%=%_DECODER)) ENCMUX = $(call ALLYES, $(1:%=%_ENCODER) $(2)_MUXER) +FILTERDEMDEC = $(call ALLYES, $(1)_FILTER $(2)_DEMUXER $(3)_DECODER) +FILTERDEMDECMUX = $(call ALLYES, $(1)_FILTER $(2)_DEMUXER $(3)_DECODER $(4)_MUXER) +FILTERDEMDECENCMUX = $(call ALLYES, $(1)_FILTER $(2)_DEMUXER $(3)_DECODER $(4)_ENCODER $(5)_MUXER) + include $(SRC_PATH)/tests/fate/acodec.mak include $(SRC_PATH)/tests/fate/vcodec.mak include $(SRC_PATH)/tests/fate/avformat.mak @@ -60,6 +64,7 @@ include $(SRC_PATH)/tests/fate/demux.mak include $(SRC_PATH)/tests/fate/dfa.mak include $(SRC_PATH)/tests/fate/dpcm.mak include $(SRC_PATH)/tests/fate/ea.mak +include $(SRC_PATH)/tests/fate/filter-audio.mak include $(SRC_PATH)/tests/fate/filter.mak include $(SRC_PATH)/tests/fate/flac.mak include $(SRC_PATH)/tests/fate/fft.mak diff --git a/tests/fate/filter-audio.mak b/tests/fate/filter-audio.mak new file mode 100644 index 0000000000..63293d97b2 --- /dev/null +++ b/tests/fate/filter-audio.mak @@ -0,0 +1,58 @@ +FATE_AMIX += fate-filter-amix-simple +fate-filter-amix-simple: CMD = avconv -filter_complex amix -i $(SRC) -ss 3 -i $(SRC1) -f f32le - +fate-filter-amix-simple: REF = $(SAMPLES)/filter/amix_simple.pcm + +FATE_AMIX += fate-filter-amix-first +fate-filter-amix-first: CMD = avconv -filter_complex amix=duration=first -ss 4 -i $(SRC) -i $(SRC1) -f f32le - +fate-filter-amix-first: REF = $(SAMPLES)/filter/amix_first.pcm + +FATE_AMIX += fate-filter-amix-transition +fate-filter-amix-transition: tests/data/asynth-44100-2-3.wav +fate-filter-amix-transition: SRC2 = $(TARGET_PATH)/tests/data/asynth-44100-2-3.wav +fate-filter-amix-transition: CMD = avconv -filter_complex amix=inputs=3:dropout_transition=0.5 -i $(SRC) -ss 2 -i $(SRC1) -ss 4 -i $(SRC2) -f f32le - +fate-filter-amix-transition: REF = $(SAMPLES)/filter/amix_transition.pcm + +FATE_AFILTER-$(call FILTERDEMDECENCMUX, AMIX, WAV, PCM_S16LE, PCM_F32LE, PCM_F32LE) += $(FATE_AMIX) +$(FATE_AMIX): tests/data/asynth-44100-2.wav tests/data/asynth-44100-2-2.wav +$(FATE_AMIX): SRC = $(TARGET_PATH)/tests/data/asynth-44100-2.wav +$(FATE_AMIX): SRC1 = $(TARGET_PATH)/tests/data/asynth-44100-2-2.wav +$(FATE_AMIX): CMP = oneoff +$(FATE_AMIX): CMP_UNIT = f32 + +FATE_AFILTER-$(call FILTERDEMDECMUX, ASYNCTS, FLV, NELLYMOSER, PCM_S16LE) += fate-filter-asyncts +fate-filter-asyncts: SRC = $(SAMPLES)/nellymoser/nellymoser-discont.flv +fate-filter-asyncts: CMD = pcm -analyzeduration 10000000 -i $(SRC) -af asyncts +fate-filter-asyncts: CMP = oneoff +fate-filter-asyncts: REF = $(SAMPLES)/nellymoser/nellymoser-discont.pcm + +FATE_AFILTER-$(call FILTERDEMDECENCMUX, CHANNELMAP, WAV, PCM_S16LE, PCM_S16LE, WAV) += fate-filter-channelmap +fate-filter-channelmap: SRC = $(TARGET_PATH)/tests/data/asynth-44100-6.wav +fate-filter-channelmap: tests/data/asynth-44100-6.wav +fate-filter-channelmap: CMD = md5 -i $(SRC) -filter_complex_script $(SRC_PATH)/tests/filtergraphs/channelmap -f wav -flags +bitexact +fate-filter-channelmap: CMP = oneline +fate-filter-channelmap: REF = 21f1977c4f9705e2057083f84764e685 + +FATE_AFILTER-$(call FILTERDEMDECENCMUX, CHANNELSPLIT, WAV, PCM_S16LE, PCM_S16LE, PCM_S16LE) += fate-filter-channelsplit +fate-filter-channelsplit: SRC = $(TARGET_PATH)/tests/data/asynth-44100-2.wav +fate-filter-channelsplit: tests/data/asynth-44100-2.wav +fate-filter-channelsplit: CMD = md5 -i $(SRC) -filter_complex channelsplit -f s16le +fate-filter-channelsplit: CMP = oneline +fate-filter-channelsplit: REF = d92988d0fe2dd92236763f47b07ab597 + +FATE_AFILTER-$(call FILTERDEMDECENCMUX, JOIN, WAV, PCM_S16LE, PCM_S16LE, PCM_S16LE) += fate-filter-join +fate-filter-join: SRC1 = $(TARGET_PATH)/tests/data/asynth-44100-2.wav +fate-filter-join: SRC2 = $(TARGET_PATH)/tests/data/asynth-44100-3.wav +fate-filter-join: tests/data/asynth-44100-2.wav tests/data/asynth-44100-3.wav +fate-filter-join: CMD = md5 -i $(SRC1) -i $(SRC2) -filter_complex join=channel_layout=5 -f s16le +fate-filter-join: CMP = oneline +fate-filter-join: REF = 38fa1b18b0c46d77df6f17bfc4f078dd + +FATE_AFILTER-$(call FILTERDEMDECENCMUX, VOLUME, WAV, PCM_S16LE, PCM_S16LE, PCM_S16LE) += fate-filter-volume +fate-filter-volume: SRC = $(TARGET_PATH)/tests/data/asynth-44100-2.wav +fate-filter-volume: tests/data/asynth-44100-2.wav +fate-filter-volume: CMD = md5 -i $(SRC) -af volume=precision=fixed:volume=0.5 -f s16le +fate-filter-volume: CMP = oneline +fate-filter-volume: REF = 4d6ba75ef3e32d305d066b9bc771d6f4 + +FATE_SAMPLES_AVCONV += $(FATE_AFILTER-yes) +fate-afilter: $(FATE_AFILTER-yes) diff --git a/tests/fate/filter.mak b/tests/fate/filter.mak index 04c1712eb2..f9487c4cc7 100644 --- a/tests/fate/filter.mak +++ b/tests/fate/filter.mak @@ -1,52 +1,6 @@ -FILTERDEMDEC = $(call ALLYES, $(1)_FILTER $(2)_DEMUXER $(3)_DECODER) -FILTERDEMDECMUX = $(call ALLYES, $(1)_FILTER $(2)_DEMUXER $(3)_DECODER $(4)_MUXER) -FILTERDEMDECENCMUX = $(call ALLYES, $(1)_FILTER $(2)_DEMUXER $(3)_DECODER $(4)_ENCODER $(5)_MUXER) - -FATE_AMIX += fate-filter-amix-simple -fate-filter-amix-simple: CMD = avconv -filter_complex amix -i $(SRC) -ss 3 -i $(SRC1) -f f32le - -fate-filter-amix-simple: REF = $(SAMPLES)/filter/amix_simple.pcm - -FATE_AMIX += fate-filter-amix-first -fate-filter-amix-first: CMD = avconv -filter_complex amix=duration=first -ss 4 -i $(SRC) -i $(SRC1) -f f32le - -fate-filter-amix-first: REF = $(SAMPLES)/filter/amix_first.pcm - -FATE_AMIX += fate-filter-amix-transition -fate-filter-amix-transition: tests/data/asynth-44100-2-3.wav -fate-filter-amix-transition: SRC2 = $(TARGET_PATH)/tests/data/asynth-44100-2-3.wav -fate-filter-amix-transition: CMD = avconv -filter_complex amix=inputs=3:dropout_transition=0.5 -i $(SRC) -ss 2 -i $(SRC1) -ss 4 -i $(SRC2) -f f32le - -fate-filter-amix-transition: REF = $(SAMPLES)/filter/amix_transition.pcm - -$(FATE_AMIX): tests/data/asynth-44100-2.wav tests/data/asynth-44100-2-2.wav -$(FATE_AMIX): SRC = $(TARGET_PATH)/tests/data/asynth-44100-2.wav -$(FATE_AMIX): SRC1 = $(TARGET_PATH)/tests/data/asynth-44100-2-2.wav -$(FATE_AMIX): CMP = oneoff -$(FATE_AMIX): CMP_UNIT = f32 - -FATE_FILTER-$(call FILTERDEMDECENCMUX, AMIX, WAV, PCM_S16LE, PCM_F32LE, PCM_F32LE) += $(FATE_AMIX) - -FATE_FILTER-$(call FILTERDEMDECMUX, ASYNCTS, FLV, NELLYMOSER, PCM_S16LE) += fate-filter-asyncts -fate-filter-asyncts: SRC = $(SAMPLES)/nellymoser/nellymoser-discont.flv -fate-filter-asyncts: CMD = pcm -analyzeduration 10000000 -i $(SRC) -af asyncts -fate-filter-asyncts: CMP = oneoff -fate-filter-asyncts: REF = $(SAMPLES)/nellymoser/nellymoser-discont.pcm - FATE_FILTER_VSYNTH-$(CONFIG_BOXBLUR_FILTER) += fate-filter-boxblur fate-filter-boxblur: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf boxblur=2:1 -FATE_FILTER-$(call FILTERDEMDECENCMUX, CHANNELMAP, WAV, PCM_S16LE, PCM_S16LE, WAV) += fate-filter-channelmap -fate-filter-channelmap: SRC = $(TARGET_PATH)/tests/data/asynth-44100-6.wav -fate-filter-channelmap: tests/data/asynth-44100-6.wav -fate-filter-channelmap: CMD = md5 -i $(SRC) -filter_complex_script $(SRC_PATH)/tests/filtergraphs/channelmap -f wav -flags +bitexact -fate-filter-channelmap: CMP = oneline -fate-filter-channelmap: REF = 21f1977c4f9705e2057083f84764e685 - -FATE_FILTER-$(call FILTERDEMDECENCMUX, CHANNELSPLIT, WAV, PCM_S16LE, PCM_S16LE, PCM_S16LE) += fate-filter-channelsplit -fate-filter-channelsplit: SRC = $(TARGET_PATH)/tests/data/asynth-44100-2.wav -fate-filter-channelsplit: tests/data/asynth-44100-2.wav -fate-filter-channelsplit: CMD = md5 -i $(SRC) -filter_complex channelsplit -f s16le -fate-filter-channelsplit: CMP = oneline -fate-filter-channelsplit: REF = d92988d0fe2dd92236763f47b07ab597 - fate-filter-delogo: CMD = framecrc -i $(SAMPLES)/real/rv30.rm -vf delogo=show=0:x=290:y=25:w=26:h=16 -an FATE_FILTER-$(call FILTERDEMDEC, DELOGO, RM, RV30) += fate-filter-delogo @@ -66,14 +20,6 @@ fate-filter-hqdn3d: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf hqdn3d FATE_FILTER_VSYNTH-$(CONFIG_INTERLACE_FILTER) += fate-filter-interlace fate-filter-interlace: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf interlace -FATE_FILTER-$(call FILTERDEMDECENCMUX, JOIN, WAV, PCM_S16LE, PCM_S16LE, PCM_S16LE) += fate-filter-join -fate-filter-join: SRC1 = $(TARGET_PATH)/tests/data/asynth-44100-2.wav -fate-filter-join: SRC2 = $(TARGET_PATH)/tests/data/asynth-44100-3.wav -fate-filter-join: tests/data/asynth-44100-2.wav tests/data/asynth-44100-3.wav -fate-filter-join: CMD = md5 -i $(SRC1) -i $(SRC2) -filter_complex join=channel_layout=5 -f s16le -fate-filter-join: CMP = oneline -fate-filter-join: REF = 38fa1b18b0c46d77df6f17bfc4f078dd - FATE_FILTER_VSYNTH-$(CONFIG_NEGATE_FILTER) += fate-filter-negate fate-filter-negate: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf negate @@ -89,13 +35,6 @@ fate-filter-transpose: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf transpose FATE_FILTER_VSYNTH-$(CONFIG_UNSHARP_FILTER) += fate-filter-unsharp fate-filter-unsharp: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf unsharp -FATE_FILTER-$(call FILTERDEMDECENCMUX, VOLUME, WAV, PCM_S16LE, PCM_S16LE, PCM_S16LE) += fate-filter-volume -fate-filter-volume: SRC = $(TARGET_PATH)/tests/data/asynth-44100-2.wav -fate-filter-volume: tests/data/asynth-44100-2.wav -fate-filter-volume: CMD = md5 -i $(SRC) -af volume=precision=fixed:volume=0.5 -f s16le -fate-filter-volume: CMP = oneline -fate-filter-volume: REF = 4d6ba75ef3e32d305d066b9bc771d6f4 - FATE_YADIF += fate-filter-yadif-mode0 fate-filter-yadif-mode0: CMD = framecrc -flags bitexact -idct simple -i $(SAMPLES)/mpeg2/mpeg2_field_encoding.ts -vf yadif=0