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

audioaggregator: Fixate to some meaningful values if no sinkpad is configured yet

Browse source 
The default caps fixation code would select a rate of 1 for example,
which is not really ideal.
This commit is contained in:
Sebastian Dröge 2018-08-16 17:54:00 +03:00
parent e89aa2af6a
commit 320243050b
1 changed files with 17 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -750,6 +750,8 @@ gst_audio_aggregator_fixate_src_caps (GstAggregator * agg, GstCaps * caps)
first_configured_pad = gst_audio_aggregator_get_first_configured_pad (agg);
caps = gst_caps_make_writable (caps);
if (first_configured_pad) {
GstStructure *s, *s2;
GstCaps *first_configured_caps =
@ -757,7 +759,6 @@ gst_audio_aggregator_fixate_src_caps (GstAggregator * agg, GstCaps * caps)
gint first_configured_rate, first_configured_channels;
gint channels;
caps = gst_caps_make_writable (caps);
s = gst_caps_get_structure (caps, 0);
s2 = gst_caps_get_structure (first_configured_caps, 0);
@ -786,6 +787,21 @@ gst_audio_aggregator_fixate_src_caps (GstAggregator * agg, GstCaps * caps)
gst_caps_unref (first_configured_caps);
gst_object_unref (first_configured_pad);
} else {
GstStructure *s;
gint channels;
s = gst_caps_get_structure (caps, 0);
gst_structure_fixate_field_nearest_int (s, "rate", GST_AUDIO_DEF_RATE);
gst_structure_fixate_field_string (s, "format", GST_AUDIO_NE ("S16"));
gst_structure_fixate_field_string (s, "layout", "interleaved");
gst_structure_fixate_field_nearest_int (s, "channels", 2);
if (gst_structure_get_int (s, "channels", &channels) && channels > 2) {
if (!gst_structure_has_field_typed (s, "channel-mask", GST_TYPE_BITMASK))
gst_structure_set (s, "channel-mask", GST_TYPE_BITMASK, 0ULL, NULL);
}
}
if (!gst_caps_is_fixed (caps))