From patchwork Wed Oct 19 12:00:36 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Timo Rothenpieler X-Patchwork-Id: 1072 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.133 with SMTP id o127csp176402vsd; Wed, 19 Oct 2016 05:02:16 -0700 (PDT) X-Received: by 10.28.198.11 with SMTP id w11mr4720440wmf.8.1476878536859; Wed, 19 Oct 2016 05:02:16 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id z7si53896235wjl.99.2016.10.19.05.02.16; Wed, 19 Oct 2016 05:02:16 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@rothenpieler.org; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id F1E56689B5B; Wed, 19 Oct 2016 15:01:01 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from btbn.de (btbn.de [5.9.118.179]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6E34A689B2E for ; Wed, 19 Oct 2016 15:00:55 +0300 (EEST) Received: from localhost.localdomain (ip4d173c0b.dynamic.kabel-deutschland.de [77.23.60.11]) by btbn.de (Postfix) with ESMTPSA id C5D6D6FF68; Wed, 19 Oct 2016 14:00:53 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=rothenpieler.org; s=mail; t=1476878453; bh=vXCfY+n+i+qk4Z7IfMWZgOpwLiQ+ahnuog5k5AOe9T4=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=fpe+AloujdTojq6jA3/HNQxO0MBJbTeqP8O3s609g1oCRps3fk5Z+/4Jy4L4JlMHF mLW3otxom/MgZZo32TGMKlNkYCQqzHhlFtBDgfqWu76RR48wGHUYewVs8xHlyGnkoP vA3W0ec1os8gOoQMCplmoKl5h3ogCcVfsFYlbuYQ= From: Timo Rothenpieler To: ffmpeg-devel@ffmpeg.org Date: Wed, 19 Oct 2016 14:00:36 +0200 Message-Id: <20161019120036.618-8-timo@rothenpieler.org> X-Mailer: git-send-email 2.10.1 In-Reply-To: <20161019120036.618-1-timo@rothenpieler.org> References: <20161019120036.618-1-timo@rothenpieler.org> Subject: [FFmpeg-devel] [PATCH 8/8] configure: cuda is no longer nonfree, enable and autodetect by default X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Timo Rothenpieler MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" --- configure | 24 ++++++------------------ 1 file changed, 6 insertions(+), 18 deletions(-) diff --git a/configure b/configure index 78113e2..b6a0276 100755 --- a/configure +++ b/configure @@ -299,8 +299,8 @@ External library support: The following libraries provide various hardware acceleration features: --disable-audiotoolbox disable Apple AudioToolbox code [autodetect] - --enable-cuda enable dynamically linked Nvidia CUDA code [no] - --enable-cuvid enable Nvidia CUVID support [autodetect] + --disable-cuda disable dynamically linked Nvidia CUDA code [autodetect] + --disable-cuvid disable Nvidia CUVID support [autodetect] --disable-d3d11va disable Microsoft Direct3D 11 video acceleration code [autodetect] --disable-dxva2 disable Microsoft DirectX 9 video acceleration code [autodetect] --enable-libmfx enable Intel MediaSDK (AKA Quick Sync Video) code via libmfx [no] @@ -3231,7 +3231,7 @@ enable audiotoolbox enable d3d11va dxva2 vaapi vda vdpau videotoolbox_hwaccel xvmc enable xlib -enable nvenc vda_framework videotoolbox videotoolbox_encoder +enable cuda cuvid nvenc vda_framework videotoolbox videotoolbox_encoder # build settings SHFLAGS='-shared -Wl,-soname,$$(@F)' @@ -5082,8 +5082,6 @@ die_license_disabled gpl libxavs die_license_disabled gpl libxvid die_license_disabled gpl x11grab -die_license_disabled nonfree cuda -die_license_disabled nonfree cuvid die_license_disabled nonfree libnpp enabled gpl && die_license_disabled_gpl nonfree libfdk_aac enabled gpl && die_license_disabled_gpl nonfree openssl @@ -5655,11 +5653,6 @@ for func in $COMPLEX_FUNCS; do eval check_complexfunc $func \${${func}_args:-1} done -# Enable CUVID by default if CUDA is enabled -if enabled cuda && ! disabled cuvid; then - enable cuvid -fi - # these are off by default, so fail if requested and not available enabled avfoundation_indev && { check_header_objcc AVFoundation/AVFoundation.h || disable avfoundation_indev; } enabled avfoundation_indev && { check_lib2 CoreGraphics/CoreGraphics.h CGGetActiveDisplayList -framework CoreGraphics || @@ -5667,12 +5660,7 @@ enabled avfoundation_indev && { check_lib2 CoreGraphics/CoreGraphics.h CGGetActi enabled avisynth && { { check_lib2 "windows.h" LoadLibrary; } || { check_lib2 "dlfcn.h" dlopen -ldl; } || die "ERROR: LoadLibrary/dlopen not found for avisynth"; } -enabled cuda && { check_lib cuda.h cuInit -lcuda || - die "ERROR: CUDA not found"; } -enabled cuvid && { add_cflags -I$source_path; - check_lib "compat/cuda/cuviddec.h" cuvidCreateDecoder -lnvcuvid || - die "ERROR: CUVID not found"; } && - { enabled cuda || +enabled cuvid && { enabled cuda || die "ERROR: CUVID requires CUDA"; } enabled chromaprint && require chromaprint chromaprint.h chromaprint_get_version -lchromaprint enabled coreimage_filter && { check_header_objcc QuartzCore/CoreImage.h || disable coreimage_filter; } @@ -6024,11 +6012,11 @@ if enabled x86; then mingw32*|mingw64*|win32|win64|linux|cygwin*) ;; *) - disable nvenc + disable cuda cuvid nvenc ;; esac else - disable nvenc + disable cuda cuvid nvenc fi enabled nvenc &&