* <programlisting>
* GstCaps *caps;
* caps = gst_caps_new_simple ("video/x-raw",
- * "format", G_TYPE_STRING, "I420"),
+ * "format", G_TYPE_STRING, "I420",
* "framerate", GST_TYPE_FRACTION, 25, 1,
* "pixel-aspect-ratio", GST_TYPE_FRACTION, 1, 1,
* "width", G_TYPE_INT, 320,
#define DEBUG_REFCOUNT
+typedef struct _GstCapsImpl
+{
+ GstCaps caps;
+
+ GPtrArray *array;
+} GstCapsImpl;
-#define GST_CAPS_ARRAY(c) ((GPtrArray *)((c)->priv))
+#define GST_CAPS_ARRAY(c) (((GstCapsImpl *)(c))->array)
#define GST_CAPS_LEN(c) (GST_CAPS_ARRAY(c)->len)
/* same as gst_caps_is_any () */
#define CAPS_IS_ANY(caps) \
- (GST_CAPS_FLAGS(caps) & GST_CAPS_FLAGS_ANY)
+ (GST_CAPS_FLAGS(caps) & GST_CAPS_FLAG_ANY)
/* same as gst_caps_is_empty () */
#define CAPS_IS_EMPTY(caps) \
const gchar * string);
GType _gst_caps_type = 0;
+GstCaps *_gst_caps_any;
+GstCaps *_gst_caps_none;
GST_DEFINE_MINI_OBJECT_TYPE (GstCaps, gst_caps);
{
_gst_caps_type = gst_caps_get_type ();
+ _gst_caps_any = gst_caps_new_any ();
+ _gst_caps_none = gst_caps_new_empty ();
+
g_value_register_transform_func (_gst_caps_type,
G_TYPE_STRING, gst_caps_transform_to_string);
}
* in practise
* GST_CAPS_ARRAY (caps) = g_ptr_array_sized_new (32);
*/
- caps->priv = g_ptr_array_new ();
+ GST_CAPS_ARRAY (caps) = g_ptr_array_new ();
}
/**
{
GstCaps *caps;
- caps = g_slice_new (GstCaps);
+ caps = (GstCaps *) g_slice_new (GstCapsImpl);
- gst_caps_init (caps, sizeof (GstCaps));
+ gst_caps_init (caps, sizeof (GstCapsImpl));
#ifdef DEBUG_REFCOUNT
GST_CAT_TRACE (GST_CAT_CAPS, "created caps %p", caps);
{
GstCaps *caps = gst_caps_new_empty ();
- GST_CAPS_FLAG_SET (caps, GST_CAPS_FLAGS_ANY);
+ GST_CAPS_FLAG_SET (caps, GST_CAPS_FLAG_ANY);
return caps;
}
return caps;
}
-GType
-gst_static_caps_get_type (void)
-{
- static GType staticcaps_type = 0;
-
- if (G_UNLIKELY (staticcaps_type == 0)) {
- staticcaps_type = g_pointer_type_register_static ("GstStaticCaps");
- }
- return staticcaps_type;
-}
-
+G_DEFINE_POINTER_TYPE (GstStaticCaps, gst_static_caps);
/**
* gst_static_caps_get:
GstCaps *
gst_static_caps_get (GstStaticCaps * static_caps)
{
- GstCaps *caps;
+ GstCaps **caps;
g_return_val_if_fail (static_caps != NULL, NULL);
- caps = (GstCaps *) static_caps;
+ caps = &static_caps->caps;
/* refcount is 0 when we need to convert */
- if (G_UNLIKELY (GST_CAPS_REFCOUNT_VALUE (caps) == 0)) {
+ if (G_UNLIKELY (*caps == NULL)) {
const char *string;
- GstCaps temp;
G_LOCK (static_caps_lock);
/* check if other thread already updated */
- if (G_UNLIKELY (GST_CAPS_REFCOUNT_VALUE (caps) > 0))
+ if (G_UNLIKELY (*caps != NULL))
goto done;
string = static_caps->string;
if (G_UNLIKELY (string == NULL))
goto no_string;
- GST_CAT_TRACE (GST_CAT_CAPS, "creating %p", static_caps);
-
- /* we construct the caps on the stack, then copy over the struct into our
- * real caps, refcount last. We do this because we must leave the refcount
- * of the result caps to 0 so that other threads don't run away with the
- * caps while we are constructing it. */
- gst_caps_init (&temp, sizeof (GstCaps));
+ *caps = gst_caps_from_string (string);
/* convert to string */
- if (G_UNLIKELY (!gst_caps_from_string_inplace (&temp, string)))
+ if (G_UNLIKELY (*caps == NULL))
g_critical ("Could not convert static caps \"%s\"", string);
- GST_MINI_OBJECT_REFCOUNT (&temp) = 0;
- memcpy (caps, &temp, sizeof (GstCaps));
- gst_caps_ref (caps);
-
- GST_CAT_TRACE (GST_CAT_CAPS, "created %p", static_caps);
+ GST_CAT_TRACE (GST_CAT_CAPS, "created %p from string %s", static_caps,
+ string);
done:
G_UNLOCK (static_caps_lock);
}
/* ref the caps, makes it not writable */
- gst_caps_ref (caps);
+ if (G_LIKELY (*caps != NULL))
+ gst_caps_ref (*caps);
- return caps;
+ return *caps;
/* ERRORS */
no_string:
/**
* gst_static_caps_cleanup:
- * @static_caps: the #GstStaticCaps to convert
+ * @static_caps: the #GstStaticCaps to clean
*
- * Clean up the caps contained in @static_caps when the refcount is 0.
+ * Clean up the cached caps contained in @static_caps.
*/
void
gst_static_caps_cleanup (GstStaticCaps * static_caps)
{
- GstCaps *caps = (GstCaps *) static_caps;
-
- /* FIXME: this is not threadsafe */
- if (GST_CAPS_REFCOUNT_VALUE (caps) == 1) {
- GstStructure *structure;
- guint i, clen;
-
- clen = GST_CAPS_LEN (caps);
-
- for (i = 0; i < clen; i++) {
- structure = (GstStructure *) gst_caps_get_structure (caps, i);
- gst_structure_set_parent_refcount (structure, NULL);
- gst_structure_free (structure);
- }
- g_ptr_array_free (GST_CAPS_ARRAY (caps), TRUE);
- GST_CAPS_REFCOUNT (caps) = 0;
- }
+ G_LOCK (static_caps_lock);
+ gst_caps_replace (&static_caps->caps, NULL);
+ G_UNLOCK (static_caps_lock);
}
/* manipulation */
if (G_UNLIKELY (CAPS_IS_ANY (caps1) || CAPS_IS_ANY (caps2))) {
/* FIXME: this leaks */
- GST_CAPS_FLAGS (caps1) |= GST_CAPS_FLAGS_ANY;
+ GST_CAPS_FLAGS (caps1) |= GST_CAPS_FLAG_ANY;
for (i = GST_CAPS_LEN (caps2) - 1; i >= 0; i--) {
structure = gst_caps_remove_and_get_structure (caps2, i);
gst_structure_free (structure);
gst_structure_free (structure);
}
} else if (G_UNLIKELY (CAPS_IS_ANY (caps2))) {
- GST_CAPS_FLAGS (caps1) |= GST_CAPS_FLAGS_ANY;
+ GST_CAPS_FLAGS (caps1) |= GST_CAPS_FLAG_ANY;
for (i = GST_CAPS_LEN (caps1) - 1; i >= 0; i--) {
structure = gst_caps_remove_and_get_structure (caps1, i);
gst_structure_free (structure);
type = va_arg (varargs, GType);
- if (G_UNLIKELY (type == G_TYPE_DATE)) {
- g_warning ("Don't use G_TYPE_DATE, use GST_TYPE_DATE instead\n");
- type = GST_TYPE_DATE;
- }
G_VALUE_COLLECT_INIT (&value, type, varargs, 0, &err);
if (G_UNLIKELY (err)) {
g_critical ("%s", err);
*
* Returns: %TRUE if @structure is a subset of @caps
*
- * Since: 0.10.35
+ * Since: 0.10.36
*/
gboolean
gst_caps_is_subset_structure (const GstCaps * caps,
gchar *s;
if (strcmp ("ANY", string) == 0) {
- GST_CAPS_FLAGS (caps) = GST_CAPS_FLAGS_ANY;
+ GST_CAPS_FLAGS (caps) = GST_CAPS_FLAG_ANY;
return TRUE;
}
if (strcmp ("EMPTY", string) == 0) {
projects / platform / upstream / gstreamer.git / blobdiff