mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-27 01:28:34 +00:00
Code Issues 1 Projects Releases Wiki Activity

audiobasesink: make _get_time more threadsafe

Browse source 
We call the _get_time function from the provided clock and we don't lock
the sink object for performance reasons. Make sure we only read and
check variables once so that they don't change while we are executing
the code.

Fixes https://bugzilla.gnome.org/show_bug.cgi?id=720661
This commit is contained in:
Wim Taymans 2014-01-21 11:21:56 +01:00
parent 4e3d101aa8
commit 6a88d6f8cd
1 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
gst-libs/gst/audio/gstaudiobasesink.c
View file

@ -513,30 +513,36 @@ done:
} }
/* we call this function without holding the lock on sink for performance
* reasons. Try hard to not deal with and invalid ringbuffer and rate. */
static GstClockTime static GstClockTime
gst_audio_base_sink_get_time (GstClock * clock, GstAudioBaseSink * sink) gst_audio_base_sink_get_time (GstClock * clock, GstAudioBaseSink * sink)
{ {
guint64 raw, samples; guint64 raw, samples;
guint delay; guint delay;
GstClockTime result; GstClockTime result;
GstAudioRingBuffer *ringbuffer;
gint rate;
if (sink->ringbuffer == NULL || sink->ringbuffer->spec.info.rate == 0) if ((ringbuffer = sink->ringbuffer) == NULL)
return GST_CLOCK_TIME_NONE;
if ((rate = ringbuffer->spec.info.rate) == 0)
return GST_CLOCK_TIME_NONE; return GST_CLOCK_TIME_NONE;
/* our processed samples are always increasing */ /* our processed samples are always increasing */
raw = samples = gst_audio_ring_buffer_samples_done (sink->ringbuffer); raw = samples = gst_audio_ring_buffer_samples_done (ringbuffer);
/* the number of samples not yet processed, this is still queued in the /* the number of samples not yet processed, this is still queued in the
* device (not played for playback). */ * device (not played for playback). */
delay = gst_audio_ring_buffer_delay (sink->ringbuffer); delay = gst_audio_ring_buffer_delay (ringbuffer);
if (G_LIKELY (samples >= delay)) if (G_LIKELY (samples >= delay))
samples -= delay; samples -= delay;
else else
samples = 0; samples = 0;
result = gst_util_uint64_scale_int (samples, GST_SECOND, result = gst_util_uint64_scale_int (samples, GST_SECOND, rate);
sink->ringbuffer->spec.info.rate);
GST_DEBUG_OBJECT (sink, GST_DEBUG_OBJECT (sink,
"processed samples: raw %" G_GUINT64_FORMAT ", delay %u, real %" "processed samples: raw %" G_GUINT64_FORMAT ", delay %u, real %"