From patchwork Thu May 11 20:59:19 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Timo Rothenpieler X-Patchwork-Id: 3652 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.3.129 with SMTP id 123csp34019vsd; Thu, 11 May 2017 14:00:13 -0700 (PDT) X-Received: by 10.28.144.15 with SMTP id s15mr271363wmd.137.1494536413755; Thu, 11 May 2017 14:00:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1494536413; cv=none; d=google.com; s=arc-20160816; b=0t8qf72cksYrcBFVkzGHgpKxZEGL3clG9yMwoXBZCLb4puN2YI6muHj4HNjsIhBXLC U/5ywefrOe9UPtMEFc1yAAqbsa52mKl0yO5Aa2C2Cd2r7TWyfoUiug/59QKRzsnNVvTX /9H30Jt9h66mg/aF1/bBUSTeMBS0vCaz0vQIsQAMPGUn+DXttGIE1owKLgH9eqY6+bTM 1FjcZmv6JXkM/nSzCulcY4L/BUxm7MxDRy5jctLADLxVSUR27fC0LyoXfcpzc70Fco85 CM7m8pk8CcQhH3qwkw6yGZvmmeRaBiyqA9NROlMrL6XFoc3gBoxXLM4kR/E2gncv3C+A xe9Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=i6uxKhh4wHP/ZJD0ahOTSkvPw8TtmhnFFctcBTTsfV8=; b=PTYEu5YizRZiJFZ6B8No5oztAthlF58Zr2DbZrSid2u5JE1+22UUMOlpvra0dhHOvy brbOdt+CNs6LuV0L/doyBQFMIFNLELmGgH12rCm9yY+fSPmk0+1ZIJGtLO+lylutEdNi 6F05IECsQn48k8wSOm6FBKLnSQkk410O962O5uIp+sKGVBSDRxw8nbVrJcZdeYqtWzBJ XzI+0dyqCHu0HAu3KimTb0ORHQC6pfEmTXHakvJWZLLO8PnTECtxBpK9zISuaqCQn6Ub JvoII5BzXvJv5KeMm0EJfKL5pHdLTM060hwncJ1yVHHr8h88oeJzcFH6AXBdfPrW5BcQ xylw== ARC-Authentication-Results: i=1; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id v67si55023wmv.2.2017.05.11.14.00.10; Thu, 11 May 2017 14:00:13 -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 CFE39688373; Thu, 11 May 2017 23:59:59 +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 A081B680A64 for ; Thu, 11 May 2017 23:59:53 +0300 (EEST) Received: from localhost.localdomain (unknown [IPv6:2a02:8109:43f:959c:ba97:5aff:fe10:ec69]) by btbn.de (Postfix) with ESMTPSA id A648B39DDE; Thu, 11 May 2017 23:00:00 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=rothenpieler.org; s=mail; t=1494536400; bh=sKVxGFavstS7FTHGBoeF/HJnmhUoOYakWgFolc5xCWg=; h=From:To:Cc:Subject:Date; b=rJHHfQ6RNr8pWWGQ+fphqiqL/wLxQXqp02FaSrOvaGLQTgt+HHHQe+UMEUQWTCHbL +52F1wK1tpAQsAbIK4JbZST+XbVDtCztNnrTtCjaqi/kMIQecRzox+Rih0fipvLCuI uVnhBet38KwaR828ZcfI/H0yO6iZDcULsZ2rJMkY= From: Timo Rothenpieler To: ffmpeg-devel@ffmpeg.org Date: Thu, 11 May 2017 22:59:19 +0200 Message-Id: <20170511205921.2172-1-timo@rothenpieler.org> X-Mailer: git-send-email 2.12.2 Subject: [FFmpeg-devel] [PATCH 1/3] configure: add cuda-sdk for things requiring full CUDA sdk 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: Yogender Gupta , Timo Rothenpieler MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" --- configure | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/configure b/configure index c347336426..ef2134828b 100755 --- a/configure +++ b/configure @@ -297,6 +297,7 @@ External library support: The following libraries provide various hardware acceleration features: --disable-audiotoolbox disable Apple AudioToolbox code [autodetect] --disable-cuda disable dynamically linked Nvidia CUDA code [autodetect] + --enable-cuda-sdk enable CUDA features that require the CUDA SDK [no] --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] @@ -1598,6 +1599,7 @@ HWACCEL_AUTODETECT_LIBRARY_LIST=" " HWACCEL_LIBRARY_NONFREE_LIST=" + cuda_sdk libnpp " @@ -2716,7 +2718,7 @@ qsvenc_select="qsv" vaapi_encode_deps="vaapi" hwupload_cuda_filter_deps="cuda" -scale_npp_filter_deps="cuda libnpp" +scale_npp_filter_deps="cuda_sdk libnpp" nvpp_filter_deps="cuda" nvenc_deps="cuda" @@ -5756,7 +5758,7 @@ done enabled avfoundation_indev && { check_header_objcc AVFoundation/AVFoundation.h || disable avfoundation_indev; } enabled avfoundation_indev && { check_lib avfoundation_indev CoreGraphics/CoreGraphics.h CGGetActiveDisplayList -framework CoreGraphics || check_lib avfoundation_indev ApplicationServices/ApplicationServices.h CGGetActiveDisplayList -framework ApplicationServices; } -enabled cuda && check_header cuda.h # this is not a dependency +enabled cuda_sdk && require cuda_sdk cuda.h cuCtxCreate -lcuda enabled cuvid && { enabled cuda || die "ERROR: CUVID requires CUDA"; } enabled chromaprint && require chromaprint chromaprint.h chromaprint_get_version -lchromaprint