From patchwork Sat Mar 3 21:39:45 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Timo Rothenpieler X-Patchwork-Id: 7809 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.181.170 with SMTP id m39csp971044jaj; Sat, 3 Mar 2018 13:40:07 -0800 (PST) X-Google-Smtp-Source: AG47ELvyto2gs3RylVeawZWseoXori8G5ssN6eC8riIsp/ywxkGAln8TshW0pMmPQXtngNtagfX5 X-Received: by 10.223.131.38 with SMTP id 35mr8415065wrd.197.1520113207347; Sat, 03 Mar 2018 13:40:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520113207; cv=none; d=google.com; s=arc-20160816; b=PcTwNnaUNlLseqrweKkTDr5G/cUEQWFoKZeJ81Kthd/wxxYGYSwOU1yvHelOm6yXfS 5UvDIENVEL1s31n0T98Fiq6k1LfvMmfSXXbcQTHq4F0W6GVmykAlm5DkKt1QvLmJ99dc XvBNtADjUkpMWiZq3+KJZwencVDmwqlWZksOdcXWN7h3oUHRoIeiMAquDOG9v2X9GNO6 Pc9iWS+mP3IhkBQoOugUxb055RAEBboD282UtIKBQX3UG0sk4ro6Y4E+B2qwFKQa1ukg ZrFnWXke1aIU1DfsF5ycOSDi0z8UUzMP77neMcbp3G7XkOd0AcIdEPkMe5mmdmyfGi3D beXw== 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=QV2D32gj6fh+qIqi/6uwkKQGUIK9FH0iYtiQ/c4f69M=; b=lNlX2wuxPnimm5KunDTrdP/7LoHAySgGCC6BQJBiiQYNi1ecULhffAsSOc1ojF2EnV hnzSDWBFhKoy0nvKOwiS1Qt4cUdvGwrIwD9+4W2x101Lnb3pqFkh2xWHJnGZMpZp3R6M tlAnEZdICbuxduQDDusyxqlbLChFzOH79EZCWfGTcLXC1rxrVqfef0WbKtPWc2aomR1q /q4QabL5BG97rm66c3BV2FRqPEyNDwgOlY7inStNoYnc3ouiczNnNoAetpgd2x4SbYHZ 9acyy8x3gsqM1h401YWbvQGOuOvfjk3Z4FqAz9O5jpNFMSCofGxjvDesPaHLLmiLaYHx Xoqw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@rothenpieler.org header.s=mail header.b=JKPRg2bO; 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 y21si6533591wra.296.2018.03.03.13.40.07; Sat, 03 Mar 2018 13:40:07 -0800 (PST) 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 header.s=mail header.b=JKPRg2bO; 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 3337668A5DE; Sat, 3 Mar 2018 23:39:59 +0200 (EET) 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 01E4E689B5B for ; Sat, 3 Mar 2018 23:39:52 +0200 (EET) Received: from localhost.localdomain (ip4d14a161.dynamic.kabel-deutschland.de [77.20.161.97]) by btbn.de (Postfix) with ESMTPSA id 05C1340E923; Sat, 3 Mar 2018 22:39:58 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=rothenpieler.org; s=mail; t=1520113199; bh=hSZLK5TbsYoxf9ziYvFW7kFnx7zY+Jjrnpu3rO3E7cY=; h=From:To:Cc:Subject:Date; b=JKPRg2bO88oOtaoZoBZzWdPjTebGVBbpehG5HCASnT+i+Y/kkXrQPG8rmP2my5hrF XlYBGLLj6EfIpGo+LWMRo5XtO/5nQODCd2cBi6tY+GsqyKj5THRRM3QmYybkRL12/+ ujSrVxS0BWoJjW2KfqhDJ9eQqvDtR1AJq53n6AfU= From: Timo Rothenpieler To: ffmpeg-devel@ffmpeg.org Date: Sat, 3 Mar 2018 22:39:45 +0100 Message-Id: <20180303213945.6968-1-timo@rothenpieler.org> X-Mailer: git-send-email 2.15.1 Subject: [FFmpeg-devel] [PATCH] configure: rename cuda to ffnvcodec 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" Right now, if someone configures ffmpeg with for example --enable-nvenc they will get an error message complaining about missing cuda. This is very confusing and already has lead people into installing the CUDA SDK, even though it's not what they need. This will make it complain about ffnvcodec instead. Signed-off-by: Timo Rothenpieler --- configure | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/configure b/configure index fe81ba31b5..5fbab4501d 100755 --- a/configure +++ b/configure @@ -307,11 +307,11 @@ External library support: The following libraries provide various hardware acceleration features: --disable-amf disable AMF video encoding code [autodetect] --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] + --disable-ffnvcodec disable dynamically linked Nvidia code [autodetect] --enable-libdrm enable DRM code (Linux) [no] --enable-libmfx enable Intel MediaSDK (AKA Quick Sync Video) code via libmfx [no] --enable-libnpp enable Nvidia Performance Primitives-based code [no] @@ -1660,6 +1660,7 @@ HWACCEL_AUTODETECT_LIBRARY_LIST=" cuvid d3d11va dxva2 + ffnvcodec nvdec nvenc vaapi @@ -2675,11 +2676,12 @@ zmbv_encoder_deps="zlib" # hardware accelerators crystalhd_deps="libcrystalhd_libcrystalhd_if_h" -cuda_deps_any="libdl LoadLibrary" -cuvid_deps="cuda" +cuda_deps="ffnvcodec" +cuvid_deps="ffnvcodec" d3d11va_deps="dxva_h ID3D11VideoDecoder ID3D11VideoContext" dxva2_deps="dxva2api_h DXVA2_ConfigPictureDecode ole32 user32" -nvdec_deps="cuda" +ffnvcodec_deps_any="libdl LoadLibrary" +nvdec_deps="ffnvcodec" videotoolbox_hwaccel_deps="videotoolbox pthreads" videotoolbox_hwaccel_extralibs="-framework QuartzCore" xvmc_deps="X11_extensions_XvMClib_h" @@ -2797,13 +2799,13 @@ qsvvpp_select="qsv" vaapi_encode_deps="vaapi" v4l2_m2m_deps_any="linux_videodev2_h" -hwupload_cuda_filter_deps="cuda" -scale_npp_filter_deps="cuda libnpp" +hwupload_cuda_filter_deps="ffnvcodec" +scale_npp_filter_deps="ffnvcodec libnpp" scale_cuda_filter_deps="cuda_sdk" thumbnail_cuda_filter_deps="cuda_sdk" amf_deps_any="libdl LoadLibrary" -nvenc_deps="cuda" +nvenc_deps="ffnvcodec" nvenc_deps_any="libdl LoadLibrary" nvenc_encoder_deps="nvenc" @@ -3357,7 +3359,7 @@ avformat_deps="avcodec avutil" avformat_suggest="libm network zlib" avresample_deps="avutil" avresample_suggest="libm" -avutil_suggest="clock_gettime cuda libm libdrm libmfx opencl user32 vaapi videotoolbox corefoundation corevideo coremedia wincrypt" +avutil_suggest="clock_gettime ffnvcodec libm libdrm libmfx opencl user32 vaapi videotoolbox corefoundation corevideo coremedia wincrypt" postproc_deps="avutil gpl" postproc_suggest="libm" swresample_deps="avutil" @@ -5811,8 +5813,10 @@ check_type "va/va.h va/va_enc_vp9.h" "VAEncPictureParameterBufferVP9" check_type "vdpau/vdpau.h" "VdpPictureInfoHEVC" -check_pkg_config cuda "ffnvcodec >= 8.0.14.1" \ - "ffnvcodec/nvEncodeAPI.h ffnvcodec/dynlink_cuda.h ffnvcodec/dynlink_cuviddec.h ffnvcodec/dynlink_nvcuvid.h" "" +if ! disabled ffnvcodec; then + check_pkg_config ffnvcodec "ffnvcodec >= 8.0.14.1" \ + "ffnvcodec/nvEncodeAPI.h ffnvcodec/dynlink_cuda.h ffnvcodec/dynlink_cuviddec.h ffnvcodec/dynlink_nvcuvid.h" "" +fi check_cpp_condition windows.h "!WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)" && enable winrt || disable winrt @@ -6257,11 +6261,11 @@ if enabled x86; then mingw32*|mingw64*|win32|win64|linux|cygwin*) ;; *) - disable cuda cuvid nvdec nvenc + disable ffnvcodec cuvid nvdec nvenc ;; esac else - disable cuda cuvid nvdec nvenc + disable ffnvcodec cuvid nvdec nvenc fi enabled nvenc &&