X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=configure;h=7a60f29f4364487a50ae6411b9fe76740b0cb9b1;hb=b35d38bd04c2bd7d80065f7a97bcdceee8997d66;hp=270de65f28d7c3bc935546c407d6766c0c898e83;hpb=9eb99ab25b5ec9af9e575371c9ef84a37c63b3e5;p=ffmpeg diff --git a/configure b/configure index 270de65f28d..7a60f29f436 100755 --- a/configure +++ b/configure @@ -112,7 +112,7 @@ Component options: --disable-swscale disable libswscale build --disable-postproc disable libpostproc build --disable-avfilter disable video filter support [no] - --disable-avresample disable libavresample build [no] + --enable-avresample enable libavresample build [no] --disable-pthreads disable pthreads [auto] --disable-w32threads disable Win32 threads [auto] --disable-os2threads disable OS/2 threads [auto] @@ -287,6 +287,14 @@ Developer options (useful when working on FFmpeg itself): \$FATE_SAMPLES at make invocation time. --enable-xmm-clobber-test check XMM registers for clobbering (Win64-only; should be used only for debugging purposes) + --enable-random randomly enable/disable components + --disable-random + --enable-random=LIST randomly enable/disable specific components or + --disable-random=LIST component groups. LIST is a comma-separated list + of NAME[:PROB] entries where NAME is a component + (group) and PROB the probability associated with + NAME (default 0.5). + --random-seed=VALUE seed value for --enable/disable-random NOTE: Object files are built at the place where configure is launched. EOF @@ -1221,6 +1229,7 @@ HAVE_LIST=" PeekNamedPipe poll_h posix_memalign + pthread_cancel round roundf sched_getaffinity @@ -1331,6 +1340,7 @@ CMDLINE_SET=" pkg_config postproc_version progs_suffix + random_seed samples strip sysinclude @@ -1400,6 +1410,7 @@ ac3_fixed_encoder_select="mdct ac3dsp" alac_encoder_select="lpc" amrnb_decoder_select="lsp" amrwb_decoder_select="lsp" +amv_encoder_select="aandct" atrac1_decoder_select="mdct sinewin" atrac3_decoder_select="mdct" binkaudio_dct_decoder_select="mdct rdft dct sinewin" @@ -1408,6 +1419,7 @@ cavs_decoder_select="golomb" cook_decoder_select="mdct sinewin" cscd_decoder_suggest="zlib" dca_decoder_select="mdct" +dirac_decoder_select="dwt golomb" dnxhd_encoder_select="aandct" dxa_decoder_select="zlib" eac3_decoder_select="ac3_decoder" @@ -1439,6 +1451,7 @@ h264_vaapi_hwaccel_select="vaapi h264_decoder" h264_vda_hwaccel_deps="VideoDecodeAcceleration_VDADecoder_h pthreads" h264_vda_hwaccel_select="vda h264_decoder" h264_vdpau_decoder_select="vdpau h264_decoder" +iac_decoder_select="sinewin" imc_decoder_select="fft mdct sinewin" jpegls_decoder_select="golomb" jpegls_encoder_select="golomb" @@ -1604,6 +1617,7 @@ matroska_demuxer_suggest="zlib bzlib" mov_demuxer_suggest="zlib" mp3_demuxer_select="mpegaudio_parser" mp4_muxer_select="mov_muxer" +mpegts_muxer_select="adts_muxer latm_muxer" mpegtsraw_demuxer_select="mpegts_demuxer" mxf_d10_muxer_select="mxf_muxer" ogg_demuxer_select="golomb" @@ -1675,11 +1689,13 @@ aconvert_filter_deps="swresample" amovie_filter_deps="avcodec avformat" aresample_filter_deps="swresample" ass_filter_deps="libass" +asyncts_filter_deps="avresample" blackframe_filter_deps="gpl" boxblur_filter_deps="gpl" colormatrix_filter_deps="gpl" cropdetect_filter_deps="gpl" delogo_filter_deps="gpl" +deshake_filter_deps="avcodec" drawtext_filter_deps="libfreetype" frei0r_filter_deps="frei0r dlopen" frei0r_filter_extralibs='$ldl' @@ -1690,10 +1706,12 @@ movie_filter_deps="avcodec avformat" mp_filter_deps="gpl avcodec swscale postproc" mptestsrc_filter_deps="gpl" negate_filter_deps="lut_filter" +resample_filter_deps="avresample" ocv_filter_deps="libopencv" pan_filter_deps="swresample" removelogo_filter_deps="avcodec avformat swscale" scale_filter_deps="swscale" +select_filter_deps="avcodec" super2xsai_filter_deps="gpl" tinterlace_filter_deps="gpl" yadif_filter_deps="gpl" @@ -1705,13 +1723,14 @@ avformat_deps="avcodec" postproc_deps="gpl" # programs +ffmpeg_deps="avcodec avfilter avformat swscale swresample" +ffmpeg_select="buffersink_filter format_filter aformat_filter + setpts_filter null_filter anull_filter" ffplay_deps="avcodec avformat swscale swresample sdl" ffplay_select="buffersink_filter rdft" ffprobe_deps="avcodec avformat" ffserver_deps="avformat ffm_muxer fork rtp_protocol rtsp_demuxer" ffserver_extralibs='$ldl' -ffmpeg_deps="avcodec avfilter avformat swscale swresample format_filter" -ffmpeg_select="buffersink_filter" doc_deps="texi2html" @@ -1733,56 +1752,6 @@ test_deps(){ mxf_d10_test_deps="avfilter" seek_lavf_mxf_d10_test_deps="mxf_d10_test" -test_deps _encoder _decoder \ - adpcm_ima_qt \ - adpcm_ima_wav \ - adpcm_ms \ - adpcm_swf \ - adpcm_yamaha=adpcm_yam \ - alac \ - asv1 \ - asv2 \ - bmp \ - dnxhd="dnxhd_1080i dnxhd_720p dnxhd_720p_rd" \ - dvvideo="dv dv_411 dv50" \ - ffv1 \ - flac \ - flashsv \ - flv \ - adpcm_g726=g726 \ - gif \ - h261 \ - h263="h263 h263p" \ - huffyuv \ - jpegls \ - mjpeg="jpg mjpeg ljpeg" \ - mp2 \ - mpeg1video="mpeg mpeg1b" \ - mpeg2video="mpeg2 mpeg2_422 mpeg2_idct_int mpeg2_ilace mpeg2_ivlc_qprd" \ - mpeg2video="mpeg2thread mpeg2thread_ilace" \ - mpeg4="mpeg4 mpeg4_adap mpeg4_qpel mpeg4_qprd mpeg4adv mpeg4nr" \ - mpeg4="mpeg4thread error rc" \ - msmpeg4v3=msmpeg4 \ - msmpeg4v2 \ - pbm=pbmpipe \ - pcx \ - pgm="pgm pgmpipe" \ - png \ - ppm="ppm ppmpipe" \ - rawvideo="rgb yuv" \ - roq \ - rv10 \ - rv20 \ - sgi \ - snow="snow snowll" \ - svq1 \ - targa=tga \ - tiff \ - wmav1 \ - wmav2 \ - wmv1 \ - wmv2 \ - test_deps _muxer _demuxer \ aiff \ pcm_alaw=alaw \ @@ -1808,7 +1777,6 @@ test_deps _muxer _demuxer \ wav \ yuv4mpegpipe=yuv4mpeg \ -ac3_fixed_test_deps="ac3_fixed_encoder ac3_decoder" colormatrix1_test_deps="colormatrix_filter" colormatrix2_test_deps="colormatrix_filter" flashsv2_test_deps="zlib" @@ -1876,7 +1844,6 @@ enable avcodec enable avdevice enable avfilter enable avformat -enable avresample enable avutil enable postproc enable stripping @@ -1978,16 +1945,12 @@ find_tests(){ map "echo ${2}\${v}_test" $(ls "$source_path"/tests/ref/$1 | grep -v '[^-a-z0-9_]') } -ACODEC_TESTS=$(find_tests acodec) -VCODEC_TESTS=$(find_tests vsynth1) LAVF_FATE_TESTS=$(find_tests lavf-fate) LAVF_TESTS=$(find_tests lavf) LAVFI_TESTS=$(find_tests lavfi) SEEK_TESTS=$(find_tests seek seek_) -ALL_TESTS="$ACODEC_TESTS $VCODEC_TESTS $LAVF_FATE_TESTS $LAVF_TESTS $LAVFI_TESTS $SEEK_TESTS" - -pcm_test_deps=$(map 'echo ${v%_*}_decoder $v' $(filter pcm_* $ENCODER_LIST)) +ALL_TESTS="$LAVF_FATE_TESTS $LAVF_TESTS $LAVFI_TESTS $SEEK_TESTS" for n in $COMPONENT_LIST; do v=$(toupper ${n%s})_LIST @@ -2010,6 +1973,27 @@ show_list() { exit 0 } +rand_list(){ + IFS=', ' + set -- $* + unset IFS + for thing; do + comp=${thing%:*} + prob=${thing#$comp} + prob=${prob#:} + is_in ${comp} $COMPONENT_LIST && eval comp=\$$(toupper ${comp%s})_LIST + echo "prob ${prob:-0.5}" + printf '%s\n' $comp + done +} + +do_random(){ + action=$1 + shift + random_seed=$(awk "BEGIN { srand($random_seed); print srand() }") + $action $(rand_list "$@" | awk "BEGIN { srand($random_seed) } \$1 == \"prob\" { prob = \$2; next } rand() < prob { print }") +} + for opt do optval="${opt#*=}" case "$opt" in @@ -2024,6 +2008,14 @@ for opt do --disable-everything) map 'eval unset \${$(toupper ${v%s})_LIST}' $COMPONENT_LIST ;; + --enable-random|--disable-random) + action=${opt%%-random} + do_random ${action#--} $COMPONENT_LIST + ;; + --enable-random=*|--disable-random=*) + action=${opt%%-random=*} + do_random ${action#--} $optval + ;; --enable-*=*|--disable-*=*) eval $(echo "${opt%%=*}" | sed 's/--/action=/;s/-/ thing=/') is_in "${thing}s" $COMPONENT_LIST || die_unknown "$opt" @@ -2850,6 +2842,10 @@ die_license_disabled() { enabled $1 || { enabled $2 && die "$2 is $1 and --enable-$1 is not specified."; } } +die_license_disabled_gpl() { + enabled $1 || { enabled $2 && die "$2 is incompatible with the gpl and --enable-$1 is not specified."; } +} + die_license_disabled gpl libcdio die_license_disabled gpl libutvideo die_license_disabled gpl libx264 @@ -2859,7 +2855,7 @@ die_license_disabled gpl x11grab die_license_disabled nonfree libaacplus die_license_disabled nonfree libfaac -die_license_disabled nonfree openssl +enabled gpl && die_license_disabled_gpl nonfree openssl die_license_disabled version3 libopencore_amrnb die_license_disabled version3 libopencore_amrwb @@ -3174,6 +3170,10 @@ for thread in $THREADS_LIST; do fi done +if enabled pthreads; then + check_func pthread_cancel +fi + check_lib math.h sin -lm && LIBM="-lm" disabled crystalhd || check_lib libcrystalhd/libcrystalhd_if.h DtsCrystalHDVersion -lcrystalhd || disable crystalhd enabled vaapi && require vaapi va/va.h vaInitialize -lva @@ -3601,6 +3601,8 @@ echo "openal enabled ${openal-no}" echo "openssl enabled ${openssl-no}" echo "zlib enabled ${zlib-no}" echo "bzlib enabled ${bzlib-no}" +test -n "$random_seed" && + echo "random seed ${random_seed}" echo for type in decoder encoder hwaccel parser demuxer muxer protocol filter bsf indev outdev; do @@ -3780,8 +3782,6 @@ print_config CONFIG_ "$config_files" $CONFIG_LIST \ $ALL_COMPONENTS \ cat >>config.mak <