mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-23 18:21:04 +00:00
Code Issues 1 Projects Releases Wiki Activity

audioaggregator: Only check downstream caps when handling CAPS events if we didn't negotiate with downstream yet

Browse source 
If we already negotiated with downstream there is not point in checking
if the caps are supported. We already know that this is the case.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/merge_requests/768>
This commit is contained in:
Sebastian Dröge 2020-07-27 18:55:35 +03:00
parent 607dc1d135
commit f5a02639e1
1 changed files with 23 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -869,20 +869,9 @@ gst_audio_aggregator_sink_setcaps (GstAudioAggregatorPad * aaggpad,
{ {
GstAudioAggregatorPad *first_configured_pad = GstAudioAggregatorPad *first_configured_pad =
gst_audio_aggregator_get_first_configured_pad (agg); gst_audio_aggregator_get_first_configured_pad (agg);
GstCaps *downstream_caps = gst_pad_get_allowed_caps (agg->srcpad);
GstCaps *rate_caps;
GstAudioInfo info; GstAudioInfo info;
gboolean ret = TRUE; gboolean ret = TRUE;
gboolean downstream_supports_rate; gboolean downstream_supports_rate = TRUE;
/* Returns NULL if there is no downstream peer */
if (!downstream_caps)
downstream_caps = gst_pad_get_pad_template_caps (agg->srcpad);
if (gst_caps_is_empty (downstream_caps)) {
ret = FALSE;
goto done;
}
if (!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); GST_WARNING_OBJECT (agg, "Rejecting invalid caps: %" GST_PTR_FORMAT, caps);
@ -893,11 +882,28 @@ gst_audio_aggregator_sink_setcaps (GstAudioAggregatorPad * aaggpad,
* because offsets will have to be updated, and audio resampling * because offsets will have to be updated, and audio resampling
* has a latency to take into account * has a latency to take into account
*/ */
rate_caps =
gst_caps_new_simple ("audio/x-raw", "rate", G_TYPE_INT, info.rate, NULL); /* Only check against the downstream caps if we didn't configure any caps
downstream_supports_rate = * so far. Otherwise we already know that downstream supports the rate
gst_caps_can_intersect (rate_caps, downstream_caps); * because we negotiated with downstream */
gst_caps_unref (rate_caps); if (!first_configured_pad) {
GstCaps *downstream_caps = gst_pad_get_allowed_caps (agg->srcpad);
/* Returns NULL if there is no downstream peer */
if (downstream_caps) {
GstCaps *rate_caps =
gst_caps_new_simple ("audio/x-raw", "rate", G_TYPE_INT, info.rate,
NULL);
gst_caps_set_features_simple (rate_caps,
gst_caps_features_copy (GST_CAPS_FEATURES_ANY));
downstream_supports_rate =
gst_caps_can_intersect (rate_caps, downstream_caps);
gst_caps_unref (rate_caps);
gst_caps_unref (downstream_caps);
}
}
if (!downstream_supports_rate || (first_configured_pad if (!downstream_supports_rate || (first_configured_pad
&& info.rate != first_configured_pad->info.rate)) { && info.rate != first_configured_pad->info.rate)) {
@ -913,13 +919,9 @@ gst_audio_aggregator_sink_setcaps (GstAudioAggregatorPad * aaggpad,
GST_OBJECT_UNLOCK (aaggpad); GST_OBJECT_UNLOCK (aaggpad);
} }
done:
if (first_configured_pad) if (first_configured_pad)
gst_object_unref (first_configured_pad); gst_object_unref (first_configured_pad);
if (downstream_caps)
gst_caps_unref (downstream_caps);
return ret; return ret;
} }