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

aggregator: Replace event lock with pad's object lock

Browse source 
Reduce the number of locks simplify code, what is protects
is exposed, but the lock was not.

Also means adding an _unlocked version of gst_aggregator_pad_steal_buffer().

https://bugzilla.gnome.org/show_bug.cgi?id=742684
This commit is contained in:
Olivier Crête 2015-01-14 14:35:15 -05:00 committed by Thibault Saunier
parent d7880f217e
commit 9071b8487c
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
gst/audiomixer/gstaudiomixer.c
View file

@ -1199,7 +1199,7 @@ gst_audio_mixer_mix_buffer (GstAudioMixer * audiomixer, GstAudioMixerPad * pad,
GstBuffer *buf; GstBuffer *buf;
/* Buffer done, drop it */ /* Buffer done, drop it */
gst_buffer_replace (&pad->buffer, NULL); gst_buffer_replace (&pad->buffer, NULL);
buf = gst_aggregator_pad_steal_buffer (aggpad); buf = gst_aggregator_pad_steal_buffer_unlocked (aggpad);
if (buf) if (buf)
gst_buffer_unref (buf); gst_buffer_unref (buf);
} }
@ -1208,7 +1208,7 @@ gst_audio_mixer_mix_buffer (GstAudioMixer * audiomixer, GstAudioMixerPad * pad,
} }
if (GST_BUFFER_FLAG_IS_SET (inbuf, GST_BUFFER_FLAG_GAP)) { if (GST_BUFFER_FLAG_IS_SET (inbuf, GST_BUFFER_FLAG_GAP)) {
GstBuffer *aggpadbuf = gst_aggregator_pad_steal_buffer (aggpad); GstBuffer *aggpadbuf = gst_aggregator_pad_steal_buffer_unlocked (aggpad);
/* skip gap buffer */ /* skip gap buffer */
GST_LOG_OBJECT (pad, "skipping GAP buffer"); GST_LOG_OBJECT (pad, "skipping GAP buffer");
@ -1330,7 +1330,7 @@ gst_audio_mixer_mix_buffer (GstAudioMixer * audiomixer, GstAudioMixerPad * pad,
/* Buffer done, drop it */ /* Buffer done, drop it */
gst_buffer_replace (&pad->buffer, NULL); gst_buffer_replace (&pad->buffer, NULL);
buf = gst_aggregator_pad_steal_buffer (aggpad); buf = gst_aggregator_pad_steal_buffer_unlocked (aggpad);
if (buf) if (buf)
gst_buffer_unref (buf); gst_buffer_unref (buf);
GST_DEBUG_OBJECT (pad, "Finished mixing buffer, waiting for next"); GST_DEBUG_OBJECT (pad, "Finished mixing buffer, waiting for next");