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

pulseaudiosink: port some more to 0.11

Browse source 
We must not forward the caps event. instead we will decide what to do when the
pad block is taken.
Use decodebin instead of decodebin2
This commit is contained in:
Wim Taymans 2011-11-04 13:56:06 +01:00
parent a19a4a69ae
commit 1352a08a71
1 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
ext/pulse/pulseaudiosink.c
View file

@ -540,7 +540,7 @@ pad_added_cb (GstElement * dbin2, GstPad * pad, gpointer * data)
GST_PULSE_AUDIO_SINK_LOCK (pbin); GST_PULSE_AUDIO_SINK_LOCK (pbin);
if (gst_pad_link (pad, sinkpad) != GST_PAD_LINK_OK) if (gst_pad_link (pad, sinkpad) != GST_PAD_LINK_OK)
GST_ERROR_OBJECT (pbin, "Failed to link decodebin2 to pulsesink"); GST_ERROR_OBJECT (pbin, "Failed to link decodebin to pulsesink");
else else
GST_DEBUG_OBJECT (pbin, "Linked new pad to pulsesink"); GST_DEBUG_OBJECT (pbin, "Linked new pad to pulsesink");
GST_PULSE_AUDIO_SINK_UNLOCK (pbin); GST_PULSE_AUDIO_SINK_UNLOCK (pbin);
@ -556,18 +556,18 @@ gst_pulse_audio_sink_add_dbin2 (GstPulseAudioSink * pbin)
g_assert (pbin->dbin2 == NULL); g_assert (pbin->dbin2 == NULL);
pbin->dbin2 = gst_element_factory_make ("decodebin2", "pulseaudiosink-dbin2"); pbin->dbin2 = gst_element_factory_make ("decodebin", "pulseaudiosink-dbin2");
if (!pbin->dbin2) { if (!pbin->dbin2) {
post_missing_element_message (pbin, "decodebin2"); post_missing_element_message (pbin, "decodebin");
GST_ELEMENT_WARNING (pbin, CORE, MISSING_PLUGIN, GST_ELEMENT_WARNING (pbin, CORE, MISSING_PLUGIN,
(_("Missing element '%s' - check your GStreamer installation."), (_("Missing element '%s' - check your GStreamer installation."),
"decodebin2"), ("audio playback might fail")); "decodebin"), ("audio playback might fail"));
goto out; goto out;
} }
if (!gst_bin_add (GST_BIN (pbin), pbin->dbin2)) { if (!gst_bin_add (GST_BIN (pbin), pbin->dbin2)) {
GST_ERROR_OBJECT (pbin, "Failed to add decodebin2 to bin"); GST_ERROR_OBJECT (pbin, "Failed to add decodebin to bin");
goto out; goto out;
} }
@ -575,7 +575,7 @@ gst_pulse_audio_sink_add_dbin2 (GstPulseAudioSink * pbin)
G_CALLBACK (pad_added_cb), pbin); G_CALLBACK (pad_added_cb), pbin);
if (!gst_element_sync_state_with_parent (pbin->dbin2)) { if (!gst_element_sync_state_with_parent (pbin->dbin2)) {
GST_ERROR_OBJECT (pbin, "Failed to set decodebin2 to parent state"); GST_ERROR_OBJECT (pbin, "Failed to set decodebin to parent state");
goto out; goto out;
} }
@ -657,7 +657,7 @@ proxypad_blocked_cb (GstPad * pad, GstPadProbeType ptype, gpointer type_data,
goto done; goto done;
} }
/* pulsesink doesn't accept the incoming caps, so add a decodebin /* pulsesink doesn't accept the incoming caps, so add a decodebin
* (potentially after removing the existing once, since decodebin2 can't * (potentially after removing the existing once, since decodebin can't
* renegotiate). */ * renegotiate). */
} else { } else {
/* Format lost, proceed to try plugging a decodebin */ /* Format lost, proceed to try plugging a decodebin */
@ -665,7 +665,7 @@ proxypad_blocked_cb (GstPad * pad, GstPadProbeType ptype, gpointer type_data,
} }
if (pbin->dbin2 != NULL) { if (pbin->dbin2 != NULL) {
/* decodebin2 doesn't support reconfiguration, so throw this one away and /* decodebin doesn't support reconfiguration, so throw this one away and
* create a new one. */ * create a new one. */
gst_pulse_audio_sink_free_dbin2 (pbin); gst_pulse_audio_sink_free_dbin2 (pbin);
} }
@ -739,8 +739,6 @@ gst_pulse_audio_sink_sink_event (GstPad * pad, GstEvent * event)
GstPulseAudioSink *pbin = GST_PULSE_AUDIO_SINK (gst_pad_get_parent (pad)); GstPulseAudioSink *pbin = GST_PULSE_AUDIO_SINK (gst_pad_get_parent (pad));
gboolean ret; gboolean ret;
ret = pbin->sinkpad_old_eventfunc (pad, gst_event_ref (event));
switch (GST_EVENT_TYPE (event)) { switch (GST_EVENT_TYPE (event)) {
case GST_EVENT_CAPS: case GST_EVENT_CAPS:
{ {
@ -755,6 +753,8 @@ gst_pulse_audio_sink_sink_event (GstPad * pad, GstEvent * event)
{ {
const GstSegment *segment = NULL; const GstSegment *segment = NULL;
ret = pbin->sinkpad_old_eventfunc (pad, gst_event_ref (event));
GST_PULSE_AUDIO_SINK_LOCK (pbin); GST_PULSE_AUDIO_SINK_LOCK (pbin);
gst_event_parse_segment (event, &segment); gst_event_parse_segment (event, &segment);
@ -773,12 +773,15 @@ gst_pulse_audio_sink_sink_event (GstPad * pad, GstEvent * event)
} }
case GST_EVENT_FLUSH_STOP: case GST_EVENT_FLUSH_STOP:
ret = pbin->sinkpad_old_eventfunc (pad, gst_event_ref (event));
GST_PULSE_AUDIO_SINK_LOCK (pbin); GST_PULSE_AUDIO_SINK_LOCK (pbin);
gst_segment_init (&pbin->segment, GST_FORMAT_UNDEFINED); gst_segment_init (&pbin->segment, GST_FORMAT_UNDEFINED);
GST_PULSE_AUDIO_SINK_UNLOCK (pbin); GST_PULSE_AUDIO_SINK_UNLOCK (pbin);
break; break;
default: default:
ret = pbin->sinkpad_old_eventfunc (pad, gst_event_ref (event));
break; break;
} }