Skip to content

gstreamer
gstreamer
Commit 0396bc2e authored by Matthew Waters's avatar Matthew Waters 🐨 Committed by Tim-Philipp Müller
Browse files
Options

aggregator: take the pad lock around queue gap event removal 

As is done for every other queue interaction
parent abc875b3
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 0 deletions
libs/gst/base/gstaggregator.c
View file @ 0396bc2e
...@@ -1477,8 +1477,10 @@ gst_aggregator_default_sink_event (GstAggregator * self, ...@@ -1477,8 +1477,10 @@ gst_aggregator_default_sink_event (GstAggregator * self,
GST_BUFFER_FLAG_SET (gapbuf, GST_BUFFER_FLAG_DROPPABLE); GST_BUFFER_FLAG_SET (gapbuf, GST_BUFFER_FLAG_DROPPABLE);
/* Remove GAP event so we can replace it with the buffer */ /* Remove GAP event so we can replace it with the buffer */
PAD_LOCK (aggpad);
if (g_queue_peek_tail (&aggpad->priv->data) == event) if (g_queue_peek_tail (&aggpad->priv->data) == event)
gst_event_unref (g_queue_pop_tail (&aggpad->priv->data)); gst_event_unref (g_queue_pop_tail (&aggpad->priv->data));
PAD_UNLOCK (aggpad);
if (gst_aggregator_pad_chain_internal (self, aggpad, gapbuf, FALSE) != if (gst_aggregator_pad_chain_internal (self, aggpad, gapbuf, FALSE) !=
GST_FLOW_OK) { GST_FLOW_OK) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment