From patchwork Mon Nov 16 04:15:55 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: leozhang X-Patchwork-Id: 23659 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 3F73D449C80 for ; Mon, 16 Nov 2020 06:21:40 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2884D68B85C; Mon, 16 Nov 2020 06:21:40 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-vs1-f42.google.com (mail-vs1-f42.google.com [209.85.217.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D38F068AAD8 for ; Mon, 16 Nov 2020 06:21:33 +0200 (EET) Received: by mail-vs1-f42.google.com with SMTP id b67so8465588vsc.3 for ; Sun, 15 Nov 2020 20:21:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=qE8y3C8xZrrwaufZHUWBU7o0nrEjSRNdqJVGd7Q+5zE=; b=BAqYFWxwZ3BPonggnHtw1txDRCgJzhSAjg+Ogat173l/8QV6wBD4B3VLFd6LUS1FNa G/hQQ5/aZhn5JhrmF/G9AQ9OTqrFcthE4E482l5d595VDpCsNmcZeAz2AU+F+jQqUKMu 2w42qq/UJmJF2qnm6vfB3Nry6uWWPpP4J/82/IStupHaEKvhrJotyffUpXF4ITPiYu84 LFpccGNHZViCvY01L02z1PwdoyRLN/TsZ1+DXZELSrIRlVvu+08/wth3vleLSIX5rQxP XSLrtXsMco1TE8oDT6WWibwolsysQ4Km9QGvkm3K6CueZ/DuxO/ER06EXBwwkQ0Jg56X x/zA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=qE8y3C8xZrrwaufZHUWBU7o0nrEjSRNdqJVGd7Q+5zE=; b=tKJNnz3BMTWO3wZxftaV2m0OXTCRG95e40Mip6+9ZHUvhmOmiJn5vULrIm1I+lPrVY wcRJd6dizZob2Fz6JJpYQE+YhVgycyo0zxqPbEvzh5jDAJZ3CVc/1aiJjLLrD5kT1rXE 7NdqBkLGPGZyS67aF+51rj6uBF0dXfGSnhChI+o6SUzlazDYXicTSguw9/qLI3Gylrgi 8Ui9k9Ei9hj77fzSz08geKPKLhTSZRoUZyqpozwk8W9aIIMtQwx7x+bwQ9I0FY2g3jlF TH7JM3FBypE8yka+kenJ5Bs33IAC3WlCE2HP39TXR71Y0h/tS0HET4l6hxWRIHlbudfY XbnA== X-Gm-Message-State: AOAM530Ti2opCy+PXvNuK1IzCEz6hrSpdkMkdnYrEBCcTkhyq2qAW7Dd PT+mFsj3sDacI93aCUuaOKmy7BQz4+U= X-Google-Smtp-Source: ABdhPJwBk9b5afLmi+VRUW/nl0TUoSXBQf/sh9jrjYf2KEGCUER5yGSZkQH6Oi1c/CqZThHf5hULyA== X-Received: by 2002:a62:d0c6:0:b029:196:1cad:6ebe with SMTP id p189-20020a62d0c60000b02901961cad6ebemr10727043pfg.63.1605500160849; Sun, 15 Nov 2020 20:16:00 -0800 (PST) Received: from PF2E8E0S-ATW.inc.bytedance.com ([61.120.150.72]) by smtp.gmail.com with ESMTPSA id h68sm16554263pfe.74.2020.11.15.20.15.58 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Nov 2020 20:16:00 -0800 (PST) From: leozhang To: ffmpeg-devel@ffmpeg.org Date: Mon, 16 Nov 2020 12:15:55 +0800 Message-Id: <20201116041555.1745-1-nowerzt@gmail.com> X-Mailer: git-send-email 2.28.0.windows.1 In-Reply-To: <20201113085523.1469-1-nowerzt@gmail.com> References: <20201113085523.1469-1-nowerzt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2] nv-codec-headers: add cuMemcpy 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: leozhang --- include/ffnvcodec/dynlink_cuda.h | 2 ++ include/ffnvcodec/dynlink_loader.h | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/include/ffnvcodec/dynlink_cuda.h b/include/ffnvcodec/dynlink_cuda.h index 117fdc5..baafa49 100644 --- a/include/ffnvcodec/dynlink_cuda.h +++ b/include/ffnvcodec/dynlink_cuda.h @@ -365,6 +365,8 @@ typedef CUresult CUDAAPI tcuMemAlloc_v2(CUdeviceptr *dptr, size_t bytesize); typedef CUresult CUDAAPI tcuMemAllocPitch_v2(CUdeviceptr *dptr, size_t *pPitch, size_t WidthInBytes, size_t Height, unsigned int ElementSizeBytes); typedef CUresult CUDAAPI tcuMemsetD8Async(CUdeviceptr dstDevice, unsigned char uc, size_t N, CUstream hStream); typedef CUresult CUDAAPI tcuMemFree_v2(CUdeviceptr dptr); +typedef CUresult CUDAAPI tcuMemcpy(CUdeviceptr dst, CUdeviceptr src, size_t bytesize); +typedef CUresult CUDAAPI tcuMemcpyAsync(CUdeviceptr dst, CUdeviceptr src, size_t bytesize, CUstream hStream); typedef CUresult CUDAAPI tcuMemcpy2D_v2(const CUDA_MEMCPY2D *pcopy); typedef CUresult CUDAAPI tcuMemcpy2DAsync_v2(const CUDA_MEMCPY2D *pcopy, CUstream hStream); typedef CUresult CUDAAPI tcuGetErrorName(CUresult error, const char** pstr); diff --git a/include/ffnvcodec/dynlink_loader.h b/include/ffnvcodec/dynlink_loader.h index b9995c3..85aebf4 100644 --- a/include/ffnvcodec/dynlink_loader.h +++ b/include/ffnvcodec/dynlink_loader.h @@ -152,6 +152,8 @@ typedef struct CudaFunctions { tcuMemAllocPitch_v2 *cuMemAllocPitch; tcuMemsetD8Async *cuMemsetD8Async; tcuMemFree_v2 *cuMemFree; + tcuMemcpy *cuMemcpy; + tcuMemcpyAsync *cuMemcpyAsync; tcuMemcpy2D_v2 *cuMemcpy2D; tcuMemcpy2DAsync_v2 *cuMemcpy2DAsync; tcuGetErrorName *cuGetErrorName; @@ -290,6 +292,8 @@ static inline int cuda_load_functions(CudaFunctions **functions, void *logctx) LOAD_SYMBOL(cuMemAllocPitch, tcuMemAllocPitch_v2, "cuMemAllocPitch_v2"); LOAD_SYMBOL(cuMemsetD8Async, tcuMemsetD8Async, "cuMemsetD8Async"); LOAD_SYMBOL(cuMemFree, tcuMemFree_v2, "cuMemFree_v2"); + LOAD_SYMBOL(cuMemcpy, tcuMemcpy, "cuMemcpy"); + LOAD_SYMBOL(cuMemcpyAsync, tcuMemcpyAsync, "cuMemcpyAsync"); LOAD_SYMBOL(cuMemcpy2D, tcuMemcpy2D_v2, "cuMemcpy2D_v2"); LOAD_SYMBOL(cuMemcpy2DAsync, tcuMemcpy2DAsync_v2, "cuMemcpy2DAsync_v2"); LOAD_SYMBOL(cuGetErrorName, tcuGetErrorName, "cuGetErrorName");