diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-01 11:26:53 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-01 11:34:34 +0200 |
| commit | 3319679d0a36bec3e78f639d6f9fbbe596f6eec3 (patch) | |
| tree | 77d6f0a7a0280252793d2462ff5be86dcf4a9cd4 /tests/fate | |
| parent | 1cba7fa364a9c95773d779ff5d5602be8391310e (diff) | |
| parent | a1e05b0487a1939334c2920fc7f9936bc9efe876 (diff) | |
| download | ffmpeg-3319679d0a36bec3e78f639d6f9fbbe596f6eec3.tar.gz | |
Merge commit 'a1e05b0487a1939334c2920fc7f9936bc9efe876'
* commit 'a1e05b0487a1939334c2920fc7f9936bc9efe876':
lavfi: add trim and atrim filters.
Conflicts:
Changelog
doc/filters.texi
libavfilter/Makefile
libavfilter/allfilters.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/fate')
| -rw-r--r-- | tests/fate/filter-audio.mak | 16 | ||||
| -rw-r--r-- | tests/fate/filter-video.mak | 14 |
2 files changed, 30 insertions, 0 deletions
diff --git a/tests/fate/filter-audio.mak b/tests/fate/filter-audio.mak index 6eaa4bff35..a4168ee95e 100644 --- a/tests/fate/filter-audio.mak +++ b/tests/fate/filter-audio.mak @@ -31,6 +31,22 @@ fate-filter-aresample: CMD = pcm -i $(SRC) -af aresample=min_comp=0.001:min_hard fate-filter-aresample: CMP = oneoff fate-filter-aresample: REF = $(SAMPLES)/nellymoser/nellymoser-discont.pcm +FATE_ATRIM += fate-filter-atrim-duration +fate-filter-atrim-duration: CMD = framecrc -i $(SRC) -af atrim=start=0.1:duration=0.01 +FATE_ATRIM += fate-filter-atrim-mixed +fate-filter-atrim-mixed: CMD = framecrc -i $(SRC) -af atrim=start=0.05:start_sample=1025:end=0.1:end_sample=4411 + +FATE_ATRIM += fate-filter-atrim-samples +fate-filter-atrim-samples: CMD = framecrc -i $(SRC) -af atrim=start_sample=26:end_sample=80 + +FATE_ATRIM += fate-filter-atrim-time +fate-filter-atrim-time: CMD = framecrc -i $(SRC) -af atrim=0.1:0.2 + +$(FATE_ATRIM): tests/data/asynth-44100-2.wav +$(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: SRC = $(TARGET_PATH)/tests/data/asynth-44100-6.wav fate-filter-channelmap: tests/data/asynth-44100-6.wav diff --git a/tests/fate/filter-video.mak b/tests/fate/filter-video.mak index 47f3684c29..bf0f4ced4b 100644 --- a/tests/fate/filter-video.mak +++ b/tests/fate/filter-video.mak @@ -73,6 +73,20 @@ fate-filter-telecine: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf telecine FATE_FILTER_VSYNTH-$(CONFIG_TRANSPOSE_FILTER) += fate-filter-transpose fate-filter-transpose: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf transpose +FATE_TRIM += fate-filter-trim-duration +fate-filter-trim-duration: CMD = framecrc -i $(SRC) -vf trim=start=0.4:duration=0.05 + +FATE_TRIM += fate-filter-trim-frame +fate-filter-trim-frame: CMD = framecrc -i $(SRC) -vf trim=start_frame=3:end_frame=10 + +FATE_TRIM += fate-filter-trim-mixed +fate-filter-trim-mixed: CMD = framecrc -i $(SRC) -vf trim=start=0.2:end=0.4:start_frame=1:end_frame=3 + +FATE_TRIM += fate-filter-trim-time +fate-filter-trim-time: CMD = framecrc -i $(SRC) -vf trim=0:0.1 + +FATE_FILTER_VSYNTH-$(CONFIG_TRIM_FILTER) += $(FATE_TRIM) + FATE_FILTER_VSYNTH-$(CONFIG_UNSHARP_FILTER) += fate-filter-unsharp fate-filter-unsharp: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf unsharp=11:11:-1.5:11:11:-1.5 |