mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-28 12:41:05 +00:00
Code Issues 1 Projects Releases Wiki Activity

audiointerleave: Avoid caps processing if not yet negotiated

Browse source 
https://bugzilla.gnome.org/show_bug.cgi?id=745768
This commit is contained in:
Olivier Crête 2015-07-02 18:33:43 -04:00
parent f6507af946
commit c2794d1ad0
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
gst/audiomixer/gstaudiointerleave.c
View file

@ -514,6 +514,11 @@ gst_audio_interleave_aggregate (GstAggregator * aggregator, gboolean timeout)
GstStructure *s; GstStructure *s;
gboolean ret; gboolean ret;
if (self->sinkcaps == NULL || self->channels == 0) {
/* In this case, let the base class handle it */
goto not_negotiated;
}
srccaps = gst_caps_copy (self->sinkcaps); srccaps = gst_caps_copy (self->sinkcaps);
s = gst_caps_get_structure (srccaps, 0); s = gst_caps_get_structure (srccaps, 0);
@ -535,6 +540,8 @@ gst_audio_interleave_aggregate (GstAggregator * aggregator, gboolean timeout)
self->new_caps = FALSE; self->new_caps = FALSE;
} }
not_negotiated:
GST_OBJECT_UNLOCK (aggregator); GST_OBJECT_UNLOCK (aggregator);
return GST_AGGREGATOR_CLASS (parent_class)->aggregate (aggregator, timeout); return GST_AGGREGATOR_CLASS (parent_class)->aggregate (aggregator, timeout);