mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-19 23:06:49 +00:00
Code Issues 1 Projects Releases Wiki Activity

pulsesink: Issue property change notification in streaming thread,

Browse source 
rather than PA thread.

pa_threaded_mainloop_lock() (a.o.) and by extension get_property should
not be done from a PA thread, but the latter may occur as a result of a
property change notification.  Fixes #571204 (though current situation
not ideal, e.g. post message rather than signal).
This commit is contained in:
Mark Nauwelaerts 2009-02-13 18:03:14 +01:00
parent 77c7eed1ae
commit 7756d37531
2 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
ext/pulse/pulsesink.c
View file

@ -269,6 +269,7 @@ gst_pulsesink_init (GstPulseSink * pulsesink, GstPulseSinkClass * klass)
pulsesink->operation_success = FALSE;
pulsesink->did_reset = FALSE;
pulsesink->in_write = FALSE;
pulsesink->notify = 0;
pulsesink->mainloop = pa_threaded_mainloop_new ();
g_assert (pulsesink->mainloop);
@ -621,13 +622,10 @@ gst_pulsesink_context_subscribe_cb (pa_context * c,
/* Actually this event is also triggered when other properties of
* the stream change that are unrelated to the volume. However it is
* probably cheaper to signal the change here and check for the
* volume when the GObject property is read instead of querying it always.
*
* Lennart thinks this is a race because g_object_notify() is not
* thread safe and this function is run from a PA controlled
* thread. But folks on #gstreamer told me that was ok. */
* volume when the GObject property is read instead of querying it always. */
g_object_notify (G_OBJECT (pulsesink), "volume");
/* inform streaming thread to notify */
g_atomic_int_compare_and_exchange (&pulsesink->notify, 0, 1);
}
#endif
@ -876,6 +874,10 @@ gst_pulsesink_write (GstAudioSink * asink, gpointer data, guint length)
GstPulseSink *pulsesink = GST_PULSESINK (asink);
size_t sum = 0;
/* FIXME post message rather than using a signal (as mixer interface) */
if (g_atomic_int_compare_and_exchange (&pulsesink->notify, 1, 0))
g_object_notify (G_OBJECT (pulsesink), "volume");
pa_threaded_mainloop_lock (pulsesink->mainloop);
pulsesink->in_write = TRUE;

1
ext/pulse/pulsesink.h
View file

@ -68,6 +68,7 @@ struct _GstPulseSink
gboolean operation_success;
gboolean did_reset, in_write;
gint notify;
};
struct _GstPulseSinkClass