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

audioaggregator: Properly propagate caps negotiation failures

Browse source 
Otherwise we'll end up doing a division by zero when clipping buffers,
and might even accept buffers for which we don't know the caps.

https://bugzilla.gnome.org/show_bug.cgi?id=796951
This commit is contained in:
Sebastian Dröge 2018-08-13 14:50:09 +03:00
parent ca15315565
commit 1b6eed694c
1 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1014,6 +1014,12 @@ gst_audio_aggregator_sink_event (GstAggregator * agg,
break; break;
} }
if (!res) {
if (event)
gst_event_unref (event);
return res;
}
if (event != NULL) if (event != NULL)
return return
GST_AGGREGATOR_CLASS (gst_audio_aggregator_parent_class)->sink_event GST_AGGREGATOR_CLASS (gst_audio_aggregator_parent_class)->sink_event
@ -1276,10 +1282,13 @@ gst_audio_aggregator_do_clip (GstAggregator * agg,
GstAudioAggregatorPad *pad = GST_AUDIO_AGGREGATOR_PAD (bpad); GstAudioAggregatorPad *pad = GST_AUDIO_AGGREGATOR_PAD (bpad);
gint rate, bpf; gint rate, bpf;
rate = GST_AUDIO_INFO_RATE (&pad->info); /* Guard against invalid audio info, we just don't clip here then */
bpf = GST_AUDIO_INFO_BPF (&pad->info); if (!GST_AUDIO_INFO_IS_VALID (&pad->info))
return buffer;
GST_OBJECT_LOCK (bpad); GST_OBJECT_LOCK (bpad);
rate = GST_AUDIO_INFO_RATE (&pad->info);
bpf = GST_AUDIO_INFO_BPF (&pad->info);
buffer = gst_audio_buffer_clip (buffer, &bpad->segment, rate, bpf); buffer = gst_audio_buffer_clip (buffer, &bpad->segment, rate, bpf);
GST_OBJECT_UNLOCK (bpad); GST_OBJECT_UNLOCK (bpad);
@ -1775,6 +1784,10 @@ gst_audio_aggregator_aggregate (GstAggregator * agg, gboolean timeout)
} }
GST_OBJECT_UNLOCK (pad); GST_OBJECT_UNLOCK (pad);
continue; continue;
} else if (!GST_AUDIO_INFO_IS_VALID (&pad->info)) {
GST_OBJECT_UNLOCK (pad);
GST_OBJECT_UNLOCK (agg);
goto not_negotiated;
} }
/* New buffer? */ /* New buffer? */