mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 03:56:16 +00:00
Code Issues 1 Projects Releases Wiki Activity

pulsesrc: consider stream alive when not connected yet

Browse source 
When we start and renegotiate, there is a moment where the stream is created but
not yet connected. Make sure all functions deal with this situation correctly
instead of erroring out.

Fixes https://bugzilla.gnome.org/show_bug.cgi?id=681247
This commit is contained in:
Wim Taymans 2012-09-10 13:35:15 +02:00
parent 619b2bd1a9
commit c47c410e7b
1 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
ext/pulse/pulsesrc.c
View file

@ -366,6 +366,9 @@ gst_pulsesrc_finalize (GObject * object)
static gboolean static gboolean
gst_pulsesrc_is_dead (GstPulseSrc * pulsesrc, gboolean check_stream) gst_pulsesrc_is_dead (GstPulseSrc * pulsesrc, gboolean check_stream)
{ {
if (!pulsesrc->stream_connected)
return TRUE;
if (!CONTEXT_OK (pulsesrc->context)) if (!CONTEXT_OK (pulsesrc->context))
goto error; goto error;
@ -1004,6 +1007,9 @@ gst_pulsesrc_read (GstAudioSrc * asrc, gpointer data, guint length,
pa_threaded_mainloop_lock (pulsesrc->mainloop); pa_threaded_mainloop_lock (pulsesrc->mainloop);
pulsesrc->in_read = TRUE; pulsesrc->in_read = TRUE;
if (!pulsesrc->stream_connected)
goto not_connected;
if (pulsesrc->paused) if (pulsesrc->paused)
goto was_paused; goto was_paused;
@ -1069,6 +1075,11 @@ gst_pulsesrc_read (GstAudioSrc * asrc, gpointer data, guint length,
return sum; return sum;
/* ERRORS */ /* ERRORS */
not_connected:
{
GST_LOG_OBJECT (pulsesrc, "we are not connected");
goto unlock_and_fail;
}
was_paused: was_paused:
{ {
GST_LOG_OBJECT (pulsesrc, "we are paused"); GST_LOG_OBJECT (pulsesrc, "we are paused");