From patchwork Fri May 12 19:40:14 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Timo Rothenpieler X-Patchwork-Id: 3662 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.3.129 with SMTP id 123csp474310vsd; Fri, 12 May 2017 12:40:34 -0700 (PDT) X-Received: by 10.28.107.143 with SMTP id a15mr3896728wmi.81.1494618034662; Fri, 12 May 2017 12:40:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1494618034; cv=none; d=google.com; s=arc-20160816; b=xTBWE1x9qyKBjPvpBskxnWCEhyGCwNDkKFw6SqFHWYxpcRUlCl24y7IlS79hXDrDBn EMnwQZxOwQ2TDPkZnPzYY4nNgPJDV0FcX/qwbWT65pgWKDt4a2N504nORBhyT0/QDM/u en4+cJO3Z3ZfPk7U/G9sZF/ugvp6YJoY0HWdOiivyQFB+W7gjeLo0yNy2tsqBweJ5S85 frsfPYzEnxJeL9EzHWLWXN3Li76JA0tYcNKmrOScfZ8sc0KolJelGCQvnTq8W/vBbg7Z dSF4u1hY9cR6BQ9VOtdyttnKqu5lGyotk08lN0jz94bYthkwFR52FT5ztFXzUDnUA+7S bcSA== 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:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=oO4Lx6jcRkULKosv86ELOYhzXYpuQ9dyyshUVfuYoig=; b=C3BKFncu5Z2bL98DrU34OCTNESCAIBGCs2vNLvq14RTGX7NBfH8oXua9HXQZgg0Cwy xnnEhGemBk6QLTotdj/EBTmdLO+bdWUMD20SWGc64ke4zNzzfsbOKxlJUJgNZfi4hCsk hp9fylZ9v9QgPcUVW6oODbXb3rcqy5qZ+Be64nJEh+S8n2BkLQNyI6vBrnoTKP7P1BxM fW8wYTUup6DoA+uJ4akiyr/2mcwgaGDJyCWnMHL5c2TXKs/P19u3kW5CDl3BnrIwpxXD 3oiTs8bl1Bs/Kwghen0mze1JyQbFnOwjemuBYXXhSye0LkHe+VDz+eMVQX+aKL6C27TY rs+w== 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 u29si4402804wru.142.2017.05.12.12.40.34; Fri, 12 May 2017 12:40:34 -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 EE01268832B; Fri, 12 May 2017 22:40:23 +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 3F56668019C for ; Fri, 12 May 2017 22:40:17 +0300 (EEST) Received: from localhost.localdomain (unknown [IPv6:2a02:8109:43f:959c:ba97:5aff:fe10:ec69]) by btbn.de (Postfix) with ESMTPSA id A28966C410; Fri, 12 May 2017 21:40:24 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=rothenpieler.org; s=mail; t=1494618024; bh=8Ed4oiBOW02GDgqfK+Xjd1IQ9AztlkRoICf+0FIWh+w=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=XCzNObQsSsfFGaG9XMUhVjpgfdH4iQ1GXBjPUmaAILlOLgg//jDetMN1rWiNLv7Ab cZROoWzniQ5dYiVH95uyYh9UXyjqklvyvKQyV63SM4hBEe0ZRADWyPZcalcRlEcFkt /8gqHRsb4cAUTGcC0uGIm/4gB8DpVtBYlacqMuPU= From: Timo Rothenpieler To: ffmpeg-devel@ffmpeg.org Date: Fri, 12 May 2017 21:40:14 +0200 Message-Id: <20170512194016.8298-1-timo@rothenpieler.org> X-Mailer: git-send-email 2.12.2 In-Reply-To: <20170511205921.2172-1-timo@rothenpieler.org> References: <20170511205921.2172-1-timo@rothenpieler.org> Subject: [FFmpeg-devel] [PATCH 1/3 fixed] 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: 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 5ae5227868..8d67838aab 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" nvenc_deps="cuda" nvenc_deps_any="dlopen LoadLibrary" @@ -5755,7 +5757,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