mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 05:16:13 +00:00
Code Issues 1 Projects Releases Wiki Activity

validate:utils: Allow plain string in gst_validate_utils_get_strv

Browse source
This commit is contained in:
Thibault Saunier 2020-02-04 18:13:51 -03:00
parent 06f6fd8de1
commit 987d125c7e
1 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
validate/gst/validate/gst-validate-utils.c
View file

@ -1148,25 +1148,33 @@ gst_validate_set_globals (GstStructure * structure)
gchar ** gchar **
gst_validate_utils_get_strv (GstStructure * str, const gchar * fieldname) gst_validate_utils_get_strv (GstStructure * str, const gchar * fieldname)
{ {
const GValue *list; const GValue *value;
gchar **parsed_list; gchar **parsed_list;
guint i, size; guint i, size;
list = gst_structure_get_value (str, fieldname); value = gst_structure_get_value (str, fieldname);
if (!list) if (!value)
return NULL; return NULL;
if (!GST_VALUE_HOLDS_LIST (list)) { if (G_VALUE_HOLDS_STRING (value)) {
parsed_list = g_new0 (gchar *, 2);
parsed_list[0] = g_value_dup_string (value);
return parsed_list;
}
if (!GST_VALUE_HOLDS_LIST (value)) {
g_error g_error
("%s must have type list of string, e.g. %s={ val1, val2 }, got: \"%s\"", ("%s must have type list of string (or a string), e.g. %s={ val1, val2 }, got: \"%s\" in %s",
fieldname, fieldname, gst_value_serialize (list)); fieldname, fieldname, gst_value_serialize (value),
gst_structure_to_string (str));
return NULL; return NULL;
} }
size = gst_value_list_get_size (list); size = gst_value_list_get_size (value);
parsed_list = g_malloc_n (size + 1, sizeof (gchar *)); parsed_list = g_malloc_n (size + 1, sizeof (gchar *));
for (i = 0; i < size; i++) for (i = 0; i < size; i++)
parsed_list[i] = g_value_dup_string (gst_value_list_get_value (list, i)); parsed_list[i] = g_value_dup_string (gst_value_list_get_value (value, i));
parsed_list[i] = NULL; parsed_list[i] = NULL;
return parsed_list; return parsed_list;