7c26761b81
* commit 'fe1c1198e670242f3cf9e3e1eef27cff77f3ee23': lavf: use dts difference instead of AVPacket.duration in find_stream_info() avf: introduce nobuffer option fate: make yadif tests consistent across systems vf_hqdn3d: support 9 and 10bit colordepth vf_hqdn3d: reduce intermediate precision vf_hqdn3d: simplify and optimize factor identical ff_inplace_start_frame out of two filters vf_hqdn3d: cosmetics avprobe/avconv: fix tentative declaration compile errors on MSVS. Conflicts: doc/APIchanges ffmpeg.c ffprobe.c libavformat/avformat.h libavformat/options_table.h libavformat/utils.c libavformat/version.h tests/fate/filter.mak tests/ref/fate/filter-yadif-mode0 tests/ref/fate/filter-yadif-mode1 Merged-by: Michael Niedermayer <michaelni@gmx.at>
47 lines
2.1 KiB
Makefile
47 lines
2.1 KiB
Makefile
FATE_AMIX += fate-filter-amix-simple
|
|
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-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-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_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_FILTER += $(FATE_AMIX)
|
|
FATE_SAMPLES_AVCONV += $(FATE_AMIX)
|
|
|
|
FATE_ASYNCTS += fate-filter-asyncts
|
|
fate-filter-asyncts: SRC = $(SAMPLES)/nellymoser/nellymoser-discont.flv
|
|
fate-filter-asyncts: CMD = pcm -i $(SRC) -af aresample=min_comp=0.001:min_hard_comp=0.1
|
|
fate-filter-asyncts: CMP = oneoff
|
|
fate-filter-asyncts: REF = $(SAMPLES)/nellymoser/nellymoser-discont.pcm
|
|
|
|
FATE_FILTER += $(FATE_ASYNCTS)
|
|
FATE_SAMPLES_AVCONV += $(FATE_ASYNCTS)
|
|
|
|
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 += fate-filter-delogo
|
|
FATE_SAMPLES_AVCONV += fate-filter-delogo
|
|
|
|
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_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 += $(FATE_YADIF)
|
|
FATE_SAMPLES_AVCONV += $(FATE_YADIF)
|
|
|
|
fate-filter: $(FATE_FILTER)
|