mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-10-02 16:52:42 +00:00
Code Issues 1 Projects Releases Wiki Activity

aggregator: Return an error directly if negotiation of a sink pad failed

Browse source 
And don't give buffers to subclasses in that case.

https://bugzilla.gnome.org/show_bug.cgi?id=796951
This commit is contained in:
Sebastian Dröge 2018-08-13 14:50:57 +03:00
parent 29ef9a81aa
commit 08bd835f09
1 changed files with 35 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
libs/gst/base/gstaggregator.c
View file

@ -718,6 +718,12 @@ gst_aggregator_wait_and_check (GstAggregator * self, gboolean * timeout)
return res; return res;
} }
typedef struct
{
gboolean processed_event;
GstFlowReturn flow_ret;
} DoHandleEventsAndQueriesData;
static gboolean static gboolean
gst_aggregator_do_events_and_queries (GstElement * self, GstPad * epad, gst_aggregator_do_events_and_queries (GstElement * self, GstPad * epad,
gpointer user_data) gpointer user_data)
@ -727,7 +733,7 @@ gst_aggregator_do_events_and_queries (GstElement * self, GstPad * epad,
GstEvent *event = NULL; GstEvent *event = NULL;
GstQuery *query = NULL; GstQuery *query = NULL;
GstAggregatorClass *klass = NULL; GstAggregatorClass *klass = NULL;
gboolean *processed_event = user_data; DoHandleEventsAndQueriesData *data = user_data;
do { do {
event = NULL; event = NULL;
@ -745,8 +751,7 @@ gst_aggregator_do_events_and_queries (GstElement * self, GstPad * epad,
if (event || query) { if (event || query) {
gboolean ret; gboolean ret;
if (processed_event) data->processed_event = TRUE;
*processed_event = TRUE;
if (klass == NULL) if (klass == NULL)
klass = GST_AGGREGATOR_GET_CLASS (self); klass = GST_AGGREGATOR_GET_CLASS (self);
@ -756,8 +761,11 @@ gst_aggregator_do_events_and_queries (GstElement * self, GstPad * epad,
ret = klass->sink_event (aggregator, pad, event); ret = klass->sink_event (aggregator, pad, event);
PAD_LOCK (pad); PAD_LOCK (pad);
if (GST_EVENT_TYPE (event) == GST_EVENT_CAPS) if (GST_EVENT_TYPE (event) == GST_EVENT_CAPS) {
pad->priv->negotiated = ret; pad->priv->negotiated = ret;
if (!ret)
pad->priv->flow_return = data->flow_ret = GST_FLOW_NOT_NEGOTIATED;
}
if (g_queue_peek_tail (&pad->priv->data) == event) if (g_queue_peek_tail (&pad->priv->data) == event)
gst_event_unref (g_queue_pop_tail (&pad->priv->data)); gst_event_unref (g_queue_pop_tail (&pad->priv->data));
gst_event_unref (event); gst_event_unref (event);
@ -1097,10 +1105,13 @@ gst_aggregator_aggregate_func (GstAggregator * self)
GST_LOG_OBJECT (self, "Checking aggregate"); GST_LOG_OBJECT (self, "Checking aggregate");
while (priv->send_eos && priv->running) { while (priv->send_eos && priv->running) {
GstFlowReturn flow_return = GST_FLOW_OK; GstFlowReturn flow_return = GST_FLOW_OK;
gboolean processed_event = FALSE; DoHandleEventsAndQueriesData events_query_data = { FALSE, GST_FLOW_OK };
gst_element_foreach_sink_pad (GST_ELEMENT_CAST (self), gst_element_foreach_sink_pad (GST_ELEMENT_CAST (self),
gst_aggregator_do_events_and_queries, NULL); gst_aggregator_do_events_and_queries, &events_query_data);
if ((flow_return = events_query_data.flow_ret) != GST_FLOW_OK)
goto handle_error;
if (self->priv->peer_latency_live) if (self->priv->peer_latency_live)
gst_element_foreach_sink_pad (GST_ELEMENT_CAST (self), gst_element_foreach_sink_pad (GST_ELEMENT_CAST (self),
@ -1111,10 +1122,15 @@ gst_aggregator_aggregate_func (GstAggregator * self)
if (!gst_aggregator_wait_and_check (self, &timeout)) if (!gst_aggregator_wait_and_check (self, &timeout))
continue; continue;
events_query_data.processed_event = TRUE;
events_query_data.flow_ret = GST_FLOW_OK;
gst_element_foreach_sink_pad (GST_ELEMENT_CAST (self), gst_element_foreach_sink_pad (GST_ELEMENT_CAST (self),
gst_aggregator_do_events_and_queries, &processed_event); gst_aggregator_do_events_and_queries, &events_query_data);
if (processed_event) if ((flow_return = events_query_data.flow_ret) != GST_FLOW_OK)
goto handle_error;
if (events_query_data.processed_event)
continue; continue;
if (gst_pad_check_reconfigure (GST_AGGREGATOR_SRC_PAD (self))) { if (gst_pad_check_reconfigure (GST_AGGREGATOR_SRC_PAD (self))) {
@ -1144,6 +1160,7 @@ gst_aggregator_aggregate_func (GstAggregator * self)
gst_aggregator_push_eos (self); gst_aggregator_push_eos (self);
} }
handle_error:
GST_LOG_OBJECT (self, "flow return is %s", gst_flow_get_name (flow_return)); GST_LOG_OBJECT (self, "flow return is %s", gst_flow_get_name (flow_return));
if (flow_return != GST_FLOW_OK) { if (flow_return != GST_FLOW_OK) {
@ -2890,6 +2907,11 @@ gst_aggregator_pad_pop_buffer (GstAggregatorPad * pad)
PAD_LOCK (pad); PAD_LOCK (pad);
if (pad->priv->flow_return != GST_FLOW_OK) {
PAD_UNLOCK (pad);
return NULL;
}
gst_aggregator_pad_clip_buffer_unlocked (pad); gst_aggregator_pad_clip_buffer_unlocked (pad);
buffer = pad->priv->clipped_buffer; buffer = pad->priv->clipped_buffer;
@ -2942,6 +2964,11 @@ gst_aggregator_pad_peek_buffer (GstAggregatorPad * pad)
PAD_LOCK (pad); PAD_LOCK (pad);
if (pad->priv->flow_return != GST_FLOW_OK) {
PAD_UNLOCK (pad);
return NULL;
}
gst_aggregator_pad_clip_buffer_unlocked (pad); gst_aggregator_pad_clip_buffer_unlocked (pad);
if (pad->priv->clipped_buffer) { if (pad->priv->clipped_buffer) {