[FFmpeg-devel] [PATCH] fate/ffmpeg: Fix requirements of shortest tests
James Almer
jamrial at gmail.com
Thu Dec 2 16:58:06 EET 2021
On Thu, Dec 2, 2021 at 11:39 AM Andreas Rheinhardt <
andreas.rheinhardt at outlook.com> wrote:
> Fixes FATE failures if e.g. libavdevice is disabled.
>
> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at outlook.com>
> ---
> tests/fate/ffmpeg.mak | 20 +++++++++++++++++---
> 1 file changed, 17 insertions(+), 3 deletions(-)
>
> diff --git a/tests/fate/ffmpeg.mak b/tests/fate/ffmpeg.mak
> index f9bc5bedf5..4ba73a8dfa 100644
> --- a/tests/fate/ffmpeg.mak
> +++ b/tests/fate/ffmpeg.mak
> @@ -86,7 +86,11 @@ fate-unknown_layout-ac3: CMD = md5
> -auto_conversion_filters \
> -guess_layout_max 0 -f s32le -ac 1 -ar 44100 -i $(TARGET_PATH)/$(AREF) \
> -f ac3 -flags +bitexact -c ac3_fixed
>
> -FATE_FFMPEG-$(call ALLYES, SINE_FILTER AMIX_FILTER MPEG4_ENCODER
> AC3_FIXED_ENCODER) += fate-shortest
> +FATE_FFMPEG-$(call ALLYES, FILE_PROTOCOL LAVFI_INDEV RAWVIDEO_DEMUXER
> \
> + SINE_FILTER PCM_S16LE_DECODER
> RAWVIDEO_DECODER \
> + ARESAMPLE_FILTER AMIX_FILTER MPEG4_ENCODER
> \
> + AC3_FIXED_ENCODER FRAMECRC_MUXER
> PIPE_PROTOCOL) \
> + += fate-shortest
> fate-shortest: tests/data/vsynth_lena.yuv
> fate-shortest: CMD = framecrc -auto_conversion_filters -f lavfi -i
> "sine=3000:d=10" -f lavfi -i "sine=1000:d=1" -sws_flags
> +accurate_rnd+bitexact -fflags +bitexact -flags +bitexact -idct simple -f
> rawvideo -s 352x288 -pix_fmt yuv420p -i
> $(TARGET_PATH)/tests/data/vsynth_lena.yuv -filter_complex
> "[0:a:0][1:a:0]amix=inputs=2[audio]" -map 2:v:0 -map "[audio]" -sws_flags
> +accurate_rnd+bitexact -fflags +bitexact -flags +bitexact -idct simple -dct
> fastint -qscale 10 -threads 1 -c:v mpeg4 -c:a ac3_fixed -shortest
>
> @@ -143,11 +147,21 @@ tests/data/audio_shorter_than_video.nut:
> ffmpeg$(PROGSSUF)$(EXESUF) | tests/data
> -sws_flags +accurate_rnd+bitexact -fflags +bitexact -flags
> +bitexact -idct simple -dct fastint -qscale 10 -c:v mpeg4 -threads 1 -c:a
> pcm_s16le -bitexact \
> -y $(TARGET_PATH)/tests/data/audio_shorter_than_video.nut
> 2>/dev/null
>
> -FATE_STREAMCOPY-$(call ALLYES, SINE_FILTER AMIX_FILTER NUT_MUXER
> PCM_S16LE_ENCODER MPEG4_ENCODER AC3_FIXED_ENCODER) += fate-copy-shortest1
> +FATE_STREAMCOPY-$(call ALLYES, FILE_PROTOCOL RAWVIDEO_DEMUXER LAVFI_INDEV
> \
> + RAWVIDEO_DECODER PCM_S16LE_DECODER
> MPEG4_ENCODER \
> + PCM_S16LE_ENCODER SINE_FILTER NUT_DEMUXER
> \
> + MPEG4_DECODER ARESAMPLE_FILTER AMIX_FILTER
> \
> + NUT_MUXER AC3_FIXED_ENCODER PIPE_PROTOCOL)
> \
> + += fate-copy-shortest1
> fate-copy-shortest1: tests/data/audio_shorter_than_video.nut
> fate-copy-shortest1: CMD = framemd5 -auto_conversion_filters -fflags
> +bitexact -flags +bitexact -f lavfi -i "sine=3000:d=10" -f lavfi -i
> "sine=1000:d=1" -i $(TARGET_PATH)/tests/data/audio_shorter_than_video.nut
> -filter_complex "[0:a:0][1:a:0]amix=inputs=2[audio]" -map 2:v:0 -map
> "[audio]" -fflags +bitexact -flags +bitexact -c:v copy -c:a ac3_fixed
> -shortest
>
> -FATE_STREAMCOPY-$(call ALLYES, SINE_FILTER AMIX_FILTER NUT_MUXER
> PCM_S16LE_ENCODER MPEG4_ENCODER AC3_FIXED_ENCODER) += fate-copy-shortest2
> +FATE_STREAMCOPY-$(call ALLYES, FILE_PROTOCOL RAWVIDEO_DEMUXER LAVFI_INDEV
> \
> + RAWVIDEO_DECODER PCM_S16LE_DECODER
> MPEG4_ENCODER \
> + PCM_S16LE_ENCODER SINE_FILTER NUT_DEMUXER
> \
> + MPEG4_DECODER ARESAMPLE_FILTER AMIX_FILTER
> \
> + NUT_MUXER AC3_FIXED_ENCODER PIPE_PROTOCOL)
> \
> + += fate-copy-shortest2
> fate-copy-shortest2: tests/data/audio_shorter_than_video.nut
> fate-copy-shortest2: CMD = framemd5 -auto_conversion_filters -fflags
> +bitexact -flags +bitexact -f lavfi -i "sine=3000:d=10" -i
> $(TARGET_PATH)/tests/data/audio_shorter_than_video.nut -filter_complex
> "[0:a:0][1:a:0]amix=inputs=2[audio]" -map 1:v:0 -map "[audio]" -fflags
> +bitexact -flags +bitexact -c:v copy -c:a ac3_fixed -shortest
>
>
This is IMO a bit excessive, since we rarely add deps like the file
protocol to any test, but it's fine so LGTM.
More information about the ffmpeg-devel
mailing list