/**
* SECTION:gstvalue
+ * @title: GstValue
* @short_description: GValue implementations specific
* to GStreamer
*
static void gst_value_register_subtract_func (GType minuend_type,
GType subtrahend_type, GstValueSubtractFunc func);
+static gboolean _priv_gst_value_parse_array (gchar * s, gchar ** after,
+ GValue * value, GType type);
+
typedef struct _GstValueUnionInfo GstValueUnionInfo;
struct _GstValueUnionInfo
{
typedef struct _GstFlagSetClass GstFlagSetClass;
+typedef struct _GstValueAbbreviation GstValueAbbreviation;
+
+struct _GstValueAbbreviation
+{
+ const gchar *type_name;
+ GType type;
+};
+
#define FUNDAMENTAL_TYPE_ID_MAX \
(G_TYPE_FUNDAMENTAL_MAX >> G_TYPE_FUNDAMENTAL_SHIFT)
#define FUNDAMENTAL_TYPE_ID(type) \
/* two helper functions to serialize/stringify any type of list
* regular lists are done with { }, arrays with < >
*/
-static gchar *
-gst_value_serialize_any_list (const GValue * value, const gchar * begin,
- const gchar * end)
+gchar *
+_priv_gst_value_serialize_any_list (const GValue * value, const gchar * begin,
+ const gchar * end, gboolean print_type)
{
guint i;
GArray *array = value->data[0].v_pointer;
v = &g_array_index (array, GValue, i);
s_val = gst_value_serialize (v);
if (s_val != NULL) {
+ if (print_type) {
+ g_string_append_c (s, '(');
+ g_string_append (s, _priv_gst_value_gtype_to_abbr (G_VALUE_TYPE (v)));
+ g_string_append_c (s, ')');
+ }
g_string_append (s, s_val);
g_free (s_val);
if (i < alen - 1) {
/* our fundamental types that are certainly not fixed */
if (type == GST_TYPE_INT_RANGE || type == GST_TYPE_DOUBLE_RANGE ||
type == GST_TYPE_INT64_RANGE ||
- type == GST_TYPE_LIST || type == GST_TYPE_FRACTION_RANGE) {
+ type == GST_TYPE_LIST || type == GST_TYPE_FRACTION_RANGE ||
+ type == GST_TYPE_STRUCTURE) {
return FALSE;
}
/* other (boxed) types that are fixed */
static gchar *
gst_value_serialize_value_list (const GValue * value)
{
- return gst_value_serialize_any_list (value, "{ ", " }");
+ return _priv_gst_value_serialize_any_list (value, "{ ", " }", TRUE);
}
static gboolean
static gchar *
gst_value_serialize_value_array (const GValue * value)
{
- return gst_value_serialize_any_list (value, "< ", " >");
+ return _priv_gst_value_serialize_any_list (value, "{ ", " }", TRUE);
}
static gboolean
return FALSE;
}
+/********************************************
+ * Serialization/deserialization of GValues *
+ ********************************************/
+
+static GstValueAbbreviation *
+_priv_gst_value_get_abbrs (gint * n_abbrs)
+{
+ static GstValueAbbreviation *abbrs = NULL;
+ static volatile gsize num = 0;
+
+ if (g_once_init_enter (&num)) {
+ /* dynamically generate the array */
+ gsize _num;
+ GstValueAbbreviation dyn_abbrs[] = {
+ {"int", G_TYPE_INT}
+ ,
+ {"i", G_TYPE_INT}
+ ,
+ {"uint", G_TYPE_UINT}
+ ,
+ {"u", G_TYPE_UINT}
+ ,
+ {"float", G_TYPE_FLOAT}
+ ,
+ {"f", G_TYPE_FLOAT}
+ ,
+ {"double", G_TYPE_DOUBLE}
+ ,
+ {"d", G_TYPE_DOUBLE}
+ ,
+ {"buffer", GST_TYPE_BUFFER}
+ ,
+ {"fraction", GST_TYPE_FRACTION}
+ ,
+ {"boolean", G_TYPE_BOOLEAN}
+ ,
+ {"bool", G_TYPE_BOOLEAN}
+ ,
+ {"b", G_TYPE_BOOLEAN}
+ ,
+ {"string", G_TYPE_STRING}
+ ,
+ {"str", G_TYPE_STRING}
+ ,
+ {"s", G_TYPE_STRING}
+ ,
+ {"structure", GST_TYPE_STRUCTURE}
+ ,
+ {"date", G_TYPE_DATE}
+ ,
+ {"datetime", GST_TYPE_DATE_TIME}
+ ,
+ {"bitmask", GST_TYPE_BITMASK}
+ ,
+ {"sample", GST_TYPE_SAMPLE}
+ ,
+ {"taglist", GST_TYPE_TAG_LIST}
+ ,
+ {"type", G_TYPE_GTYPE}
+ ,
+ {"array", GST_TYPE_ARRAY}
+ ,
+ {"list", GST_TYPE_LIST}
+ };
+ _num = G_N_ELEMENTS (dyn_abbrs);
+ /* permanently allocate and copy the array now */
+ abbrs = g_new0 (GstValueAbbreviation, _num);
+ memcpy (abbrs, dyn_abbrs, sizeof (GstValueAbbreviation) * _num);
+ g_once_init_leave (&num, _num);
+ }
+ *n_abbrs = num;
+
+ return abbrs;
+}
+
+/* given a type_name that could be a type abbreviation or a registered GType,
+ * return a matching GType */
+static GType
+_priv_gst_value_gtype_from_abbr (const char *type_name)
+{
+ int i;
+ GstValueAbbreviation *abbrs;
+ gint n_abbrs;
+ GType ret;
+
+ g_return_val_if_fail (type_name != NULL, G_TYPE_INVALID);
+
+ abbrs = _priv_gst_value_get_abbrs (&n_abbrs);
+
+ for (i = 0; i < n_abbrs; i++) {
+ if (strcmp (type_name, abbrs[i].type_name) == 0) {
+ return abbrs[i].type;
+ }
+ }
+
+ /* this is the fallback */
+ ret = g_type_from_name (type_name);
+ /* If not found, try it as a dynamic type */
+ if (G_UNLIKELY (ret == 0))
+ ret = gst_dynamic_type_factory_load (type_name);
+ return ret;
+
+}
+
+const char *
+_priv_gst_value_gtype_to_abbr (GType type)
+{
+ int i;
+ GstValueAbbreviation *abbrs;
+ gint n_abbrs;
+
+ g_return_val_if_fail (type != G_TYPE_INVALID, NULL);
+
+ abbrs = _priv_gst_value_get_abbrs (&n_abbrs);
+
+ for (i = 0; i < n_abbrs; i++) {
+ if (type == abbrs[i].type) {
+ return abbrs[i].type_name;
+ }
+ }
+
+ return g_type_name (type);
+}
+
+/*
+ * _priv_gst_value_parse_string:
+ * @s: string to parse
+ * @end: out-pointer to char behind end of string
+ * @next: out-pointer to start of unread data
+ * @unescape: @TRUE if the substring is escaped.
+ *
+ * Find the end of a sub-string. If end == next, the string will not be
+ * null-terminated. In all other cases it will be.
+ *
+ * Note: This function modifies the string in @s (if unescape == @TRUE).
+ *
+ * Returns: @TRUE if a sub-string was found and @FALSE if the string is not
+ * terminated.
+ */
+gboolean
+_priv_gst_value_parse_string (gchar * s, gchar ** end, gchar ** next,
+ gboolean unescape)
+{
+ gchar *w;
+
+ if (*s == 0)
+ return FALSE;
+
+ if (*s != '"') {
+ int ret = _priv_gst_value_parse_simple_string (s, end);
+ *next = *end;
+
+ return ret;
+ }
+
+ /* Find the closing quotes */
+ if (unescape) {
+ w = s;
+ s++;
+ while (*s != '"') {
+ if (G_UNLIKELY (*s == 0))
+ return FALSE;
+ if (G_UNLIKELY (*s == '\\')) {
+ s++;
+ if (G_UNLIKELY (*s == 0))
+ return FALSE;
+ }
+ *w = *s;
+ w++;
+ s++;
+ }
+ s++;
+ } else {
+ s++;
+ while (*s != '"') {
+ if (G_UNLIKELY (*s == 0))
+ return FALSE;
+ if (G_UNLIKELY (*s == '\\')) {
+ s++;
+ if (G_UNLIKELY (*s == 0))
+ return FALSE;
+ }
+ s++;
+ }
+ s++;
+ w = s;
+ }
+
+ *end = w;
+ *next = s;
+
+ return TRUE;
+}
+
+static gboolean
+_priv_gst_value_parse_range (gchar * s, gchar ** after, GValue * value,
+ GType type)
+{
+ GValue value1 = { 0 };
+ GValue value2 = { 0 };
+ GValue value3 = { 0 };
+ GType range_type;
+ gboolean ret, have_step = FALSE;
+
+ if (*s != '[')
+ return FALSE;
+ s++;
+
+ ret = _priv_gst_value_parse_value (s, &s, &value1, type);
+ if (!ret)
+ return FALSE;
+
+ while (g_ascii_isspace (*s))
+ s++;
+
+ if (*s != ',')
+ return FALSE;
+ s++;
+
+ while (g_ascii_isspace (*s))
+ s++;
+
+ ret = _priv_gst_value_parse_value (s, &s, &value2, type);
+ if (!ret)
+ return FALSE;
+
+ while (g_ascii_isspace (*s))
+ s++;
+
+ /* optional step for int and int64 */
+ if (G_VALUE_TYPE (&value1) == G_TYPE_INT
+ || G_VALUE_TYPE (&value1) == G_TYPE_INT64) {
+ if (*s == ',') {
+ s++;
+
+ while (g_ascii_isspace (*s))
+ s++;
+
+ ret = _priv_gst_value_parse_value (s, &s, &value3, type);
+ if (!ret)
+ return FALSE;
+
+ while (g_ascii_isspace (*s))
+ s++;
+
+ have_step = TRUE;
+ }
+ }
+
+ if (*s != ']')
+ return FALSE;
+ s++;
+
+ if (G_VALUE_TYPE (&value1) != G_VALUE_TYPE (&value2))
+ return FALSE;
+ if (have_step && G_VALUE_TYPE (&value1) != G_VALUE_TYPE (&value3))
+ return FALSE;
+
+ if (G_VALUE_TYPE (&value1) == G_TYPE_DOUBLE) {
+ range_type = GST_TYPE_DOUBLE_RANGE;
+ g_value_init (value, range_type);
+ gst_value_set_double_range (value,
+ gst_g_value_get_double_unchecked (&value1),
+ gst_g_value_get_double_unchecked (&value2));
+ } else if (G_VALUE_TYPE (&value1) == G_TYPE_INT) {
+ range_type = GST_TYPE_INT_RANGE;
+ g_value_init (value, range_type);
+ if (have_step)
+ gst_value_set_int_range_step (value,
+ gst_g_value_get_int_unchecked (&value1),
+ gst_g_value_get_int_unchecked (&value2),
+ gst_g_value_get_int_unchecked (&value3));
+ else
+ gst_value_set_int_range (value, gst_g_value_get_int_unchecked (&value1),
+ gst_g_value_get_int_unchecked (&value2));
+ } else if (G_VALUE_TYPE (&value1) == G_TYPE_INT64) {
+ range_type = GST_TYPE_INT64_RANGE;
+ g_value_init (value, range_type);
+ if (have_step)
+ gst_value_set_int64_range_step (value,
+ gst_g_value_get_int64_unchecked (&value1),
+ gst_g_value_get_int64_unchecked (&value2),
+ gst_g_value_get_int64_unchecked (&value3));
+ else
+ gst_value_set_int64_range (value,
+ gst_g_value_get_int64_unchecked (&value1),
+ gst_g_value_get_int64_unchecked (&value2));
+ } else if (G_VALUE_TYPE (&value1) == GST_TYPE_FRACTION) {
+ range_type = GST_TYPE_FRACTION_RANGE;
+ g_value_init (value, range_type);
+ gst_value_set_fraction_range (value, &value1, &value2);
+ } else {
+ return FALSE;
+ }
+
+ *after = s;
+ return TRUE;
+}
+
+static gboolean
+_priv_gst_value_parse_any_list (gchar * s, gchar ** after, GValue * value,
+ GType type, char begin, char end)
+{
+ GValue list_value = { 0 };
+ gboolean ret;
+ GArray *array;
+
+ array = g_value_peek_pointer (value);
+
+ if (*s != begin)
+ return FALSE;
+ s++;
+
+ while (g_ascii_isspace (*s))
+ s++;
+ if (*s == end) {
+ s++;
+ *after = s;
+ return TRUE;
+ }
+
+ ret = _priv_gst_value_parse_value (s, &s, &list_value, type);
+ if (!ret)
+ return FALSE;
+
+ g_array_append_val (array, list_value);
+
+ while (g_ascii_isspace (*s))
+ s++;
+
+ while (*s != end) {
+ if (*s != ',')
+ return FALSE;
+ s++;
+
+ while (g_ascii_isspace (*s))
+ s++;
+
+ memset (&list_value, 0, sizeof (list_value));
+ ret = _priv_gst_value_parse_value (s, &s, &list_value, type);
+ if (!ret)
+ return FALSE;
+
+ g_array_append_val (array, list_value);
+ while (g_ascii_isspace (*s))
+ s++;
+ }
+
+ s++;
+
+ *after = s;
+ return TRUE;
+}
+
+static gboolean
+_priv_gst_value_parse_list (gchar * s, gchar ** after, GValue * value,
+ GType type)
+{
+ return _priv_gst_value_parse_any_list (s, after, value, type, '{', '}');
+}
+
+static gboolean
+_priv_gst_value_parse_array (gchar * s, gchar ** after, GValue * value,
+ GType type)
+{
+ return _priv_gst_value_parse_any_list (s, after, value, type, '<', '>');
+}
+
+gboolean
+_priv_gst_value_parse_simple_string (gchar * str, gchar ** end)
+{
+ char *s = str;
+
+ while (G_LIKELY (GST_ASCII_IS_STRING (*s))) {
+ s++;
+ }
+
+ *end = s;
+
+ return (s != str);
+}
+
+gboolean
+_priv_gst_value_parse_value (gchar * str,
+ gchar ** after, GValue * value, GType default_type)
+{
+ gchar *type_name;
+ gchar *type_end;
+ gchar *value_s;
+ gchar *value_end;
+ gchar *s;
+ gchar c;
+ int ret = 0;
+ GType type = default_type;
+
+ s = str;
+ while (g_ascii_isspace (*s))
+ s++;
+
+ /* check if there's a (type_name) 'cast' */
+ type_name = NULL;
+ if (*s == '(') {
+ s++;
+ while (g_ascii_isspace (*s))
+ s++;
+ type_name = s;
+ if (G_UNLIKELY (!_priv_gst_value_parse_simple_string (s, &type_end)))
+ return FALSE;
+ s = type_end;
+ while (g_ascii_isspace (*s))
+ s++;
+ if (G_UNLIKELY (*s != ')'))
+ return FALSE;
+ s++;
+ while (g_ascii_isspace (*s))
+ s++;
+
+ c = *type_end;
+ *type_end = 0;
+ type = _priv_gst_value_gtype_from_abbr (type_name);
+ GST_DEBUG ("trying type name '%s'", type_name);
+ *type_end = c;
+
+ if (G_UNLIKELY (type == G_TYPE_INVALID)) {
+ GST_WARNING ("invalid type");
+ return FALSE;
+ }
+ }
+
+ while (g_ascii_isspace (*s))
+ s++;
+ if (*s == '[') {
+ ret = _priv_gst_value_parse_range (s, &s, value, type);
+ } else if (*s == '{') {
+ g_value_init (value, GST_TYPE_LIST);
+ ret = _priv_gst_value_parse_list (s, &s, value, type);
+ } else if (*s == '<') {
+ g_value_init (value, GST_TYPE_ARRAY);
+ ret = _priv_gst_value_parse_array (s, &s, value, type);
+ } else {
+ value_s = s;
+
+ if (G_UNLIKELY (type == G_TYPE_INVALID)) {
+ GType try_types[] =
+ { G_TYPE_INT, G_TYPE_DOUBLE, GST_TYPE_FRACTION, GST_TYPE_FLAG_SET,
+ G_TYPE_BOOLEAN, G_TYPE_STRING
+ };
+ int i;
+
+ if (G_UNLIKELY (!_priv_gst_value_parse_string (s, &value_end, &s, TRUE)))
+ return FALSE;
+ /* Set NULL terminator for deserialization */
+ c = *value_end;
+ *value_end = '\0';
+
+ for (i = 0; i < G_N_ELEMENTS (try_types); i++) {
+ g_value_init (value, try_types[i]);
+ ret = gst_value_deserialize (value, value_s);
+ if (ret)
+ break;
+ g_value_unset (value);
+ }
+ } else {
+ g_value_init (value, type);
+
+ if (G_UNLIKELY (!_priv_gst_value_parse_string (s, &value_end, &s,
+ (type != G_TYPE_STRING))))
+ return FALSE;
+ /* Set NULL terminator for deserialization */
+ c = *value_end;
+ *value_end = '\0';
+
+ ret = gst_value_deserialize (value, value_s);
+ if (G_UNLIKELY (!ret))
+ g_value_unset (value);
+ }
+ *value_end = c;
+ }
+
+ *after = s;
+
+ return ret;
+}
+
/**************
* GstSegment *
**************/
return res;
}
+/*********
+ * gtype *
+ *********/
+
+static gint
+gst_value_compare_gtype (const GValue * value1, const GValue * value2)
+{
+ if (value1->data[0].v_pointer == value2->data[0].v_pointer)
+ return GST_VALUE_EQUAL;
+ return GST_VALUE_UNORDERED;
+}
+
+static gchar *
+gst_value_serialize_gtype (const GValue * value)
+{
+ return g_strdup (g_type_name (g_value_get_gtype (value)));
+}
+
+static gboolean
+gst_value_deserialize_gtype (GValue * dest, const gchar * s)
+{
+ GType t = g_type_from_name (s);
+ gboolean ret = TRUE;
+
+ if (t == G_TYPE_INVALID)
+ ret = FALSE;
+ if (ret) {
+ g_value_set_gtype (dest, t);
+ }
+ return ret;
+}
+
/****************
* subset *
****************/
return TRUE;
}
+static gboolean
+gst_value_is_subset_structure_structure (const GValue * value1,
+ const GValue * value2)
+{
+ const GstStructure *s1, *s2;
+
+ g_return_val_if_fail (GST_VALUE_HOLDS_STRUCTURE (value1), FALSE);
+ g_return_val_if_fail (GST_VALUE_HOLDS_STRUCTURE (value2), FALSE);
+
+ s1 = gst_value_get_structure (value1);
+ s2 = gst_value_get_structure (value2);
+
+ return gst_structure_is_subset (s1, s2);
+}
+
/**
* gst_value_is_subset:
* @value1: a #GValue
} else if (GST_VALUE_HOLDS_FLAG_SET (value1) &&
GST_VALUE_HOLDS_FLAG_SET (value2)) {
return gst_value_is_subset_flagset_flagset (value1, value2);
+ } else if (GST_VALUE_HOLDS_STRUCTURE (value1)
+ && GST_VALUE_HOLDS_STRUCTURE (value2)) {
+ return gst_value_is_subset_structure_structure (value1, value2);
}
/*
return TRUE;
}
+/* iterating over the result taking the union with the other structure's value */
+static gboolean
+structure_field_union_into (GQuark field_id, GValue * val, gpointer user_data)
+{
+ GstStructure *other = user_data;
+ const GValue *other_value;
+ GValue res_value = G_VALUE_INIT;
+
+ other_value = gst_structure_id_get_value (other, field_id);
+ /* no value in the other struct, just keep this value */
+ if (!other_value)
+ return TRUE;
+
+ if (!gst_value_union (&res_value, val, other_value))
+ return FALSE;
+
+ g_value_unset (val);
+ gst_value_init_and_copy (val, &res_value);
+ return TRUE;
+}
+
+/* iterating over the other source structure adding missing values */
+static gboolean
+structure_field_union_from (GQuark field_id, const GValue * other_val,
+ gpointer user_data)
+{
+ GstStructure *result = user_data;
+ const GValue *result_value;
+
+ result_value = gst_structure_id_get_value (result, field_id);
+ if (!result_value)
+ gst_structure_id_set_value (result, field_id, other_val);
+
+ return TRUE;
+}
+
+static gboolean
+gst_value_union_structure_structure (GValue * dest, const GValue * src1,
+ const GValue * src2)
+{
+ const GstStructure *s1, *s2;
+ GstStructure *result;
+ gboolean ret;
+
+ g_return_val_if_fail (GST_VALUE_HOLDS_STRUCTURE (src1), FALSE);
+ g_return_val_if_fail (GST_VALUE_HOLDS_STRUCTURE (src2), FALSE);
+
+ s1 = gst_value_get_structure (src1);
+ s2 = gst_value_get_structure (src2);
+
+ /* Can't join two structures with different names into a single structure */
+ if (!gst_structure_has_name (s1, gst_structure_get_name (s2))) {
+ gst_value_list_concat (dest, src1, src2);
+ return TRUE;
+ }
+
+ result = gst_structure_copy (s1);
+ ret =
+ gst_structure_map_in_place (result, structure_field_union_into,
+ (gpointer) s2);
+ if (!ret)
+ goto out;
+ ret =
+ gst_structure_foreach (s2, structure_field_union_from, (gpointer) result);
+
+ if (ret) {
+ g_value_init (dest, GST_TYPE_STRUCTURE);
+ gst_value_set_structure (dest, result);
+ }
+
+out:
+ gst_structure_free (result);
+ return ret;
+}
+
/****************
* intersection *
****************/
return TRUE;
}
+static gboolean
+gst_value_intersect_structure_structure (GValue * dest,
+ const GValue * src1, const GValue * src2)
+{
+ const GstStructure *s1, *s2;
+ GstStructure *d1;
+
+ s1 = gst_value_get_structure (src1);
+ s2 = gst_value_get_structure (src2);
+
+ d1 = gst_structure_intersect (s1, s2);
+ if (!d1)
+ return FALSE;
+
+ if (dest) {
+ g_value_init (dest, GST_TYPE_STRUCTURE);
+ gst_value_set_structure (dest, d1);
+ }
+
+ gst_structure_free (d1);
+ return TRUE;
+}
+
/***************
* subtraction *
***************/
return TRUE;
}
-
/**************
* comparison *
**************/
/* special cases */
if (mtype == GST_TYPE_LIST || stype == GST_TYPE_LIST)
return TRUE;
+ if (mtype == GST_TYPE_STRUCTURE || stype == GST_TYPE_STRUCTURE)
+ return FALSE;
len = gst_value_subtract_funcs->len;
for (i = 0; i < len; i++) {
return FALSE;
}
+static gboolean
+structure_field_is_fixed (GQuark field_id, const GValue * val,
+ gpointer user_data)
+{
+ return gst_value_is_fixed (val);
+}
+
/**
* gst_value_is_fixed:
* @value: the #GValue to check
} else if (GST_VALUE_HOLDS_FLAG_SET (value)) {
/* Flagsets are only fixed if there are no 'don't care' bits */
return (gst_value_get_flagset_mask (value) == GST_FLAG_SET_MASK_EXACT);
+ } else if (GST_VALUE_HOLDS_STRUCTURE (value)) {
+ return gst_structure_foreach (gst_value_get_structure (value),
+ structure_field_is_fixed, NULL);
}
return gst_type_is_fixed (type);
}
g_value_init (dest, G_VALUE_TYPE (src));
gst_value_set_flagset (dest, flags, GST_FLAG_SET_MASK_EXACT);
return TRUE;
+ } else if (GST_VALUE_HOLDS_STRUCTURE (src)) {
+ const GstStructure *str = (GstStructure *) gst_value_get_structure (src);
+ GstStructure *kid;
+
+ if (!str)
+ return FALSE;
+
+ kid = gst_structure_copy (str);
+ gst_structure_fixate (kid);
+ g_value_init (dest, GST_TYPE_STRUCTURE);
+ gst_value_set_structure (dest, kid);
+ gst_structure_free (kid);
+ return TRUE;
} else {
return FALSE;
}
if (end != NULL) {
gchar *class_name = g_strndup (set_class, end - set_class);
GType flags_type = g_type_from_name (class_name);
+ if (flags_type == 0) {
+ GST_TRACE ("Looking for dynamic type %s", class_name);
+ gst_dynamic_type_factory_load (class_name);
+ }
- g_free (class_name);
-
- if (flags_type != 0)
+ if (flags_type != 0) {
flags_klass = g_type_class_ref (flags_type);
+ GST_TRACE ("Going to parse %s as %s", s, class_name);
+ }
+ g_free (class_name);
}
if (flags_klass) {
/* These initial sizes are used for the tables
* below, and save a couple of reallocs at startup */
-static const gint GST_VALUE_TABLE_DEFAULT_SIZE = 34;
-static const gint GST_VALUE_UNION_TABLE_DEFAULT_SIZE = 3;
-static const gint GST_VALUE_INTERSECT_TABLE_DEFAULT_SIZE = 10;
+
+static const gint GST_VALUE_TABLE_DEFAULT_SIZE = 35;
+static const gint GST_VALUE_UNION_TABLE_DEFAULT_SIZE = 4;
+static const gint GST_VALUE_INTERSECT_TABLE_DEFAULT_SIZE = 11;
static const gint GST_VALUE_SUBTRACT_TABLE_DEFAULT_SIZE = 12;
void
REGISTER_SERIALIZATION_CONST (G_TYPE_UCHAR, uchar);
+ REGISTER_SERIALIZATION (G_TYPE_GTYPE, gtype);
+
g_value_register_transform_func (GST_TYPE_INT_RANGE, G_TYPE_STRING,
gst_value_transform_int_range_string);
g_value_register_transform_func (GST_TYPE_INT64_RANGE, G_TYPE_STRING,
gst_value_intersect_fraction_range_fraction_range);
gst_value_register_intersect_func (GST_TYPE_FLAG_SET, GST_TYPE_FLAG_SET,
gst_value_intersect_flagset_flagset);
+ gst_value_register_intersect_func (GST_TYPE_STRUCTURE, GST_TYPE_STRUCTURE,
+ gst_value_intersect_structure_structure);
gst_value_register_subtract_func (G_TYPE_INT, GST_TYPE_INT_RANGE,
gst_value_subtract_int_int_range);
gst_value_union_int_range_int_range);
gst_value_register_union_func (GST_TYPE_FLAG_SET, GST_TYPE_FLAG_SET,
gst_value_union_flagset_flagset);
+ gst_value_register_union_func (GST_TYPE_STRUCTURE, GST_TYPE_STRUCTURE,
+ gst_value_union_structure_structure);
#if GST_VERSION_NANO == 1
/* If building from git master, check starting array sizes matched actual size
projects / platform / upstream / gstreamer.git / blobdiff