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

alphacombine: unblock when alpha sink is eos

Browse Source 
If the alpha sink receives EOS while the other thread was waiting for a
alpha buffer it was stuck waiting forever.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/8775>
This commit is contained in:
Guillaume Desmottes 2025-04-04 12:18:24 +02:00 committed by GStreamer Marge Bot
parent d2086675a4
commit 9b19c10f39
1 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
subprojects/gst-plugins-bad/gst/codecalpha/gstalphacombine.c
View File

@ -112,6 +112,8 @@ struct _GstAlphaCombine
/* Number of flush-stop events received, used to know when all sink pads are
done flushing. Protected by buffer_lock */
guint flush_stops;
/* alpha stream EOS, protected by buffer_lock */
gboolean alpha_eos;
/* sink pad being blocked while waiting for the other pad to receive
* FLUSH_STOP. Protected by buffer_lock */
@ -300,6 +302,11 @@ gst_alpha_combine_peek_alpha_buffer (GstAlphaCombine * self,
return GST_FLOW_FLUSHING;
}
if (self->alpha_eos) {
g_mutex_unlock (&self->buffer_lock);
return GST_FLOW_EOS;
}
/* Now is a good time to validate the formats, as the alpha_vinfo won't be
* updated until we signal this alpha_buffer_as being consumed */
if (!gst_alpha_combine_negotiate (self)) {
@ -596,6 +603,22 @@ gst_alpha_combine_alpha_event (GstPad * pad, GstObject * object,
gst_alpha_combine_handle_gap (self);
break;
}
case GST_EVENT_EOS:
{
/* alpha is eos so no point keep waiting for a alpha buffer */
g_mutex_lock (&self->buffer_lock);
self->alpha_eos = TRUE;
g_cond_broadcast (&self->buffer_cond);
g_mutex_unlock (&self->buffer_lock);
break;
}
case GST_EVENT_STREAM_START:
{
g_mutex_lock (&self->buffer_lock);
self->alpha_eos = FALSE;
g_mutex_unlock (&self->buffer_lock);
break;
}
default:
break;
}
@ -736,6 +759,7 @@ gst_alpha_combine_init (GstAlphaCombine * self)
self->alpha_pad = gst_element_get_static_pad (GST_ELEMENT (self), "alpha");
self->src_pad = gst_element_get_static_pad (GST_ELEMENT (self), "src");
self->flushing = FALSE;
self->alpha_eos = FALSE;
self->flush_stops = 0;
self->pad_block_id = 0;
self->blocked_pad = NULL;