diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-07-29 01:56:31 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-07-29 02:16:26 +0200 |
commit | 706bd8ea19a6f723795547885714033ac68a4d74 (patch) | |
tree | 39f7933c9432b35801c81903fa7dc352de92fe95 /tests/fate | |
parent | 0f8f9248471bbee5649c8efdc52d02c1cf93bba1 (diff) | |
parent | c83f44dba11930744e167856b48fbc24a8ff0e63 (diff) | |
download | ffmpeg-streaming-706bd8ea19a6f723795547885714033ac68a4d74.zip ffmpeg-streaming-706bd8ea19a6f723795547885714033ac68a4d74.tar.gz |
Merge remote-tracking branch 'qatar/master'
* qatar/master: (35 commits)
h264_idct_10bit: port x86 assembly to cpuflags.
x86inc: clip num_args to 7 on x86-32.
x86inc: sync to latest version from x264.
fft: rename "z" to "zc" to prevent name collision.
wv: return meaningful error codes.
wv: return AVERROR_EOF on EOF, not EIO.
mp3dec: forward errors for av_get_packet().
mp3dec: remove a pointless local variable.
mp3dec: remove commented out cruft.
lavfi: bump minor to mark stabilizing the ABI.
FATE: add tests for yadif.
FATE: add a test for delogo video filter.
FATE: add a test for amix audio filter.
audiogen: allow specifying random seed as a commandline parameter.
vc1dec: Override invalid macroblock quantizer
vc1: avoid reading beyond the last line in vc1_draw_sprites()
vc1dec: check that coded slice positions and interlacing match.
vc1dec: Do not ignore ff_vc1_parse_frame_header_adv return value
configure: Move parts that should not be user-selectable to CONFIG_EXTRA
lavf: remove commented out cruft in avformat_find_stream_info()
...
Conflicts:
Makefile
configure
libavcodec/vc1dec.c
libavcodec/x86/h264_deblock.asm
libavcodec/x86/h264_deblock_10bit.asm
libavcodec/x86/h264dsp_mmx.c
libavfilter/version.h
libavformat/mp3dec.c
libavformat/utils.c
libavformat/wv.c
libavutil/x86/x86inc.asm
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/fate')
-rw-r--r-- | tests/fate/filter.mak | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/tests/fate/filter.mak b/tests/fate/filter.mak index cd309ab..5e4c153 100644 --- a/tests/fate/filter.mak +++ b/tests/fate/filter.mak @@ -1,3 +1,25 @@ +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 @@ -7,4 +29,18 @@ 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 -i $(SAMPLES)/mpeg2/mpeg2_field_encoding.ts -vf yadif=0 + +FATE_YADIF += fate-filter-yadif-mode1 +fate-filter-yadif-mode1: CMD = framecrc -i $(SAMPLES)/mpeg2/mpeg2_field_encoding.ts -vf yadif=1 + +FATE_FILTER += $(FATE_YADIF) +FATE_SAMPLES_AVCONV += $(FATE_YADIF) + fate-filter: $(FATE_FILTER) |