[FFmpeg-cvslog] avutil/hwcontext_cuda: combine transfer functions
Timo Rothenpieler
git at videolan.org
Thu Mar 19 18:38:51 EET 2020
ffmpeg | branch: master | Timo Rothenpieler <timo at rothenpieler.org> | Thu Mar 19 17:35:59 2020 +0100| [d9a37af070abd3869b11c830e1c90466b0cabb9c] | committer: Timo Rothenpieler
avutil/hwcontext_cuda: combine transfer functions
Gets rid of some mostly duplicated code and adds the ability to do
hardware to hardware transfers.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d9a37af070abd3869b11c830e1c90466b0cabb9c
---
libavutil/hwcontext_cuda.c | 78 ++++++++++++++--------------------------------
1 file changed, 23 insertions(+), 55 deletions(-)
diff --git a/libavutil/hwcontext_cuda.c b/libavutil/hwcontext_cuda.c
index 4add65e009..95402a1460 100644
--- a/libavutil/hwcontext_cuda.c
+++ b/libavutil/hwcontext_cuda.c
@@ -201,8 +201,8 @@ static int cuda_transfer_get_formats(AVHWFramesContext *ctx,
return 0;
}
-static int cuda_transfer_data_from(AVHWFramesContext *ctx, AVFrame *dst,
- const AVFrame *src)
+static int cuda_transfer_data(AVHWFramesContext *ctx, AVFrame *dst,
+ const AVFrame *src)
{
CUDAFramesContext *priv = ctx->internal->priv;
AVHWDeviceContext *device_ctx = ctx->device_ctx;
@@ -212,73 +212,41 @@ static int cuda_transfer_data_from(AVHWFramesContext *ctx, AVFrame *dst,
CUcontext dummy;
int i, ret;
- /* We don't support transfers to HW devices. */
- if (dst->hw_frames_ctx)
- return AVERROR(ENOSYS);
-
ret = CHECK_CU(cu->cuCtxPushCurrent(hwctx->cuda_ctx));
if (ret < 0)
return ret;
for (i = 0; i < FF_ARRAY_ELEMS(src->data) && src->data[i]; i++) {
CUDA_MEMCPY2D cpy = {
- .srcMemoryType = CU_MEMORYTYPE_DEVICE,
- .dstMemoryType = CU_MEMORYTYPE_HOST,
- .srcDevice = (CUdeviceptr)src->data[i],
- .dstHost = dst->data[i],
.srcPitch = src->linesize[i],
.dstPitch = dst->linesize[i],
.WidthInBytes = FFMIN(src->linesize[i], dst->linesize[i]),
- .Height = src->height >> (i ? priv->shift_height : 0),
+ .Height = src->height >> ((i == 0 || i == 3) ? 0 : priv->shift_height),
};
+ if (src->hw_frames_ctx) {
+ cpy.srcMemoryType = CU_MEMORYTYPE_DEVICE;
+ cpy.srcDevice = (CUdeviceptr)src->data[i];
+ } else {
+ cpy.srcMemoryType = CU_MEMORYTYPE_HOST;
+ cpy.srcHost = src->data[i];
+ }
+
+ if (dst->hw_frames_ctx) {
+ cpy.dstMemoryType = CU_MEMORYTYPE_DEVICE;
+ cpy.dstDevice = (CUdeviceptr)dst->data[i];
+ } else {
+ cpy.dstMemoryType = CU_MEMORYTYPE_HOST;
+ cpy.dstHost = dst->data[i];
+ }
+
ret = CHECK_CU(cu->cuMemcpy2DAsync(&cpy, hwctx->stream));
if (ret < 0)
goto exit;
}
- ret = CHECK_CU(cu->cuStreamSynchronize(hwctx->stream));
- if (ret < 0)
- goto exit;
-
-exit:
- CHECK_CU(cu->cuCtxPopCurrent(&dummy));
-
- return 0;
-}
-
-static int cuda_transfer_data_to(AVHWFramesContext *ctx, AVFrame *dst,
- const AVFrame *src)
-{
- CUDAFramesContext *priv = ctx->internal->priv;
- AVHWDeviceContext *device_ctx = ctx->device_ctx;
- AVCUDADeviceContext *hwctx = device_ctx->hwctx;
- CudaFunctions *cu = hwctx->internal->cuda_dl;
-
- CUcontext dummy;
- int i, ret;
-
- /* We don't support transfers from HW devices. */
- if (src->hw_frames_ctx)
- return AVERROR(ENOSYS);
-
- ret = CHECK_CU(cu->cuCtxPushCurrent(hwctx->cuda_ctx));
- if (ret < 0)
- return ret;
-
- for (i = 0; i < FF_ARRAY_ELEMS(src->data) && src->data[i]; i++) {
- CUDA_MEMCPY2D cpy = {
- .srcMemoryType = CU_MEMORYTYPE_HOST,
- .dstMemoryType = CU_MEMORYTYPE_DEVICE,
- .srcHost = src->data[i],
- .dstDevice = (CUdeviceptr)dst->data[i],
- .srcPitch = src->linesize[i],
- .dstPitch = dst->linesize[i],
- .WidthInBytes = FFMIN(src->linesize[i], dst->linesize[i]),
- .Height = src->height >> ((i == 0 || i == 3) ? 0 : priv->shift_height),
- };
-
- ret = CHECK_CU(cu->cuMemcpy2DAsync(&cpy, hwctx->stream));
+ if (!dst->hw_frames_ctx) {
+ ret = CHECK_CU(cu->cuStreamSynchronize(hwctx->stream));
if (ret < 0)
goto exit;
}
@@ -522,8 +490,8 @@ const HWContextType ff_hwcontext_type_cuda = {
.frames_init = cuda_frames_init,
.frames_get_buffer = cuda_get_buffer,
.transfer_get_formats = cuda_transfer_get_formats,
- .transfer_data_to = cuda_transfer_data_to,
- .transfer_data_from = cuda_transfer_data_from,
+ .transfer_data_to = cuda_transfer_data,
+ .transfer_data_from = cuda_transfer_data,
.pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_CUDA, AV_PIX_FMT_NONE },
};
More information about the ffmpeg-cvslog
mailing list