diff options
author | Edward Hervey <edward@centricular.com> | 2017-11-09 17:38:19 +0100 |
---|---|---|
committer | Edward Hervey <bilboed@bilboed.com> | 2017-11-09 17:42:37 +0100 |
commit | c8d2c692758a5c6635f35a2e1551c64a67c20f57 (patch) | |
tree | b61ccb8f13033214b3b659c4853a97324a0059bc | |
parent | 82fb85403c070a0abcf726fe3df88954b87fda7d (diff) |
concat: Make QoS forward MT-safe
In the same way it's done for other event forwarding.
-rw-r--r-- | plugins/elements/gstconcat.c | 26 |
1 files changed, 19 insertions, 7 deletions
diff --git a/plugins/elements/gstconcat.c b/plugins/elements/gstconcat.c index 4cc134d993..1493b3824b 100644 --- a/plugins/elements/gstconcat.c +++ b/plugins/elements/gstconcat.c @@ -715,16 +715,28 @@ gst_concat_src_event (GstPad * pad, GstObject * parent, GstEvent * event) GstClockTimeDiff diff; GstClockTime timestamp; gdouble proportion; + GstPad *sinkpad = NULL; - gst_event_parse_qos (event, &type, &proportion, &diff, ×tamp); - gst_event_unref (event); + g_mutex_lock (&self->lock); + if ((sinkpad = self->current_sinkpad)) + gst_object_ref (sinkpad); + g_mutex_unlock (&self->lock); + + if (sinkpad) { + gst_event_parse_qos (event, &type, &proportion, &diff, ×tamp); + gst_event_unref (event); - if (timestamp != GST_CLOCK_TIME_NONE - && timestamp > self->current_start_offset) { - timestamp -= self->current_start_offset; - event = gst_event_new_qos (type, proportion, diff, timestamp); - ret = gst_pad_push_event (self->current_sinkpad, event); + if (timestamp != GST_CLOCK_TIME_NONE + && timestamp > self->current_start_offset) { + timestamp -= self->current_start_offset; + event = gst_event_new_qos (type, proportion, diff, timestamp); + ret = gst_pad_push_event (self->current_sinkpad, event); + } else { + ret = FALSE; + } + gst_object_unref (sinkpad); } else { + gst_event_unref (event); ret = FALSE; } break; |