diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-29 04:02:23 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-29 04:02:23 +0200 |
| commit | e755c8ac462e85e6c3de4f0207dc6bb5c86409cf (patch) | |
| tree | 79b263a53249817baa638e164c3d61d03d84f5fe /tests | |
| parent | ca90ca8ce365261355f3b66936b9cc011fdd1cdc (diff) | |
| parent | 4a27a52a1f74016095b7aee1b4a422cf62217ade (diff) | |
| download | ffmpeg-e755c8ac462e85e6c3de4f0207dc6bb5c86409cf.tar.gz | |
Merge commit '4a27a52a1f74016095b7aee1b4a422cf62217ade'
* commit '4a27a52a1f74016095b7aee1b4a422cf62217ade':
fate: Don't use files from SRC_PATH in the actual tests
indeo4: reuse context block VLC for band instead of defaulting
Conflicts:
tests/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/Makefile | 6 | ||||
| -rw-r--r-- | tests/fate/filter-audio.mak | 3 | ||||
| -rw-r--r-- | tests/fate/filter-video.mak | 6 |
3 files changed, 11 insertions, 4 deletions
diff --git a/tests/Makefile b/tests/Makefile index cd8c1e2821..09a5e055ac 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -13,7 +13,7 @@ ffservertest: ffserver$(EXESUF) tests/vsynth1/00.pgm tests/data/asynth1.sw @echo $(SRC_PATH)/tests/ffserver-regression.sh $(FFSERVER_REFFILE) $(SRC_PATH)/tests/ffserver.conf -OBJDIRS += tests/data tests/vsynth1 +OBJDIRS += tests/data tests/vsynth1 tests/data/filtergraphs $(VREF): tests/videogen$(HOSTEXESUF) | tests/vsynth1 $(M)./$< 'tests/vsynth1/' @@ -41,6 +41,10 @@ tests/data/ffprobe-test.nut: ffmpeg$(EXESUF) | tests/data tests/data/%.sw tests/data/asynth% tests/data/vsynth%.yuv tests/vsynth%/00.pgm tests/data/%.nut: TAG = GEN +tests/data/filtergraphs/%: TAG = COPY +tests/data/filtergraphs/%: $(SRC_PATH)/tests/filtergraphs/% | tests/data/filtergraphs + $(M)cp $< $@ + CHKCFG = $(if $($(1))$(!$(1)),$($(1)), $(error No such config: $(1))) ALLYES = $(strip $(call XYES, $(1))) diff --git a/tests/fate/filter-audio.mak b/tests/fate/filter-audio.mak index a4168ee95e..91fa23fa31 100644 --- a/tests/fate/filter-audio.mak +++ b/tests/fate/filter-audio.mak @@ -48,9 +48,10 @@ $(FATE_ATRIM): SRC = $(TARGET_PATH)/tests/data/asynth-44100-2.wav FATE_FILTER-$(call FILTERDEMDECENCMUX, ATRIM, WAV, PCM_S16LE, PCM_S16LE, WAV) += $(FATE_ATRIM) FATE_AFILTER-$(call FILTERDEMDECENCMUX, CHANNELMAP, WAV, PCM_S16LE, PCM_S16LE, WAV) += fate-filter-channelmap +fate-filter-channelmap: tests/data/filtergraphs/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: CMD = md5 -i $(SRC) -filter_complex_script $(TARGET_PATH)/tests/data/filtergraphs/channelmap -f wav -flags +bitexact fate-filter-channelmap: CMP = oneline fate-filter-channelmap: REF = 06168d06085e2c0603e4e118ba4cade2 diff --git a/tests/fate/filter-video.mak b/tests/fate/filter-video.mak index 2df9cc8794..04c089f807 100644 --- a/tests/fate/filter-video.mak +++ b/tests/fate/filter-video.mak @@ -53,7 +53,8 @@ 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 +fate-filter-overlay: tests/data/filtergraphs/overlay +fate-filter-overlay: CMD = framecrc -c:v pgmyuv -i $(SRC) -c:v pgmyuv -i $(SRC) -filter_complex_script $(TARGET_PATH)/tests/data/filtergraphs/overlay FATE_FILTER_VSYNTH-$(call ALLYES, SPLIT_FILTER SCALE_FILTER PAD_FILTER OVERLAY_FILTER) += fate-filter-overlay_rgb fate-filter-overlay_rgb: CMD = framecrc -c:v pgmyuv -i $(SRC) -filter_complex_script $(SRC_PATH)/tests/filtergraphs/overlay_rgb @@ -68,7 +69,8 @@ FATE_FILTER_VSYNTH-$(CONFIG_SEPARATEFIELDS_FILTER) += fate-filter-separatefields fate-filter-separatefields: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf separatefields FATE_FILTER_VSYNTH-$(call ALLYES, SETPTS_FILTER SETTB_FILTER) += fate-filter-setpts -fate-filter-setpts: CMD = framecrc -c:v pgmyuv -i $(SRC) -filter_script $(SRC_PATH)/tests/filtergraphs/setpts +fate-filter-setpts: tests/data/filtergraphs/setpts +fate-filter-setpts: CMD = framecrc -c:v pgmyuv -i $(SRC) -filter_script $(TARGET_PATH)/tests/data/filtergraphs/setpts FATE_FILTER_VSYNTH-$(CONFIG_TELECINE_FILTER) += fate-filter-telecine fate-filter-telecine: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf telecine |