diff options
author | Seungha Yang <seungha.yang@navercorp.com> | 2019-03-26 20:24:22 +0900 |
---|---|---|
committer | Matthew Waters <matthew@centricular.com> | 2019-03-26 11:54:16 +0000 |
commit | d0f2f262aa5e914339cfb346f6ff1254306e98e2 (patch) | |
tree | e79c204ab9d4f8e9458014131dbc09ee0ee7acb2 | |
parent | 54982527509d23f36827181a59275547a811559f (diff) | |
download | gstreamer-plugins-bad-d0f2f262aa5e914339cfb346f6ff1254306e98e2.tar.gz |
nvenc: Ensure unmap resources before finalizing them
Mapped resource via NvEncMapInputResource() will result to unregister fail.
It can happen when paused to ready state change without EOS event.
-rw-r--r-- | sys/nvenc/gstnvbaseenc.c | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/sys/nvenc/gstnvbaseenc.c b/sys/nvenc/gstnvbaseenc.c index f4b03cdd4..0567bfde4 100644 --- a/sys/nvenc/gstnvbaseenc.c +++ b/sys/nvenc/gstnvbaseenc.c @@ -179,6 +179,10 @@ struct gl_input_resource gsize cuda_num_bytes; NV_ENC_REGISTER_RESOURCE nv_resource; NV_ENC_MAP_INPUT_RESOURCE nv_mapped_resource; + + /* whether nv_mapped_resource was mapped via NvEncMapInputResource() + * and therefore should unmap via NvEncUnmapInputResource or not */ + gboolean mapped; }; #endif @@ -837,6 +841,8 @@ gst_nv_base_enc_bitstream_thread (gpointer user_data) nv_ret = NvEncUnmapInputResource (nvenc->encoder, in_gl_resource->nv_mapped_resource.mappedResource); + in_gl_resource->mapped = FALSE; + if (nv_ret != NV_ENC_SUCCESS) { GST_ERROR_OBJECT (nvenc, "Failed to unmap input resource %p, ret %d", in_gl_resource, nv_ret); @@ -971,6 +977,20 @@ gst_nv_base_enc_free_buffers (GstNvBaseEnc * nvenc) struct gl_input_resource *in_gl_resource = nvenc->input_bufs[i]; cuCtxPushCurrent (nvenc->cuda_ctx); + + if (in_gl_resource->mapped) { + GST_LOG_OBJECT (nvenc, "Unmap resource %p", in_gl_resource); + + nv_ret = + NvEncUnmapInputResource (nvenc->encoder, + in_gl_resource->nv_mapped_resource.mappedResource); + + if (nv_ret != NV_ENC_SUCCESS) { + GST_ERROR_OBJECT (nvenc, "Failed to unmap input resource %p, ret %d", + in_gl_resource, nv_ret); + } + } + nv_ret = NvEncUnregisterResource (nvenc->encoder, in_gl_resource->nv_resource.registeredResource); @@ -1734,6 +1754,8 @@ gst_nv_base_enc_handle_frame (GstVideoEncoder * enc, GstVideoCodecFrame * frame) goto error; } + in_gl_resource->mapped = TRUE; + out_buf = g_async_queue_try_pop (nvenc->bitstream_pool); if (out_buf == NULL) { GST_DEBUG_OBJECT (nvenc, "wait for output buf to become available again"); |