Commit 8a76c326 authored by Wim Taymans's avatar Wim Taymans
Browse files

caps: _do_simplify() -> _simplify()

Rename _do_simplify() to _simplify(). The name was introduced as a replacement
method for a deprecated method but we can now rename it again.
Fix some docs.
parent 9cdbffea
......@@ -257,8 +257,9 @@ GST_META_FLAG_UNSET
GstMetaInfo
GstMetaInitFunction
GstMetaFreeFunction
GstMetaCopyFunction
GstMetaTransformFunction
gst_meta_api_type_register
gst_meta_api_type_has_tag
gst_meta_register
gst_meta_get_info
<SUBSECTION Standard>
......@@ -397,7 +398,7 @@ gst_caps_intersect
gst_caps_intersect_full
gst_caps_union
gst_caps_normalize
gst_caps_do_simplify
gst_caps_simplify
gst_caps_replace
gst_caps_to_string
gst_caps_from_string
......@@ -504,10 +505,6 @@ GST_CLOCK_ENTRY_STATUS
GstClockReturn
GstClockFlags
GST_CLOCK_FLAGS
GST_CLOCK_BROADCAST
GST_CLOCK_GET_COND
GST_CLOCK_TIMED_WAIT
GST_CLOCK_WAIT
gst_clock_add_observation
gst_clock_set_master
gst_clock_get_master
......
......@@ -435,7 +435,7 @@ gst_static_caps_cleanup (GstStaticCaps * static_caps)
static GstStructure *
gst_caps_remove_and_get_structure (GstCaps * caps, guint idx)
{
/* don't use index_fast, gst_caps_do_simplify relies on the order */
/* don't use index_fast, gst_caps_simplify relies on the order */
GstStructure *s = g_ptr_array_remove_index (GST_CAPS_ARRAY (caps), idx);
gst_structure_set_parent_refcount (s, NULL);
......@@ -1498,7 +1498,7 @@ gst_caps_subtract (GstCaps * minuend, GstCaps * subtrahend)
}
gst_caps_unref (src);
dest = gst_caps_do_simplify (dest);
dest = gst_caps_simplify (dest);
return dest;
}
......@@ -1575,7 +1575,7 @@ gst_caps_union (GstCaps * caps1, GstCaps * caps2)
dest1 = _gst_caps_copy (caps1);
gst_caps_append (dest1, gst_caps_ref (caps2));
dest1 = gst_caps_do_simplify (dest1);
dest1 = gst_caps_simplify (dest1);
return dest1;
}
......@@ -1764,7 +1764,7 @@ gst_caps_switch_structures (GstCaps * caps, GstStructure * old,
}
/**
* gst_caps_do_simplify:
* gst_caps_simplify:
* @caps: (transfer full): a #GstCaps to simplify
*
* Modifies the given @caps inplace into a representation that represents the
......@@ -1775,7 +1775,7 @@ gst_caps_switch_structures (GstCaps * caps, GstStructure * old,
* Returns: The simplified caps.
*/
GstCaps *
gst_caps_do_simplify (GstCaps * caps)
gst_caps_simplify (GstCaps * caps)
{
GstStructure *simplify, *compare, *result = NULL;
gint i, j, start;
......
......@@ -438,7 +438,7 @@ GstCaps * gst_caps_subtract (GstCaps *minuend,
GstCaps * gst_caps_union (GstCaps *caps1,
GstCaps *caps2) G_GNUC_WARN_UNUSED_RESULT;
GstCaps * gst_caps_normalize (GstCaps *caps) G_GNUC_WARN_UNUSED_RESULT;
GstCaps * gst_caps_do_simplify (GstCaps *caps) G_GNUC_WARN_UNUSED_RESULT;
GstCaps * gst_caps_simplify (GstCaps *caps) G_GNUC_WARN_UNUSED_RESULT;
GstCaps * gst_caps_fixate (GstCaps *caps) G_GNUC_WARN_UNUSED_RESULT;
......
......@@ -107,8 +107,6 @@ gst_meta_api_type_has_tag (GType api, GQuark tag)
* @init_func: a #GstMetaInitFunction
* @free_func: a #GstMetaFreeFunction
* @transform_func: a #GstMetaTransformFunction
* @tags: a NULL terminated array of strings describing what the metadata
* contains info about.
*
* Register a new #GstMeta implementation.
*
......
......@@ -165,8 +165,6 @@ typedef gboolean (*GstMetaTransformFunction) (GstBuffer *transbuf,
* @init_func: function for initializing the metadata
* @free_func: function for freeing the metadata
* @transform_func: function for transforming the metadata
* @tags: 0 terminated array of GQuarks describing what the metadata
* contains info about
*
* The #GstMetaInfo provides information about a specific metadata
* structure.
......
......@@ -873,7 +873,8 @@ gst_query_get_structure (GstQuery * query)
* gst_query_writable_structure:
* @query: a #GstQuery
*
* Get the structure of a query.
* Get the structure of a query. This method should be called with a writable
* @query so that the returned structure is guranteed to be writable.
*
* Returns: (transfer none): the #GstStructure of the query. The structure is
* still owned by the query and will therefore be freed when the query
......
......@@ -324,7 +324,7 @@ gst_registry_chunks_save_feature (GList ** list, GstPluginFeature * feature)
GstCaps *fcaps = gst_caps_ref (factory->caps);
/* we simplify the caps before saving. This is a lot faster
* when loading them later on */
fcaps = gst_caps_do_simplify (fcaps);
fcaps = gst_caps_simplify (fcaps);
str = gst_caps_to_string (fcaps);
gst_caps_unref (fcaps);
......
......@@ -298,7 +298,7 @@ gst_capsfilter_prepare_buf (GstBaseTransform * trans, GstBuffer * input,
g_return_val_if_fail (out_caps != NULL, GST_FLOW_ERROR);
}
out_caps = gst_caps_do_simplify (out_caps);
out_caps = gst_caps_simplify (out_caps);
if (gst_caps_is_fixed (out_caps) && !gst_caps_is_empty (out_caps)) {
GST_DEBUG_OBJECT (trans, "Have fixed output caps %"
......
......@@ -196,8 +196,8 @@ GST_START_TEST (test_simplify)
fail_unless (caps != NULL,
"gst_caps_from_string (non_simple_caps_string) failed");
caps = gst_caps_do_simplify (caps);
fail_unless (caps != NULL, "gst_caps_do_simplify() should have worked");
caps = gst_caps_simplify (caps);
fail_unless (caps != NULL, "gst_caps_simplify() should have worked");
/* check simplified caps, should be:
*
......
......@@ -170,7 +170,6 @@ EXPORTS
gst_caps_append_structure
gst_caps_can_intersect
gst_caps_copy_nth
gst_caps_do_simplify
gst_caps_fixate
gst_caps_flags_get_type
gst_caps_from_string
......@@ -202,6 +201,7 @@ EXPORTS
gst_caps_set_simple
gst_caps_set_simple_valist
gst_caps_set_value
gst_caps_simplify
gst_caps_steal_structure
gst_caps_subtract
gst_caps_to_string
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment