From: Olivier CrĂȘte Date: Thu, 13 Jul 2017 22:38:34 +0000 (-0400) Subject: aggregator: Don't block if adding to the tail of the queue X-Git-Tag: 1.16.2~574^2~9 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8b60b25917c224b95afa0f05792560c5bee46eac;p=platform%2Fupstream%2Fgstreamer.git aggregator: Don't block if adding to the tail of the queue If we're adding to the tail of the queue, it's because we're converting a gap event, so don't block there it means we're calling from the output thread. https://bugzilla.gnome.org/show_bug.cgi?id=784911 --- diff --git a/libs/gst/base/gstaggregator.c b/libs/gst/base/gstaggregator.c index 9f4c42f..3a642d8 100644 --- a/libs/gst/base/gstaggregator.c +++ b/libs/gst/base/gstaggregator.c @@ -2497,7 +2497,7 @@ gst_aggregator_pad_chain_internal (GstAggregator * self, aggpad->priv->first_buffer = FALSE; } - if (gst_aggregator_pad_has_space (self, aggpad) + if ((gst_aggregator_pad_has_space (self, aggpad) || !head) && aggpad->priv->flow_return == GST_FLOW_OK) { if (head) g_queue_push_head (&aggpad->priv->data, buffer);