mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-09-28 14:52:24 +00:00
audioconvert: remove unnecessary deep nesting in fixate function
Makes it easier to read and removes two levels of indentation.
This commit is contained in:
parent
f678411c6e
commit
f448977dbd
1 changed files with 66 additions and 66 deletions
|
@ -443,6 +443,7 @@ gst_audio_convert_fixate_format (GstBaseTransform * base, GstStructure * ins,
|
||||||
const GValue *format;
|
const GValue *format;
|
||||||
const GstAudioFormatInfo *in_info, *out_info = NULL;
|
const GstAudioFormatInfo *in_info, *out_info = NULL;
|
||||||
GstAudioFormatFlags in_flags, out_flags = 0;
|
GstAudioFormatFlags in_flags, out_flags = 0;
|
||||||
|
gint i, len;
|
||||||
|
|
||||||
in_format = gst_structure_get_string (ins, "format");
|
in_format = gst_structure_get_string (ins, "format");
|
||||||
if (!in_format)
|
if (!in_format)
|
||||||
|
@ -453,6 +454,10 @@ gst_audio_convert_fixate_format (GstBaseTransform * base, GstStructure * ins,
|
||||||
if (format == NULL)
|
if (format == NULL)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
/* nothing to fixate? */
|
||||||
|
if (!GST_VALUE_HOLDS_LIST (format))
|
||||||
|
return;
|
||||||
|
|
||||||
in_info =
|
in_info =
|
||||||
gst_audio_format_get_info (gst_audio_format_from_string (in_format));
|
gst_audio_format_get_info (gst_audio_format_from_string (in_format));
|
||||||
if (!in_info)
|
if (!in_info)
|
||||||
|
@ -462,24 +467,22 @@ gst_audio_convert_fixate_format (GstBaseTransform * base, GstStructure * ins,
|
||||||
in_flags &= ~(GST_AUDIO_FORMAT_FLAG_UNPACK);
|
in_flags &= ~(GST_AUDIO_FORMAT_FLAG_UNPACK);
|
||||||
in_flags &= ~(GST_AUDIO_FORMAT_FLAG_SIGNED);
|
in_flags &= ~(GST_AUDIO_FORMAT_FLAG_SIGNED);
|
||||||
|
|
||||||
if (GST_VALUE_HOLDS_LIST (format)) {
|
|
||||||
gint i, len;
|
|
||||||
|
|
||||||
len = gst_value_list_get_size (format);
|
len = gst_value_list_get_size (format);
|
||||||
for (i = 0; i < len; i++) {
|
for (i = 0; i < len; i++) {
|
||||||
|
const GstAudioFormatInfo *t_info;
|
||||||
|
GstAudioFormatFlags t_flags;
|
||||||
const GValue *val;
|
const GValue *val;
|
||||||
const gchar *fname;
|
const gchar *fname;
|
||||||
|
|
||||||
val = gst_value_list_get_value (format, i);
|
val = gst_value_list_get_value (format, i);
|
||||||
if (G_VALUE_HOLDS_STRING (val)) {
|
if (!G_VALUE_HOLDS_STRING (val))
|
||||||
const GstAudioFormatInfo *t_info;
|
continue;
|
||||||
GstAudioFormatFlags t_flags;
|
|
||||||
|
|
||||||
fname = g_value_get_string (val);
|
fname = g_value_get_string (val);
|
||||||
t_info =
|
t_info = gst_audio_format_get_info (gst_audio_format_from_string (fname));
|
||||||
gst_audio_format_get_info (gst_audio_format_from_string (fname));
|
|
||||||
if (!t_info)
|
if (!t_info)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
/* accept input format immediately */
|
/* accept input format immediately */
|
||||||
if (strcmp (fname, in_format) == 0) {
|
if (strcmp (fname, in_format) == 0) {
|
||||||
out_info = t_info;
|
out_info = t_info;
|
||||||
|
@ -524,15 +527,12 @@ gst_audio_convert_fixate_format (GstBaseTransform * base, GstStructure * ins,
|
||||||
out_info = t_info;
|
out_info = t_info;
|
||||||
out_flags = t_flags;
|
out_flags = t_flags;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
|
||||||
if (out_info)
|
if (out_info)
|
||||||
gst_structure_set (outs, "format", G_TYPE_STRING,
|
gst_structure_set (outs, "format", G_TYPE_STRING,
|
||||||
GST_AUDIO_FORMAT_INFO_NAME (out_info), NULL);
|
GST_AUDIO_FORMAT_INFO_NAME (out_info), NULL);
|
||||||
} else {
|
|
||||||
/* nothing to fixate */
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
|
|
Loading…
Reference in a new issue