mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-06-26 09:50:39 +00:00
Code Issues 1 Projects Releases Wiki Activity

audioconvert: refactor format removal.

Browse source 
remove_format_info was a bit confusing to read, this removes
it in favor of standard gst_caps_map_in_place calls.

This no longer simplifies the resulting caps, but I
consider this should be the job of basetransform.

https://bugzilla.gnome.org/show_bug.cgi?id=785471
This commit is contained in:
Mathieu Duponchelle 2017-08-15 00:20:40 +02:00
parent fc86194595
commit 7a407b69e1
1 changed files with 24 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

67
gst/audioconvert/gstaudioconvert.c
View file

@ -239,49 +239,29 @@ parse_error:
} }
} }
/* copies the given caps */ static gboolean
static GstCaps * remove_format_from_structure (GstCapsFeatures * features,
gst_audio_convert_caps_remove_format_info (GstCaps * caps, gboolean channels) GstStructure * structure, gpointer user_data G_GNUC_UNUSED)
{ {
GstStructure *st; gst_structure_remove_field (structure, "format");
gint i, n, n_channels; return TRUE;
GstCaps *res; }
guint64 channel_mask;
res = gst_caps_new_empty (); static gboolean
remove_channels_from_structure (GstCapsFeatures * features, GstStructure * s,
gpointer user_data G_GNUC_UNUSED)
{
guint64 mask;
gint channels;
n = gst_caps_get_size (caps); /* Only remove the channels and channel-mask for non-NONE layouts */
for (i = 0; i < n; i++) { if (!gst_structure_get (s, "channel-mask", GST_TYPE_BITMASK, &mask, NULL) ||
gboolean remove_channels = FALSE; (mask != 0 || (gst_structure_get_int (s, "channels", &channels)
&& channels == 1))) {
st = gst_caps_get_structure (caps, i); gst_structure_remove_fields (s, "channel-mask", "channels", NULL);
/* If this is already expressed by the existing caps
* skip this structure */
if (i > 0 && gst_caps_is_subset_structure (res, st))
continue;
st = gst_structure_copy (st);
gst_structure_remove_field (st, "format");
/* Only remove the channels and channel-mask for non-NONE layouts */
if (gst_structure_get (st, "channel-mask", GST_TYPE_BITMASK, &channel_mask,
NULL)) {
if (channel_mask != 0
|| (gst_structure_get_int (st, "channels", &n_channels)
&& (n_channels == 1)))
remove_channels = TRUE;
} else {
remove_channels = TRUE;
}
if (remove_channels && channels)
gst_structure_remove_fields (st, "channel-mask", "channels", NULL);
gst_caps_append_structure (res, st);
} }
return res; return TRUE;
} }
/* The caps can be transformed into any other caps with format info removed. /* The caps can be transformed into any other caps with format info removed.
@ -294,8 +274,10 @@ gst_audio_convert_transform_caps (GstBaseTransform * btrans,
GstCaps *tmp, *tmp2; GstCaps *tmp, *tmp2;
GstCaps *result; GstCaps *result;
/* Get all possible caps that we can transform to */ tmp = gst_caps_copy (caps);
tmp = gst_audio_convert_caps_remove_format_info (caps, TRUE);
gst_caps_map_in_place (tmp, remove_format_from_structure, NULL);
gst_caps_map_in_place (tmp, remove_channels_from_structure, NULL);
if (filter) { if (filter) {
tmp2 = gst_caps_intersect_full (filter, tmp, GST_CAPS_INTERSECT_FIRST); tmp2 = gst_caps_intersect_full (filter, tmp, GST_CAPS_INTERSECT_FIRST);
@ -610,12 +592,11 @@ gst_audio_convert_fixate_caps (GstBaseTransform * base,
result = gst_caps_intersect (othercaps, caps); result = gst_caps_intersect (othercaps, caps);
if (gst_caps_is_empty (result)) { if (gst_caps_is_empty (result)) {
GstCaps *removed; GstCaps *removed = gst_caps_copy (caps);
if (result) if (result)
gst_caps_unref (result); gst_caps_unref (result);
/* try to preserve channels */ gst_caps_map_in_place (removed, remove_format_from_structure, NULL);
removed = gst_audio_convert_caps_remove_format_info (caps, FALSE);
result = gst_caps_intersect (othercaps, removed); result = gst_caps_intersect (othercaps, removed);
gst_caps_unref (removed); gst_caps_unref (removed);
if (gst_caps_is_empty (result)) { if (gst_caps_is_empty (result)) {