[FFmpeg-devel] [PATCH 1/3] Fix fate-lavfi-pixfmts test cross-compilation.

Måns Rullgård mans
Sun Aug 1 11:33:21 CEST 2010


Stefano Sabatini <stefano.sabatini-lala at poste.it> writes:

> Add the lavfi-showfiltfmts dependency in the Makefile, and correctly
> use the $target_exec and $target_path variables for invoking the
> lavfi-showfiltfmts tool.
> ---
>  Makefile                  |    5 ++++-
>  tests/lavfi-regression.sh |    5 +++--
>  2 files changed, 7 insertions(+), 3 deletions(-)
>
> diff --git a/Makefile b/Makefile
> index 68c9663..c948c20 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -226,6 +226,9 @@ tests/data/asynth1.sw tests/vsynth%/00.pgm: TAG = GEN
>  tests/seek_test$(EXESUF): tests/seek_test.o $(FF_DEP_LIBS)
>  	$(LD) $(FF_LDFLAGS) -o $@ $< $(FF_EXTRALIBS)
>
> +tools/lavfi-showfiltfmts$(EXESUF): tools/lavfi-showfiltfmts.o $(FF_DEP_LIBS)
> +	$(LD) $(FF_LDFLAGS) -o $@ $< $(FF_EXTRALIBS)
> +
>  include $(SRC_PATH_BARE)/tests/fate.mak
>  include $(SRC_PATH_BARE)/tests/fate2.mak
>
> @@ -248,7 +251,7 @@ FATE = $(FATE_ACODEC)                                                   \
>  $(FATE_ACODEC): $(AREF)
>  $(FATE_VCODEC): $(VREF)
>  $(FATE_LAVF):   $(REFS)
> -$(FATE_LAVFI):  $(REFS)
> +$(FATE_LAVFI):  $(REFS) tools/lavfi-showfiltfmts$(EXESUF)
>  $(FATE_SEEK):   fate-codec fate-lavf tests/seek_test$(EXESUF)
>
>  $(FATE_ACODEC):  CMD = codectest acodec
> diff --git a/tests/lavfi-regression.sh b/tests/lavfi-regression.sh
> index 1e6cd1b..fdb6ad1 100755
> --- a/tests/lavfi-regression.sh
> +++ b/tests/lavfi-regression.sh
> @@ -66,15 +66,16 @@ vflip
>  "
>
>  if [ -n "$do_pixfmts_be" ] || [ -n "$do_pixfmts_le" ]; then
> +    showfiltfmts="$target_exec $target_path/tools/lavfi-showfiltfmts"
>      # exclude pixel formats which are not supported as input
>      excluded_pix_fmts="$(ffmpeg -pix_fmts list 2>/dev/null | sed -ne '9,$p' | grep '^\..\.' | cut -d' ' -f2)"

This line must use $ffmpeg, or you'll be running whatever ffmpeg is
installed on your host system.

>
> -    scale_out_pix_fmts=$(tools/lavfi-showfiltfmts scale | grep "^OUTPUT" | cut -d: -f2)
> +    scale_out_pix_fmts=$($showfiltfmts scale | grep "^OUTPUT" | cut -d: -f2)
>      scale_out_pix_fmts=$(get_exclusive_elements "$scale_out_pix_fmts" "$excluded_pix_fmts")
>
>      for filter_args in $filters_args; do
>          filter=$(echo $filter_args | sed -e 's/\([^=]\+\)=.*/\1/')
> -        in_pix_fmts=$(tools/lavfi-showfiltfmts $filter | grep "^INPUT" | cut -d: -f2)
> +        in_pix_fmts=$($showfiltfmts $filter | grep "^INPUT" | cut -d: -f2)
>          pix_fmts=$(get_common_elements "$in_pix_fmts" "$scale_out_pix_fmts")
>
>          for pix_fmt in $pix_fmts; do

Looks OK otherwise, but please hold enabling it (the next patch) a
little longer.

-- 
M?ns Rullg?rd
mans at mansr.com



More information about the ffmpeg-devel mailing list