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

audio-aggregator: Check return values

Browse source 
And copy over already-parsed information

CID #1427140
This commit is contained in:
Edward Hervey 2018-03-23 14:24:38 +01:00 committed by Edward Hervey
parent 345aa2cd9e
commit a034018a75
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -699,7 +699,10 @@ gst_audio_aggregator_sink_setcaps (GstAudioAggregatorPad * aaggpad,
goto done; goto done;
} }
gst_audio_info_from_caps (&info, caps); if (!gst_audio_info_from_caps (&info, caps)) {
GST_WARNING_OBJECT (agg, "Rejecting invalid caps: %" GST_PTR_FORMAT, caps);
return FALSE;
}
s = gst_caps_get_structure (downstream_caps, 0); s = gst_caps_get_structure (downstream_caps, 0);
/* TODO: handle different rates on sinkpads, a bit complex /* TODO: handle different rates on sinkpads, a bit complex
@ -715,7 +718,7 @@ gst_audio_aggregator_sink_setcaps (GstAudioAggregatorPad * aaggpad,
GstAudioAggregatorPadClass *klass = GstAudioAggregatorPadClass *klass =
GST_AUDIO_AGGREGATOR_PAD_GET_CLASS (aaggpad); GST_AUDIO_AGGREGATOR_PAD_GET_CLASS (aaggpad);
GST_OBJECT_LOCK (aaggpad); GST_OBJECT_LOCK (aaggpad);
gst_audio_info_from_caps (&aaggpad->info, caps); aaggpad->info = info;
if (klass->update_conversion_info) if (klass->update_conversion_info)
klass->update_conversion_info (aaggpad); klass->update_conversion_info (aaggpad);
GST_OBJECT_UNLOCK (aaggpad); GST_OBJECT_UNLOCK (aaggpad);