mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-05 06:58:56 +00:00
Code Issues 1 Projects Releases Wiki Activity

nvenc: Use non default CUDA stream and async operation

Browse source 
Use CUDA async operation if possible with non default CUDA stream
This commit is contained in:
Seungha Yang 2019-08-18 22:51:18 +09:00 committed by Matthew Waters
parent 5615e9258f
commit ca6657367c
2 changed files with 30 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
sys/nvcodec/gstnvbaseenc.c
View file

@ -292,6 +292,7 @@ gst_nv_base_enc_open (GstVideoEncoder * enc)
GstNvBaseEnc *nvenc = GST_NV_BASE_ENC (enc); GstNvBaseEnc *nvenc = GST_NV_BASE_ENC (enc);
GstNvBaseEncClass *klass = GST_NV_BASE_ENC_GET_CLASS (enc); GstNvBaseEncClass *klass = GST_NV_BASE_ENC_GET_CLASS (enc);
GValue *formats = NULL; GValue *formats = NULL;
CUresult cuda_ret;
if (!gst_cuda_ensure_element_context (GST_ELEMENT_CAST (enc), if (!gst_cuda_ensure_element_context (GST_ELEMENT_CAST (enc),
klass->cuda_device_id, &nvenc->cuda_ctx)) { klass->cuda_device_id, &nvenc->cuda_ctx)) {
@ -299,6 +300,16 @@ gst_nv_base_enc_open (GstVideoEncoder * enc)
return FALSE; return FALSE;
} }
if (gst_cuda_context_push (nvenc->cuda_ctx)) {
cuda_ret = CuStreamCreate (&nvenc->cuda_stream, CU_STREAM_NON_BLOCKING);
if (!gst_cuda_result (cuda_ret)) {
GST_WARNING_OBJECT (nvenc,
"Could not create cuda stream, will use default stream");
nvenc->cuda_stream = NULL;
}
gst_cuda_context_pop (NULL);
}
{ {
NV_ENC_OPEN_ENCODE_SESSION_EX_PARAMS params = { 0, }; NV_ENC_OPEN_ENCODE_SESSION_EX_PARAMS params = { 0, };
NVENCSTATUS nv_ret; NVENCSTATUS nv_ret;
@ -640,14 +651,24 @@ static gboolean
gst_nv_base_enc_close (GstVideoEncoder * enc) gst_nv_base_enc_close (GstVideoEncoder * enc)
{ {
GstNvBaseEnc *nvenc = GST_NV_BASE_ENC (enc); GstNvBaseEnc *nvenc = GST_NV_BASE_ENC (enc);
gboolean ret = TRUE;
if (nvenc->encoder) { if (nvenc->encoder) {
if (NvEncDestroyEncoder (nvenc->encoder) != NV_ENC_SUCCESS) if (NvEncDestroyEncoder (nvenc->encoder) != NV_ENC_SUCCESS)
return FALSE; ret = FALSE;
nvenc->encoder = NULL; nvenc->encoder = NULL;
} }
if (nvenc->cuda_ctx && nvenc->cuda_stream) {
if (gst_cuda_context_push (nvenc->cuda_ctx)) {
gst_cuda_result (CuStreamDestroy (nvenc->cuda_stream));
gst_cuda_context_pop (NULL);
}
}
gst_clear_object (&nvenc->cuda_ctx); gst_clear_object (&nvenc->cuda_ctx);
nvenc->cuda_stream = NULL;
GST_OBJECT_LOCK (nvenc); GST_OBJECT_LOCK (nvenc);
if (nvenc->input_formats) if (nvenc->input_formats)
@ -667,7 +688,7 @@ gst_nv_base_enc_close (GstVideoEncoder * enc)
nvenc->bitstream_pool = NULL; nvenc->bitstream_pool = NULL;
} }
return TRUE; return ret;
} }
static void static void
@ -1537,7 +1558,8 @@ _map_gl_input_buffer (GstGLContext * context, struct map_gl_input *data)
} }
cuda_ret = cuda_ret =
CuGraphicsMapResources (1, &data->in_gl_resource->cuda_texture, 0); CuGraphicsMapResources (1, &data->in_gl_resource->cuda_texture,
data->nvenc->cuda_stream);
if (!gst_cuda_result (cuda_ret)) { if (!gst_cuda_result (cuda_ret)) {
GST_ERROR_OBJECT (data->nvenc, "failed to map GL texture %u into cuda " GST_ERROR_OBJECT (data->nvenc, "failed to map GL texture %u into cuda "
"ret :%d", gl_mem->mem.tex_id, cuda_ret); "ret :%d", gl_mem->mem.tex_id, cuda_ret);
@ -1574,7 +1596,7 @@ _map_gl_input_buffer (GstGLContext * context, struct map_gl_input *data)
param.WidthInBytes = _get_plane_width (data->info, i); param.WidthInBytes = _get_plane_width (data->info, i);
param.Height = _get_plane_height (data->info, i); param.Height = _get_plane_height (data->info, i);
cuda_ret = CuMemcpy2D (&param); cuda_ret = CuMemcpy2DAsync (&param, data->nvenc->cuda_stream);
if (!gst_cuda_result (cuda_ret)) { if (!gst_cuda_result (cuda_ret)) {
GST_ERROR_OBJECT (data->nvenc, "failed to copy GL texture %u into cuda " GST_ERROR_OBJECT (data->nvenc, "failed to copy GL texture %u into cuda "
"ret :%d", gl_mem->mem.tex_id, cuda_ret); "ret :%d", gl_mem->mem.tex_id, cuda_ret);
@ -1582,7 +1604,8 @@ _map_gl_input_buffer (GstGLContext * context, struct map_gl_input *data)
} }
cuda_ret = cuda_ret =
CuGraphicsUnmapResources (1, &data->in_gl_resource->cuda_texture, 0); CuGraphicsUnmapResources (1, &data->in_gl_resource->cuda_texture,
data->nvenc->cuda_stream);
if (!gst_cuda_result (cuda_ret)) { if (!gst_cuda_result (cuda_ret)) {
GST_ERROR_OBJECT (data->nvenc, "failed to unmap GL texture %u from cuda " GST_ERROR_OBJECT (data->nvenc, "failed to unmap GL texture %u from cuda "
"ret :%d", gl_mem->mem.tex_id, cuda_ret); "ret :%d", gl_mem->mem.tex_id, cuda_ret);
@ -1600,6 +1623,7 @@ _map_gl_input_buffer (GstGLContext * context, struct map_gl_input *data)
data_pointer = data_pointer + data_pointer = data_pointer +
dest_stride * _get_plane_height (&data->nvenc->input_info, i); dest_stride * _get_plane_height (&data->nvenc->input_info, i);
} }
gst_cuda_result (CuStreamSynchronize (data->nvenc->cuda_stream));
gst_cuda_context_pop (NULL); gst_cuda_context_pop (NULL);
} }
#endif #endif

1
sys/nvcodec/gstnvbaseenc.h
View file

@ -72,6 +72,7 @@ typedef struct {
gint gop_size; gint gop_size;
GstCudaContext * cuda_ctx; GstCudaContext * cuda_ctx;
CUstream cuda_stream;
void * encoder; void * encoder;
/* the supported input formats */ /* the supported input formats */