aggregator: Replace event lock with pad's object lock
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:
parent
d7880f217e
commit
9071b8487c
@ -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");
|
||||||
|
Loading…
x
Reference in New Issue
Block a user