mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-09 08:55:33 +00:00
Code Issues 1 Projects Releases Wiki Activity

nvenc: Use CUDA stream of memory if exists

Browse source 
Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3629>
This commit is contained in:
Seungha Yang 2022-12-23 03:12:24 +09:00 committed by GStreamer Marge Bot
parent 7a8bb85523
commit 10ade466ef
1 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
subprojects/gst-plugins-bad/sys/nvcodec/gstnvbaseenc.c
View file

@ -2219,13 +2219,14 @@ _map_gl_input_buffer (GstGLContext * context, GstNvEncGLMapData * data)
static gboolean static gboolean
gst_nv_base_enc_upload_frame (GstNvBaseEnc * nvenc, GstVideoFrame * frame, gst_nv_base_enc_upload_frame (GstNvBaseEnc * nvenc, GstVideoFrame * frame,
GstNvEncInputResource * resource, gboolean use_device_memory) GstNvEncInputResource * resource, gboolean use_device_memory,
GstCudaStream * stream)
{ {
gint i; gint i;
CUdeviceptr dst = resource->cuda_pointer; CUdeviceptr dst = resource->cuda_pointer;
GstVideoInfo *info = &frame->info; GstVideoInfo *info = &frame->info;
CUresult cuda_ret; CUresult cuda_ret;
CUstream stream = gst_cuda_stream_get_handle (nvenc->stream); CUstream stream_handle = gst_cuda_stream_get_handle (stream);
if (!gst_cuda_context_push (nvenc->cuda_ctx)) { if (!gst_cuda_context_push (nvenc->cuda_ctx)) {
GST_ERROR_OBJECT (nvenc, "cannot push context"); GST_ERROR_OBJECT (nvenc, "cannot push context");
@ -2252,7 +2253,7 @@ gst_nv_base_enc_upload_frame (GstNvBaseEnc * nvenc, GstVideoFrame * frame,
param.WidthInBytes = _get_plane_width (info, i); param.WidthInBytes = _get_plane_width (info, i);
param.Height = _get_plane_height (info, i); param.Height = _get_plane_height (info, i);
cuda_ret = CuMemcpy2DAsync (&param, stream); cuda_ret = CuMemcpy2DAsync (&param, stream_handle);
if (!gst_cuda_result (cuda_ret)) { if (!gst_cuda_result (cuda_ret)) {
GST_ERROR_OBJECT (nvenc, "cannot copy %dth plane, ret %d", i, cuda_ret); GST_ERROR_OBJECT (nvenc, "cannot copy %dth plane, ret %d", i, cuda_ret);
gst_cuda_context_pop (NULL); gst_cuda_context_pop (NULL);
@ -2263,7 +2264,7 @@ gst_nv_base_enc_upload_frame (GstNvBaseEnc * nvenc, GstVideoFrame * frame,
dst += dest_stride * _get_plane_height (&nvenc->input_info, i); dst += dest_stride * _get_plane_height (&nvenc->input_info, i);
} }
gst_cuda_result (CuStreamSynchronize (stream)); gst_cuda_result (CuStreamSynchronize (stream_handle));
gst_cuda_context_pop (NULL); gst_cuda_context_pop (NULL);
return TRUE; return TRUE;
@ -2404,6 +2405,7 @@ gst_nv_base_enc_handle_frame (GstVideoEncoder * enc, GstVideoCodecFrame * frame)
GstNvEncFrameState *state = NULL; GstNvEncFrameState *state = NULL;
GstNvEncInputResource *resource = NULL; GstNvEncInputResource *resource = NULL;
gboolean use_device_memory = FALSE; gboolean use_device_memory = FALSE;
GstCudaStream *stream = nvenc->stream;
g_assert (nvenc->encoder != NULL); g_assert (nvenc->encoder != NULL);
@ -2445,8 +2447,14 @@ gst_nv_base_enc_handle_frame (GstVideoEncoder * enc, GstVideoCodecFrame * frame)
(gst_cuda_context_can_access_peer (cmem->context, nvenc->cuda_ctx) && (gst_cuda_context_can_access_peer (cmem->context, nvenc->cuda_ctx) &&
gst_cuda_context_can_access_peer (nvenc->cuda_ctx, gst_cuda_context_can_access_peer (nvenc->cuda_ctx,
cmem->context))) { cmem->context))) {
GstCudaStream *mem_stream;
use_device_memory = TRUE; use_device_memory = TRUE;
in_map_flags |= GST_MAP_CUDA; in_map_flags |= GST_MAP_CUDA;
mem_stream = gst_cuda_memory_get_stream (cmem);
if (mem_stream)
stream = mem_stream;
} }
} }
} }
@ -2491,7 +2499,7 @@ gst_nv_base_enc_handle_frame (GstVideoEncoder * enc, GstVideoCodecFrame * frame)
} else } else
#endif #endif
if (!gst_nv_base_enc_upload_frame (nvenc, if (!gst_nv_base_enc_upload_frame (nvenc,
&vframe, resource, use_device_memory)) { &vframe, resource, use_device_memory, stream)) {
flow = GST_FLOW_ERROR; flow = GST_FLOW_ERROR;
goto unmap_and_drop; goto unmap_and_drop;
} }