aggregator: Assert if the sink/src pad type that is to be used is not a GstAggregator...

[platform/upstream/gstreamer.git] / gst / gststructure.c

diff --git a/gst/gststructure.c b/gst/gststructure.c
index 43686b2..ee60ce0 100644 (file)
--- a/gst/gststructure.c
+++ b/gst/gststructure.c
@@ -2208,12 +2208,19 @@ gst_structure_fixate_field_nearest_int (GstStructure * structure,
     /* already fixed */
     return FALSE;
   } else if (G_VALUE_TYPE (value) == GST_TYPE_INT_RANGE) {
-    int min, max;
+    int min, max, step;
 
     min = gst_value_get_int_range_min (value);
     max = gst_value_get_int_range_max (value);
+    step = gst_value_get_int_range_step (value);
 
     target = CLAMP (target, min, max);
+    if (G_UNLIKELY (step != 1)) {
+      gint rem = target % step;
+      target -= rem;
+      if (rem > step / 2)
+        target += step;
+    }
 
     gst_structure_set (structure, field_name, G_TYPE_INT, target, NULL);
     return TRUE;
@@ -3094,7 +3101,7 @@ gst_structure_get_array (GstStructure * structure, const gchar * fieldname,
  * with @fieldname or the existing field did not contain a %GST_TYPE_LIST, this
  * function returns %FALSE.
  *
- * Since 1.12
+ * Since: 1.12
  */
 gboolean
 gst_structure_get_list (GstStructure * structure, const gchar * fieldname,
@@ -3142,7 +3149,7 @@ _gst_structure_set_any_list (GstStructure * structure, GType type,
  * the field specified by @fieldname.  Be aware that this is slower then using
  * %GST_TYPE_ARRAY in a #GValue directly.
  *
- * Since 1.12
+ * Since: 1.12
  */
 void
 gst_structure_set_array (GstStructure * structure, const gchar * fieldname,
@@ -3162,7 +3169,7 @@ gst_structure_set_array (GstStructure * structure, const gchar * fieldname,
  * the field specified by @fieldname. Be aware that this is slower then using
  * %GST_TYPE_LIST in a #GValue directly.
  *
- * Since 1.12
+ * Since: 1.12
  */
 void
 gst_structure_set_list (GstStructure * structure, const gchar * fieldname,