structure: add function to fixate

Add a function to fixate a structure and use it for the default fixate function
in gstpad.c.

diff --git a/gst/gstpad.c b/gst/gstpad.c
index 5b258f85bb763bebc5527d3614495fcc907de5f8..4cfcea85e4ce2ff98d78b9fc4ab2c01084c2c039 100644 (file)
--- a/gst/gstpad.c
+++ b/gst/gstpad.c
@@ -2488,19 +2488,6 @@ no_peer:
   }
 }
 
-static gboolean
-default_fixate (GQuark field_id, const GValue * value, gpointer data)
-{
-  GstStructure *s = data;
-  GValue v = { 0 };
-
-  if (gst_value_fixate (&v, value)) {
-    gst_structure_id_set_value (s, field_id, &v);
-    g_value_unset (&v);
-  }
-  return TRUE;
-}
-
 static void
 gst_pad_default_fixate (GstPad * pad, GstCaps * caps)
 {
@@ -2509,7 +2496,7 @@ gst_pad_default_fixate (GstPad * pad, GstCaps * caps)
   /* default fixation */
   gst_caps_truncate (caps);
   s = gst_caps_get_structure (caps, 0);
-  gst_structure_foreach (s, default_fixate, s);
+  gst_structure_fixate (s);
 }
 
 /**
@@ -2630,7 +2617,7 @@ is_same_caps:
 #endif
 no_func:
   {
-    GST_DEBUG_OBJECT (pad, "no acceptcase function");
+    GST_DEBUG_OBJECT (pad, "no acceptcaps function");
     return FALSE;
   }
 }

diff --git a/gst/gststructure.c b/gst/gststructure.c
index 9f66bc9901db46d1403d77ebf285859cccab0054..b04236ea7d311539f88a11bf22f173b6492cd3b1 100644 (file)
--- a/gst/gststructure.c
+++ b/gst/gststructure.c
@@ -3191,3 +3191,29 @@ gst_structure_is_subset (const GstStructure * subset,
   return gst_structure_foreach ((GstStructure *) subset,
       gst_caps_structure_is_subset_field, (gpointer) superset);
 }
+
+static gboolean
+default_fixate (GQuark field_id, const GValue * value, gpointer data)
+{
+  GstStructure *s = data;
+  GValue v = { 0 };
+
+  if (gst_value_fixate (&v, value)) {
+    gst_structure_id_set_value (s, field_id, &v);
+    g_value_unset (&v);
+  }
+  return TRUE;
+}
+
+/**
+ * gst_structure_fixate:
+ * @structure: a #GstStructure
+ *
+ * Fixate all values in @structure using gst_value_fixate().
+ * @structure will be modified in-place and should be writable.
+ */
+void
+gst_structure_fixate (GstStructure * structure)
+{
+  gst_structure_foreach (structure, default_fixate, structure);
+}

diff --git a/gst/gststructure.h b/gst/gststructure.h
index e96799e508bc9efa3bc577c9b03e2d24bbe8598e..41d4dfe077d0403a7c32be029ffb22cfc9b3fe1f 100644 (file)
--- a/gst/gststructure.h
+++ b/gst/gststructure.h
@@ -251,6 +251,7 @@ gboolean                 gst_structure_can_intersect(const GstStructure *struct1
                                                     const GstStructure *struct2);
 GstStructure*            gst_structure_intersect (const GstStructure *struct1,
                                                   const GstStructure *struct2);
+void                     gst_structure_fixate    (GstStructure *structure);
 
 G_END_DECLS