Merge commit 'b357f1d1d3dd1d6672df6a397a31be425d31b6d1'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 19 Apr 2013 21:11:44 +0000 (23:11 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 19 Apr 2013 21:13:20 +0000 (23:13 +0200)
* commit 'b357f1d1d3dd1d6672df6a397a31be425d31b6d1':
  fate: Split audio filters into their own separate file

Conflicts:
tests/Makefile
tests/fate/filter.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
tests/Makefile
tests/fate/filter-audio.mak
tests/fate/filter.mak

diff --cc tests/Makefile
@@@ -81,8 -64,7 +85,9 @@@ include $(SRC_PATH)/tests/fate/demux.ma
  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/ffmpeg.mak
 +include $(SRC_PATH)/tests/fate/ffprobe.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
index 0000000,63293d9..fd244ec
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,58 +1,64 @@@
 -fate-filter-amix-simple: CMD = avconv -filter_complex amix -i $(SRC) -ss 3 -i $(SRC1) -f f32le -
+ FATE_AMIX += fate-filter-amix-simple
 -fate-filter-amix-first: CMD = avconv -filter_complex amix=duration=first -ss 4 -i $(SRC) -i $(SRC1) -f f32le -
++fate-filter-amix-simple: CMD = ffmpeg -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-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-first: CMD = ffmpeg -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-asyncts: REF = $(SAMPLES)/nellymoser/nellymoser-discont.pcm
++fate-filter-amix-transition: CMD = ffmpeg -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-channelmap: REF = 21f1977c4f9705e2057083f84764e685
++fate-filter-asyncts: REF = $(SAMPLES)/nellymoser/nellymoser-discont-async-v2.pcm
++
++FATE_FILTER-$(CONFIG_ARESAMPLE_FILTER) += fate-filter-aresample
++fate-filter-aresample: SRC = $(SAMPLES)/nellymoser/nellymoser-discont.flv
++fate-filter-aresample: CMD = pcm -i $(SRC) -af aresample=min_comp=0.001:min_hard_comp=0.1:first_pts=0
++fate-filter-aresample: CMP = oneoff
++fate-filter-aresample: 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_AFILTER-$(call FILTERDEMDECENCMUX, JOIN, WAV, PCM_S16LE, PCM_S16LE, PCM_S16LE) += fate-filter-join
++fate-filter-channelmap: REF = 06168d06085e2c0603e4e118ba4cade2
+ 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, VOLUME, WAV, PCM_S16LE, PCM_S16LE, PCM_S16LE) += fate-filter-volume
++#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-filter-volume: CMD = md5 -i $(SRC) -af volume=precision=fixed:volume=0.5 -f s16le
++FATE_AFILTER-$(call ALLYES, WAV_DEMUXER PCM_S16LE_DECODER PCM_S16LE_ENCODER PCM_S16LE_MUXER APERMS_FILTER VOLUME_FILTER) += 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 aperms=random,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)
@@@ -1,60 -1,9 +1,8 @@@
  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 = 06168d06085e2c0603e4e118ba4cade2
- 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
 +FATE_FILTER-$(call ALLYES, PERMS_FILTER DELOGO_FILTER RM_DEMUXER RV30_DECODER) += fate-filter-delogo
 +fate-filter-delogo: CMD = framecrc -i $(SAMPLES)/real/rv30.rm -vf perms=random,delogo=show=0:x=290:y=25:w=26:h=16 -an
  
  FATE_FILTER_VSYNTH-$(CONFIG_DRAWBOX_FILTER) += fate-filter-drawbox
  fate-filter-drawbox: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf drawbox=10:20:200:60:red@0.5
@@@ -71,22 -20,8 +19,14 @@@ fate-filter-hqdn3d: CMD = framecrc -c:
  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
 +FATE_FILTER_VSYNTH-$(call ALLYES, NEGATE_FILTER PERMS_FILTER) += fate-filter-negate
 +fate-filter-negate: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf perms=random,negate
 +
 +FATE_FILTER_VSYNTH-$(CONFIG_HISTOGRAM_FILTER) += fate-filter-histogram-levels
 +fate-filter-histogram-levels: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf histogram -flags +bitexact -sws_flags +accurate_rnd+bitexact
 +
 +FATE_FILTER_VSYNTH-$(CONFIG_HISTOGRAM_FILTER) += fate-filter-histogram-waveform
 +fate-filter-histogram-waveform: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf histogram=mode=waveform -flags +bitexact -sws_flags +accurate_rnd+bitexact
  
  FATE_FILTER_VSYNTH-$(CONFIG_OVERLAY_FILTER) += fate-filter-overlay
  fate-filter-overlay: CMD = framecrc -c:v pgmyuv -i $(SRC) -c:v pgmyuv -i $(SRC) -filter_complex_script $(SRC_PATH)/tests/filtergraphs/overlay
@@@ -100,18 -35,11 +40,11 @@@ fate-filter-transpose: CMD = framecrc -
  FATE_FILTER_VSYNTH-$(CONFIG_UNSHARP_FILTER) += fate-filter-unsharp
  fate-filter-unsharp: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf unsharp
  
- FATE_FILTER-$(call ALLYES, WAV_DEMUXER PCM_S16LE_DECODER PCM_S16LE_ENCODER PCM_S16LE_MUXER APERMS_FILTER VOLUME_FILTER) += 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 aperms=random,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
 +fate-filter-yadif-mode0: CMD = framecrc -flags bitexact -idct simple -i $(SAMPLES)/mpeg2/mpeg2_field_encoding.ts -vframes 30 -vf yadif=0
  
  FATE_YADIF += fate-filter-yadif-mode1
 -fate-filter-yadif-mode1: CMD = framecrc -flags bitexact -idct simple -i $(SAMPLES)/mpeg2/mpeg2_field_encoding.ts -vf yadif=1
 +fate-filter-yadif-mode1: CMD = framecrc -flags bitexact -idct simple -i $(SAMPLES)/mpeg2/mpeg2_field_encoding.ts -vframes 59 -vf yadif=1
  
  FATE_FILTER-$(call FILTERDEMDEC, YADIF, MPEGTS, MPEG2VIDEO) += $(FATE_YADIF)