mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-07 07:58:51 +00:00
Code Issues 1 Projects Releases Wiki Activity

pulsesink: simplify clock provide code

Browse source 
Don't leak the pulsesink element by having the clock keep a ref to the sink.
Create the clock only once in the constructor and use the baseaudiosink clock
cleanup code.
This commit is contained in:
Wim Taymans 2010-09-07 19:02:01 +02:00
parent 7fd77c07d5
commit 2148b2db0a
1 changed files with 31 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

68
ext/pulse/pulsesink.c
View file

@ -1963,6 +1963,14 @@ gst_pulsesink_init (GstPulseSink * pulsesink, GstPulseSinkClass * klass)
GST_DEBUG_OBJECT (pulsesink, "using pulseaudio version %s", GST_DEBUG_OBJECT (pulsesink, "using pulseaudio version %s",
pulsesink->pa_version); pulsesink->pa_version);
/* override with a custom clock */
if (GST_BASE_AUDIO_SINK (pulsesink)->provided_clock)
gst_object_unref (GST_BASE_AUDIO_SINK (pulsesink)->provided_clock);
GST_BASE_AUDIO_SINK (pulsesink)->provided_clock =
gst_audio_clock_new ("GstPulseSinkClock",
(GstAudioClockGetTimeFunc) gst_pulsesink_get_time, pulsesink);
/* TRUE for sinks, FALSE for sources */ /* TRUE for sinks, FALSE for sources */
pulsesink->probe = gst_pulseprobe_new (G_OBJECT (pulsesink), pulsesink->probe = gst_pulseprobe_new (G_OBJECT (pulsesink),
G_OBJECT_GET_CLASS (pulsesink), PROP_DEVICE, pulsesink->device, G_OBJECT_GET_CLASS (pulsesink), PROP_DEVICE, pulsesink->device,
@ -2671,30 +2679,11 @@ gst_pulsesink_change_state (GstElement * element, GstStateChange transition)
case GST_STATE_CHANGE_NULL_TO_READY: case GST_STATE_CHANGE_NULL_TO_READY:
g_assert (pulsesink->mainloop == NULL); g_assert (pulsesink->mainloop == NULL);
pulsesink->mainloop = pa_threaded_mainloop_new (); pulsesink->mainloop = pa_threaded_mainloop_new ();
if (!pulsesink->mainloop) { if (!pulsesink->mainloop)
GST_ELEMENT_ERROR (pulsesink, RESOURCE, FAILED, goto mainloop_failed;
("pa_threaded_mainloop_new() failed"), (NULL));
return GST_STATE_CHANGE_FAILURE;
}
res = pa_threaded_mainloop_start (pulsesink->mainloop); res = pa_threaded_mainloop_start (pulsesink->mainloop);
g_assert (res == 0); g_assert (res == 0);
/* override with a custom clock */
if (GST_BASE_AUDIO_SINK (pulsesink)->provided_clock)
gst_object_unref (GST_BASE_AUDIO_SINK (pulsesink)->provided_clock);
/* FIXME: get rid once we can depend on core/base git again (>= 0.10.30.1)
* (and the pbutils include above as well) */
#if defined(GST_PLUGINS_BASE_VERSION_MAJOR)
GST_BASE_AUDIO_SINK (pulsesink)->provided_clock =
gst_audio_clock_new_full ("GstPulseSinkClock",
(GstAudioClockGetTimeFunc) gst_pulsesink_get_time,
gst_object_ref (pulsesink), (GDestroyNotify) gst_object_unref);
#else
GST_BASE_AUDIO_SINK (pulsesink)->provided_clock =
gst_audio_clock_new ("GstPulseSinkClock",
(GstAudioClockGetTimeFunc) gst_pulsesink_get_time, pulsesink);
#endif
break; break;
case GST_STATE_CHANGE_READY_TO_PAUSED: case GST_STATE_CHANGE_READY_TO_PAUSED:
gst_element_post_message (element, gst_element_post_message (element,
@ -2706,19 +2695,8 @@ gst_pulsesink_change_state (GstElement * element, GstStateChange transition)
} }
ret = GST_ELEMENT_CLASS (parent_class)->change_state (element, transition); ret = GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
if (ret == GST_STATE_CHANGE_FAILURE)
/* Clear the PA mainloop if baseaudiosink failed to open the ring_buffer */ goto state_failure;
if (ret == GST_STATE_CHANGE_FAILURE
&& transition == GST_STATE_CHANGE_NULL_TO_READY) {
if (GST_BASE_AUDIO_SINK (pulsesink)->provided_clock)
gst_object_unref (GST_BASE_AUDIO_SINK (pulsesink)->provided_clock);
GST_BASE_AUDIO_SINK (pulsesink)->provided_clock = NULL;
g_assert (pulsesink->mainloop);
pa_threaded_mainloop_stop (pulsesink->mainloop);
pa_threaded_mainloop_free (pulsesink->mainloop);
pulsesink->mainloop = NULL;
}
switch (transition) { switch (transition) {
case GST_STATE_CHANGE_PAUSED_TO_READY: case GST_STATE_CHANGE_PAUSED_TO_READY:
@ -2727,9 +2705,6 @@ gst_pulsesink_change_state (GstElement * element, GstStateChange transition)
GST_BASE_AUDIO_SINK (pulsesink)->provided_clock)); GST_BASE_AUDIO_SINK (pulsesink)->provided_clock));
break; break;
case GST_STATE_CHANGE_READY_TO_NULL: case GST_STATE_CHANGE_READY_TO_NULL:
if (GST_BASE_AUDIO_SINK (pulsesink)->provided_clock)
gst_object_unref (GST_BASE_AUDIO_SINK (pulsesink)->provided_clock);
GST_BASE_AUDIO_SINK (pulsesink)->provided_clock = NULL;
if (pulsesink->mainloop) { if (pulsesink->mainloop) {
pa_threaded_mainloop_stop (pulsesink->mainloop); pa_threaded_mainloop_stop (pulsesink->mainloop);
pa_threaded_mainloop_free (pulsesink->mainloop); pa_threaded_mainloop_free (pulsesink->mainloop);
@ -2741,4 +2716,23 @@ gst_pulsesink_change_state (GstElement * element, GstStateChange transition)
} }
return ret; return ret;
/* ERRORS */
mainloop_failed:
{
GST_ELEMENT_ERROR (pulsesink, RESOURCE, FAILED,
("pa_threaded_mainloop_new() failed"), (NULL));
return GST_STATE_CHANGE_FAILURE;
}
state_failure:
{
if (transition == GST_STATE_CHANGE_NULL_TO_READY) {
/* Clear the PA mainloop if baseaudiosink failed to open the ring_buffer */
g_assert (pulsesink->mainloop);
pa_threaded_mainloop_stop (pulsesink->mainloop);
pa_threaded_mainloop_free (pulsesink->mainloop);
pulsesink->mainloop = NULL;
}
return ret;
}
} }