mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-30 13:41:48 +00:00
Code Issues 1 Projects Releases Wiki Activity

alphacombine: Implement flow return propagation

Browse source 
The EOS handling was not the problem way. Instead of this, implement
proper prorogation of the flow return for the alpha chain function.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/2238>
This commit is contained in:
Nicolas Dufresne 2021-05-12 17:29:02 -04:00 committed by GStreamer Marge Bot
parent ea08442699
commit 1229257ad4
1 changed files with 25 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
gst/codecalpha/gstalphacombine.c
View file

@ -86,6 +86,7 @@ struct _GstAlphaCombine
/* protected by sink_pad stream lock */ /* protected by sink_pad stream lock */
GstBuffer *last_alpha_buffer; GstBuffer *last_alpha_buffer;
GstFlowReturn last_flow_ret;
GMutex buffer_lock; GMutex buffer_lock;
GCond buffer_cond; GCond buffer_cond;
@ -96,8 +97,6 @@ struct _GstAlphaCombine
GstVideoInfo sink_vinfo; GstVideoInfo sink_vinfo;
GstVideoInfo alpha_vinfo; GstVideoInfo alpha_vinfo;
GstVideoFormat src_format; GstVideoFormat src_format;
gboolean alpha_is_eos;
}; };
#define gst_alpha_combine_parent_class parent_class #define gst_alpha_combine_parent_class parent_class
@ -153,7 +152,7 @@ gst_alpha_combine_reset (GstAlphaCombine * self)
{ {
gst_buffer_replace (&self->alpha_buffer, NULL); gst_buffer_replace (&self->alpha_buffer, NULL);
gst_buffer_replace (&self->last_alpha_buffer, NULL); gst_buffer_replace (&self->last_alpha_buffer, NULL);
self->alpha_is_eos = FALSE; self->last_flow_ret = GST_FLOW_OK;
} }
/* /*
@ -204,7 +203,7 @@ gst_alpha_combine_negotiate (GstAlphaCombine * self)
} }
static GstFlowReturn static GstFlowReturn
gst_alpha_combine_pull_alpha_buffer (GstAlphaCombine * self, gst_alpha_combine_peek_alpha_buffer (GstAlphaCombine * self,
GstBuffer ** alpha_buffer) GstBuffer ** alpha_buffer)
{ {
g_mutex_lock (&self->buffer_lock); g_mutex_lock (&self->buffer_lock);
@ -224,17 +223,14 @@ gst_alpha_combine_pull_alpha_buffer (GstAlphaCombine * self,
return GST_FLOW_NOT_NEGOTIATED; return GST_FLOW_NOT_NEGOTIATED;
} }
*alpha_buffer = self->alpha_buffer; *alpha_buffer = gst_buffer_ref (self->alpha_buffer);
self->alpha_buffer = NULL;
g_cond_broadcast (&self->buffer_cond);
g_mutex_unlock (&self->buffer_lock); g_mutex_unlock (&self->buffer_lock);
if (GST_BUFFER_FLAG_IS_SET (*alpha_buffer, GST_BUFFER_FLAG_GAP)) { if (GST_BUFFER_FLAG_IS_SET (*alpha_buffer, GST_BUFFER_FLAG_GAP)) {
if (!self->last_alpha_buffer) { if (!self->last_alpha_buffer) {
GST_ELEMENT_ERROR (self, STREAM, WRONG_TYPE, GST_ELEMENT_ERROR (self, STREAM, WRONG_TYPE,
("Cannot handle streams without an initial alpha buffer."), (NULL)); ("Cannot handle streams without an initial alpha buffer."), (NULL));
gst_buffer_replace (alpha_buffer, NULL); gst_clear_buffer (alpha_buffer);
return GST_FLOW_ERROR; return GST_FLOW_ERROR;
} }
@ -245,9 +241,22 @@ gst_alpha_combine_pull_alpha_buffer (GstAlphaCombine * self,
return GST_FLOW_OK; return GST_FLOW_OK;
} }
static void
gst_alpha_combine_pop_alpha_buffer (GstAlphaCombine * self,
GstFlowReturn flow_ret)
{
g_mutex_lock (&self->buffer_lock);
self->last_flow_ret = flow_ret;
gst_clear_buffer (&self->alpha_buffer);
g_cond_broadcast (&self->buffer_cond);
g_mutex_unlock (&self->buffer_lock);
}
static GstFlowReturn static GstFlowReturn
gst_alpha_combine_push_alpha_buffer (GstAlphaCombine * self, GstBuffer * buffer) gst_alpha_combine_push_alpha_buffer (GstAlphaCombine * self, GstBuffer * buffer)
{ {
GstFlowReturn ret;
g_mutex_lock (&self->buffer_lock); g_mutex_lock (&self->buffer_lock);
/* We wait for the alpha_buffer to be consumed and store the buffer for the /* We wait for the alpha_buffer to be consumed and store the buffer for the
@ -264,9 +273,10 @@ gst_alpha_combine_push_alpha_buffer (GstAlphaCombine * self, GstBuffer * buffer)
self->alpha_buffer = buffer; self->alpha_buffer = buffer;
GST_DEBUG_OBJECT (self, "Stored pending alpha buffer %p", buffer); GST_DEBUG_OBJECT (self, "Stored pending alpha buffer %p", buffer);
g_cond_signal (&self->buffer_cond); g_cond_signal (&self->buffer_cond);
ret = self->last_flow_ret;
g_mutex_unlock (&self->buffer_lock); g_mutex_unlock (&self->buffer_lock);
return GST_FLOW_OK; return ret;
} }
static GstFlowReturn static GstFlowReturn
@ -282,7 +292,7 @@ gst_alpha_combine_sink_chain (GstPad * pad, GstObject * object,
gint alpha_stride; gint alpha_stride;
GstBuffer *buffer; GstBuffer *buffer;
ret = gst_alpha_combine_pull_alpha_buffer (self, &alpha_buffer); ret = gst_alpha_combine_peek_alpha_buffer (self, &alpha_buffer);
if (ret != GST_FLOW_OK) if (ret != GST_FLOW_OK)
return ret; return ret;
@ -335,7 +345,10 @@ gst_alpha_combine_sink_chain (GstPad * pad, GstObject * object,
gst_buffer_unref (src_buffer); gst_buffer_unref (src_buffer);
gst_buffer_unref (alpha_buffer); gst_buffer_unref (alpha_buffer);
return gst_pad_push (self->src_pad, buffer); ret = gst_pad_push (self->src_pad, buffer);
gst_alpha_combine_pop_alpha_buffer (self, ret);
return ret;
} }
static GstFlowReturn static GstFlowReturn
@ -344,11 +357,6 @@ gst_alpha_combine_alpha_chain (GstPad * pad, GstObject * object,
{ {
GstAlphaCombine *self = GST_ALPHA_COMBINE (object); GstAlphaCombine *self = GST_ALPHA_COMBINE (object);
if (self->alpha_is_eos) {
gst_buffer_unref (buffer);
return GST_FLOW_EOS;
}
return gst_alpha_combine_push_alpha_buffer (self, buffer); return gst_alpha_combine_push_alpha_buffer (self, buffer);
} }
@ -461,7 +469,6 @@ gst_alpha_combine_alpha_event (GstPad * pad, GstObject * object,
return TRUE; return TRUE;
case GST_EVENT_EOS: case GST_EVENT_EOS:
gst_event_unref (event); gst_event_unref (event);
self->alpha_is_eos = TRUE;
return TRUE; return TRUE;
default: default:
break; break;