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

audioaggregate: Don't hold object locks across calls to aggregate_one

Browse source 
https://bugzilla.gnome.org/show_bug.cgi?id=782878
This commit is contained in:
Olivier Crête 2017-05-20 19:00:23 +02:00
parent 55ab23cc30
commit 930c3cea40
3 changed files with 31 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
gst-libs/gst/audio/gstaudioaggregator.c
View file

@ -976,6 +976,8 @@ gst_audio_aggregator_mix_buffer (GstAudioAggregator * aagg,
guint out_start; guint out_start;
gboolean filled; gboolean filled;
guint blocksize; guint blocksize;
guint in_offset;
gboolean pad_changed = FALSE;
blocksize = gst_util_uint64_scale (aagg->priv->output_buffer_duration, blocksize = gst_util_uint64_scale (aagg->priv->output_buffer_duration,
GST_AUDIO_INFO_RATE (&aagg->info), GST_SECOND); GST_AUDIO_INFO_RATE (&aagg->info), GST_SECOND);
@ -1001,12 +1003,26 @@ gst_audio_aggregator_mix_buffer (GstAudioAggregator * aagg,
return FALSE; return FALSE;
} }
gst_buffer_ref (inbuf);
in_offset = pad->priv->position;
GST_OBJECT_UNLOCK (pad);
GST_OBJECT_UNLOCK (aagg);
filled = GST_AUDIO_AGGREGATOR_GET_CLASS (aagg)->aggregate_one_buffer (aagg, filled = GST_AUDIO_AGGREGATOR_GET_CLASS (aagg)->aggregate_one_buffer (aagg,
pad, inbuf, pad->priv->position, outbuf, out_start, overlap); pad, inbuf, in_offset, outbuf, out_start, overlap);
GST_OBJECT_LOCK (aagg);
GST_OBJECT_LOCK (pad);
pad_changed = (inbuf != pad->priv->buffer);
gst_buffer_unref (inbuf);
if (filled) if (filled)
GST_BUFFER_FLAG_UNSET (outbuf, GST_BUFFER_FLAG_GAP); GST_BUFFER_FLAG_UNSET (outbuf, GST_BUFFER_FLAG_GAP);
if (pad_changed)
return FALSE;
pad->priv->position += overlap; pad->priv->position += overlap;
pad->priv->output_offset += overlap; pad->priv->output_offset += overlap;

6
gst/audiomixer/gstaudiointerleave.c
View file

@ -823,6 +823,9 @@ gst_audio_interleave_aggregate_one_buffer (GstAudioAggregator * aagg,
gint out_width, in_bpf, out_bpf, out_channels, channel; gint out_width, in_bpf, out_bpf, out_channels, channel;
guint8 *outdata; guint8 *outdata;
GST_OBJECT_LOCK (aagg);
GST_OBJECT_LOCK (aaggpad);
out_width = GST_AUDIO_INFO_WIDTH (&aagg->info) / 8; out_width = GST_AUDIO_INFO_WIDTH (&aagg->info) / 8;
in_bpf = GST_AUDIO_INFO_BPF (&aaggpad->info); in_bpf = GST_AUDIO_INFO_BPF (&aaggpad->info);
out_bpf = GST_AUDIO_INFO_BPF (&aagg->info); out_bpf = GST_AUDIO_INFO_BPF (&aagg->info);
@ -850,6 +853,9 @@ gst_audio_interleave_aggregate_one_buffer (GstAudioAggregator * aagg,
gst_buffer_unmap (inbuf, &inmap); gst_buffer_unmap (inbuf, &inmap);
gst_buffer_unmap (outbuf, &outmap); gst_buffer_unmap (outbuf, &outmap);
GST_OBJECT_UNLOCK (aaggpad);
GST_OBJECT_UNLOCK (aagg);
return TRUE; return TRUE;
} }

9
gst/audiomixer/gstaudiomixer.c
View file

@ -624,7 +624,6 @@ gst_audiomixer_release_pad (GstElement * element, GstPad * pad)
} }
/* Called with object lock and pad object lock held */
static gboolean static gboolean
gst_audiomixer_aggregate_one_buffer (GstAudioAggregator * aagg, gst_audiomixer_aggregate_one_buffer (GstAudioAggregator * aagg,
GstAudioAggregatorPad * aaggpad, GstBuffer * inbuf, guint in_offset, GstAudioAggregatorPad * aaggpad, GstBuffer * inbuf, guint in_offset,
@ -635,8 +634,13 @@ gst_audiomixer_aggregate_one_buffer (GstAudioAggregator * aagg,
GstMapInfo outmap; GstMapInfo outmap;
gint bpf; gint bpf;
GST_OBJECT_LOCK (aagg);
GST_OBJECT_LOCK (aaggpad);
if (pad->mute || pad->volume < G_MINDOUBLE) { if (pad->mute || pad->volume < G_MINDOUBLE) {
GST_DEBUG_OBJECT (pad, "Skipping muted pad"); GST_DEBUG_OBJECT (pad, "Skipping muted pad");
GST_OBJECT_UNLOCK (aaggpad);
GST_OBJECT_UNLOCK (aagg);
return FALSE; return FALSE;
} }
@ -744,6 +748,9 @@ gst_audiomixer_aggregate_one_buffer (GstAudioAggregator * aagg,
gst_buffer_unmap (inbuf, &inmap); gst_buffer_unmap (inbuf, &inmap);
gst_buffer_unmap (outbuf, &outmap); gst_buffer_unmap (outbuf, &outmap);
GST_OBJECT_UNLOCK (aaggpad);
GST_OBJECT_UNLOCK (aagg);
return TRUE; return TRUE;
} }