mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-04 22:48:54 +00:00
Code Issues 1 Projects Releases Wiki Activity

osxaudio: Take lock around sink/source before accessing the ringbuffer

Browse source 
https://bugzilla.gnome.org/show_bug.cgi?id=740987
This commit is contained in:
Arun Raghavan 2014-12-08 22:38:22 +05:30
parent 4a58ebf487
commit d18a6b0a2c
2 changed files with 13 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
sys/osxaudio/gstosxaudiosink.c
View file

@ -358,7 +358,12 @@ gst_osx_audio_sink_getcaps (GstBaseSink * sink, GstCaps * filter)
gstelement_class = GST_ELEMENT_GET_CLASS (sink);
osxsink = GST_OSX_AUDIO_SINK (sink);
GST_OBJECT_LOCK (osxsink);
buf = GST_AUDIO_BASE_SINK (sink)->ringbuffer;
if (buf)
gst_object_ref (buf);
GST_OBJECT_UNLOCK (osxsink);
if (buf) {
GST_OBJECT_LOCK (buf);
@ -380,6 +385,8 @@ gst_osx_audio_sink_getcaps (GstBaseSink * sink, GstCaps * filter)
ret = gst_caps_ref (osxsink->cached_caps);
GST_OBJECT_UNLOCK (buf);
gst_object_unref (buf);
}
if (ret && filter) {

6
sys/osxaudio/gstosxaudiosrc.c
View file

@ -311,7 +311,12 @@ gst_osx_audio_src_get_caps (GstBaseSrc * src, GstCaps * filter)
gstelement_class = GST_ELEMENT_GET_CLASS (src);
osxsrc = GST_OSX_AUDIO_SRC (src);
GST_OBJECT_LOCK (osxsrc);
buf = GST_AUDIO_BASE_SRC (src)->ringbuffer;
if (buf)
gst_object_ref (buf);
GST_OBJECT_UNLOCK (osxsrc);
if (buf) {
GST_OBJECT_LOCK (buf);
@ -330,6 +335,7 @@ gst_osx_audio_src_get_caps (GstBaseSrc * src, GstCaps * filter)
}
GST_OBJECT_UNLOCK (buf);
gst_object_unref (buf);
}
if (!ret && osxsrc->cached_caps)