mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-12 10:25:33 +00:00
Code Issues 1 Projects Releases Wiki Activity

ext/pulse/pulsesink.c: Fix problems with pulsesink randomly erroring with code 'OK' after a format change on the stre...

Browse source 
Original commit message from CVS:
* ext/pulse/pulsesink.c:
Fix problems with pulsesink randomly erroring with code 'OK' after a
format change on the stream by waiting when disconnecting the stream.
This commit is contained in:
Jan Schmidt 2008-09-27 00:43:07 +00:00
parent b17599a297
commit 44cb25a342
2 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2008-09-27 Jan Schmidt <jan.schmidt@sun.com>
* ext/pulse/pulsesink.c:
Fix problems with pulsesink randomly erroring with code 'OK' after a
format change on the stream by waiting when disconnecting the stream.
2008-09-26 Wim Taymans <wim.taymans@collabora.co.uk> 2008-09-26 Wim Taymans <wim.taymans@collabora.co.uk>
* gst/rtp/gstrtpamrdepay.c: (gst_rtp_amr_depay_class_init), * gst/rtp/gstrtpamrdepay.c: (gst_rtp_amr_depay_class_init),

12
ext/pulse/pulsesink.c
View file

@ -273,6 +273,7 @@ gst_pulsesink_destroy_stream (GstPulseSink * pulsesink)
{ {
if (pulsesink->stream) { if (pulsesink->stream) {
pa_stream_disconnect (pulsesink->stream); pa_stream_disconnect (pulsesink->stream);
pa_threaded_mainloop_wait (pulsesink->mainloop);
pa_stream_unref (pulsesink->stream); pa_stream_unref (pulsesink->stream);
pulsesink->stream = NULL; pulsesink->stream = NULL;
} }
@ -507,6 +508,7 @@ gst_pulsesink_open (GstAudioSink * asink)
{ {
GstPulseSink *pulsesink = GST_PULSESINK (asink); GstPulseSink *pulsesink = GST_PULSESINK (asink);
gchar *name = gst_pulse_client_name (); gchar *name = gst_pulse_client_name ();
pa_context_state_t state;
pa_threaded_mainloop_lock (pulsesink->mainloop); pa_threaded_mainloop_lock (pulsesink->mainloop);
@ -530,7 +532,9 @@ gst_pulsesink_open (GstAudioSink * asink)
/* Wait until the context is ready */ /* Wait until the context is ready */
pa_threaded_mainloop_wait (pulsesink->mainloop); pa_threaded_mainloop_wait (pulsesink->mainloop);
if (pa_context_get_state (pulsesink->context) != PA_CONTEXT_READY) { state = pa_context_get_state (pulsesink->context);
if (state != PA_CONTEXT_READY) {
GST_DEBUG_OBJECT (pulsesink, "Context state was not READY. Got: %d", state);
GST_ELEMENT_ERROR (pulsesink, RESOURCE, FAILED, ("Failed to connect: %s", GST_ELEMENT_ERROR (pulsesink, RESOURCE, FAILED, ("Failed to connect: %s",
pa_strerror (pa_context_errno (pulsesink->context))), (NULL)); pa_strerror (pa_context_errno (pulsesink->context))), (NULL));
goto unlock_and_fail; goto unlock_and_fail;
@ -564,6 +568,7 @@ gst_pulsesink_prepare (GstAudioSink * asink, GstRingBufferSpec * spec)
{ {
pa_buffer_attr buf_attr; pa_buffer_attr buf_attr;
pa_channel_map channel_map; pa_channel_map channel_map;
pa_stream_state_t s_state;
GstPulseSink *pulsesink = GST_PULSESINK (asink); GstPulseSink *pulsesink = GST_PULSESINK (asink);
if (!gst_pulse_fill_sample_spec (spec, &pulsesink->sample_spec)) { if (!gst_pulse_fill_sample_spec (spec, &pulsesink->sample_spec)) {
@ -620,7 +625,10 @@ gst_pulsesink_prepare (GstAudioSink * asink, GstRingBufferSpec * spec)
/* Wait until the stream is ready */ /* Wait until the stream is ready */
pa_threaded_mainloop_wait (pulsesink->mainloop); pa_threaded_mainloop_wait (pulsesink->mainloop);
if (pa_stream_get_state (pulsesink->stream) != PA_STREAM_READY) { s_state = pa_stream_get_state (pulsesink->stream);
if (s_state != PA_STREAM_READY) {
GST_DEBUG_OBJECT (pulsesink, "Stream state was not READY. Got: %d",
s_state);
GST_ELEMENT_ERROR (pulsesink, RESOURCE, FAILED, GST_ELEMENT_ERROR (pulsesink, RESOURCE, FAILED,
("Failed to connect stream: %s", ("Failed to connect stream: %s",
pa_strerror (pa_context_errno (pulsesink->context))), (NULL)); pa_strerror (pa_context_errno (pulsesink->context))), (NULL));