From patchwork Mon Nov 18 08:53:44 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oleg Dobkin X-Patchwork-Id: 16314 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 7A8B9446CE5 for ; Mon, 18 Nov 2019 10:53:59 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5655568A5C3; Mon, 18 Nov 2019 10:53:59 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F0527689FF6 for ; Mon, 18 Nov 2019 10:53:52 +0200 (EET) Received: by mail-wr1-f65.google.com with SMTP id w9so18419009wrr.0 for ; Mon, 18 Nov 2019 00:53:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=anyvision-co.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=X/TWxLgHChijyKnZpTJ2e85HlnExTGAgz1Iw2flnZjc=; b=A6UQxfGBN/grGIzN4pPFaIk99b9PSvau+B5BrzYBs1ny93gOzm092148ZQVmgPk/NG FW8ND1n4eKlRxezjxddA2d+irqqWYLpKz1TjPip6JdXAxeDsTDXQIJU2pbjmo4wAMABV TW0CL+hO8/oPn30/gT6KfHngW2VEp+ontqeqU45V4LpD8pNgPRKTjLiebOlbVPR5x4Hz SVlQQdT6sC1Tuz84foO3H73vUDGZ86isQATjE0Ayg5MSL0r/ssWgof/JNm7/UNxlmVBg gdIeix3gQF8q6pUPLpeYA4ztoL1qVXzZwdxEPkkYOhots7DOmOaOMyJ9WIM7Z/Bd/dva O5lw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=X/TWxLgHChijyKnZpTJ2e85HlnExTGAgz1Iw2flnZjc=; b=Z7V97dyHU1nCl2zT5KbuQjHL2cw1AI5uPhjjGeWKGP/s5i1pbCD0M8IbEMsPa8ZSDK CDu9HlIEO96VGhi5cBSiUBukRx1PzVG2iDJFNmv2FRSfr6arRG/C9CJiBX3hhWaD1Bn2 qK3cO9GME+hsOZQ45jUFXMggM4UpbRTGx9wCxAexGV0N3w4Kk4J9QzbNt/98X2W5Jyw0 haR920V6//cyHn8kvlBkImTAcBkcGMlen/mLLcKIoC9Tenc8QuKwk6yb7+w3jzmrrsef kkBlcd5O+dAusWdmvj9kTP/+YBP5/01ZsYxC881Y20LGRpD/HRcvghffvcLC7IOrSqaC V7kg== X-Gm-Message-State: APjAAAX3UpSTaI6wGQVTKKEQMTohTcHVYYJMywYU23WVm6HJidlu0Hmi 3fYEq7Ku7Np0pWhcmUvuCTahBSfWdaA= X-Google-Smtp-Source: APXvYqyU4D7/L0WZ8/Mmf8ST3qDD24ds1Kj2Ehhf1xXnB2E00btPyaNEqXQ85EehLFIJFuBPZRbYyw== X-Received: by 2002:a5d:5224:: with SMTP id i4mr13486976wra.303.1574067232012; Mon, 18 Nov 2019 00:53:52 -0800 (PST) Received: from localhost.localdomain ([31.154.171.234]) by smtp.gmail.com with ESMTPSA id h124sm20666003wme.30.2019.11.18.00.53.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Nov 2019 00:53:51 -0800 (PST) From: Oleg Dobkin To: ffmpeg-devel@ffmpeg.org Date: Mon, 18 Nov 2019 10:53:44 +0200 Message-Id: <20191118085344.32617-1-olegd@anyvision.co> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH] Add cuDevicePrimaryCtxRetain and cuDevicePrimaryCtxRelease 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: Oleg Dobkin MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" These functions can be used to create HW cuda device using primary contexts - which is the preferred approach. Signed-off-by: Oleg Dobkin --- ffnvcodec.pc.in | 2 +- include/ffnvcodec/dynlink_cuda.h | 2 ++ include/ffnvcodec/dynlink_loader.h | 4 ++++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ffnvcodec.pc.in b/ffnvcodec.pc.in index 7799048..2a6318f 100644 --- a/ffnvcodec.pc.in +++ b/ffnvcodec.pc.in @@ -3,5 +3,5 @@ includedir=${prefix}/include Name: ffnvcodec Description: FFmpeg version of Nvidia Codec SDK headers -Version: 9.1.23.1 +Version: 9.1.23.2 Cflags: -I${includedir} diff --git a/include/ffnvcodec/dynlink_cuda.h b/include/ffnvcodec/dynlink_cuda.h index 5c85e0d..bf0ed9f 100644 --- a/include/ffnvcodec/dynlink_cuda.h +++ b/include/ffnvcodec/dynlink_cuda.h @@ -331,6 +331,8 @@ typedef CUresult CUDAAPI tcuMemcpy2DAsync_v2(const CUDA_MEMCPY2D *pcopy, CUstrea typedef CUresult CUDAAPI tcuGetErrorName(CUresult error, const char** pstr); typedef CUresult CUDAAPI tcuGetErrorString(CUresult error, const char** pstr); typedef CUresult CUDAAPI tcuCtxGetDevice(CUdevice *device); +typedef CUresult CUDAAPI tcuDevicePrimaryCtxRetain(CUcontext *pctx, CUdevice dev); +typedef CUresult CUDAAPI tcuDevicePrimaryCtxRelease(CUdevice dev); typedef CUresult CUDAAPI tcuStreamCreate(CUstream *phStream, unsigned int flags); typedef CUresult CUDAAPI tcuStreamQuery(CUstream hStream); diff --git a/include/ffnvcodec/dynlink_loader.h b/include/ffnvcodec/dynlink_loader.h index a1fa323..f471200 100644 --- a/include/ffnvcodec/dynlink_loader.h +++ b/include/ffnvcodec/dynlink_loader.h @@ -157,6 +157,8 @@ typedef struct CudaFunctions { tcuGetErrorName *cuGetErrorName; tcuGetErrorString *cuGetErrorString; tcuCtxGetDevice *cuCtxGetDevice; + tcuDevicePrimaryCtxRetain *cuDevicePrimaryCtxRetain; + tcuDevicePrimaryCtxRelease *cuDevicePrimaryCtxRelease; tcuStreamCreate *cuStreamCreate; tcuStreamQuery *cuStreamQuery; @@ -282,6 +284,8 @@ static inline int cuda_load_functions(CudaFunctions **functions, void *logctx) LOAD_SYMBOL(cuGetErrorName, tcuGetErrorName, "cuGetErrorName"); LOAD_SYMBOL(cuGetErrorString, tcuGetErrorString, "cuGetErrorString"); LOAD_SYMBOL(cuCtxGetDevice, tcuCtxGetDevice, "cuCtxGetDevice"); + LOAD_SYMBOL(cuDevicePrimaryCtxRetain, tcuDevicePrimaryCtxRetain, "cuDevicePrimaryCtxRetain"); + LOAD_SYMBOL(cuDevicePrimaryCtxRelease, tcuDevicePrimaryCtxRelease, "cuDevicePrimaryCtxRelease"); LOAD_SYMBOL(cuStreamCreate, tcuStreamCreate, "cuStreamCreate"); LOAD_SYMBOL(cuStreamQuery, tcuStreamQuery, "cuStreamQuery");