From patchwork Sun Oct 1 02:06:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 44075 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1204:b0:15d:8365:d4b8 with SMTP id v4csp655997pzf; Sat, 30 Sep 2023 19:06:49 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHrTqPYcQ6uGvzqltor80+fD9mSXadGu98CKWU/Sbj0fo5rHxRTPfIxhbhBXtkj4XC/mXg8 X-Received: by 2002:a05:6512:3e24:b0:504:7bd5:a269 with SMTP id i36-20020a0565123e2400b005047bd5a269mr7650214lfv.64.1696126009045; Sat, 30 Sep 2023 19:06:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696126009; cv=none; d=google.com; s=arc-20160816; b=VapketDbfDUjaMgPLJ8HYctzzYr3BHTEJuJj3ioRzsmkkT5898fCF2BN1fWe8y9JOe YTePPoOvJVFMRqXM1Qm2EtEULc7ZfBPwaSGzL9HvH1wK54h09MR7FmNIXu8+Hnt0vlXo 9tL+ZIP0Rqa0CwjhX55fs6gpxRxzEEcAIhRrB4Rg/ulyiOdSiGoqxV8qv2RPWelRQnGp /X1Bqjd26pjzlBZdtCOxDyfX8kK1hzS2+sjkaGA/OI1JasH3juZOwDNgCk9NN4tAsqlc vfuJSt8LPEyWpLx/+TfG2HN+A3KeVGv1yrszJnPYXnfHni8yL6Y541yIu/3ptrZ84FnU u8PA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=ipUiEN8/a9h4ZqTQvOovsMnoBYzmR4H9ygsL2/AQUHI=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=rrRrzMqNtN2d0p5k8Y/eoUuaBEDGlRVFrWkZMrfGfT8r9h3RtQwqk1QPjDdMTqEGMm QCo4rjDiR353oqLfSveNaXFqY+ron8e3iPhMtclB5trlBKSRh+G2ZeHxofN+es9sPgcm C0eLCARBYdTRbUdCKVVN2miKrbUP0ln0agAcaZfGv++OEyraJuDyEtHCu+dXDWCdhzP8 tUTzkuJ6GUDQwsYaR/NB3YTCuzoWm+evvWITSyFEEXDWeknd8b2aDCYgfjjgfY+PlcUz 38R2ZZWku3UjgSnZrdqsOJJ2kRn1HGcnvMt4Ou77KIZ51Nbg5L2kdMPdsxwYXXFxrp/Z Re+Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=Ty9IXEG9; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id p19-20020aa7d313000000b005333c731461si16992674edq.280.2023.09.30.19.06.48; Sat, 30 Sep 2023 19:06:49 -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=@gmail.com header.s=20230601 header.b=Ty9IXEG9; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id F212368CBF7; Sun, 1 Oct 2023 05:06:44 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oi1-f180.google.com (mail-oi1-f180.google.com [209.85.167.180]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4672B68CBF7 for ; Sun, 1 Oct 2023 05:06:38 +0300 (EEST) Received: by mail-oi1-f180.google.com with SMTP id 5614622812f47-3ae214a077cso8647002b6e.0 for ; Sat, 30 Sep 2023 19:06:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696125996; x=1696730796; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=1Qk9oxt9Ld/rzFb2knS/gCtI4DbMaK0h0tVT2FjW4Dw=; b=Ty9IXEG91alH2RjQzKHG0e+l8JGK21u0PO/MCw5FO8n5k6TNY2ECVBqTEnc5fx2sbd nrfj5slt6U0aZP2pNaX5/X7HgzO/bTTSORSxGJgvT5nMIHCvqSxFLHgu9aEeTkSWe9wq gwcDBmA8tad7WRF/u2J+EQPRcwljKmf6SJwWnCItIa/byJsnf+LlhYnUf4vVJ1JZDbkd 9fEhvF/fx3crJ9g0Z0B8i1tVXzCv51XaJd/A9x+VHRKYcX4rHvni98j0mwaVx4wEy3FP UuRc1dyE+nz3LgrCHNaQo+EQi+gKI3TWXc1zLsoujrCHgI5g4IlvSrUkKbqicRspNCzp PSEw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696125996; x=1696730796; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=1Qk9oxt9Ld/rzFb2knS/gCtI4DbMaK0h0tVT2FjW4Dw=; b=R/0GZbeF4XxGyLBZiGmse+LAPkETD1EMBu42Zm7LFaVz0rOJYCZ8MERidogqFmunkt jKntYXJde5+kou6bYhllVu34vcjoHDuYAkALHnqSEP+ye6cTzvSjYFCb8O72wMpRbkQD /T6l+WoaDey853a8DaKtsLfu0mmN29TSetNN802+Yjw+hFlN5y5rJuyc/rbWDvFtp6s9 vXaE9dBk9FExhRSylD2Qw0RBNbFjdKiYEAm4REDnFns0nvMkSSWBPs80YqV+pzXMzY6F hLa2bV0YZcf00wGGKFHFW3uNuOR6Gx9NQ1nVxAs7L6drAS+0Sd66p2pv9BAz8c6HmM1g 3jmA== X-Gm-Message-State: AOJu0YyiQKmqjFIIM2VknI2fv8t7LP/DiDguoX6a49epPbqXWmiYkez6 s2wH67Q1P+y5mYGAYoM18DiRo18iZpI= X-Received: by 2002:a05:6808:1306:b0:3ac:f107:52b with SMTP id y6-20020a056808130600b003acf107052bmr11953383oiv.2.1696125996052; Sat, 30 Sep 2023 19:06:36 -0700 (PDT) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id s1-20020a170902ea0100b001c3be750900sm19433193plg.163.2023.09.30.19.06.34 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 30 Sep 2023 19:06:35 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sat, 30 Sep 2023 23:06:28 -0300 Message-ID: <20231001020628.2768-1-jamrial@gmail.com> X-Mailer: git-send-email 2.42.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avutil/hwcontext_cuda: check that the SDK defines cuCtxGetCurrent() X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: Ilp7dZHhVsnS Fixes compilation after 05f8b2ca0f7e28775837a572c65ce9218f534ee2 Signed-off-by: James Almer --- libavutil/hwcontext_cuda.c | 4 ++++ libavutil/hwcontext_cuda_internal.h | 9 +++++++++ 2 files changed, 13 insertions(+) diff --git a/libavutil/hwcontext_cuda.c b/libavutil/hwcontext_cuda.c index 0312d3b9d7..4f55f6441d 100644 --- a/libavutil/hwcontext_cuda.c +++ b/libavutil/hwcontext_cuda.c @@ -362,10 +362,14 @@ static int cuda_context_init(AVHWDeviceContext *device_ctx, int flags) { if (ret < 0) return ret; } else if (flags & AV_CUDA_USE_CURRENT_CONTEXT) { +#if NVDECAPI_CHECK_VERSION(12, 1) ret = CHECK_CU(cu->cuCtxGetCurrent(&hwctx->cuda_ctx)); if (ret < 0) return ret; av_log(device_ctx, AV_LOG_INFO, "Using current CUDA context.\n"); +#else + return AVERROR(ENOSYS); +#endif } else { ret = CHECK_CU(cu->cuCtxCreate(&hwctx->cuda_ctx, desired_flags, hwctx->internal->cuda_device)); diff --git a/libavutil/hwcontext_cuda_internal.h b/libavutil/hwcontext_cuda_internal.h index d5633c58d5..fe0963b4e5 100644 --- a/libavutil/hwcontext_cuda_internal.h +++ b/libavutil/hwcontext_cuda_internal.h @@ -28,6 +28,15 @@ * FFmpeg internal API for CUDA. */ +#if defined(NVDECAPI_MAJOR_VERSION) && defined(NVDECAPI_MINOR_VERSION) +# define NVDECAPI_CHECK_VERSION(major, minor) \ + ((major) < NVDECAPI_MAJOR_VERSION || ((major) == NVDECAPI_MAJOR_VERSION && (minor) <= NVDECAPI_MINOR_VERSION)) +#else +/* version macros were added in SDK 8.1 ffnvcodec */ +# define NVDECAPI_CHECK_VERSION(major, minor) \ + ((major) < 8 || ((major) == 8 && (minor) <= 0)) +#endif + struct AVCUDADeviceContextInternal { CudaFunctions *cuda_dl; int is_allocated;