From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 328AB47AB9 for ; Sun, 1 Oct 2023 02:24:55 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6DD8D68CD5B; Sun, 1 Oct 2023 05:24:53 +0300 (EEST) Received: from mail-oi1-f175.google.com (mail-oi1-f175.google.com [209.85.167.175]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B4E3E68CD15 for ; Sun, 1 Oct 2023 05:24:46 +0300 (EEST) Received: by mail-oi1-f175.google.com with SMTP id 5614622812f47-3ae5ee80c0dso4005708b6e.3 for ; Sat, 30 Sep 2023 19:24:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696127085; x=1696731885; darn=ffmpeg.org; h=content-transfer-encoding:in-reply-to:autocrypt:content-language :references:to:from:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=k69TT78o/eE1+YZZd3PWY9d0QP6XQJ6l0mf9bLgOovw=; b=LrG+AGv7uAlFx5bX91TxC6CM2a1HCHh0AKNgqOgAsP43eEP/fAQp9hIDTyCDHG9ncU j5qWwPnY92mfwyoY49MyMBhl0j6fA6XnFJf2MOEAgn6b6+gB1+SRt2ofEnEPXCLdlhF+ dp36enUpqQFtKivMtNnRh8TnHTl+4tBM+xFV+ivIZcvzccF83MXlT51Lfm+ftZrUR8rY AyisuQDEarn8TwefXJmoOUmEjfSyZaifNtEhpG1lJfN2/nRTQcd+38VSw2mRMTToVIO2 ylj2SfnMGxttN5XwKS0xRMHJ0ynmFe4QF9wFmy63d2btbu3WqSuCGKmeonudQVOQUtQJ PIgg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696127085; x=1696731885; h=content-transfer-encoding:in-reply-to:autocrypt:content-language :references:to:from:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=k69TT78o/eE1+YZZd3PWY9d0QP6XQJ6l0mf9bLgOovw=; b=VR9vHXYz4KdQD+uA2+JDzmQi2xS2Zoe6jTzgTqMJN09VGbW5mPX0Lbh97ZNOiQdv3N lFUf3khDYmDSQpecjbcPLdg8R6QBGYJ+yt2S53yLbD6sAKBsgHNGXaf/4HXlMeRMG3Am XfFhmnsHyUyUNzk21HCo+kRqXm4/KpsGxuPX6bzUNm0/MQKlyVZ+mfmbEnXEq9Nh0yf1 p3z/fZqg7vVixI2e08gBQwlDd5voLA3+yyeJXkXwh2nIpsOgKxvVnGdDay8/nlooB5wl MWCr0FTdK8tztyt7ff+xP+szA0y65ZBKKhVG5eaTc7jZikjlm7pgjE2ULmuFw6g5QgxZ WQew== X-Gm-Message-State: AOJu0YyoIYhlVQiwxhHyRcuczcY7qXSXWY+/HN09/e8iuLaBQWT749Mb GA+IhqIyXsTljzXIus6LwGm797j3bcM= X-Google-Smtp-Source: AGHT+IFt5GKEQ1y9/nFARcufNB8GIY1/ioHoZ2f7zBU83jho2SSzYnS75qZcnJ7HrvwF/XMheCAfHQ== X-Received: by 2002:a05:6808:302:b0:3ae:1282:cc95 with SMTP id i2-20020a056808030200b003ae1282cc95mr8779623oie.32.1696127084687; Sat, 30 Sep 2023 19:24:44 -0700 (PDT) Received: from [192.168.0.10] (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id 12-20020a170902e9cc00b001c613091aeesm9749970plk.293.2023.09.30.19.24.43 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 30 Sep 2023 19:24:44 -0700 (PDT) Message-ID: Date: Sat, 30 Sep 2023 23:24:49 -0300 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird From: James Almer To: ffmpeg-devel@ffmpeg.org References: <20231001020628.2768-1-jamrial@gmail.com> Content-Language: en-US Autocrypt: addr=jamrial@gmail.com; keydata= xsBNBFjZtqABCADLW+vdEoZaJZDsIO6geYFTOcn1unsEHefj9zn+3oTHlDFFzO47mzHsSfbK 9JE2xpOJEVnC8FAF5Sayi/pVwV+mtQUV3n5dgVeVBYF9GUQwOGFCpK8X54RRqhkgknbunOEE 0CtgAJgmpFmmmHgq02GvEspx1h/rh4apqwQR6QX4Favb+x9+i9ytVpwVcBX94vo2toyP7h/K BWfadQmb8ltgE1kshfg+SQs/H5bTV5Z1DuEASf02ZL/1qYB/sdTgWPLv9XMUHHsRFmMY8TMx wJSkP+Af3AiYQPJYz1B1D4tt98T/NoiVdin10zATakPjV8hXaobuRmxgakkUASXudydDABEB AAHNH0phbWVzIEFsbWVyIDxqYW1yaWFsQGdtYWlsLmNvbT7CwJIEEwEIADwCGwMGCwkIBwMC BhUIAgkKCwQWAgMBAh4BAheAFiEEd1EujP2UoWlX5pp6FGMBrXN2WeAFAmJoLUUCGQEACgkQ FGMBrXN2WeAFVQf9GtGhniRs1PzNUOgJktCnv6j4BbLieaIPYPEFXKDHOgjqQE2zVMYXnoXl Jam928ii902a8OY06r9ywn/R8ApD1/3NY/v64O71CY9scz5XyH2au8wIZ6HwFy3/f7sqjdGD uctY8Qs7rjT7NkoC5lmgMu2v2k03dGtM9AAf5AK5gU+H0EUw7vmKKiXzUqt5kvBuf4CEwXvH AQT1SMJ52rIlDWB7FQFyZeUbOAK2IgY/KNedfK6nsgd/eQVnlofPd2XoddE7kP6iys7jJefw DD3g3rZyDTq7in5dyk5glaNpWZpbHGBs+9SCYLnfQ8XvWqPFOD+gj0plamKANgOvavKTxM7A TQRY2bagAQgA69YtILj8kYxmqPr/M8+MXT7wVoOWVW9lvSmPquCELaDy/NIS7D06VC5EuE/6 JlJXZMTn37NLlyWhzwOgXuXw5w2tyoQQBuvqGiXJijuXwXH7HKdzrc6rpYtAqt5w05hzNrFS KrS0izG64VpWrfproy3BsL+8TBm9brLhhNPynVRqVukbbGzlATTzNQGZ14TTi2/dL6DkMQnM qn4jX9UEe4GdGQBP50bUJSSmeiIkyNLWA+znuN2PZEz930ZwNrF9GtDVw7mzcmpCZ7spldE2 tutbpy9D1bIqxyqBrYDSezyzL2adR1qgHyOTMCHg2AYNkrIQHrSyJxKTpZ1/hqOp8wARAQAB wsBfBBgBAgAJBQJY2bagAhsMAAoJEBRjAa1zdlnghekH/0Yb0iYJ74oID2f/Fj+AJKS2ekQF P2xOr8lpGzgp/+yWUvPtqbX0A33anBJdYwxaAC0NataX3tfZ+oJkzXqfmqhIHMPYHdZesJA2 Bk9hU/33mDl5s5U66/z0uelWzwKVHoQ2O6or4+qF3HJFSJLCe9uvWJ3zXf9F342Ftj73sfx+ 3xkw/IXsN1RqbYqDlzpoEQ99SIEfY/8Jjwnd3sIPfqkuyeaYfe6GJDqKawdCEP1oRRlbXEAp TJgYz8r3nPhGv9cdHNDCk44ISbsqVuxIEnLqi4fTPZaGupiQhT+srl268TTAp2TQW7+6Ce/b NPQorMquzS/LZoyALpmsYi/miMc= In-Reply-To: <20231001020628.2768-1-jamrial@gmail.com> Subject: Re: [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 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: On 9/30/2023 11:06 PM, James Almer wrote: > 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) Actually no, this check is not enough as cuCtxGetCurrent() was added to ffnvcodec headers after the version bump to 12.1 Either we leave things as is and expect to get people to update their headers until a new SDK version is released, its changes merged and version bumped, or revert the implementation bits of 05f8b2ca0f, leaving only the API in place. AVERROR(ENOSYS) would then be returned any time AV_CUDA_USE_CURRENT_CONTEXT is requested regardless of what headers are present at compile time. > 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; _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".