FaSTTUBe/GST-Tensordecoder-ov_ep
35
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

nvencoder: Fix GstVideoCodecFrame leak on non-flow-ok return

Browse Source 
... and use gst_video_encoder_release_frame() to drop frame
instead of gst_video_encoder_finish_frame()

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/9078>
This commit is contained in:
Seungha Yang 2025-05-26 23:17:15 +09:00
parent 500f9b60af
commit 1fb633368e
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
subprojects/gst-plugins-bad/sys/nvcodec/gstnvencoder.cpp
View File

@ -963,7 +963,7 @@ gst_nv_encoder_thread_func (GstNvEncoder * self)
status = gst_nv_enc_task_lock_bitstream (task, &bitstream); status = gst_nv_enc_task_lock_bitstream (task, &bitstream);
if (status != NV_ENC_SUCCESS) { if (status != NV_ENC_SUCCESS) {
gst_nv_enc_task_unref (task); gst_nv_enc_task_unref (task);
gst_video_encoder_finish_frame (encoder, frame); gst_video_encoder_release_frame (encoder, frame);
GST_ELEMENT_ERROR (self, STREAM, ENCODE, (NULL), GST_ELEMENT_ERROR (self, STREAM, ENCODE, (NULL),
("Failed to lock bitstream, status: %" GST_NVENC_STATUS_FORMAT, ("Failed to lock bitstream, status: %" GST_NVENC_STATUS_FORMAT,
GST_NVENC_STATUS_ARGS (status))); GST_NVENC_STATUS_ARGS (status)));
@ -974,6 +974,7 @@ gst_nv_encoder_thread_func (GstNvEncoder * self)
if (priv->last_flow != GST_FLOW_OK) { if (priv->last_flow != GST_FLOW_OK) {
gst_nv_enc_task_unlock_bitstream (task); gst_nv_enc_task_unlock_bitstream (task);
gst_nv_enc_task_unref (task); gst_nv_enc_task_unref (task);
gst_video_encoder_release_frame (encoder, frame);
continue; continue;
} }
@ -2167,14 +2168,14 @@ gst_nv_encoder_handle_frame (GstVideoEncoder * encoder,
if (priv->last_flow != GST_FLOW_OK) { if (priv->last_flow != GST_FLOW_OK) {
GST_INFO_OBJECT (self, "Last flow was %s", GST_INFO_OBJECT (self, "Last flow was %s",
gst_flow_get_name (priv->last_flow)); gst_flow_get_name (priv->last_flow));
gst_video_encoder_finish_frame (encoder, frame); gst_video_encoder_release_frame (encoder, frame);
return priv->last_flow; return priv->last_flow;
} }
if (!priv->object && !gst_nv_encoder_init_session (self, in_buf)) { if (!priv->object && !gst_nv_encoder_init_session (self, in_buf)) {
GST_ERROR_OBJECT (self, "Encoder object was not configured"); GST_ERROR_OBJECT (self, "Encoder object was not configured");
gst_video_encoder_finish_frame (encoder, frame); gst_video_encoder_release_frame (encoder, frame);
return GST_FLOW_NOT_NEGOTIATED; return GST_FLOW_NOT_NEGOTIATED;
} }
@ -2183,7 +2184,7 @@ gst_nv_encoder_handle_frame (GstVideoEncoder * encoder,
switch (reconfig) { switch (reconfig) {
case GST_NV_ENCODER_RECONFIGURE_BITRATE: case GST_NV_ENCODER_RECONFIGURE_BITRATE:
if (!gst_nv_encoder_reconfigure_session (self)) { if (!gst_nv_encoder_reconfigure_session (self)) {
gst_video_encoder_finish_frame (encoder, frame); gst_video_encoder_release_frame (encoder, frame);
return GST_FLOW_NOT_NEGOTIATED; return GST_FLOW_NOT_NEGOTIATED;
} }
break; break;
@ -2191,7 +2192,7 @@ gst_nv_encoder_handle_frame (GstVideoEncoder * encoder,
{ {
gst_nv_encoder_drain (self, TRUE); gst_nv_encoder_drain (self, TRUE);
if (!gst_nv_encoder_init_session (self, nullptr)) { if (!gst_nv_encoder_init_session (self, nullptr)) {
gst_video_encoder_finish_frame (encoder, frame); gst_video_encoder_release_frame (encoder, frame);
return GST_FLOW_NOT_NEGOTIATED; return GST_FLOW_NOT_NEGOTIATED;
} }
break; break;
@ -2210,14 +2211,14 @@ gst_nv_encoder_handle_frame (GstVideoEncoder * encoder,
if (priv->last_flow != GST_FLOW_OK) { if (priv->last_flow != GST_FLOW_OK) {
GST_INFO_OBJECT (self, "Last flow was %s", GST_INFO_OBJECT (self, "Last flow was %s",
gst_flow_get_name (priv->last_flow)); gst_flow_get_name (priv->last_flow));
gst_video_encoder_finish_frame (encoder, frame); gst_video_encoder_release_frame (encoder, frame);
return priv->last_flow; return priv->last_flow;
} }
if (ret != GST_FLOW_OK) { if (ret != GST_FLOW_OK) {
GST_DEBUG_OBJECT (self, "AcquireTask returned %s", gst_flow_get_name (ret)); GST_DEBUG_OBJECT (self, "AcquireTask returned %s", gst_flow_get_name (ret));
gst_video_encoder_finish_frame (encoder, frame); gst_video_encoder_release_frame (encoder, frame);
return ret; return ret;
} }
@ -2228,7 +2229,7 @@ gst_nv_encoder_handle_frame (GstVideoEncoder * encoder,
if (ret != GST_FLOW_OK) { if (ret != GST_FLOW_OK) {
GST_ERROR_OBJECT (self, "Failed to upload frame"); GST_ERROR_OBJECT (self, "Failed to upload frame");
gst_nv_enc_task_unref (task); gst_nv_enc_task_unref (task);
gst_video_encoder_finish_frame (encoder, frame); gst_video_encoder_release_frame (encoder, frame);
return ret; return ret;
} }
@ -2243,7 +2244,7 @@ gst_nv_encoder_handle_frame (GstVideoEncoder * encoder,
gst_nv_encoder_get_pic_struct (self, in_buf), task); gst_nv_encoder_get_pic_struct (self, in_buf), task);
if (status != NV_ENC_SUCCESS) { if (status != NV_ENC_SUCCESS) {
GST_ERROR_OBJECT (self, "Failed to encode frame"); GST_ERROR_OBJECT (self, "Failed to encode frame");
gst_video_encoder_finish_frame (encoder, frame); gst_video_encoder_release_frame (encoder, frame);
return GST_FLOW_ERROR; return GST_FLOW_ERROR;
} }