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

latency: fix custom event leaks

Browse source 
If the element before the sink needs $n buffers to produce one output
buffer, we were reffing $n events and unreffing only one.
Prevent this by using g_object_set_qdata_full() to handle the event
unreffing so we're sure no ref will be lost.
This commit is contained in:
Guillaume Desmottes 2019-08-06 10:09:22 +05:30
parent de9ff83533
commit a9bc30b51c
1 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
plugins/tracers/gstlatency.c
View file

@ -297,10 +297,9 @@ calculate_latency (GstElement * parent, GstPad * pad, guint64 ts)
GST_DEBUG ("%s_%s: Should log full lantency now (event %p)", GST_DEBUG ("%s_%s: Should log full lantency now (event %p)",
GST_DEBUG_PAD_NAME (pad), ev); GST_DEBUG_PAD_NAME (pad), ev);
if (ev) { if (ev) {
g_object_set_qdata ((GObject *) pad, latency_probe_id, NULL);
log_latency (gst_event_get_structure (ev), peer_parent, log_latency (gst_event_get_structure (ev), peer_parent,
GST_PAD_PEER (pad), ts); GST_PAD_PEER (pad), ts);
gst_event_unref (ev); g_object_set_qdata ((GObject *) pad, latency_probe_id, NULL);
} }
} }
@ -308,9 +307,8 @@ calculate_latency (GstElement * parent, GstPad * pad, guint64 ts)
GST_DEBUG ("%s_%s: Should log sub lantency now (event %p)", GST_DEBUG ("%s_%s: Should log sub lantency now (event %p)",
GST_DEBUG_PAD_NAME (pad), ev); GST_DEBUG_PAD_NAME (pad), ev);
if (ev) { if (ev) {
g_object_set_qdata ((GObject *) pad, sub_latency_probe_id, NULL);
log_element_latency (gst_event_get_structure (ev), parent, pad, ts); log_element_latency (gst_event_get_structure (ev), parent, pad, ts);
gst_event_unref (ev); g_object_set_qdata ((GObject *) pad, sub_latency_probe_id, NULL);
} }
} }
} }
@ -412,8 +410,8 @@ do_push_event_pre (GstTracer * self, guint64 ts, GstPad * pad, GstEvent * ev)
if (GST_OBJECT_FLAG_IS_SET (peer_parent, GST_ELEMENT_FLAG_SINK)) { if (GST_OBJECT_FLAG_IS_SET (peer_parent, GST_ELEMENT_FLAG_SINK)) {
/* store event so that we can calculate latency when the buffer that /* store event so that we can calculate latency when the buffer that
* follows has been processed */ * follows has been processed */
g_object_set_qdata ((GObject *) pad, latency_probe_id, g_object_set_qdata_full ((GObject *) pad, latency_probe_id,
gst_event_ref (ev)); gst_event_ref (ev), (GDestroyNotify) gst_event_unref);
} }
} }
@ -433,8 +431,8 @@ do_push_event_pre (GstTracer * self, guint64 ts, GstPad * pad, GstEvent * ev)
!g_str_equal (value_pad_name, pad_name)) { !g_str_equal (value_pad_name, pad_name)) {
GST_DEBUG ("%s_%s: Storing sub-latency event", GST_DEBUG ("%s_%s: Storing sub-latency event",
GST_DEBUG_PAD_NAME (pad)); GST_DEBUG_PAD_NAME (pad));
g_object_set_qdata ((GObject *) pad, sub_latency_probe_id, g_object_set_qdata_full ((GObject *) pad, sub_latency_probe_id,
gst_event_ref (ev)); gst_event_ref (ev), (GDestroyNotify) gst_event_unref);
} }
g_free (pad_name); g_free (pad_name);