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

vtdec: fix seeks hangs due to a race condition draining

Browse Source 
If the drain function of the decoder triggered by FLUSH_START
is run while the output loop is running, once the output loop
finished vtdec->downstream_ret will be GST_FLOW_FLUSHING instead
of GST_FLOW_OK, which must not be treated as an error since
the queue is cleaned correctly as well.

Fix #4179

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/8328>
This commit is contained in:
Andoni Morales Alastruey 2025-01-20 18:19:18 +01:00 committed by GStreamer Marge Bot
parent 26e6109b44
commit 432ada66f2
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
subprojects/gst-plugins-bad/sys/applemedia/vtdec.c
View File

@ -303,7 +303,6 @@ gst_vtdec_output_loop (GstVtdec * vtdec)
GstVideoCodecFrame *frame; GstVideoCodecFrame *frame;
GstFlowReturn ret = GST_FLOW_OK; GstFlowReturn ret = GST_FLOW_OK;
GstVideoDecoder *decoder = GST_VIDEO_DECODER (vtdec); GstVideoDecoder *decoder = GST_VIDEO_DECODER (vtdec);
gboolean is_flushing;
g_mutex_lock (&vtdec->queue_mutex); g_mutex_lock (&vtdec->queue_mutex);
while (gst_vec_deque_is_empty (vtdec->reorder_queue) while (gst_vec_deque_is_empty (vtdec->reorder_queue)
@ -321,6 +320,8 @@ gst_vtdec_output_loop (GstVtdec * vtdec)
* that we push in PTS order, or if we're draining/flushing */ * that we push in PTS order, or if we're draining/flushing */
while ((gst_vec_deque_get_length (vtdec->reorder_queue) >= while ((gst_vec_deque_get_length (vtdec->reorder_queue) >=
vtdec->dbp_size) || vtdec->is_flushing || vtdec->is_draining) { vtdec->dbp_size) || vtdec->is_flushing || vtdec->is_draining) {
gboolean is_flushing;
frame = gst_vec_deque_pop_head (vtdec->reorder_queue); frame = gst_vec_deque_pop_head (vtdec->reorder_queue);
is_flushing = vtdec->is_flushing; is_flushing = vtdec->is_flushing;
g_cond_signal (&vtdec->queue_cond); g_cond_signal (&vtdec->queue_cond);
@ -358,7 +359,6 @@ gst_vtdec_output_loop (GstVtdec * vtdec)
g_mutex_unlock (&vtdec->queue_mutex); g_mutex_unlock (&vtdec->queue_mutex);
GST_VIDEO_DECODER_STREAM_LOCK (vtdec); GST_VIDEO_DECODER_STREAM_LOCK (vtdec);
vtdec->downstream_ret = ret;
/* We need to empty the queue immediately so that session_output_callback() /* We need to empty the queue immediately so that session_output_callback()
* can push out the current buffer, otherwise it can deadlock */ * can push out the current buffer, otherwise it can deadlock */
@ -370,10 +370,14 @@ gst_vtdec_output_loop (GstVtdec * vtdec)
gst_video_decoder_release_frame (decoder, frame); gst_video_decoder_release_frame (decoder, frame);
} }
if (vtdec->is_flushing && ret == GST_FLOW_FLUSHING) {
ret = GST_FLOW_OK;
}
g_cond_signal (&vtdec->queue_cond); g_cond_signal (&vtdec->queue_cond);
g_mutex_unlock (&vtdec->queue_mutex); g_mutex_unlock (&vtdec->queue_mutex);
} }
vtdec->downstream_ret = ret;
GST_VIDEO_DECODER_STREAM_UNLOCK (vtdec); GST_VIDEO_DECODER_STREAM_UNLOCK (vtdec);
if (ret != GST_FLOW_OK) { if (ret != GST_FLOW_OK) {