mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-11-26 19:01:44 +02:00
61930bd0d7
* qatar/master: (27 commits) libxvid: Give more suitable names to libxvid-related files. libxvid: Separate libxvid encoder from libxvid rate control code. jpeglsdec: Remove write-only variable in ff_jpegls_decode_lse(). fate: cosmetics: lowercase some comments fate: Give more consistent names to some RealVideo/RealAudio tests. lavfi: add avfilter_get_audio_buffer_ref_from_arrays(). lavfi: add extended_data to AVFilterBuffer. lavc: check that extended_data is properly set in avcodec_encode_audio2(). lavc: pad last audio frame with silence when needed. samplefmt: add a function for filling a buffer with silence. samplefmt: add a function for copying audio samples. lavr: do not try to copy to uninitialized output audio data. lavr: make avresample_read() with NULL output discard samples. fate: split idroq audio and video into separate tests fate: improve dependencies fate: add convenient shorthands for ea-vp6, libavcodec, libavutil tests fate: split some combined tests into separate audio and video tests fate: fix dependencies for probe tests mips: intreadwrite: fix inline asm for gcc 4.8 mips: intreadwrite: remove unnecessary inline asm ... Conflicts: cmdutils.h configure doc/APIchanges doc/filters.texi ffmpeg.c ffplay.c libavcodec/internal.h libavcodec/jpeglsdec.c libavcodec/libschroedingerdec.c libavcodec/libxvid.c libavcodec/libxvid_rc.c libavcodec/utils.c libavcodec/version.h libavfilter/avfilter.c libavfilter/avfilter.h libavfilter/buffersink.h tests/Makefile tests/fate/aac.mak tests/fate/audio.mak tests/fate/demux.mak tests/fate/ea.mak tests/fate/image.mak tests/fate/libavutil.mak tests/fate/lossless-audio.mak tests/fate/lossless-video.mak tests/fate/microsoft.mak tests/fate/qt.mak tests/fate/real.mak tests/fate/screen.mak tests/fate/video.mak tests/fate/voice.mak tests/fate/vqf.mak tests/ref/fate/ea-mad tests/ref/fate/ea-tqi Merged-by: Michael Niedermayer <michaelni@gmx.at>
54 lines
1.9 KiB
Makefile
54 lines
1.9 KiB
Makefile
FATE_EA_VP6 += fate-ea-vp60
|
|
fate-ea-vp60: CMD = framecrc -i $(SAMPLES)/ea-vp6/g36.vp6
|
|
|
|
FATE_EA_VP6 += fate-ea-vp61
|
|
fate-ea-vp61: CMD = framecrc -i $(SAMPLES)/ea-vp6/MovieSkirmishGondor.vp6 -t 4
|
|
|
|
FATE_AVCONV += $(FATE_EA_VP6)
|
|
fate-ea-vp6: $(FATE_EA_VP6)
|
|
|
|
FATE_VP3 += fate-vp31
|
|
fate-vp31: CMD = framecrc -i $(SAMPLES)/vp3/vp31.avi
|
|
|
|
FATE_VP3 += fate-vp3-coeff-level64
|
|
fate-vp3-coeff-level64: CMD = framecrc -i $(SAMPLES)/vp3/coeff_level64.mkv
|
|
|
|
FATE_AVCONV += $(FATE_VP3)
|
|
fate-vp3: $(FATE_VP3)
|
|
|
|
FATE_AVCONV += fate-vp5
|
|
fate-vp5: CMD = framecrc -i $(SAMPLES)/vp5/potter512-400-partial.avi -an
|
|
|
|
FATE_AVCONV += fate-vp6a
|
|
fate-vp6a: CMD = framecrc -i $(SAMPLES)/flash-vp6/300x180-Scr-f8-056alpha.flv
|
|
|
|
FATE_AVCONV += fate-vp6f
|
|
fate-vp6f: CMD = framecrc -i $(SAMPLES)/flash-vp6/clip1024.flv
|
|
|
|
VP8_SUITE = 001 002 003 004 005 006 007 008 009 010 011 012 013 014 015 016 017
|
|
|
|
define FATE_VP8_SUITE
|
|
FATE_VP8 += fate-vp8-test-vector$(2)-$(1)
|
|
fate-vp8-test-vector$(2)-$(1): CMD = framemd5 $(3) -i $(SAMPLES)/vp8-test-vectors-r1/vp80-00-comprehensive-$(1).ivf
|
|
fate-vp8-test-vector$(2)-$(1): REF = $(SRC_PATH)/tests/ref/fate/vp8-test-vector-$(1)
|
|
endef
|
|
|
|
define FATE_VP8_FULL
|
|
$(foreach N,$(VP8_SUITE),$(eval $(call FATE_VP8_SUITE,$(N),$(1),$(2))))
|
|
|
|
# FIXME this file contains two frames with identical timestamps,
|
|
# so avconv drops one of them
|
|
FATE_VP8 += fate-vp8-sign-bias$(1)
|
|
fate-vp8-sign-bias$(1): CMD = framemd5 $(2) -i $(SAMPLES)/vp8/sintel-signbias.ivf
|
|
fate-vp8-sign-bias$(1): REF = $(SRC_PATH)/tests/ref/fate/vp8-sign-bias
|
|
|
|
FATE_VP8 += fate-vp8-size-change$(1)
|
|
fate-vp8-size-change$(1): CMD = framemd5 $(2) -flags +bitexact -i $(SAMPLES)/vp8/frame_size_change.webm -frames:v 30 -sws_flags bitexact+bilinear
|
|
fate-vp8-size-change$(1): REF = $(SRC_PATH)/tests/ref/fate/vp8-size-change
|
|
endef
|
|
|
|
$(eval $(call FATE_VP8_FULL))
|
|
$(eval $(call FATE_VP8_FULL,-emu-edge,-flags +emu_edge))
|
|
FATE_AVCONV += $(FATE_VP8)
|
|
fate-vp8: $(FATE_VP8)
|