mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-23 15:48:23 +00:00
Code Issues 1 Projects Releases Wiki Activity

pulseaudiosink: avoid endless caps loop

Browse source 
Check if the caps are the same before adding a new probe. Because of reconfigure
events, upstreams sends multiple caps events.
This commit is contained in:
Wim Taymans 2011-11-23 09:26:17 +01:00
parent 736a484129
commit bb3fbfc18e
1 changed files with 20 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
ext/pulse/pulseaudiosink.c
View file

@ -525,9 +525,8 @@ dbin_event_probe (GstPad * pad, GstPadProbeInfo * info, gpointer data)
if (GST_EVENT_TYPE (event) == GST_EVENT_SEGMENT) { if (GST_EVENT_TYPE (event) == GST_EVENT_SEGMENT) {
GST_DEBUG_OBJECT (pbin, "Got newsegment - dropping"); GST_DEBUG_OBJECT (pbin, "Got newsegment - dropping");
gst_pad_remove_probe (pad, pbin->event_probe_id); pbin->event_probe_id = 0;
gst_object_unref (pbin); return GST_PAD_PROBE_REMOVE;
return GST_PAD_PROBE_DROP;
} }
return GST_PAD_PROBE_OK; return GST_PAD_PROBE_OK;
@ -585,9 +584,11 @@ gst_pulse_audio_sink_add_dbin (GstPulseAudioSink * pbin)
/* Trap the newsegment events that we feed the decodebin and discard them */ /* Trap the newsegment events that we feed the decodebin and discard them */
sinkpad = gst_element_get_static_pad (GST_ELEMENT (pbin->psink), "sink"); sinkpad = gst_element_get_static_pad (GST_ELEMENT (pbin->psink), "sink");
pbin->event_probe_id = if (pbin->event_probe_id == 0)
gst_pad_add_probe (sinkpad, GST_PAD_PROBE_TYPE_EVENT_DOWNSTREAM, pbin->event_probe_id =
dbin_event_probe, gst_object_ref (pbin), NULL); gst_pad_add_probe (sinkpad, GST_PAD_PROBE_TYPE_EVENT_DOWNSTREAM,
dbin_event_probe, gst_object_ref (pbin),
(GDestroyNotify) gst_object_unref);
gst_object_unref (sinkpad); gst_object_unref (sinkpad);
sinkpad = NULL; sinkpad = NULL;
@ -877,12 +878,25 @@ gst_pulse_audio_sink_set_caps (GstPulseAudioSink * pbin, GstCaps * caps)
GST_PULSE_AUDIO_SINK_LOCK (pbin); GST_PULSE_AUDIO_SINK_LOCK (pbin);
GST_DEBUG_OBJECT (pbin, "got caps %" GST_PTR_FORMAT, caps);
if (gst_pad_has_current_caps (pbin->sinkpad)) {
GstCaps *current;
/* See if we already got caps on our sinkpad */
current = gst_pad_get_current_caps (pbin->sinkpad);
ret = gst_caps_is_equal (caps, current);
gst_caps_unref (current);
if (ret)
goto done;
}
if (pbin->block_probe_id == 0) if (pbin->block_probe_id == 0)
pbin->block_probe_id = pbin->block_probe_id =
gst_pad_add_probe (pbin->sink_proxypad, gst_pad_add_probe (pbin->sink_proxypad,
GST_PAD_PROBE_TYPE_BLOCK_DOWNSTREAM, proxypad_blocked_cb, GST_PAD_PROBE_TYPE_BLOCK_DOWNSTREAM, proxypad_blocked_cb,
gst_object_ref (pbin), (GDestroyNotify) gst_object_unref); gst_object_ref (pbin), (GDestroyNotify) gst_object_unref);
done:
GST_PULSE_AUDIO_SINK_UNLOCK (pbin); GST_PULSE_AUDIO_SINK_UNLOCK (pbin);
return ret; return ret;