mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-11-25 19:21:06 +00:00
gst: capsfeatures: Use GstIdStr for caps features
Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/7432>
This commit is contained in:
Sebastian Dröge
parent
6233eb0ff3
commit
eed7c9c66a
2 changed files with 410 additions and 49 deletions
|
|
@ -50,9 +50,13 @@
|
|||
#include "config.h"
|
||||
#endif
|
||||
|
||||
/* FIXME: For deprecated GstCapsFeatures API usage */
|
||||
#define GLIB_DISABLE_DEPRECATION_WARNINGS
|
||||
|
||||
#include <string.h>
|
||||
#include "gst_private.h"
|
||||
#include "gstcapsfeatures.h"
|
||||
#include "gstidstr-private.h"
|
||||
#include <gst/gst.h>
|
||||
|
||||
GST_DEBUG_CATEGORY_STATIC (gst_caps_features_debug);
|
||||
|
|
@ -70,7 +74,7 @@ GType _gst_caps_features_type = 0;
|
|||
static gint static_caps_features_parent_refcount = G_MAXINT;
|
||||
GstCapsFeatures *_gst_caps_features_any = NULL;
|
||||
GstCapsFeatures *_gst_caps_features_memory_system_memory = NULL;
|
||||
static GQuark _gst_caps_feature_memory_system_memory = 0;
|
||||
static GstIdStr _gst_caps_feature_memory_system_memory = GST_ID_STR_INIT;
|
||||
|
||||
G_DEFINE_BOXED_TYPE (GstCapsFeatures, gst_caps_features,
|
||||
gst_caps_features_copy, gst_caps_features_free);
|
||||
|
|
@ -90,8 +94,6 @@ _priv_gst_caps_features_initialize (void)
|
|||
"GstCapsFeatures debug");
|
||||
|
||||
_gst_caps_features_type = gst_caps_features_get_type ();
|
||||
_gst_caps_feature_memory_system_memory =
|
||||
g_quark_from_static_string (GST_CAPS_FEATURE_MEMORY_SYSTEM_MEMORY);
|
||||
|
||||
g_value_register_transform_func (_gst_caps_features_type, G_TYPE_STRING,
|
||||
gst_caps_features_transform_to_string);
|
||||
|
|
@ -99,8 +101,11 @@ _priv_gst_caps_features_initialize (void)
|
|||
_gst_caps_features_any = gst_caps_features_new_any ();
|
||||
gst_caps_features_set_parent_refcount (_gst_caps_features_any,
|
||||
&static_caps_features_parent_refcount);
|
||||
gst_id_str_set_static_str (&_gst_caps_feature_memory_system_memory,
|
||||
GST_CAPS_FEATURE_MEMORY_SYSTEM_MEMORY);
|
||||
_gst_caps_features_memory_system_memory =
|
||||
gst_caps_features_new_id (_gst_caps_feature_memory_system_memory, 0);
|
||||
gst_caps_features_new_id_str (&_gst_caps_feature_memory_system_memory,
|
||||
NULL);
|
||||
gst_caps_features_set_parent_refcount
|
||||
(_gst_caps_features_memory_system_memory,
|
||||
&static_caps_features_parent_refcount);
|
||||
|
|
@ -116,6 +121,7 @@ _priv_gst_caps_features_cleanup (void)
|
|||
(_gst_caps_features_memory_system_memory, NULL);
|
||||
gst_caps_features_free (_gst_caps_features_memory_system_memory);
|
||||
_gst_caps_features_memory_system_memory = NULL;
|
||||
gst_id_str_clear (&_gst_caps_feature_memory_system_memory);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -183,7 +189,8 @@ gst_caps_features_new_empty (void)
|
|||
features = g_new (GstCapsFeatures, 1);
|
||||
features->type = _gst_caps_features_type;
|
||||
features->parent_refcount = NULL;
|
||||
features->array = g_array_new (FALSE, FALSE, sizeof (GQuark));
|
||||
features->array = g_array_new (FALSE, FALSE, sizeof (GstIdStr));
|
||||
g_array_set_clear_func (features->array, (GDestroyNotify) gst_id_str_clear);
|
||||
features->is_any = FALSE;
|
||||
|
||||
GST_TRACE ("created caps features %p", features);
|
||||
|
|
@ -234,6 +241,30 @@ gst_caps_features_new_single (const gchar * feature)
|
|||
return features;
|
||||
}
|
||||
|
||||
/**
|
||||
* gst_caps_features_new_single_static_str:
|
||||
* @feature: The feature
|
||||
*
|
||||
* Creates a new #GstCapsFeatures with a single feature.
|
||||
*
|
||||
* @feature needs to be valid for the remaining lifetime of the process, e.g. has
|
||||
* to be a static string.
|
||||
*
|
||||
* Returns: (transfer full): a new #GstCapsFeatures
|
||||
*
|
||||
* Since: 1.26
|
||||
*/
|
||||
GstCapsFeatures *
|
||||
gst_caps_features_new_single_static_str (const gchar * feature)
|
||||
{
|
||||
GstCapsFeatures *features;
|
||||
g_return_val_if_fail (feature != NULL, NULL);
|
||||
|
||||
features = gst_caps_features_new_empty ();
|
||||
gst_caps_features_add_static_str (features, feature);
|
||||
return features;
|
||||
}
|
||||
|
||||
/**
|
||||
* gst_caps_features_new:
|
||||
* @feature1: name of first feature to set
|
||||
|
|
@ -289,6 +320,68 @@ gst_caps_features_new_valist (const gchar * feature1, va_list varargs)
|
|||
return features;
|
||||
}
|
||||
|
||||
/**
|
||||
* gst_caps_features_new_static_str:
|
||||
* @feature1: name of first feature to set
|
||||
* @...: additional features
|
||||
*
|
||||
* Creates a new #GstCapsFeatures with the given features.
|
||||
* The last argument must be %NULL.
|
||||
*
|
||||
* @feature1 and all other features need to be valid for the remaining lifetime
|
||||
* of the process, e.g. have to be a static string.
|
||||
*
|
||||
* Returns: (transfer full): a new, empty #GstCapsFeatures
|
||||
*
|
||||
* Since: 1.26
|
||||
*/
|
||||
GstCapsFeatures *
|
||||
gst_caps_features_new_static_str (const gchar * feature1, ...)
|
||||
{
|
||||
GstCapsFeatures *features;
|
||||
va_list varargs;
|
||||
|
||||
g_return_val_if_fail (feature1 != NULL, NULL);
|
||||
|
||||
va_start (varargs, feature1);
|
||||
features = gst_caps_features_new_static_str_valist (feature1, varargs);
|
||||
va_end (varargs);
|
||||
|
||||
return features;
|
||||
}
|
||||
|
||||
/**
|
||||
* gst_caps_features_new_static_str_valist:
|
||||
* @feature1: name of first feature to set
|
||||
* @varargs: variable argument list
|
||||
*
|
||||
* Creates a new #GstCapsFeatures with the given features.
|
||||
*
|
||||
* @feature1 and all other features need to be valid for the remaining lifetime
|
||||
* of the process, e.g. have to be a static string.
|
||||
*
|
||||
* Returns: (transfer full): a new, empty #GstCapsFeatures
|
||||
*
|
||||
* Since: 1.26
|
||||
*/
|
||||
GstCapsFeatures *
|
||||
gst_caps_features_new_static_str_valist (const gchar * feature1,
|
||||
va_list varargs)
|
||||
{
|
||||
GstCapsFeatures *features;
|
||||
|
||||
g_return_val_if_fail (feature1 != NULL, NULL);
|
||||
|
||||
features = gst_caps_features_new_empty ();
|
||||
|
||||
while (feature1) {
|
||||
gst_caps_features_add_static_str (features, feature1);
|
||||
feature1 = va_arg (varargs, const gchar *);
|
||||
}
|
||||
|
||||
return features;
|
||||
}
|
||||
|
||||
/**
|
||||
* gst_caps_features_new_id:
|
||||
* @feature1: name of first feature to set
|
||||
|
|
@ -300,6 +393,8 @@ gst_caps_features_new_valist (const gchar * feature1, va_list varargs)
|
|||
* Returns: (transfer full): a new, empty #GstCapsFeatures
|
||||
*
|
||||
* Since: 1.2
|
||||
*
|
||||
* Deprecated: 1.26: Use gst_caps_features_new_id_str().
|
||||
*/
|
||||
GstCapsFeatures *
|
||||
gst_caps_features_new_id (GQuark feature1, ...)
|
||||
|
|
@ -310,7 +405,10 @@ gst_caps_features_new_id (GQuark feature1, ...)
|
|||
g_return_val_if_fail (feature1 != 0, NULL);
|
||||
|
||||
va_start (varargs, feature1);
|
||||
#pragma GCC diagnostic push
|
||||
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
|
||||
features = gst_caps_features_new_id_valist (feature1, varargs);
|
||||
#pragma GCC diagnostic pop
|
||||
va_end (varargs);
|
||||
|
||||
return features;
|
||||
|
|
@ -326,6 +424,8 @@ gst_caps_features_new_id (GQuark feature1, ...)
|
|||
* Returns: (transfer full): a new, empty #GstCapsFeatures
|
||||
*
|
||||
* Since: 1.2
|
||||
*
|
||||
* Deprecated: 1.26: Use gst_caps_features_new_id_str_valist().
|
||||
*/
|
||||
GstCapsFeatures *
|
||||
gst_caps_features_new_id_valist (GQuark feature1, va_list varargs)
|
||||
|
|
@ -337,13 +437,71 @@ gst_caps_features_new_id_valist (GQuark feature1, va_list varargs)
|
|||
features = gst_caps_features_new_empty ();
|
||||
|
||||
while (feature1) {
|
||||
#pragma GCC diagnostic push
|
||||
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
|
||||
gst_caps_features_add_id (features, feature1);
|
||||
#pragma GCC diagnostic pop
|
||||
feature1 = va_arg (varargs, GQuark);
|
||||
}
|
||||
|
||||
return features;
|
||||
}
|
||||
|
||||
/**
|
||||
* gst_caps_features_new_id_str:
|
||||
* @feature1: name of first feature to set
|
||||
* @...: additional features
|
||||
*
|
||||
* Creates a new #GstCapsFeatures with the given features.
|
||||
* The last argument must be 0.
|
||||
*
|
||||
* Returns: (transfer full): a new, empty #GstCapsFeatures
|
||||
*
|
||||
* Since: 1.26
|
||||
*/
|
||||
GstCapsFeatures *
|
||||
gst_caps_features_new_id_str (const GstIdStr * feature1, ...)
|
||||
{
|
||||
GstCapsFeatures *features;
|
||||
va_list varargs;
|
||||
|
||||
g_return_val_if_fail (feature1 != NULL, NULL);
|
||||
|
||||
va_start (varargs, feature1);
|
||||
features = gst_caps_features_new_id_str_valist (feature1, varargs);
|
||||
va_end (varargs);
|
||||
|
||||
return features;
|
||||
}
|
||||
|
||||
/**
|
||||
* gst_caps_features_new_id_str_valist:
|
||||
* @feature1: name of first feature to set
|
||||
* @varargs: variable argument list
|
||||
*
|
||||
* Creates a new #GstCapsFeatures with the given features.
|
||||
*
|
||||
* Returns: (transfer full): a new, empty #GstCapsFeatures
|
||||
*
|
||||
* Since: 1.26
|
||||
*/
|
||||
GstCapsFeatures *
|
||||
gst_caps_features_new_id_str_valist (const GstIdStr * feature1, va_list varargs)
|
||||
{
|
||||
GstCapsFeatures *features;
|
||||
|
||||
g_return_val_if_fail (feature1 != NULL, NULL);
|
||||
|
||||
features = gst_caps_features_new_empty ();
|
||||
|
||||
while (feature1) {
|
||||
gst_caps_features_add_id_str (features, feature1);
|
||||
feature1 = va_arg (varargs, const GstIdStr *);
|
||||
}
|
||||
|
||||
return features;
|
||||
}
|
||||
|
||||
/**
|
||||
* gst_caps_features_set_parent_refcount:
|
||||
* @features: a #GstCapsFeatures
|
||||
|
|
@ -404,7 +562,8 @@ gst_caps_features_copy (const GstCapsFeatures * features)
|
|||
copy = gst_caps_features_new_empty ();
|
||||
n = gst_caps_features_get_size (features);
|
||||
for (i = 0; i < n; i++)
|
||||
gst_caps_features_add_id (copy, gst_caps_features_get_nth_id (features, i));
|
||||
gst_caps_features_add_id_str (copy,
|
||||
gst_caps_features_get_nth_id_str (features, i));
|
||||
copy->is_any = features->is_any;
|
||||
|
||||
return copy;
|
||||
|
|
@ -481,9 +640,9 @@ priv_gst_caps_features_append_to_gstring (const GstCapsFeatures * features,
|
|||
|
||||
n = features->array->len;
|
||||
for (i = 0; i < n; i++) {
|
||||
GQuark *quark = &g_array_index (features->array, GQuark, i);
|
||||
const GstIdStr *feature = &g_array_index (features->array, GstIdStr, i);
|
||||
|
||||
g_string_append (s, g_quark_to_string (*quark));
|
||||
g_string_append (s, gst_id_str_as_str (feature));
|
||||
if (i + 1 < n)
|
||||
g_string_append (s, ", ");
|
||||
}
|
||||
|
|
@ -611,15 +770,15 @@ const gchar *
|
|||
gst_caps_features_get_nth (const GstCapsFeatures * features, guint i)
|
||||
{
|
||||
const gchar *feature;
|
||||
GQuark quark;
|
||||
const GstIdStr *feature_str;
|
||||
|
||||
g_return_val_if_fail (features != NULL, NULL);
|
||||
|
||||
quark = gst_caps_features_get_nth_id (features, i);
|
||||
if (!quark)
|
||||
feature_str = gst_caps_features_get_nth_id_str (features, i);
|
||||
if (!feature_str)
|
||||
return NULL;
|
||||
|
||||
feature = g_quark_to_string (quark);
|
||||
feature = gst_id_str_as_str (feature_str);
|
||||
return feature;
|
||||
}
|
||||
|
||||
|
|
@ -633,18 +792,46 @@ gst_caps_features_get_nth (const GstCapsFeatures * features, guint i)
|
|||
* Returns: The @i-th feature of @features.
|
||||
*
|
||||
* Since: 1.2
|
||||
*
|
||||
* Deprecated: 1.26: Use gst_caps_features_get_nth_id_str().
|
||||
*/
|
||||
GQuark
|
||||
gst_caps_features_get_nth_id (const GstCapsFeatures * features, guint i)
|
||||
{
|
||||
GQuark *quark;
|
||||
GQuark quark;
|
||||
const GstIdStr *feature_str;
|
||||
|
||||
g_return_val_if_fail (features != NULL, 0);
|
||||
g_return_val_if_fail (i < features->array->len, 0);
|
||||
|
||||
quark = &g_array_index (features->array, GQuark, i);
|
||||
feature_str = gst_caps_features_get_nth_id_str (features, i);
|
||||
|
||||
return *quark;
|
||||
quark = g_quark_from_string (gst_id_str_as_str (feature_str));
|
||||
return quark;
|
||||
}
|
||||
|
||||
/**
|
||||
* gst_caps_features_get_nth_id_str:
|
||||
* @features: a #GstCapsFeatures.
|
||||
* @i: index of the feature
|
||||
*
|
||||
* Returns the @i-th feature of @features.
|
||||
*
|
||||
* Returns: The @i-th feature of @features.
|
||||
*
|
||||
* Since: 1.26
|
||||
*/
|
||||
const GstIdStr *
|
||||
gst_caps_features_get_nth_id_str (const GstCapsFeatures * features, guint i)
|
||||
{
|
||||
const GstIdStr *feature;
|
||||
|
||||
g_return_val_if_fail (features != NULL, 0);
|
||||
g_return_val_if_fail (i < features->array->len, 0);
|
||||
|
||||
feature = &g_array_index (features->array, GstIdStr, i);
|
||||
|
||||
return feature;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -662,11 +849,18 @@ gboolean
|
|||
gst_caps_features_contains (const GstCapsFeatures * features,
|
||||
const gchar * feature)
|
||||
{
|
||||
GstIdStr s = GST_ID_STR_INIT;
|
||||
gboolean res;
|
||||
|
||||
g_return_val_if_fail (features != NULL, FALSE);
|
||||
g_return_val_if_fail (feature != NULL, FALSE);
|
||||
|
||||
return gst_caps_features_contains_id (features,
|
||||
g_quark_from_string (feature));
|
||||
// Not technically correct but the string is never leaving this scope and is never copied
|
||||
gst_id_str_set_static_str (&s, feature);
|
||||
res = gst_caps_features_contains_id_str (features, &s);
|
||||
gst_id_str_clear (&s);
|
||||
|
||||
return res;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -679,24 +873,54 @@ gst_caps_features_contains (const GstCapsFeatures * features,
|
|||
* Returns: %TRUE if @features contains @feature.
|
||||
*
|
||||
* Since: 1.2
|
||||
*
|
||||
* Deprecated: 1.26: Use gst_caps_features_contains_id_str().
|
||||
*/
|
||||
gboolean
|
||||
gst_caps_features_contains_id (const GstCapsFeatures * features, GQuark feature)
|
||||
{
|
||||
guint i, n;
|
||||
GstIdStr s = GST_ID_STR_INIT;
|
||||
|
||||
g_return_val_if_fail (features != NULL, FALSE);
|
||||
g_return_val_if_fail (feature != 0, FALSE);
|
||||
|
||||
gst_id_str_set_static_str (&s, g_quark_to_string (feature));
|
||||
|
||||
return gst_caps_features_contains_id_str (features, &s);
|
||||
}
|
||||
|
||||
/**
|
||||
* gst_caps_features_contains_id_str:
|
||||
* @features: a #GstCapsFeatures.
|
||||
* @feature: a feature
|
||||
*
|
||||
* Checks if @features contains @feature.
|
||||
*
|
||||
* Returns: %TRUE if @features contains @feature.
|
||||
*
|
||||
* Since: 1.26
|
||||
*/
|
||||
gboolean
|
||||
gst_caps_features_contains_id_str (const GstCapsFeatures * features,
|
||||
const GstIdStr * feature)
|
||||
{
|
||||
guint i, n;
|
||||
|
||||
g_return_val_if_fail (features != NULL, FALSE);
|
||||
g_return_val_if_fail (feature != NULL, FALSE);
|
||||
|
||||
if (features->is_any)
|
||||
return TRUE;
|
||||
|
||||
n = features->array->len;
|
||||
if (n == 0)
|
||||
return feature == _gst_caps_feature_memory_system_memory;
|
||||
if (n == 0) {
|
||||
return gst_id_str_is_equal (feature,
|
||||
&_gst_caps_feature_memory_system_memory);
|
||||
}
|
||||
|
||||
for (i = 0; i < n; i++) {
|
||||
if (gst_caps_features_get_nth_id (features, i) == feature)
|
||||
if (gst_id_str_is_equal (gst_caps_features_get_nth_id_str (features, i),
|
||||
feature))
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
|
|
@ -730,12 +954,12 @@ gst_caps_features_is_equal (const GstCapsFeatures * features1,
|
|||
if (features1->array->len == 0 && features2->array->len == 0)
|
||||
return TRUE;
|
||||
if (features1->array->len == 0 && features2->array->len == 1
|
||||
&& gst_caps_features_contains_id (features2,
|
||||
_gst_caps_feature_memory_system_memory))
|
||||
&& gst_caps_features_contains_id_str (features2,
|
||||
&_gst_caps_feature_memory_system_memory))
|
||||
return TRUE;
|
||||
if (features2->array->len == 0 && features1->array->len == 1
|
||||
&& gst_caps_features_contains_id (features1,
|
||||
_gst_caps_feature_memory_system_memory))
|
||||
&& gst_caps_features_contains_id_str (features1,
|
||||
&_gst_caps_feature_memory_system_memory))
|
||||
return TRUE;
|
||||
|
||||
if (features1->array->len != features2->array->len)
|
||||
|
|
@ -743,8 +967,8 @@ gst_caps_features_is_equal (const GstCapsFeatures * features1,
|
|||
|
||||
n = features1->array->len;
|
||||
for (i = 0; i < n; i++)
|
||||
if (!gst_caps_features_contains_id (features2,
|
||||
gst_caps_features_get_nth_id (features1, i)))
|
||||
if (!gst_caps_features_contains_id_str (features2,
|
||||
gst_caps_features_get_nth_id_str (features1, i)))
|
||||
return FALSE;
|
||||
|
||||
return TRUE;
|
||||
|
|
@ -768,6 +992,30 @@ gst_caps_features_is_any (const GstCapsFeatures * features)
|
|||
return features->is_any;
|
||||
}
|
||||
|
||||
// Takes ownership of feature
|
||||
static void
|
||||
gst_caps_features_add_id_str_internal (GstCapsFeatures * features,
|
||||
GstIdStr * feature)
|
||||
{
|
||||
if (!gst_caps_feature_name_is_valid (gst_id_str_as_str (feature))) {
|
||||
g_warning ("Invalid caps feature name: %s", gst_id_str_as_str (feature));
|
||||
gst_id_str_clear (feature);
|
||||
return;
|
||||
}
|
||||
|
||||
/* If features is empty it will contain sysmem, however
|
||||
* we want to add it explicitly if it is attempted to be
|
||||
* added as first features
|
||||
*/
|
||||
if (features->array->len > 0
|
||||
&& gst_caps_features_contains_id_str (features, feature)) {
|
||||
gst_id_str_clear (feature);
|
||||
return;
|
||||
}
|
||||
|
||||
g_array_append_val (features->array, *feature);
|
||||
}
|
||||
|
||||
/**
|
||||
* gst_caps_features_add:
|
||||
* @features: a #GstCapsFeatures.
|
||||
|
|
@ -780,12 +1028,44 @@ gst_caps_features_is_any (const GstCapsFeatures * features)
|
|||
void
|
||||
gst_caps_features_add (GstCapsFeatures * features, const gchar * feature)
|
||||
{
|
||||
GstIdStr s = GST_ID_STR_INIT;
|
||||
|
||||
g_return_if_fail (features != NULL);
|
||||
g_return_if_fail (IS_MUTABLE (features));
|
||||
g_return_if_fail (feature != NULL);
|
||||
g_return_if_fail (!features->is_any);
|
||||
|
||||
gst_caps_features_add_id (features, g_quark_from_string (feature));
|
||||
gst_id_str_set (&s, feature);
|
||||
|
||||
gst_caps_features_add_id_str_internal (features, &s);
|
||||
}
|
||||
|
||||
/**
|
||||
* gst_caps_features_add_static_str:
|
||||
* @features: a #GstCapsFeatures.
|
||||
* @feature: a feature.
|
||||
*
|
||||
* Adds @feature to @features.
|
||||
*
|
||||
* @feature needs to be valid for the remaining lifetime of the process, e.g. has
|
||||
* to be a static string.
|
||||
*
|
||||
* Since: 1.26
|
||||
*/
|
||||
void
|
||||
gst_caps_features_add_static_str (GstCapsFeatures * features,
|
||||
const gchar * feature)
|
||||
{
|
||||
GstIdStr s = GST_ID_STR_INIT;
|
||||
|
||||
g_return_if_fail (features != NULL);
|
||||
g_return_if_fail (IS_MUTABLE (features));
|
||||
g_return_if_fail (feature != NULL);
|
||||
g_return_if_fail (!features->is_any);
|
||||
|
||||
gst_id_str_set_static_str (&s, feature);
|
||||
|
||||
gst_caps_features_add_id_str_internal (features, &s);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -796,29 +1076,47 @@ gst_caps_features_add (GstCapsFeatures * features, const gchar * feature)
|
|||
* Adds @feature to @features.
|
||||
*
|
||||
* Since: 1.2
|
||||
*
|
||||
* Deprecated: 1.26: Use gst_caps_features_add_id_str().
|
||||
*/
|
||||
void
|
||||
gst_caps_features_add_id (GstCapsFeatures * features, GQuark feature)
|
||||
{
|
||||
GstIdStr s = GST_ID_STR_INIT;
|
||||
|
||||
g_return_if_fail (features != NULL);
|
||||
g_return_if_fail (IS_MUTABLE (features));
|
||||
g_return_if_fail (feature != 0);
|
||||
g_return_if_fail (!features->is_any);
|
||||
|
||||
if (!gst_caps_feature_name_is_valid (g_quark_to_string (feature))) {
|
||||
g_warning ("Invalid caps feature name: %s", g_quark_to_string (feature));
|
||||
return;
|
||||
gst_id_str_set_static_str (&s, g_quark_to_string (feature));
|
||||
|
||||
gst_caps_features_add_id_str_internal (features, &s);
|
||||
}
|
||||
|
||||
/* If features is empty it will contain sysmem, however
|
||||
* we want to add it explicitly if it is attempted to be
|
||||
* added as first features
|
||||
/**
|
||||
* gst_caps_features_add_id_str:
|
||||
* @features: a #GstCapsFeatures.
|
||||
* @feature: a feature.
|
||||
*
|
||||
* Adds @feature to @features.
|
||||
*
|
||||
* Since: 1.26
|
||||
*/
|
||||
if (features->array->len > 0
|
||||
&& gst_caps_features_contains_id (features, feature))
|
||||
return;
|
||||
void
|
||||
gst_caps_features_add_id_str (GstCapsFeatures * features,
|
||||
const GstIdStr * feature)
|
||||
{
|
||||
GstIdStr s = GST_ID_STR_INIT;
|
||||
|
||||
g_array_append_val (features->array, feature);
|
||||
g_return_if_fail (features != NULL);
|
||||
g_return_if_fail (IS_MUTABLE (features));
|
||||
g_return_if_fail (feature != NULL);
|
||||
g_return_if_fail (!features->is_any);
|
||||
|
||||
gst_id_str_copy_into (&s, feature);
|
||||
|
||||
gst_caps_features_add_id_str_internal (features, &s);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -833,11 +1131,16 @@ gst_caps_features_add_id (GstCapsFeatures * features, GQuark feature)
|
|||
void
|
||||
gst_caps_features_remove (GstCapsFeatures * features, const gchar * feature)
|
||||
{
|
||||
GstIdStr s = GST_ID_STR_INIT;
|
||||
|
||||
g_return_if_fail (features != NULL);
|
||||
g_return_if_fail (IS_MUTABLE (features));
|
||||
g_return_if_fail (feature != NULL);
|
||||
|
||||
gst_caps_features_remove_id (features, g_quark_from_string (feature));
|
||||
// Not technically correct but the string is never leaving this scope and is never copied
|
||||
gst_id_str_set_static_str (&s, feature);
|
||||
gst_caps_features_remove_id_str (features, &s);
|
||||
gst_id_str_clear (&s);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -848,21 +1151,48 @@ gst_caps_features_remove (GstCapsFeatures * features, const gchar * feature)
|
|||
* Removes @feature from @features.
|
||||
*
|
||||
* Since: 1.2
|
||||
*
|
||||
* Deprecated: 1.26: Use gst_caps_features_remove_id_str().
|
||||
*/
|
||||
void
|
||||
gst_caps_features_remove_id (GstCapsFeatures * features, GQuark feature)
|
||||
{
|
||||
guint i, n;
|
||||
GstIdStr s = GST_ID_STR_INIT;
|
||||
|
||||
|
||||
g_return_if_fail (features != NULL);
|
||||
g_return_if_fail (IS_MUTABLE (features));
|
||||
g_return_if_fail (feature != 0);
|
||||
|
||||
gst_id_str_set_static_str (&s, g_quark_to_string (feature));
|
||||
|
||||
gst_caps_features_remove_id_str (features, &s);
|
||||
}
|
||||
|
||||
/**
|
||||
* gst_caps_features_remove_id_str:
|
||||
* @features: a #GstCapsFeatures.
|
||||
* @feature: a feature.
|
||||
*
|
||||
* Removes @feature from @features.
|
||||
*
|
||||
* Since: 1.26
|
||||
*/
|
||||
void
|
||||
gst_caps_features_remove_id_str (GstCapsFeatures * features,
|
||||
const GstIdStr * feature)
|
||||
{
|
||||
guint i, n;
|
||||
|
||||
g_return_if_fail (features != NULL);
|
||||
g_return_if_fail (IS_MUTABLE (features));
|
||||
g_return_if_fail (feature != NULL);
|
||||
|
||||
n = features->array->len;
|
||||
for (i = 0; i < n; i++) {
|
||||
GQuark quark = gst_caps_features_get_nth_id (features, i);
|
||||
const GstIdStr *f = gst_caps_features_get_nth_id_str (features, i);
|
||||
|
||||
if (quark == feature) {
|
||||
if (gst_id_str_is_equal (f, feature)) {
|
||||
g_array_remove_index_fast (features->array, i);
|
||||
return;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -23,6 +23,7 @@
|
|||
|
||||
#include <gst/gstconfig.h>
|
||||
#include <gst/glib-compat.h>
|
||||
#include <gst/gstidstr.h>
|
||||
#include <glib-object.h>
|
||||
#include <glib.h>
|
||||
|
||||
|
|
@ -60,18 +61,33 @@ GstCapsFeatures * gst_caps_features_new_any (void);
|
|||
GST_API
|
||||
GstCapsFeatures * gst_caps_features_new_single (const gchar *feature) G_GNUC_MALLOC;
|
||||
|
||||
GST_API
|
||||
GstCapsFeatures * gst_caps_features_new_single_static_str (const gchar *feature) G_GNUC_MALLOC;
|
||||
|
||||
GST_API
|
||||
GstCapsFeatures * gst_caps_features_new (const gchar *feature1, ...) G_GNUC_NULL_TERMINATED;
|
||||
|
||||
GST_API
|
||||
GstCapsFeatures * gst_caps_features_new_static_str (const gchar *feature1, ...) G_GNUC_NULL_TERMINATED;
|
||||
|
||||
GST_API
|
||||
GstCapsFeatures * gst_caps_features_new_valist (const gchar *feature1, va_list varargs);
|
||||
|
||||
GST_API
|
||||
GstCapsFeatures * gst_caps_features_new_static_str_valist (const gchar *feature1, va_list varargs);
|
||||
|
||||
GST_DEPRECATED_FOR(gst_caps_features_new_id_str)
|
||||
GstCapsFeatures * gst_caps_features_new_id (GQuark feature1, ...);
|
||||
|
||||
GST_API
|
||||
GST_DEPRECATED_FOR(gst_caps_features_new_id_str_valist)
|
||||
GstCapsFeatures * gst_caps_features_new_id_valist (GQuark feature1, va_list varargs);
|
||||
|
||||
GST_API
|
||||
GstCapsFeatures * gst_caps_features_new_id_str (const GstIdStr * feature1, ...);
|
||||
|
||||
GST_API
|
||||
GstCapsFeatures * gst_caps_features_new_id_str_valist (const GstIdStr * feature1, va_list varargs);
|
||||
|
||||
GST_API
|
||||
gboolean gst_caps_features_set_parent_refcount (GstCapsFeatures *features, gint * refcount);
|
||||
|
||||
|
|
@ -93,15 +109,21 @@ guint gst_caps_features_get_size (const GstCapsFeatures * features);
|
|||
GST_API
|
||||
const gchar * gst_caps_features_get_nth (const GstCapsFeatures * features, guint i);
|
||||
|
||||
GST_API
|
||||
GST_DEPRECATED_FOR(gst_caps_features_get_nth_id_str)
|
||||
GQuark gst_caps_features_get_nth_id (const GstCapsFeatures * features, guint i);
|
||||
|
||||
GST_API
|
||||
const GstIdStr * gst_caps_features_get_nth_id_str (const GstCapsFeatures * features, guint i);
|
||||
|
||||
GST_API
|
||||
gboolean gst_caps_features_contains (const GstCapsFeatures * features, const gchar * feature);
|
||||
|
||||
GST_API
|
||||
GST_DEPRECATED_FOR(gst_caps_features_contains_id_str)
|
||||
gboolean gst_caps_features_contains_id (const GstCapsFeatures * features, GQuark feature);
|
||||
|
||||
GST_API
|
||||
gboolean gst_caps_features_contains_id_str (const GstCapsFeatures * features, const GstIdStr * feature);
|
||||
|
||||
GST_API
|
||||
gboolean gst_caps_features_is_equal (const GstCapsFeatures * features1, const GstCapsFeatures * features2);
|
||||
|
||||
|
|
@ -112,14 +134,23 @@ GST_API
|
|||
void gst_caps_features_add (GstCapsFeatures * features, const gchar * feature);
|
||||
|
||||
GST_API
|
||||
void gst_caps_features_add_static_str (GstCapsFeatures * features, const gchar * feature);
|
||||
|
||||
GST_DEPRECATED_FOR(gst_caps_features_add_id_str)
|
||||
void gst_caps_features_add_id (GstCapsFeatures * features, GQuark feature);
|
||||
|
||||
GST_API
|
||||
void gst_caps_features_add_id_str (GstCapsFeatures * features, const GstIdStr * feature);
|
||||
|
||||
GST_API
|
||||
void gst_caps_features_remove (GstCapsFeatures * features, const gchar * feature);
|
||||
|
||||
GST_API
|
||||
GST_DEPRECATED_FOR(gst_caps_features_remove_id_str)
|
||||
void gst_caps_features_remove_id (GstCapsFeatures * features, GQuark feature);
|
||||
|
||||
GST_API
|
||||
void gst_caps_features_remove_id_str (GstCapsFeatures * features, const GstIdStr * feature);
|
||||
|
||||
G_DEFINE_AUTOPTR_CLEANUP_FUNC(GstCapsFeatures, gst_caps_features_free)
|
||||
|
||||
G_END_DECLS
|
||||
|
|
|
|||
Loading…
Reference in a new issue