mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-25 01:30:38 +00:00
Code Issues 1 Projects Releases Wiki Activity

audioaggregator: fix channel-mask negotiation

Browse source 
When outputting more than two channels, a channel-mask has to be
specified in the output caps.

We follow the same heuristic as other cases, when downstream
does not specify a channel-mask, we use that of the first
configured pad, and if there was none we generate a fallback
mask.

https://bugzilla.gnome.org/show_bug.cgi?id=794257
This commit is contained in:
Mathieu Duponchelle 2018-03-12 16:23:02 +01:00
parent 247b22ae1a
commit e9be107e4a
1 changed files with 13 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -773,6 +773,7 @@ gst_audio_aggregator_fixate_src_caps (GstAggregator * agg, GstCaps * caps)
GstCaps *first_configured_caps = GstCaps *first_configured_caps =
gst_audio_info_to_caps (&first_configured_pad->info); gst_audio_info_to_caps (&first_configured_pad->info);
gint first_configured_rate, first_configured_channels; gint first_configured_rate, first_configured_channels;
gint channels;
caps = gst_caps_make_writable (caps); caps = gst_caps_make_writable (caps);
s = gst_caps_get_structure (caps, 0); s = gst_caps_get_structure (caps, 0);
@ -789,6 +790,18 @@ gst_audio_aggregator_fixate_src_caps (GstAggregator * agg, GstCaps * caps)
gst_structure_fixate_field_nearest_int (s, "channels", gst_structure_fixate_field_nearest_int (s, "channels",
first_configured_channels); first_configured_channels);
gst_structure_get_int (s, "channels", &channels);
if (!gst_structure_has_field (s, "channel-mask") && channels > 2) {
guint64 mask;
if (!gst_structure_get (s2, "channel-mask", GST_TYPE_BITMASK, &mask,
NULL)) {
mask = gst_audio_channel_get_fallback_mask (channels);
}
gst_structure_set (s, "channel-mask", GST_TYPE_BITMASK, mask, NULL);
}
gst_caps_unref (first_configured_caps); gst_caps_unref (first_configured_caps);
gst_object_unref (first_configured_pad); gst_object_unref (first_configured_pad);
} }