MrBesen/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix fate-lavfi-pixfmts test cross-compilation.

Browse Source 
Add the lavfi-showfiltfmts dependency in the Makefile, and correctly
use the $target_exec and $target_path variables for invoking the
lavfi-showfiltfmts tool.

Originally committed as revision 24645 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Stefano Sabatini 2010-08-01 10:27:04 +00:00
parent 2b346e042e
commit 43d2c6a511
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile
View File

@ -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

5
tests/lavfi-regression.sh
View File

@ -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)"
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