mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-30 13:41:48 +00:00
Code Issues 1 Projects Releases Wiki Activity

baseaudiosrc: Add src object lock around call to ringbuffer parse caps.

Browse source 
A race was observed between query() and setcaps() where the latter would
change the ringbuffer spec while the former was performing operations
based this data.
This commit is contained in:
Stian Johansen 2011-02-23 10:55:12 +01:00 committed by Sebastian Dröge
parent 63cfa2a50d
commit 0f8edca902
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
gst-libs/gst/audio/gstbaseaudiosrc.c
View file

@ -560,14 +560,20 @@ gst_base_audio_src_setcaps (GstBaseSrc * bsrc, GstCaps * caps)
spec->buffer_time = src->buffer_time; spec->buffer_time = src->buffer_time;
spec->latency_time = src->latency_time; spec->latency_time = src->latency_time;
GST_OBJECT_LOCK (src);
if (!gst_ring_buffer_parse_caps (spec, caps)) if (!gst_ring_buffer_parse_caps (spec, caps))
{
GST_OBJECT_UNLOCK (src);
goto parse_error; goto parse_error;
}
/* calculate suggested segsize and segtotal */ /* calculate suggested segsize and segtotal */
spec->segsize = spec->segsize =
spec->rate * spec->bytes_per_sample * spec->latency_time / GST_MSECOND; spec->rate * spec->bytes_per_sample * spec->latency_time / GST_MSECOND;
spec->segtotal = spec->buffer_time / spec->latency_time; spec->segtotal = spec->buffer_time / spec->latency_time;
GST_OBJECT_UNLOCK (src);
GST_DEBUG ("release old ringbuffer"); GST_DEBUG ("release old ringbuffer");
gst_ring_buffer_release (src->ringbuffer); gst_ring_buffer_release (src->ringbuffer);