2003-11-11 19:14:14 +00:00
|
|
|
/* GStreamer
|
|
|
|
* Copyright (C) <2003> David A. Schleef <ds@schleef.org>
|
|
|
|
*
|
|
|
|
* This library is free software; you can redistribute it and/or
|
|
|
|
* modify it under the terms of the GNU Library General Public
|
|
|
|
* License as published by the Free Software Foundation; either
|
|
|
|
* version 2 of the License, or (at your option) any later version.
|
|
|
|
*
|
|
|
|
* This library is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
|
* Library General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU Library General Public
|
|
|
|
* License along with this library; if not, write to the
|
|
|
|
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
|
|
|
* Boston, MA 02111-1307, USA.
|
|
|
|
*/
|
2005-10-15 16:01:57 +00:00
|
|
|
|
2005-08-27 10:57:00 +00:00
|
|
|
/**
|
|
|
|
* SECTION:gstcaps
|
|
|
|
* @short_description: Structure describing sets of media formats
|
|
|
|
* @see_also: #GstStructure
|
|
|
|
*
|
2005-11-18 16:04:28 +00:00
|
|
|
* Caps (capabilities) are lighweight refcounted objects describing media types.
|
2005-11-09 12:01:46 +00:00
|
|
|
* They are composed of an array of #GstStructure.
|
|
|
|
*
|
|
|
|
* Caps are exposed on #GstPadTemplate to describe all possible types a
|
2007-02-13 09:10:53 +00:00
|
|
|
* given pad can handle. They are also stored in the #GstRegistry along with
|
|
|
|
* a description of the #GstElement.
|
2005-11-09 12:01:46 +00:00
|
|
|
*
|
2006-07-02 12:54:03 +00:00
|
|
|
* Caps are exposed on the element pads using the gst_pad_get_caps() pad
|
|
|
|
* function. This function describes the possible types that the pad can
|
2005-11-18 16:04:28 +00:00
|
|
|
* handle or produce at runtime.
|
2005-11-09 12:01:46 +00:00
|
|
|
*
|
|
|
|
* Caps are also attached to buffers to describe to content of the data
|
|
|
|
* pointed to by the buffer with gst_buffer_set_caps(). Caps attached to
|
|
|
|
* a #GstBuffer allow for format negotiation upstream and downstream.
|
|
|
|
*
|
|
|
|
* A #GstCaps can be constructed with the following code fragment:
|
|
|
|
*
|
|
|
|
* <example>
|
|
|
|
* <title>Creating caps</title>
|
|
|
|
* <programlisting>
|
|
|
|
* GstCaps *caps;
|
|
|
|
* caps = gst_caps_new_simple ("video/x-raw-yuv",
|
|
|
|
* "format", GST_TYPE_FOURCC, GST_MAKE_FOURCC ('I', '4', '2', '0'),
|
2007-02-13 09:10:53 +00:00
|
|
|
* "framerate", GST_TYPE_FRACTION, 25, 1,
|
2005-11-09 12:01:46 +00:00
|
|
|
* "pixel-aspect-ratio", GST_TYPE_FRACTION, 1, 1,
|
2006-07-02 12:54:03 +00:00
|
|
|
* "width", G_TYPE_INT, 320,
|
|
|
|
* "height", G_TYPE_INT, 240,
|
2005-11-09 12:01:46 +00:00
|
|
|
* NULL);
|
|
|
|
* </programlisting>
|
|
|
|
* </example>
|
|
|
|
*
|
|
|
|
* A #GstCaps is fixed when it has no properties with ranges or lists. Use
|
|
|
|
* gst_caps_is_fixed() to test for fixed caps. Only fixed caps can be
|
|
|
|
* set on a #GstPad or #GstBuffer.
|
|
|
|
*
|
2005-11-18 16:04:28 +00:00
|
|
|
* Various methods exist to work with the media types such as subtracting
|
2005-11-09 12:01:46 +00:00
|
|
|
* or intersecting.
|
|
|
|
*
|
2007-02-13 09:10:53 +00:00
|
|
|
* Last reviewed on 2007-02-13 (0.10.10)
|
2005-08-27 10:57:00 +00:00
|
|
|
*/
|
2003-11-11 19:14:14 +00:00
|
|
|
|
|
|
|
#ifdef HAVE_CONFIG_H
|
|
|
|
#include "config.h"
|
|
|
|
#endif
|
|
|
|
#include <string.h>
|
2004-04-22 16:39:23 +00:00
|
|
|
#include <signal.h>
|
2003-11-11 19:14:14 +00:00
|
|
|
|
2004-05-03 16:03:24 +00:00
|
|
|
#include "gst_private.h"
|
2004-05-07 02:36:28 +00:00
|
|
|
#include <gst/gst.h>
|
2004-05-03 16:03:24 +00:00
|
|
|
|
2005-10-15 16:16:04 +00:00
|
|
|
#define DEBUG_REFCOUNT
|
2005-03-07 18:27:42 +00:00
|
|
|
|
2004-01-29 02:24:52 +00:00
|
|
|
#define CAPS_POISON(caps) G_STMT_START{ \
|
|
|
|
if (caps) { \
|
|
|
|
GstCaps *_newcaps = gst_caps_copy (caps); \
|
2005-03-07 18:27:42 +00:00
|
|
|
gst_caps_unref(caps); \
|
2004-01-29 02:24:52 +00:00
|
|
|
caps = _newcaps; \
|
|
|
|
} \
|
|
|
|
} G_STMT_END
|
|
|
|
#define STRUCTURE_POISON(structure) G_STMT_START{ \
|
|
|
|
if (structure) { \
|
|
|
|
GstStructure *_newstruct = gst_structure_copy (structure); \
|
|
|
|
gst_structure_free(structure); \
|
|
|
|
structure = _newstruct; \
|
|
|
|
} \
|
|
|
|
} G_STMT_END
|
2005-03-07 18:27:42 +00:00
|
|
|
#define IS_WRITABLE(caps) \
|
2005-04-24 22:49:45 +00:00
|
|
|
(g_atomic_int_get (&(caps)->refcount) == 1)
|
gst/elements/gsttee.c: Remove usage of gst_pad_proxy_fixate.
Original commit message from CVS:
* gst/elements/gsttee.c: (gst_tee_init), (gst_tee_request_new_pad):
Remove usage of gst_pad_proxy_fixate.
* gst/gstcaps.c: (gst_caps_append), (gst_caps_append_structure),
(gst_caps_split_one), (gst_caps_replace):
Add poisoning code.
* gst/gstmarshal.list:
Add pointer__pointer for fixate signal
* gst/gstpad.c: (gst_real_pad_class_init),
(_gst_real_pad_fixate_accumulator), (gst_pad_link_fixate),
(_gst_pad_default_fixate_func), (gst_pad_proxy_fixate),
(gst_pad_set_explicit_caps), (gst_pad_template_new):
Add poisoning code. Add fixate signal on RealPad. Change
set_explicit_caps() to take const GstCaps, like try_set_caps().
* gst/gstpad.h:
* testsuite/caps/Makefile.am:
* testsuite/caps/app_fixate.c: Add a test for the fixate signal
2004-01-04 23:43:11 +00:00
|
|
|
|
2006-07-03 16:57:54 +00:00
|
|
|
#if GLIB_CHECK_VERSION (2, 10, 0)
|
|
|
|
#define ALLOC_CAPS() g_slice_new (GstCaps)
|
|
|
|
#define FREE_CAPS(caps) g_slice_free (GstCaps, caps)
|
|
|
|
#else
|
|
|
|
#define ALLOC_CAPS() g_new (GstCaps, 1)
|
|
|
|
#define FREE_CAPS(caps) g_free (caps)
|
|
|
|
#endif
|
gst/elements/gsttee.c: Remove usage of gst_pad_proxy_fixate.
Original commit message from CVS:
* gst/elements/gsttee.c: (gst_tee_init), (gst_tee_request_new_pad):
Remove usage of gst_pad_proxy_fixate.
* gst/gstcaps.c: (gst_caps_append), (gst_caps_append_structure),
(gst_caps_split_one), (gst_caps_replace):
Add poisoning code.
* gst/gstmarshal.list:
Add pointer__pointer for fixate signal
* gst/gstpad.c: (gst_real_pad_class_init),
(_gst_real_pad_fixate_accumulator), (gst_pad_link_fixate),
(_gst_pad_default_fixate_func), (gst_pad_proxy_fixate),
(gst_pad_set_explicit_caps), (gst_pad_template_new):
Add poisoning code. Add fixate signal on RealPad. Change
set_explicit_caps() to take const GstCaps, like try_set_caps().
* gst/gstpad.h:
* testsuite/caps/Makefile.am:
* testsuite/caps/app_fixate.c: Add a test for the fixate signal
2004-01-04 23:43:11 +00:00
|
|
|
|
2007-01-25 17:41:39 +00:00
|
|
|
/* lock to protect multiple invocations of static caps to caps conversion */
|
|
|
|
G_LOCK_DEFINE_STATIC (static_caps_lock);
|
|
|
|
|
2004-03-13 15:27:01 +00:00
|
|
|
static void gst_caps_transform_to_string (const GValue * src_value,
|
|
|
|
GValue * dest_value);
|
|
|
|
static gboolean gst_caps_from_string_inplace (GstCaps * caps,
|
|
|
|
const gchar * string);
|
2005-03-07 18:27:42 +00:00
|
|
|
static GstCaps *gst_caps_copy_conditional (GstCaps * src);
|
2004-03-12 19:32:26 +00:00
|
|
|
|
|
|
|
GType
|
|
|
|
gst_caps_get_type (void)
|
2003-11-11 19:14:14 +00:00
|
|
|
{
|
2004-03-12 19:39:19 +00:00
|
|
|
static GType gst_caps_type = 0;
|
2004-03-13 15:27:01 +00:00
|
|
|
|
2006-02-28 10:52:02 +00:00
|
|
|
if (G_UNLIKELY (gst_caps_type == 0)) {
|
2004-03-12 19:32:26 +00:00
|
|
|
gst_caps_type = g_boxed_type_register_static ("GstCaps",
|
2004-03-15 19:27:17 +00:00
|
|
|
(GBoxedCopyFunc) gst_caps_copy_conditional,
|
2005-03-07 18:27:42 +00:00
|
|
|
(GBoxedFreeFunc) gst_caps_unref);
|
2004-03-13 15:27:01 +00:00
|
|
|
|
2004-03-12 19:32:26 +00:00
|
|
|
g_value_register_transform_func (gst_caps_type,
|
2004-03-15 19:27:17 +00:00
|
|
|
G_TYPE_STRING, gst_caps_transform_to_string);
|
2004-03-12 19:32:26 +00:00
|
|
|
}
|
2004-03-13 15:27:01 +00:00
|
|
|
|
2004-03-12 19:32:26 +00:00
|
|
|
return gst_caps_type;
|
2003-11-11 19:14:14 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* creation/deletion */
|
2004-01-15 09:03:42 +00:00
|
|
|
|
|
|
|
/**
|
|
|
|
* gst_caps_new_empty:
|
|
|
|
*
|
|
|
|
* Creates a new #GstCaps that is empty. That is, the returned
|
|
|
|
* #GstCaps contains no media formats.
|
2005-10-10 09:48:21 +00:00
|
|
|
* Caller is responsible for unreffing the returned caps.
|
2004-01-15 09:03:42 +00:00
|
|
|
*
|
|
|
|
* Returns: the new #GstCaps
|
|
|
|
*/
|
2004-03-12 19:32:26 +00:00
|
|
|
GstCaps *
|
|
|
|
gst_caps_new_empty (void)
|
2003-11-11 19:14:14 +00:00
|
|
|
{
|
2006-07-03 16:57:54 +00:00
|
|
|
GstCaps *caps = ALLOC_CAPS ();
|
2003-11-11 19:14:14 +00:00
|
|
|
|
2004-03-12 19:32:26 +00:00
|
|
|
caps->type = GST_TYPE_CAPS;
|
2006-07-03 16:57:54 +00:00
|
|
|
caps->refcount = 1;
|
|
|
|
caps->flags = 0;
|
2004-03-13 15:27:01 +00:00
|
|
|
caps->structs = g_ptr_array_new ();
|
2003-11-11 19:14:14 +00:00
|
|
|
|
2005-03-07 18:27:42 +00:00
|
|
|
#ifdef DEBUG_REFCOUNT
|
|
|
|
GST_CAT_LOG (GST_CAT_CAPS, "created caps %p", caps);
|
|
|
|
#endif
|
|
|
|
|
2003-11-11 19:14:14 +00:00
|
|
|
return caps;
|
|
|
|
}
|
|
|
|
|
2004-01-15 09:03:42 +00:00
|
|
|
/**
|
gst/gstcaps.c: fix bug when converting from empty string.
Original commit message from CVS:
* gst/gstcaps.c: (gst_caps_from_string_inplace):
fix bug when converting from empty string.
* gst/gstcaps.c: (gst_caps_new_any), (gst_caps_new_simple),
(gst_caps_new_full_valist), (gst_caps_copy), (gst_caps_copy_1):
use gst_caps_new_empty to allocate a new caps. Only that function
allocates memory for caps now.
* gst/gstcaps.c: (gst_caps_remove_and_get_structure),
(gst_caps_remove_structure):
add ability to remove one structure (but not to header yet)
* gst/gstcaps.c: (gst_caps_compare_structures),
(gst_caps_simplify), (gst_caps_structure_figure_out_union),
(gst_caps_structure_simplify), (gst_caps_do_simplify),
* gst/gstcaps.h:
add gst_caps_do_simplify that tries to simplify a caps in place.
Deprecate old gst_caps_simplify function.
* testsuite/caps/caps.h:
add caps.h containing a common set of caps to test against.
* testsuite/caps/sets.c: (check_caps), (main):
use it.
* testsuite/caps/.cvsignore:
* testsuite/caps/Makefile.am:
* testsuite/caps/simplify.c: (check_caps), (main):
add test to check correctness and efficency of caps simplification.
2004-04-22 02:35:13 +00:00
|
|
|
* gst_caps_new_any:
|
2004-01-15 09:03:42 +00:00
|
|
|
*
|
|
|
|
* Creates a new #GstCaps that indicates that it is compatible with
|
|
|
|
* any media format.
|
|
|
|
*
|
|
|
|
* Returns: the new #GstCaps
|
|
|
|
*/
|
2004-03-12 19:32:26 +00:00
|
|
|
GstCaps *
|
|
|
|
gst_caps_new_any (void)
|
2003-11-11 19:14:14 +00:00
|
|
|
{
|
gst/gstcaps.c: fix bug when converting from empty string.
Original commit message from CVS:
* gst/gstcaps.c: (gst_caps_from_string_inplace):
fix bug when converting from empty string.
* gst/gstcaps.c: (gst_caps_new_any), (gst_caps_new_simple),
(gst_caps_new_full_valist), (gst_caps_copy), (gst_caps_copy_1):
use gst_caps_new_empty to allocate a new caps. Only that function
allocates memory for caps now.
* gst/gstcaps.c: (gst_caps_remove_and_get_structure),
(gst_caps_remove_structure):
add ability to remove one structure (but not to header yet)
* gst/gstcaps.c: (gst_caps_compare_structures),
(gst_caps_simplify), (gst_caps_structure_figure_out_union),
(gst_caps_structure_simplify), (gst_caps_do_simplify),
* gst/gstcaps.h:
add gst_caps_do_simplify that tries to simplify a caps in place.
Deprecate old gst_caps_simplify function.
* testsuite/caps/caps.h:
add caps.h containing a common set of caps to test against.
* testsuite/caps/sets.c: (check_caps), (main):
use it.
* testsuite/caps/.cvsignore:
* testsuite/caps/Makefile.am:
* testsuite/caps/simplify.c: (check_caps), (main):
add test to check correctness and efficency of caps simplification.
2004-04-22 02:35:13 +00:00
|
|
|
GstCaps *caps = gst_caps_new_empty ();
|
2003-11-11 19:14:14 +00:00
|
|
|
|
2003-12-22 01:39:35 +00:00
|
|
|
caps->flags = GST_CAPS_FLAGS_ANY;
|
2003-11-11 19:14:14 +00:00
|
|
|
|
|
|
|
return caps;
|
|
|
|
}
|
|
|
|
|
2004-01-15 09:03:42 +00:00
|
|
|
/**
|
|
|
|
* gst_caps_new_simple:
|
|
|
|
* @media_type: the media type of the structure
|
2004-03-30 07:36:19 +00:00
|
|
|
* @fieldname: first field to set
|
2004-01-15 09:03:42 +00:00
|
|
|
* @...: additional arguments
|
|
|
|
*
|
|
|
|
* Creates a new #GstCaps that contains one #GstStructure. The
|
|
|
|
* structure is defined by the arguments, which have the same format
|
2005-11-09 12:01:46 +00:00
|
|
|
* as gst_structure_new().
|
2005-10-10 09:48:21 +00:00
|
|
|
* Caller is responsible for unreffing the returned caps.
|
2004-01-15 09:03:42 +00:00
|
|
|
*
|
|
|
|
* Returns: the new #GstCaps
|
|
|
|
*/
|
2004-03-12 19:32:26 +00:00
|
|
|
GstCaps *
|
2004-03-13 15:27:01 +00:00
|
|
|
gst_caps_new_simple (const char *media_type, const char *fieldname, ...)
|
2003-11-11 19:14:14 +00:00
|
|
|
{
|
2003-12-22 01:39:35 +00:00
|
|
|
GstCaps *caps;
|
2003-11-11 19:14:14 +00:00
|
|
|
GstStructure *structure;
|
|
|
|
va_list var_args;
|
|
|
|
|
gst/gstcaps.c: fix bug when converting from empty string.
Original commit message from CVS:
* gst/gstcaps.c: (gst_caps_from_string_inplace):
fix bug when converting from empty string.
* gst/gstcaps.c: (gst_caps_new_any), (gst_caps_new_simple),
(gst_caps_new_full_valist), (gst_caps_copy), (gst_caps_copy_1):
use gst_caps_new_empty to allocate a new caps. Only that function
allocates memory for caps now.
* gst/gstcaps.c: (gst_caps_remove_and_get_structure),
(gst_caps_remove_structure):
add ability to remove one structure (but not to header yet)
* gst/gstcaps.c: (gst_caps_compare_structures),
(gst_caps_simplify), (gst_caps_structure_figure_out_union),
(gst_caps_structure_simplify), (gst_caps_do_simplify),
* gst/gstcaps.h:
add gst_caps_do_simplify that tries to simplify a caps in place.
Deprecate old gst_caps_simplify function.
* testsuite/caps/caps.h:
add caps.h containing a common set of caps to test against.
* testsuite/caps/sets.c: (check_caps), (main):
use it.
* testsuite/caps/.cvsignore:
* testsuite/caps/Makefile.am:
* testsuite/caps/simplify.c: (check_caps), (main):
add test to check correctness and efficency of caps simplification.
2004-04-22 02:35:13 +00:00
|
|
|
caps = gst_caps_new_empty ();
|
2003-11-11 19:14:14 +00:00
|
|
|
|
|
|
|
va_start (var_args, fieldname);
|
|
|
|
structure = gst_structure_new_valist (media_type, fieldname, var_args);
|
|
|
|
va_end (var_args);
|
|
|
|
|
2003-12-22 01:39:35 +00:00
|
|
|
gst_caps_append_structure (caps, structure);
|
2004-03-13 15:27:01 +00:00
|
|
|
|
2003-11-11 19:14:14 +00:00
|
|
|
return caps;
|
|
|
|
}
|
|
|
|
|
2004-01-15 09:03:42 +00:00
|
|
|
/**
|
|
|
|
* gst_caps_new_full:
|
|
|
|
* @struct1: the first structure to add
|
|
|
|
* @...: additional structures to add
|
|
|
|
*
|
|
|
|
* Creates a new #GstCaps and adds all the structures listed as
|
|
|
|
* arguments. The list must be NULL-terminated. The structures
|
|
|
|
* are not copied; the returned #GstCaps owns the structures.
|
|
|
|
*
|
|
|
|
* Returns: the new #GstCaps
|
|
|
|
*/
|
2004-03-12 19:32:26 +00:00
|
|
|
GstCaps *
|
2004-03-13 15:27:01 +00:00
|
|
|
gst_caps_new_full (GstStructure * struct1, ...)
|
2003-11-11 19:14:14 +00:00
|
|
|
{
|
2003-12-22 01:39:35 +00:00
|
|
|
GstCaps *caps;
|
2003-11-11 19:14:14 +00:00
|
|
|
va_list var_args;
|
|
|
|
|
|
|
|
va_start (var_args, struct1);
|
2003-12-22 01:39:35 +00:00
|
|
|
caps = gst_caps_new_full_valist (struct1, var_args);
|
2003-11-11 19:14:14 +00:00
|
|
|
va_end (var_args);
|
|
|
|
|
|
|
|
return caps;
|
|
|
|
}
|
|
|
|
|
2004-01-15 09:03:42 +00:00
|
|
|
/**
|
|
|
|
* gst_caps_new_full_valist:
|
2004-03-30 07:36:19 +00:00
|
|
|
* @structure: the first structure to add
|
2004-01-15 09:03:42 +00:00
|
|
|
* @var_args: additional structures to add
|
|
|
|
*
|
|
|
|
* Creates a new #GstCaps and adds all the structures listed as
|
|
|
|
* arguments. The list must be NULL-terminated. The structures
|
|
|
|
* are not copied; the returned #GstCaps owns the structures.
|
|
|
|
*
|
|
|
|
* Returns: the new #GstCaps
|
|
|
|
*/
|
2004-03-12 19:32:26 +00:00
|
|
|
GstCaps *
|
2004-03-13 15:27:01 +00:00
|
|
|
gst_caps_new_full_valist (GstStructure * structure, va_list var_args)
|
2003-11-11 19:14:14 +00:00
|
|
|
{
|
2003-12-22 01:39:35 +00:00
|
|
|
GstCaps *caps;
|
2003-11-11 19:14:14 +00:00
|
|
|
|
gst/gstcaps.c: fix bug when converting from empty string.
Original commit message from CVS:
* gst/gstcaps.c: (gst_caps_from_string_inplace):
fix bug when converting from empty string.
* gst/gstcaps.c: (gst_caps_new_any), (gst_caps_new_simple),
(gst_caps_new_full_valist), (gst_caps_copy), (gst_caps_copy_1):
use gst_caps_new_empty to allocate a new caps. Only that function
allocates memory for caps now.
* gst/gstcaps.c: (gst_caps_remove_and_get_structure),
(gst_caps_remove_structure):
add ability to remove one structure (but not to header yet)
* gst/gstcaps.c: (gst_caps_compare_structures),
(gst_caps_simplify), (gst_caps_structure_figure_out_union),
(gst_caps_structure_simplify), (gst_caps_do_simplify),
* gst/gstcaps.h:
add gst_caps_do_simplify that tries to simplify a caps in place.
Deprecate old gst_caps_simplify function.
* testsuite/caps/caps.h:
add caps.h containing a common set of caps to test against.
* testsuite/caps/sets.c: (check_caps), (main):
use it.
* testsuite/caps/.cvsignore:
* testsuite/caps/Makefile.am:
* testsuite/caps/simplify.c: (check_caps), (main):
add test to check correctness and efficency of caps simplification.
2004-04-22 02:35:13 +00:00
|
|
|
caps = gst_caps_new_empty ();
|
2003-11-11 19:14:14 +00:00
|
|
|
|
2004-03-13 15:27:01 +00:00
|
|
|
while (structure) {
|
2003-12-22 01:39:35 +00:00
|
|
|
gst_caps_append_structure (caps, structure);
|
|
|
|
structure = va_arg (var_args, GstStructure *);
|
2003-11-11 19:14:14 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
return caps;
|
|
|
|
}
|
|
|
|
|
2004-01-15 09:03:42 +00:00
|
|
|
/**
|
|
|
|
* gst_caps_copy:
|
|
|
|
* @caps: the #GstCaps to copy
|
|
|
|
*
|
2005-03-07 18:27:42 +00:00
|
|
|
* Creates a new #GstCaps as a copy of the old @caps. The new caps will have a
|
|
|
|
* refcount of 1, owned by the caller. The structures are copied as well.
|
|
|
|
*
|
|
|
|
* Note that this function is the semantic equivalent of a gst_caps_ref()
|
|
|
|
* followed by a gst_caps_make_writable(). If you only want to hold on to a
|
|
|
|
* reference to the data, you should use gst_caps_ref().
|
|
|
|
*
|
|
|
|
* When you are finished with the caps, call gst_caps_unref() on it.
|
2004-01-15 09:03:42 +00:00
|
|
|
*
|
|
|
|
* Returns: the new #GstCaps
|
|
|
|
*/
|
2004-03-12 19:32:26 +00:00
|
|
|
GstCaps *
|
2004-03-13 15:27:01 +00:00
|
|
|
gst_caps_copy (const GstCaps * caps)
|
2003-11-11 19:14:14 +00:00
|
|
|
{
|
2003-12-22 01:39:35 +00:00
|
|
|
GstCaps *newcaps;
|
2003-11-11 19:14:14 +00:00
|
|
|
GstStructure *structure;
|
2005-10-15 00:12:22 +00:00
|
|
|
guint i;
|
2003-11-11 19:14:14 +00:00
|
|
|
|
gst/gstcaps.c: Patch from Tim-Philipp Müller to fix GST_CAPS() and GST_IS_CAPS(). (bug #141304)
Original commit message from CVS:
* gst/gstcaps.c: (gst_caps_copy), (gst_caps_free),
(gst_caps_append), (gst_caps_append_structure),
(gst_caps_get_size), (gst_caps_get_structure), (gst_caps_copy_1),
(gst_caps_set_simple), (gst_caps_set_simple_valist),
(gst_caps_is_any), (gst_caps_is_empty), (gst_caps_is_chained),
(gst_caps_is_fixed), (gst_caps_is_always_compatible),
(gst_caps_intersect), (gst_caps_normalize),
(gst_caps_transform_to_string): Patch from Tim-Philipp Müller
to fix GST_CAPS() and GST_IS_CAPS(). (bug #141304)
* gst/gstcaps.h: use GST_IS_CAPS().
2004-04-28 20:19:46 +00:00
|
|
|
g_return_val_if_fail (GST_IS_CAPS (caps), NULL);
|
2003-12-22 01:39:35 +00:00
|
|
|
|
gst/gstcaps.c: fix bug when converting from empty string.
Original commit message from CVS:
* gst/gstcaps.c: (gst_caps_from_string_inplace):
fix bug when converting from empty string.
* gst/gstcaps.c: (gst_caps_new_any), (gst_caps_new_simple),
(gst_caps_new_full_valist), (gst_caps_copy), (gst_caps_copy_1):
use gst_caps_new_empty to allocate a new caps. Only that function
allocates memory for caps now.
* gst/gstcaps.c: (gst_caps_remove_and_get_structure),
(gst_caps_remove_structure):
add ability to remove one structure (but not to header yet)
* gst/gstcaps.c: (gst_caps_compare_structures),
(gst_caps_simplify), (gst_caps_structure_figure_out_union),
(gst_caps_structure_simplify), (gst_caps_do_simplify),
* gst/gstcaps.h:
add gst_caps_do_simplify that tries to simplify a caps in place.
Deprecate old gst_caps_simplify function.
* testsuite/caps/caps.h:
add caps.h containing a common set of caps to test against.
* testsuite/caps/sets.c: (check_caps), (main):
use it.
* testsuite/caps/.cvsignore:
* testsuite/caps/Makefile.am:
* testsuite/caps/simplify.c: (check_caps), (main):
add test to check correctness and efficency of caps simplification.
2004-04-22 02:35:13 +00:00
|
|
|
newcaps = gst_caps_new_empty ();
|
2003-11-11 19:14:14 +00:00
|
|
|
newcaps->flags = caps->flags;
|
|
|
|
|
2004-03-13 15:27:01 +00:00
|
|
|
for (i = 0; i < caps->structs->len; i++) {
|
2003-12-22 01:39:35 +00:00
|
|
|
structure = gst_caps_get_structure (caps, i);
|
2004-03-13 15:27:01 +00:00
|
|
|
gst_caps_append_structure (newcaps, gst_structure_copy (structure));
|
2003-11-11 19:14:14 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
return newcaps;
|
|
|
|
}
|
|
|
|
|
2005-03-07 18:27:42 +00:00
|
|
|
static void
|
|
|
|
_gst_caps_free (GstCaps * caps)
|
2003-11-11 19:14:14 +00:00
|
|
|
{
|
|
|
|
GstStructure *structure;
|
2005-10-15 00:12:22 +00:00
|
|
|
guint i;
|
2003-12-22 01:39:35 +00:00
|
|
|
|
2005-03-07 18:27:42 +00:00
|
|
|
/* The refcount must be 0, but since we're only called by gst_caps_unref,
|
|
|
|
* don't bother testing. */
|
2004-03-13 15:27:01 +00:00
|
|
|
|
|
|
|
for (i = 0; i < caps->structs->len; i++) {
|
2005-03-07 18:27:42 +00:00
|
|
|
structure = (GstStructure *) gst_caps_get_structure (caps, i);
|
|
|
|
gst_structure_set_parent_refcount (structure, NULL);
|
2003-11-11 19:14:14 +00:00
|
|
|
gst_structure_free (structure);
|
|
|
|
}
|
2004-03-13 15:27:01 +00:00
|
|
|
g_ptr_array_free (caps->structs, TRUE);
|
2003-12-22 01:39:35 +00:00
|
|
|
#ifdef USE_POISONING
|
2004-03-13 15:27:01 +00:00
|
|
|
memset (caps, 0xff, sizeof (GstCaps));
|
2003-12-22 01:39:35 +00:00
|
|
|
#endif
|
2007-01-25 17:41:39 +00:00
|
|
|
|
|
|
|
#ifdef DEBUG_REFCOUNT
|
|
|
|
GST_CAT_LOG (GST_CAT_CAPS, "freeing caps %p", caps);
|
|
|
|
#endif
|
2006-07-03 16:57:54 +00:00
|
|
|
FREE_CAPS (caps);
|
2003-11-11 19:14:14 +00:00
|
|
|
}
|
|
|
|
|
2005-03-07 18:27:42 +00:00
|
|
|
/**
|
|
|
|
* gst_caps_make_writable:
|
|
|
|
* @caps: the #GstCaps to make writable
|
|
|
|
*
|
|
|
|
* Returns a writable copy of @caps.
|
|
|
|
*
|
|
|
|
* If there is only one reference count on @caps, the caller must be the owner,
|
|
|
|
* and so this function will return the caps object unchanged. If on the other
|
|
|
|
* hand there is more than one reference on the object, a new caps object will
|
|
|
|
* be returned. The caller's reference on @caps will be removed, and instead the
|
|
|
|
* caller will own a reference to the returned object.
|
|
|
|
*
|
|
|
|
* In short, this function unrefs the caps in the argument and refs the caps
|
|
|
|
* that it returns. Don't access the argument after calling this function. See
|
|
|
|
* also: gst_caps_ref().
|
|
|
|
*
|
|
|
|
* Returns: the same #GstCaps object.
|
|
|
|
*/
|
|
|
|
GstCaps *
|
|
|
|
gst_caps_make_writable (GstCaps * caps)
|
|
|
|
{
|
|
|
|
GstCaps *copy;
|
|
|
|
|
|
|
|
g_return_val_if_fail (caps != NULL, NULL);
|
|
|
|
|
|
|
|
/* we are the only instance reffing this caps */
|
2005-04-24 22:49:45 +00:00
|
|
|
if (g_atomic_int_get (&caps->refcount) == 1)
|
2005-03-07 18:27:42 +00:00
|
|
|
return caps;
|
|
|
|
|
|
|
|
/* else copy */
|
|
|
|
copy = gst_caps_copy (caps);
|
|
|
|
gst_caps_unref (caps);
|
|
|
|
|
|
|
|
return copy;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* gst_caps_ref:
|
|
|
|
* @caps: the #GstCaps to reference
|
|
|
|
*
|
|
|
|
* Add a reference to a #GstCaps object.
|
|
|
|
*
|
|
|
|
* From this point on, until the caller calls gst_caps_unref() or
|
|
|
|
* gst_caps_make_writable(), it is guaranteed that the caps object will not
|
|
|
|
* change. This means its structures won't change, etc. To use a #GstCaps
|
|
|
|
* object, you must always have a refcount on it -- either the one made
|
|
|
|
* implicitly by gst_caps_new(), or via taking one explicitly with this
|
|
|
|
* function.
|
|
|
|
*
|
|
|
|
* Returns: the same #GstCaps object.
|
|
|
|
*/
|
|
|
|
GstCaps *
|
|
|
|
gst_caps_ref (GstCaps * caps)
|
|
|
|
{
|
|
|
|
g_return_val_if_fail (caps != NULL, NULL);
|
|
|
|
|
|
|
|
#ifdef DEBUG_REFCOUNT
|
2006-02-27 11:01:06 +00:00
|
|
|
GST_CAT_LOG (GST_CAT_REFCOUNTING, "%p %d->%d", caps,
|
2005-03-07 18:27:42 +00:00
|
|
|
GST_CAPS_REFCOUNT_VALUE (caps), GST_CAPS_REFCOUNT_VALUE (caps) + 1);
|
|
|
|
#endif
|
gst/: Make gst_caps_replace() work like other _replace() functions.
Original commit message from CVS:
* gst/base/gstbasesink.c: (gst_basesink_base_init),
(gst_basesink_pad_getcaps), (gst_basesink_init),
(gst_basesink_chain_unlocked):
* gst/base/gsttypefindhelper.c: (helper_find_suggest),
(gst_type_find_helper):
* gst/elements/gsttypefindelement.c:
(gst_type_find_element_have_type), (gst_type_find_element_init),
(stop_typefinding), (gst_type_find_element_handle_event),
(find_suggest), (gst_type_find_element_chain),
(gst_type_find_element_checkgetrange),
(gst_type_find_element_getrange), (do_typefind),
(gst_type_find_element_activate):
* gst/gstbuffer.c: (_gst_buffer_sub_free),
(gst_buffer_default_free), (gst_buffer_default_copy),
(gst_buffer_set_caps):
* gst/gstcaps.c: (gst_caps_ref), (gst_caps_unref),
(gst_caps_replace):
* gst/gstmessage.c: (gst_message_new),
(gst_message_new_state_changed):
* gst/gstpad.c: (gst_pad_set_active), (gst_pad_peer_set_active),
(gst_pad_set_checkgetrange_function),
(gst_pad_link_prepare_filtered), (gst_pad_relink_filtered),
(gst_pad_set_caps), (gst_pad_check_pull_range),
(gst_pad_pull_range), (gst_static_pad_template_get_caps):
* gst/gstpad.h:
* gst/gsttypefind.c: (gst_type_find_register):
Make gst_caps_replace() work like other _replace() functions.
Use _caps_replace() where possible.
Make sure _message_new() initialises its field.
Add gst_static_pad_template_get_caps()
2005-04-20 09:10:42 +00:00
|
|
|
g_return_val_if_fail (GST_CAPS_REFCOUNT_VALUE (caps) > 0, NULL);
|
2005-03-07 18:27:42 +00:00
|
|
|
|
2005-04-24 22:49:45 +00:00
|
|
|
g_atomic_int_inc (&caps->refcount);
|
2005-03-07 18:27:42 +00:00
|
|
|
|
|
|
|
return caps;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* gst_caps_unref:
|
|
|
|
* @caps: the #GstCaps to unref
|
|
|
|
*
|
2005-10-15 15:30:24 +00:00
|
|
|
* Unref a #GstCaps and and free all its structures and the
|
2005-03-07 18:27:42 +00:00
|
|
|
* structures' values when the refcount reaches 0.
|
|
|
|
*/
|
|
|
|
void
|
|
|
|
gst_caps_unref (GstCaps * caps)
|
|
|
|
{
|
|
|
|
g_return_if_fail (caps != NULL);
|
|
|
|
|
|
|
|
#ifdef DEBUG_REFCOUNT
|
2006-02-27 11:01:06 +00:00
|
|
|
GST_CAT_LOG (GST_CAT_REFCOUNTING, "%p %d->%d", caps,
|
2005-03-07 18:27:42 +00:00
|
|
|
GST_CAPS_REFCOUNT_VALUE (caps), GST_CAPS_REFCOUNT_VALUE (caps) - 1);
|
|
|
|
#endif
|
|
|
|
|
gst/: Make gst_caps_replace() work like other _replace() functions.
Original commit message from CVS:
* gst/base/gstbasesink.c: (gst_basesink_base_init),
(gst_basesink_pad_getcaps), (gst_basesink_init),
(gst_basesink_chain_unlocked):
* gst/base/gsttypefindhelper.c: (helper_find_suggest),
(gst_type_find_helper):
* gst/elements/gsttypefindelement.c:
(gst_type_find_element_have_type), (gst_type_find_element_init),
(stop_typefinding), (gst_type_find_element_handle_event),
(find_suggest), (gst_type_find_element_chain),
(gst_type_find_element_checkgetrange),
(gst_type_find_element_getrange), (do_typefind),
(gst_type_find_element_activate):
* gst/gstbuffer.c: (_gst_buffer_sub_free),
(gst_buffer_default_free), (gst_buffer_default_copy),
(gst_buffer_set_caps):
* gst/gstcaps.c: (gst_caps_ref), (gst_caps_unref),
(gst_caps_replace):
* gst/gstmessage.c: (gst_message_new),
(gst_message_new_state_changed):
* gst/gstpad.c: (gst_pad_set_active), (gst_pad_peer_set_active),
(gst_pad_set_checkgetrange_function),
(gst_pad_link_prepare_filtered), (gst_pad_relink_filtered),
(gst_pad_set_caps), (gst_pad_check_pull_range),
(gst_pad_pull_range), (gst_static_pad_template_get_caps):
* gst/gstpad.h:
* gst/gsttypefind.c: (gst_type_find_register):
Make gst_caps_replace() work like other _replace() functions.
Use _caps_replace() where possible.
Make sure _message_new() initialises its field.
Add gst_static_pad_template_get_caps()
2005-04-20 09:10:42 +00:00
|
|
|
g_return_if_fail (GST_CAPS_REFCOUNT_VALUE (caps) > 0);
|
|
|
|
|
2005-03-07 18:27:42 +00:00
|
|
|
/* if we ended up with the refcount at zero, free the caps */
|
2006-07-03 16:57:54 +00:00
|
|
|
if (G_UNLIKELY (g_atomic_int_dec_and_test (&caps->refcount)))
|
2005-03-07 18:27:42 +00:00
|
|
|
_gst_caps_free (caps);
|
|
|
|
}
|
|
|
|
|
2005-12-20 11:12:53 +00:00
|
|
|
GType
|
|
|
|
gst_static_caps_get_type (void)
|
|
|
|
{
|
|
|
|
static GType staticcaps_type = 0;
|
|
|
|
|
2006-02-28 10:52:02 +00:00
|
|
|
if (G_UNLIKELY (staticcaps_type == 0)) {
|
2005-12-20 11:12:53 +00:00
|
|
|
staticcaps_type = g_pointer_type_register_static ("GstStaticCaps");
|
|
|
|
}
|
|
|
|
return staticcaps_type;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2004-01-15 09:03:42 +00:00
|
|
|
/**
|
|
|
|
* gst_static_caps_get:
|
|
|
|
* @static_caps: the #GstStaticCaps to convert
|
|
|
|
*
|
|
|
|
* Converts a #GstStaticCaps to a #GstCaps.
|
|
|
|
*
|
2005-08-22 14:35:42 +00:00
|
|
|
* Returns: A pointer to the #GstCaps. Unref after usage. Since the
|
2005-10-15 15:30:24 +00:00
|
|
|
* core holds an additional ref to the returned caps,
|
2005-08-22 14:35:42 +00:00
|
|
|
* use gst_caps_make_writable() on the returned caps to modify it.
|
2004-01-15 09:03:42 +00:00
|
|
|
*/
|
tests/network-clock.scm: Commentary update.
Original commit message from CVS:
2005-07-01 Andy Wingo <wingo@pobox.com>
* tests/network-clock.scm: Commentary update.
* gst/elements/gstidentity.c (PROP_DUPLICATE): Gone daddy gone.
Didn't really make sense, not implementable with basetransform,
etc.
(gst_identity_transform): Unref inbuf via make_writable. Feeble
attempt at implementing the sync property, needs an unlock method.
* gst/base/gstbasetransform.c (gst_base_transform_transform_caps):
New func, by default returns the same caps (the identity
transformation).
(gst_base_transform_getcaps): Uses transform_caps to return
something sensible.
(gst_base_transform_setcaps): Complicated logic to get caps on
both pads, even if they are different, and to call set_caps once
for every time both pads get their caps set.
(gst_base_transform_handle_buffer): Give the ref to the transform
function. Allows in-place modification of the buffer.
* gst/base/gstbasetransform.h (transform_caps): New class method.
Given caps on one side, what can I do on the other.
(set_caps): Take two caps, one for each side of the element.
* gst/gstpad.h:
* gst/gstpad.c (gst_pad_fixate_caps): Change prototype to modify
caps in place. This is safe because we can check the mutability of
the caps, and a good idea because fixate functions are just called
as a matter of last resort. (Not actually implemented.)
(gst_pad_set_caps): If the caps we're setting is actually the same
as the existing pad caps, just update the pointer without calling
setcaps. Assert that caps is either NULL or fixed, as per the
docs.
* gst/gstghostpad.c: Update for fixate changes.
2005-07-01 16:46:59 +00:00
|
|
|
GstCaps *
|
2004-03-13 15:27:01 +00:00
|
|
|
gst_static_caps_get (GstStaticCaps * static_caps)
|
2003-11-11 19:14:14 +00:00
|
|
|
{
|
2006-07-03 16:57:54 +00:00
|
|
|
GstCaps *caps;
|
|
|
|
|
|
|
|
g_return_val_if_fail (static_caps != NULL, NULL);
|
|
|
|
|
|
|
|
caps = (GstCaps *) static_caps;
|
2003-11-11 19:14:14 +00:00
|
|
|
|
2007-01-25 17:41:39 +00:00
|
|
|
/* refcount is 0 when we need to convert */
|
|
|
|
if (G_UNLIKELY (g_atomic_int_get (&caps->refcount) == 0)) {
|
|
|
|
const char *string;
|
|
|
|
GstCaps temp;
|
|
|
|
|
|
|
|
G_LOCK (static_caps_lock);
|
|
|
|
/* check if other thread already updated */
|
|
|
|
if (G_UNLIKELY (g_atomic_int_get (&caps->refcount) > 0))
|
|
|
|
goto done;
|
|
|
|
|
|
|
|
string = static_caps->string;
|
|
|
|
|
|
|
|
if (G_UNLIKELY (string == NULL))
|
2006-07-03 16:57:54 +00:00
|
|
|
goto no_string;
|
2005-04-24 22:49:45 +00:00
|
|
|
|
2007-01-25 17:41:39 +00:00
|
|
|
GST_CAT_LOG (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. */
|
|
|
|
temp.type = GST_TYPE_CAPS;
|
2007-01-26 09:37:03 +00:00
|
|
|
temp.flags = 0;
|
2007-01-25 17:41:39 +00:00
|
|
|
temp.structs = g_ptr_array_new ();
|
|
|
|
|
|
|
|
/* initialize the caps to a refcount of 1 so the caps can be writable for
|
|
|
|
* the next statement */
|
|
|
|
gst_atomic_int_set (&temp.refcount, 1);
|
2003-12-22 01:39:35 +00:00
|
|
|
|
2006-07-03 16:57:54 +00:00
|
|
|
/* convert to string */
|
2007-01-25 17:41:39 +00:00
|
|
|
if (G_UNLIKELY (!gst_caps_from_string_inplace (&temp, string)))
|
|
|
|
g_critical ("Could not convert static caps \"%s\"", string);
|
|
|
|
|
|
|
|
/* now copy stuff over to the real caps. */
|
|
|
|
caps->type = temp.type;
|
|
|
|
caps->flags = temp.flags;
|
|
|
|
caps->structs = temp.structs;
|
|
|
|
/* and bump the refcount so other threads can now read */
|
|
|
|
gst_atomic_int_set (&caps->refcount, 1);
|
|
|
|
|
|
|
|
GST_CAT_LOG (GST_CAT_CAPS, "created %p", static_caps);
|
|
|
|
done:
|
|
|
|
G_UNLOCK (static_caps_lock);
|
2003-11-11 19:14:14 +00:00
|
|
|
}
|
2005-08-22 14:35:42 +00:00
|
|
|
/* ref the caps, makes it not writable */
|
|
|
|
gst_caps_ref (caps);
|
2003-11-11 19:14:14 +00:00
|
|
|
|
|
|
|
return caps;
|
2006-07-03 16:57:54 +00:00
|
|
|
|
|
|
|
/* ERRORS */
|
|
|
|
no_string:
|
|
|
|
{
|
2007-01-25 17:41:39 +00:00
|
|
|
G_UNLOCK (static_caps_lock);
|
|
|
|
g_warning ("static caps %p string is NULL", static_caps);
|
2006-07-03 16:57:54 +00:00
|
|
|
return NULL;
|
|
|
|
}
|
2003-11-11 19:14:14 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* manipulation */
|
2005-03-07 18:27:42 +00:00
|
|
|
static GstStructure *
|
|
|
|
gst_caps_remove_and_get_structure (GstCaps * caps, guint idx)
|
|
|
|
{
|
2006-07-02 14:37:10 +00:00
|
|
|
/* don't use index_fast, gst_caps_do_simplify relies on the order */
|
2005-03-07 18:27:42 +00:00
|
|
|
GstStructure *s = g_ptr_array_remove_index (caps->structs, idx);
|
|
|
|
|
|
|
|
gst_structure_set_parent_refcount (s, NULL);
|
|
|
|
return s;
|
|
|
|
}
|
|
|
|
|
2006-08-21 14:54:31 +00:00
|
|
|
static gboolean
|
|
|
|
gst_structure_is_equal_foreach (GQuark field_id, const GValue * val2,
|
|
|
|
gpointer data)
|
|
|
|
{
|
|
|
|
GstStructure *struct1 = (GstStructure *) data;
|
|
|
|
const GValue *val1 = gst_structure_id_get_value (struct1, field_id);
|
|
|
|
|
|
|
|
if (val1 == NULL)
|
|
|
|
return FALSE;
|
|
|
|
if (gst_value_compare (val1, val2) == GST_VALUE_EQUAL) {
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
2006-08-24 10:40:31 +00:00
|
|
|
static gboolean
|
|
|
|
gst_caps_structure_is_subset_field (GQuark field_id, const GValue * value,
|
|
|
|
gpointer user_data)
|
|
|
|
{
|
|
|
|
GstStructure *subtract_from = user_data;
|
|
|
|
GValue subtraction = { 0, };
|
|
|
|
const GValue *other;
|
|
|
|
gint res;
|
|
|
|
|
|
|
|
other = gst_structure_id_get_value (subtract_from, field_id);
|
|
|
|
if (!other) {
|
|
|
|
/* field is missing in one set */
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
/*
|
2006-08-29 14:39:42 +00:00
|
|
|
* [1,2] - 1 = 2
|
|
|
|
* 1 - [1,2] = ???
|
2006-08-24 10:40:31 +00:00
|
|
|
*/
|
|
|
|
if (!gst_value_subtract (&subtraction, other, value)) {
|
|
|
|
/* empty result -> values are the same, or first was a value and
|
|
|
|
* second was a list
|
2006-08-29 14:39:42 +00:00
|
|
|
* verify that result is empty by swapping args */
|
2006-08-24 10:40:31 +00:00
|
|
|
if (!gst_value_subtract (&subtraction, value, other)) {
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
g_value_unset (&subtraction);
|
|
|
|
return FALSE;
|
|
|
|
}
|
2006-08-29 14:39:42 +00:00
|
|
|
|
2006-08-24 10:40:31 +00:00
|
|
|
res = gst_value_compare (&subtraction, other);
|
2006-08-29 14:39:42 +00:00
|
|
|
g_value_unset (&subtraction);
|
|
|
|
|
2006-08-24 10:40:31 +00:00
|
|
|
if (res == GST_VALUE_EQUAL) {
|
|
|
|
/* value was empty ? */
|
|
|
|
return FALSE;
|
|
|
|
} else {
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static gboolean
|
|
|
|
gst_caps_structure_is_subset (const GstStructure * minuend,
|
|
|
|
const GstStructure * subtrahend)
|
|
|
|
{
|
|
|
|
if ((minuend->name != subtrahend->name) ||
|
|
|
|
(gst_structure_n_fields (minuend) !=
|
|
|
|
gst_structure_n_fields (subtrahend))) {
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
return gst_structure_foreach ((GstStructure *) subtrahend,
|
|
|
|
gst_caps_structure_is_subset_field, (gpointer) minuend);
|
|
|
|
}
|
|
|
|
|
2004-01-15 09:03:42 +00:00
|
|
|
/**
|
|
|
|
* gst_caps_append:
|
|
|
|
* @caps1: the #GstCaps that will be appended to
|
|
|
|
* @caps2: the #GstCaps to append
|
|
|
|
*
|
2005-03-07 18:27:42 +00:00
|
|
|
* Appends the structures contained in @caps2 to @caps1. The structures in
|
|
|
|
* @caps2 are not copied -- they are transferred to @caps1, and then @caps2 is
|
|
|
|
* freed. If either caps is ANY, the resulting caps will be ANY.
|
2004-01-15 09:03:42 +00:00
|
|
|
*/
|
2004-03-12 19:32:26 +00:00
|
|
|
void
|
2004-03-13 15:27:01 +00:00
|
|
|
gst_caps_append (GstCaps * caps1, GstCaps * caps2)
|
2003-11-11 19:14:14 +00:00
|
|
|
{
|
|
|
|
GstStructure *structure;
|
2004-02-07 15:37:21 +00:00
|
|
|
int i;
|
gst/gstcaps.c: add sanity checks
Original commit message from CVS:
2003-12-27 Benjamin Otte <in7y118@public.uni-hamburg.de>
* gst/gstcaps.c: (gst_caps_append):
add sanity checks
* gst/gstcaps.h: (gst_caps_debug):
remove, it doesn't exist anymore.
* gst/gstelement.c: (gst_element_threadsafe_properties_pre_run),
(gst_element_threadsafe_properties_post_run):
make debugging messages not clutter up THREAD debug category
(gst_element_negotiate_pads), (gst_element_clear_pad_caps),
(gst_element_change_state):
update to new caps API
* gst/gstinterface.c: (gst_implements_interface_cast):
don't put vital code in g_return_if_fail
* gst/gstpad.c: (gst_pad_link_try), (gst_pad_try_set_caps),
(gst_pad_link_filtered):
add pst_pad_try_link and use it.
(gst_pad_perform_negotiate), (gst_pad_renegotiate):
implement correctly, deprecate first one.
(gst_pad_link_unnegotiate), (gst_pad_unnegotiate):
add and implement.
(gst_pad_try_relink_filtered), (gst_pad_relink_filtered):
implement.
(gst_pad_get_negotiated_caps):
add and implement. Make GST_PAD_CAPS call this function.
(gst_pad_get_caps):
remove unneeded check..
(gst_pad_recover_caps_error):
disable, always return FALSE.
(gst_real_pad_dispose):
don't free caps and appfilter anymore, they're unused.
* gst/gstpad.h:
Reflect changes mentioned above.
* gst/gstsystemclock.c: (gst_system_clock_wait):
Make 'clock is way behind' a debugging message.
* gst/gstthread.c: (gst_thread_change_state):
Fix debugging message
2003-12-27 13:51:31 +00:00
|
|
|
|
gst/gstcaps.c: Patch from Tim-Philipp Müller to fix GST_CAPS() and GST_IS_CAPS(). (bug #141304)
Original commit message from CVS:
* gst/gstcaps.c: (gst_caps_copy), (gst_caps_free),
(gst_caps_append), (gst_caps_append_structure),
(gst_caps_get_size), (gst_caps_get_structure), (gst_caps_copy_1),
(gst_caps_set_simple), (gst_caps_set_simple_valist),
(gst_caps_is_any), (gst_caps_is_empty), (gst_caps_is_chained),
(gst_caps_is_fixed), (gst_caps_is_always_compatible),
(gst_caps_intersect), (gst_caps_normalize),
(gst_caps_transform_to_string): Patch from Tim-Philipp Müller
to fix GST_CAPS() and GST_IS_CAPS(). (bug #141304)
* gst/gstcaps.h: use GST_IS_CAPS().
2004-04-28 20:19:46 +00:00
|
|
|
g_return_if_fail (GST_IS_CAPS (caps1));
|
|
|
|
g_return_if_fail (GST_IS_CAPS (caps2));
|
2005-03-07 18:27:42 +00:00
|
|
|
g_return_if_fail (IS_WRITABLE (caps1));
|
|
|
|
g_return_if_fail (IS_WRITABLE (caps2));
|
gst/gstcaps.c: add sanity checks
Original commit message from CVS:
2003-12-27 Benjamin Otte <in7y118@public.uni-hamburg.de>
* gst/gstcaps.c: (gst_caps_append):
add sanity checks
* gst/gstcaps.h: (gst_caps_debug):
remove, it doesn't exist anymore.
* gst/gstelement.c: (gst_element_threadsafe_properties_pre_run),
(gst_element_threadsafe_properties_post_run):
make debugging messages not clutter up THREAD debug category
(gst_element_negotiate_pads), (gst_element_clear_pad_caps),
(gst_element_change_state):
update to new caps API
* gst/gstinterface.c: (gst_implements_interface_cast):
don't put vital code in g_return_if_fail
* gst/gstpad.c: (gst_pad_link_try), (gst_pad_try_set_caps),
(gst_pad_link_filtered):
add pst_pad_try_link and use it.
(gst_pad_perform_negotiate), (gst_pad_renegotiate):
implement correctly, deprecate first one.
(gst_pad_link_unnegotiate), (gst_pad_unnegotiate):
add and implement.
(gst_pad_try_relink_filtered), (gst_pad_relink_filtered):
implement.
(gst_pad_get_negotiated_caps):
add and implement. Make GST_PAD_CAPS call this function.
(gst_pad_get_caps):
remove unneeded check..
(gst_pad_recover_caps_error):
disable, always return FALSE.
(gst_real_pad_dispose):
don't free caps and appfilter anymore, they're unused.
* gst/gstpad.h:
Reflect changes mentioned above.
* gst/gstsystemclock.c: (gst_system_clock_wait):
Make 'clock is way behind' a debugging message.
* gst/gstthread.c: (gst_thread_change_state):
Fix debugging message
2003-12-27 13:51:31 +00:00
|
|
|
|
gst/elements/gsttee.c: Remove usage of gst_pad_proxy_fixate.
Original commit message from CVS:
* gst/elements/gsttee.c: (gst_tee_init), (gst_tee_request_new_pad):
Remove usage of gst_pad_proxy_fixate.
* gst/gstcaps.c: (gst_caps_append), (gst_caps_append_structure),
(gst_caps_split_one), (gst_caps_replace):
Add poisoning code.
* gst/gstmarshal.list:
Add pointer__pointer for fixate signal
* gst/gstpad.c: (gst_real_pad_class_init),
(_gst_real_pad_fixate_accumulator), (gst_pad_link_fixate),
(_gst_pad_default_fixate_func), (gst_pad_proxy_fixate),
(gst_pad_set_explicit_caps), (gst_pad_template_new):
Add poisoning code. Add fixate signal on RealPad. Change
set_explicit_caps() to take const GstCaps, like try_set_caps().
* gst/gstpad.h:
* testsuite/caps/Makefile.am:
* testsuite/caps/app_fixate.c: Add a test for the fixate signal
2004-01-04 23:43:11 +00:00
|
|
|
#ifdef USE_POISONING
|
|
|
|
CAPS_POISON (caps2);
|
|
|
|
#endif
|
gst/gstcaps.c: check for ANY caps before appending/unioning
Original commit message from CVS:
* gst/gstcaps.c: (gst_caps_append), (gst_caps_union):
check for ANY caps before appending/unioning
* gst/gstcaps.c: (gst_caps_is_subset),
(gst_caps_is_equal), (gst_caps_structure_subtract_field),
(gst_caps_structure_subtract), (gst_caps_subtract):
* gst/gstcaps.h:
add gst_caps_is_equal, gst_caps_is_subset and gst_caps_subtract to
the API. deprecate gst_caps_is_equal_fixed
* gst/gstpad.c: (gst_pad_try_set_caps):
* gst/gstqueue.c: (gst_queue_link):
s/gst_caps_is_equal_fixed/gst_caps_is_equal/
* gst/gststructure.c: (gst_structure_get_name_id):
* gst/gststructure.h:
add function gst_structure_get_name_id
* gst/gstvalue.c: (gst_value_subtract_int_int_range),
(gst_value_create_new_range), (gst_value_subtract_int_range_int),
(gst_value_subtract_int_range_int_range),
(gst_value_subtract_double_double_range),
(gst_value_subtract_double_range_double),
(gst_value_subtract_double_range_double_range),
(gst_value_subtract_from_list), (gst_value_subtract_list),
(gst_value_can_intersect), (gst_value_subtract),
(gst_value_can_subtract), (gst_value_register_subtract_func),
(_gst_value_initialize):
* gst/gstvalue.h:
add support for subtracting values from each other. Note that
subtracting means subtracting as in set theory. Required for caps
stuff above.
* testsuite/caps/.cvsignore:
* testsuite/caps/Makefile.am:
* testsuite/caps/erathostenes.c: (erathostenes), (main):
* testsuite/caps/sets.c: (check_caps), (main):
* testsuite/caps/subtract.c: (check_caps), (main):
add tests for subtraction and equality code.
2004-04-21 03:25:13 +00:00
|
|
|
if (gst_caps_is_any (caps1) || gst_caps_is_any (caps2)) {
|
2004-05-07 02:36:28 +00:00
|
|
|
/* FIXME: this leaks */
|
gst/gstcaps.c: check for ANY caps before appending/unioning
Original commit message from CVS:
* gst/gstcaps.c: (gst_caps_append), (gst_caps_union):
check for ANY caps before appending/unioning
* gst/gstcaps.c: (gst_caps_is_subset),
(gst_caps_is_equal), (gst_caps_structure_subtract_field),
(gst_caps_structure_subtract), (gst_caps_subtract):
* gst/gstcaps.h:
add gst_caps_is_equal, gst_caps_is_subset and gst_caps_subtract to
the API. deprecate gst_caps_is_equal_fixed
* gst/gstpad.c: (gst_pad_try_set_caps):
* gst/gstqueue.c: (gst_queue_link):
s/gst_caps_is_equal_fixed/gst_caps_is_equal/
* gst/gststructure.c: (gst_structure_get_name_id):
* gst/gststructure.h:
add function gst_structure_get_name_id
* gst/gstvalue.c: (gst_value_subtract_int_int_range),
(gst_value_create_new_range), (gst_value_subtract_int_range_int),
(gst_value_subtract_int_range_int_range),
(gst_value_subtract_double_double_range),
(gst_value_subtract_double_range_double),
(gst_value_subtract_double_range_double_range),
(gst_value_subtract_from_list), (gst_value_subtract_list),
(gst_value_can_intersect), (gst_value_subtract),
(gst_value_can_subtract), (gst_value_register_subtract_func),
(_gst_value_initialize):
* gst/gstvalue.h:
add support for subtracting values from each other. Note that
subtracting means subtracting as in set theory. Required for caps
stuff above.
* testsuite/caps/.cvsignore:
* testsuite/caps/Makefile.am:
* testsuite/caps/erathostenes.c: (erathostenes), (main):
* testsuite/caps/sets.c: (check_caps), (main):
* testsuite/caps/subtract.c: (check_caps), (main):
add tests for subtraction and equality code.
2004-04-21 03:25:13 +00:00
|
|
|
caps1->flags |= GST_CAPS_FLAGS_ANY;
|
2005-03-07 18:27:42 +00:00
|
|
|
for (i = caps2->structs->len - 1; i >= 0; i--) {
|
|
|
|
structure = gst_caps_remove_and_get_structure (caps2, i);
|
|
|
|
gst_structure_free (structure);
|
gst/gstcaps.c: check for ANY caps before appending/unioning
Original commit message from CVS:
* gst/gstcaps.c: (gst_caps_append), (gst_caps_union):
check for ANY caps before appending/unioning
* gst/gstcaps.c: (gst_caps_is_subset),
(gst_caps_is_equal), (gst_caps_structure_subtract_field),
(gst_caps_structure_subtract), (gst_caps_subtract):
* gst/gstcaps.h:
add gst_caps_is_equal, gst_caps_is_subset and gst_caps_subtract to
the API. deprecate gst_caps_is_equal_fixed
* gst/gstpad.c: (gst_pad_try_set_caps):
* gst/gstqueue.c: (gst_queue_link):
s/gst_caps_is_equal_fixed/gst_caps_is_equal/
* gst/gststructure.c: (gst_structure_get_name_id):
* gst/gststructure.h:
add function gst_structure_get_name_id
* gst/gstvalue.c: (gst_value_subtract_int_int_range),
(gst_value_create_new_range), (gst_value_subtract_int_range_int),
(gst_value_subtract_int_range_int_range),
(gst_value_subtract_double_double_range),
(gst_value_subtract_double_range_double),
(gst_value_subtract_double_range_double_range),
(gst_value_subtract_from_list), (gst_value_subtract_list),
(gst_value_can_intersect), (gst_value_subtract),
(gst_value_can_subtract), (gst_value_register_subtract_func),
(_gst_value_initialize):
* gst/gstvalue.h:
add support for subtracting values from each other. Note that
subtracting means subtracting as in set theory. Required for caps
stuff above.
* testsuite/caps/.cvsignore:
* testsuite/caps/Makefile.am:
* testsuite/caps/erathostenes.c: (erathostenes), (main):
* testsuite/caps/sets.c: (check_caps), (main):
* testsuite/caps/subtract.c: (check_caps), (main):
add tests for subtraction and equality code.
2004-04-21 03:25:13 +00:00
|
|
|
}
|
|
|
|
} else {
|
2005-03-07 18:27:42 +00:00
|
|
|
int len = caps2->structs->len;
|
|
|
|
|
|
|
|
for (i = 0; i < len; i++) {
|
|
|
|
structure = gst_caps_remove_and_get_structure (caps2, 0);
|
gst/gstcaps.c: check for ANY caps before appending/unioning
Original commit message from CVS:
* gst/gstcaps.c: (gst_caps_append), (gst_caps_union):
check for ANY caps before appending/unioning
* gst/gstcaps.c: (gst_caps_is_subset),
(gst_caps_is_equal), (gst_caps_structure_subtract_field),
(gst_caps_structure_subtract), (gst_caps_subtract):
* gst/gstcaps.h:
add gst_caps_is_equal, gst_caps_is_subset and gst_caps_subtract to
the API. deprecate gst_caps_is_equal_fixed
* gst/gstpad.c: (gst_pad_try_set_caps):
* gst/gstqueue.c: (gst_queue_link):
s/gst_caps_is_equal_fixed/gst_caps_is_equal/
* gst/gststructure.c: (gst_structure_get_name_id):
* gst/gststructure.h:
add function gst_structure_get_name_id
* gst/gstvalue.c: (gst_value_subtract_int_int_range),
(gst_value_create_new_range), (gst_value_subtract_int_range_int),
(gst_value_subtract_int_range_int_range),
(gst_value_subtract_double_double_range),
(gst_value_subtract_double_range_double),
(gst_value_subtract_double_range_double_range),
(gst_value_subtract_from_list), (gst_value_subtract_list),
(gst_value_can_intersect), (gst_value_subtract),
(gst_value_can_subtract), (gst_value_register_subtract_func),
(_gst_value_initialize):
* gst/gstvalue.h:
add support for subtracting values from each other. Note that
subtracting means subtracting as in set theory. Required for caps
stuff above.
* testsuite/caps/.cvsignore:
* testsuite/caps/Makefile.am:
* testsuite/caps/erathostenes.c: (erathostenes), (main):
* testsuite/caps/sets.c: (check_caps), (main):
* testsuite/caps/subtract.c: (check_caps), (main):
add tests for subtraction and equality code.
2004-04-21 03:25:13 +00:00
|
|
|
gst_caps_append_structure (caps1, structure);
|
|
|
|
}
|
2003-11-11 19:14:14 +00:00
|
|
|
}
|
2005-03-07 18:27:42 +00:00
|
|
|
gst_caps_unref (caps2); /* guaranteed to free it */
|
2003-11-11 19:14:14 +00:00
|
|
|
}
|
|
|
|
|
2006-08-21 14:54:31 +00:00
|
|
|
/**
|
|
|
|
* gst_caps_merge:
|
|
|
|
* @caps1: the #GstCaps that will take the new entries
|
|
|
|
* @caps2: the #GstCaps to merge in
|
|
|
|
*
|
2006-08-24 10:40:31 +00:00
|
|
|
* Appends the structures contained in @caps2 to @caps1 if they are not yet
|
|
|
|
* expressed by @caps1. The structures in @caps2 are not copied -- they are
|
|
|
|
* transferred to @caps1, and then @caps2 is freed.
|
2006-08-21 14:54:31 +00:00
|
|
|
* If either caps is ANY, the resulting caps will be ANY.
|
2006-09-14 20:08:14 +00:00
|
|
|
*
|
|
|
|
* Since: 0.10.10
|
2006-08-21 14:54:31 +00:00
|
|
|
*/
|
|
|
|
void
|
|
|
|
gst_caps_merge (GstCaps * caps1, GstCaps * caps2)
|
|
|
|
{
|
|
|
|
GstStructure *structure;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
g_return_if_fail (GST_IS_CAPS (caps1));
|
|
|
|
g_return_if_fail (GST_IS_CAPS (caps2));
|
|
|
|
g_return_if_fail (IS_WRITABLE (caps1));
|
|
|
|
g_return_if_fail (IS_WRITABLE (caps2));
|
|
|
|
|
|
|
|
#ifdef USE_POISONING
|
|
|
|
CAPS_POISON (caps2);
|
|
|
|
#endif
|
2006-08-24 10:40:31 +00:00
|
|
|
if (gst_caps_is_any (caps1)) {
|
2006-08-21 14:54:31 +00:00
|
|
|
for (i = caps2->structs->len - 1; i >= 0; i--) {
|
|
|
|
structure = gst_caps_remove_and_get_structure (caps2, i);
|
|
|
|
gst_structure_free (structure);
|
|
|
|
}
|
2006-08-24 10:40:31 +00:00
|
|
|
} else if (gst_caps_is_any (caps2)) {
|
|
|
|
caps1->flags |= GST_CAPS_FLAGS_ANY;
|
|
|
|
for (i = caps1->structs->len - 1; i >= 0; i--) {
|
|
|
|
structure = gst_caps_remove_and_get_structure (caps1, i);
|
|
|
|
gst_structure_free (structure);
|
|
|
|
}
|
2006-08-21 14:54:31 +00:00
|
|
|
} else {
|
2006-08-24 10:40:31 +00:00
|
|
|
int len = caps2->structs->len;
|
|
|
|
|
|
|
|
for (i = 0; i < len; i++) {
|
|
|
|
structure = gst_caps_remove_and_get_structure (caps2, 0);
|
|
|
|
gst_caps_merge_structure (caps1, structure);
|
|
|
|
}
|
|
|
|
/* this is too naive
|
|
|
|
GstCaps *com = gst_caps_intersect (caps1, caps2);
|
|
|
|
GstCaps *add = gst_caps_subtract (caps2, com);
|
2006-08-21 14:54:31 +00:00
|
|
|
|
|
|
|
GST_DEBUG ("common : %d", gst_caps_get_size (com));
|
|
|
|
GST_DEBUG ("adding : %d", gst_caps_get_size (add));
|
2006-08-24 10:40:31 +00:00
|
|
|
gst_caps_append (caps1, add);
|
|
|
|
gst_caps_unref (com);
|
2006-08-21 14:54:31 +00:00
|
|
|
*/
|
|
|
|
}
|
|
|
|
gst_caps_unref (caps2); /* guaranteed to free it */
|
|
|
|
}
|
|
|
|
|
2004-01-15 09:03:42 +00:00
|
|
|
/**
|
|
|
|
* gst_caps_append_structure:
|
|
|
|
* @caps: the #GstCaps that will be appended to
|
|
|
|
* @structure: the #GstStructure to append
|
|
|
|
*
|
2004-03-30 07:36:19 +00:00
|
|
|
* Appends @structure to @caps. The structure is not copied; @caps
|
2004-01-15 09:03:42 +00:00
|
|
|
* becomes the owner of @structure.
|
|
|
|
*/
|
2004-03-12 19:32:26 +00:00
|
|
|
void
|
2004-03-13 15:27:01 +00:00
|
|
|
gst_caps_append_structure (GstCaps * caps, GstStructure * structure)
|
2003-11-11 19:14:14 +00:00
|
|
|
{
|
gst/gstcaps.c: Patch from Tim-Philipp Müller to fix GST_CAPS() and GST_IS_CAPS(). (bug #141304)
Original commit message from CVS:
* gst/gstcaps.c: (gst_caps_copy), (gst_caps_free),
(gst_caps_append), (gst_caps_append_structure),
(gst_caps_get_size), (gst_caps_get_structure), (gst_caps_copy_1),
(gst_caps_set_simple), (gst_caps_set_simple_valist),
(gst_caps_is_any), (gst_caps_is_empty), (gst_caps_is_chained),
(gst_caps_is_fixed), (gst_caps_is_always_compatible),
(gst_caps_intersect), (gst_caps_normalize),
(gst_caps_transform_to_string): Patch from Tim-Philipp Müller
to fix GST_CAPS() and GST_IS_CAPS(). (bug #141304)
* gst/gstcaps.h: use GST_IS_CAPS().
2004-04-28 20:19:46 +00:00
|
|
|
g_return_if_fail (GST_IS_CAPS (caps));
|
2005-03-07 18:27:42 +00:00
|
|
|
g_return_if_fail (IS_WRITABLE (caps));
|
2003-12-22 01:39:35 +00:00
|
|
|
|
2006-07-03 16:57:54 +00:00
|
|
|
if (G_LIKELY (structure)) {
|
2005-03-07 18:27:42 +00:00
|
|
|
g_return_if_fail (structure->parent_refcount == NULL);
|
2004-01-15 09:03:42 +00:00
|
|
|
#if 0
|
gst/elements/gsttee.c: Remove usage of gst_pad_proxy_fixate.
Original commit message from CVS:
* gst/elements/gsttee.c: (gst_tee_init), (gst_tee_request_new_pad):
Remove usage of gst_pad_proxy_fixate.
* gst/gstcaps.c: (gst_caps_append), (gst_caps_append_structure),
(gst_caps_split_one), (gst_caps_replace):
Add poisoning code.
* gst/gstmarshal.list:
Add pointer__pointer for fixate signal
* gst/gstpad.c: (gst_real_pad_class_init),
(_gst_real_pad_fixate_accumulator), (gst_pad_link_fixate),
(_gst_pad_default_fixate_func), (gst_pad_proxy_fixate),
(gst_pad_set_explicit_caps), (gst_pad_template_new):
Add poisoning code. Add fixate signal on RealPad. Change
set_explicit_caps() to take const GstCaps, like try_set_caps().
* gst/gstpad.h:
* testsuite/caps/Makefile.am:
* testsuite/caps/app_fixate.c: Add a test for the fixate signal
2004-01-04 23:43:11 +00:00
|
|
|
#ifdef USE_POISONING
|
2004-01-05 16:25:31 +00:00
|
|
|
STRUCTURE_POISON (structure);
|
2004-01-06 21:39:53 +00:00
|
|
|
#endif
|
gst/elements/gsttee.c: Remove usage of gst_pad_proxy_fixate.
Original commit message from CVS:
* gst/elements/gsttee.c: (gst_tee_init), (gst_tee_request_new_pad):
Remove usage of gst_pad_proxy_fixate.
* gst/gstcaps.c: (gst_caps_append), (gst_caps_append_structure),
(gst_caps_split_one), (gst_caps_replace):
Add poisoning code.
* gst/gstmarshal.list:
Add pointer__pointer for fixate signal
* gst/gstpad.c: (gst_real_pad_class_init),
(_gst_real_pad_fixate_accumulator), (gst_pad_link_fixate),
(_gst_pad_default_fixate_func), (gst_pad_proxy_fixate),
(gst_pad_set_explicit_caps), (gst_pad_template_new):
Add poisoning code. Add fixate signal on RealPad. Change
set_explicit_caps() to take const GstCaps, like try_set_caps().
* gst/gstpad.h:
* testsuite/caps/Makefile.am:
* testsuite/caps/app_fixate.c: Add a test for the fixate signal
2004-01-04 23:43:11 +00:00
|
|
|
#endif
|
2005-03-07 18:27:42 +00:00
|
|
|
gst_structure_set_parent_refcount (structure, &caps->refcount);
|
2003-12-22 01:39:35 +00:00
|
|
|
g_ptr_array_add (caps->structs, structure);
|
2003-11-11 19:14:14 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2006-08-21 14:54:31 +00:00
|
|
|
/**
|
gst/gstcaps.c: fix bug when converting from empty string.
Original commit message from CVS:
* gst/gstcaps.c: (gst_caps_from_string_inplace):
fix bug when converting from empty string.
* gst/gstcaps.c: (gst_caps_new_any), (gst_caps_new_simple),
(gst_caps_new_full_valist), (gst_caps_copy), (gst_caps_copy_1):
use gst_caps_new_empty to allocate a new caps. Only that function
allocates memory for caps now.
* gst/gstcaps.c: (gst_caps_remove_and_get_structure),
(gst_caps_remove_structure):
add ability to remove one structure (but not to header yet)
* gst/gstcaps.c: (gst_caps_compare_structures),
(gst_caps_simplify), (gst_caps_structure_figure_out_union),
(gst_caps_structure_simplify), (gst_caps_do_simplify),
* gst/gstcaps.h:
add gst_caps_do_simplify that tries to simplify a caps in place.
Deprecate old gst_caps_simplify function.
* testsuite/caps/caps.h:
add caps.h containing a common set of caps to test against.
* testsuite/caps/sets.c: (check_caps), (main):
use it.
* testsuite/caps/.cvsignore:
* testsuite/caps/Makefile.am:
* testsuite/caps/simplify.c: (check_caps), (main):
add test to check correctness and efficency of caps simplification.
2004-04-22 02:35:13 +00:00
|
|
|
* gst_caps_remove_structure:
|
|
|
|
* @caps: the #GstCaps to remove from
|
|
|
|
* @idx: Index of the structure to remove
|
|
|
|
*
|
2005-10-15 15:30:24 +00:00
|
|
|
* removes the stucture with the given index from the list of structures
|
gst/gstcaps.c: fix bug when converting from empty string.
Original commit message from CVS:
* gst/gstcaps.c: (gst_caps_from_string_inplace):
fix bug when converting from empty string.
* gst/gstcaps.c: (gst_caps_new_any), (gst_caps_new_simple),
(gst_caps_new_full_valist), (gst_caps_copy), (gst_caps_copy_1):
use gst_caps_new_empty to allocate a new caps. Only that function
allocates memory for caps now.
* gst/gstcaps.c: (gst_caps_remove_and_get_structure),
(gst_caps_remove_structure):
add ability to remove one structure (but not to header yet)
* gst/gstcaps.c: (gst_caps_compare_structures),
(gst_caps_simplify), (gst_caps_structure_figure_out_union),
(gst_caps_structure_simplify), (gst_caps_do_simplify),
* gst/gstcaps.h:
add gst_caps_do_simplify that tries to simplify a caps in place.
Deprecate old gst_caps_simplify function.
* testsuite/caps/caps.h:
add caps.h containing a common set of caps to test against.
* testsuite/caps/sets.c: (check_caps), (main):
use it.
* testsuite/caps/.cvsignore:
* testsuite/caps/Makefile.am:
* testsuite/caps/simplify.c: (check_caps), (main):
add test to check correctness and efficency of caps simplification.
2004-04-22 02:35:13 +00:00
|
|
|
* contained in @caps.
|
|
|
|
*/
|
|
|
|
void
|
|
|
|
gst_caps_remove_structure (GstCaps * caps, guint idx)
|
|
|
|
{
|
|
|
|
GstStructure *structure;
|
|
|
|
|
|
|
|
g_return_if_fail (caps != NULL);
|
|
|
|
g_return_if_fail (idx <= gst_caps_get_size (caps));
|
2005-03-07 18:27:42 +00:00
|
|
|
g_return_if_fail (IS_WRITABLE (caps));
|
gst/gstcaps.c: fix bug when converting from empty string.
Original commit message from CVS:
* gst/gstcaps.c: (gst_caps_from_string_inplace):
fix bug when converting from empty string.
* gst/gstcaps.c: (gst_caps_new_any), (gst_caps_new_simple),
(gst_caps_new_full_valist), (gst_caps_copy), (gst_caps_copy_1):
use gst_caps_new_empty to allocate a new caps. Only that function
allocates memory for caps now.
* gst/gstcaps.c: (gst_caps_remove_and_get_structure),
(gst_caps_remove_structure):
add ability to remove one structure (but not to header yet)
* gst/gstcaps.c: (gst_caps_compare_structures),
(gst_caps_simplify), (gst_caps_structure_figure_out_union),
(gst_caps_structure_simplify), (gst_caps_do_simplify),
* gst/gstcaps.h:
add gst_caps_do_simplify that tries to simplify a caps in place.
Deprecate old gst_caps_simplify function.
* testsuite/caps/caps.h:
add caps.h containing a common set of caps to test against.
* testsuite/caps/sets.c: (check_caps), (main):
use it.
* testsuite/caps/.cvsignore:
* testsuite/caps/Makefile.am:
* testsuite/caps/simplify.c: (check_caps), (main):
add test to check correctness and efficency of caps simplification.
2004-04-22 02:35:13 +00:00
|
|
|
|
|
|
|
structure = gst_caps_remove_and_get_structure (caps, idx);
|
|
|
|
gst_structure_free (structure);
|
|
|
|
}
|
|
|
|
|
2006-08-24 10:40:31 +00:00
|
|
|
/**
|
|
|
|
* gst_caps_merge_structure:
|
|
|
|
* @caps: the #GstCaps that will the the new structure
|
|
|
|
* @structure: the #GstStructure to merge
|
|
|
|
*
|
|
|
|
* Appends @structure to @caps if its not already expressed by @caps. The
|
|
|
|
* structure is not copied; @caps becomes the owner of @structure.
|
|
|
|
*/
|
|
|
|
void
|
2006-08-28 16:39:20 +00:00
|
|
|
gst_caps_merge_structure (GstCaps * caps, GstStructure * structure)
|
2006-08-24 10:40:31 +00:00
|
|
|
{
|
|
|
|
g_return_if_fail (GST_IS_CAPS (caps));
|
|
|
|
g_return_if_fail (IS_WRITABLE (caps));
|
|
|
|
|
2006-08-28 16:39:20 +00:00
|
|
|
if (G_LIKELY (structure)) {
|
2006-08-24 10:40:31 +00:00
|
|
|
GstStructure *structure1;
|
|
|
|
int i;
|
|
|
|
gboolean unique = TRUE;
|
|
|
|
|
2006-08-28 16:39:20 +00:00
|
|
|
g_return_if_fail (structure->parent_refcount == NULL);
|
2006-08-24 10:40:31 +00:00
|
|
|
#if 0
|
|
|
|
#ifdef USE_POISONING
|
2006-08-28 16:39:20 +00:00
|
|
|
STRUCTURE_POISON (structure);
|
2006-08-24 10:40:31 +00:00
|
|
|
#endif
|
|
|
|
#endif
|
|
|
|
/* check each structure */
|
|
|
|
for (i = caps->structs->len - 1; i >= 0; i--) {
|
|
|
|
structure1 = gst_caps_get_structure (caps, i);
|
2006-08-28 16:39:20 +00:00
|
|
|
/* if structure is a subset of structure1, then skip it */
|
|
|
|
if (gst_caps_structure_is_subset (structure1, structure)) {
|
2006-08-24 10:40:31 +00:00
|
|
|
unique = FALSE;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (unique) {
|
2006-08-28 16:39:20 +00:00
|
|
|
gst_structure_set_parent_refcount (structure, &caps->refcount);
|
|
|
|
g_ptr_array_add (caps->structs, structure);
|
2006-08-24 10:40:31 +00:00
|
|
|
} else {
|
2006-08-28 16:39:20 +00:00
|
|
|
gst_structure_free (structure);
|
2006-08-24 10:40:31 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2004-01-15 09:03:42 +00:00
|
|
|
/**
|
2004-03-26 03:46:16 +00:00
|
|
|
* gst_caps_get_size:
|
2004-01-15 09:03:42 +00:00
|
|
|
* @caps: a #GstCaps
|
|
|
|
*
|
2004-03-26 03:46:16 +00:00
|
|
|
* Gets the number of structures contained in @caps.
|
|
|
|
*
|
2004-01-15 09:03:42 +00:00
|
|
|
* Returns: the number of structures that @caps contains
|
|
|
|
*/
|
2005-10-15 00:12:22 +00:00
|
|
|
guint
|
2004-03-13 15:27:01 +00:00
|
|
|
gst_caps_get_size (const GstCaps * caps)
|
2003-11-11 19:14:14 +00:00
|
|
|
{
|
gst/gstcaps.c: Patch from Tim-Philipp Müller to fix GST_CAPS() and GST_IS_CAPS(). (bug #141304)
Original commit message from CVS:
* gst/gstcaps.c: (gst_caps_copy), (gst_caps_free),
(gst_caps_append), (gst_caps_append_structure),
(gst_caps_get_size), (gst_caps_get_structure), (gst_caps_copy_1),
(gst_caps_set_simple), (gst_caps_set_simple_valist),
(gst_caps_is_any), (gst_caps_is_empty), (gst_caps_is_chained),
(gst_caps_is_fixed), (gst_caps_is_always_compatible),
(gst_caps_intersect), (gst_caps_normalize),
(gst_caps_transform_to_string): Patch from Tim-Philipp Müller
to fix GST_CAPS() and GST_IS_CAPS(). (bug #141304)
* gst/gstcaps.h: use GST_IS_CAPS().
2004-04-28 20:19:46 +00:00
|
|
|
g_return_val_if_fail (GST_IS_CAPS (caps), 0);
|
2003-12-22 01:39:35 +00:00
|
|
|
|
|
|
|
return caps->structs->len;
|
|
|
|
}
|
|
|
|
|
2004-01-15 09:03:42 +00:00
|
|
|
/**
|
|
|
|
* gst_caps_get_structure:
|
|
|
|
* @caps: a #GstCaps
|
|
|
|
* @index: the index of the structure
|
|
|
|
*
|
2005-10-15 15:30:24 +00:00
|
|
|
* Finds the structure in @caps that has the index @index, and
|
2004-01-15 09:03:42 +00:00
|
|
|
* returns it.
|
|
|
|
*
|
|
|
|
* WARNING: This function takes a const GstCaps *, but returns a
|
|
|
|
* non-const GstStructure *. This is for programming convenience --
|
|
|
|
* the caller should be aware that structures inside a constant
|
2005-11-09 12:01:46 +00:00
|
|
|
* #GstCaps should not be modified.
|
2004-01-15 09:03:42 +00:00
|
|
|
*
|
|
|
|
* Returns: a pointer to the #GstStructure corresponding to @index
|
|
|
|
*/
|
2004-03-12 19:32:26 +00:00
|
|
|
GstStructure *
|
2005-10-15 00:12:22 +00:00
|
|
|
gst_caps_get_structure (const GstCaps * caps, guint index)
|
2003-12-22 01:39:35 +00:00
|
|
|
{
|
gst/gstcaps.c: Patch from Tim-Philipp Müller to fix GST_CAPS() and GST_IS_CAPS(). (bug #141304)
Original commit message from CVS:
* gst/gstcaps.c: (gst_caps_copy), (gst_caps_free),
(gst_caps_append), (gst_caps_append_structure),
(gst_caps_get_size), (gst_caps_get_structure), (gst_caps_copy_1),
(gst_caps_set_simple), (gst_caps_set_simple_valist),
(gst_caps_is_any), (gst_caps_is_empty), (gst_caps_is_chained),
(gst_caps_is_fixed), (gst_caps_is_always_compatible),
(gst_caps_intersect), (gst_caps_normalize),
(gst_caps_transform_to_string): Patch from Tim-Philipp Müller
to fix GST_CAPS() and GST_IS_CAPS(). (bug #141304)
* gst/gstcaps.h: use GST_IS_CAPS().
2004-04-28 20:19:46 +00:00
|
|
|
g_return_val_if_fail (GST_IS_CAPS (caps), NULL);
|
2003-12-22 01:39:35 +00:00
|
|
|
g_return_val_if_fail (index < caps->structs->len, NULL);
|
|
|
|
|
2004-03-13 15:27:01 +00:00
|
|
|
return g_ptr_array_index (caps->structs, index);
|
2003-11-11 19:14:14 +00:00
|
|
|
}
|
|
|
|
|
2005-10-15 15:30:24 +00:00
|
|
|
/**
|
|
|
|
* gst_caps_copy_nth:
|
2005-11-09 12:01:46 +00:00
|
|
|
* @caps: the #GstCaps to copy
|
2005-03-07 18:27:42 +00:00
|
|
|
* @nth: the nth structure to copy
|
2005-10-15 15:30:24 +00:00
|
|
|
*
|
2005-11-09 12:01:46 +00:00
|
|
|
* Creates a new #GstCaps and appends a copy of the nth structure
|
2005-10-15 15:30:24 +00:00
|
|
|
* contained in @caps.
|
|
|
|
*
|
2005-11-09 12:01:46 +00:00
|
|
|
* Returns: the new #GstCaps
|
2004-01-15 09:03:42 +00:00
|
|
|
*/
|
2004-03-12 19:32:26 +00:00
|
|
|
GstCaps *
|
2005-10-15 00:12:22 +00:00
|
|
|
gst_caps_copy_nth (const GstCaps * caps, guint nth)
|
2003-11-11 19:14:14 +00:00
|
|
|
{
|
2003-12-22 01:39:35 +00:00
|
|
|
GstCaps *newcaps;
|
2003-11-11 19:14:14 +00:00
|
|
|
GstStructure *structure;
|
|
|
|
|
gst/gstcaps.c: Patch from Tim-Philipp Müller to fix GST_CAPS() and GST_IS_CAPS(). (bug #141304)
Original commit message from CVS:
* gst/gstcaps.c: (gst_caps_copy), (gst_caps_free),
(gst_caps_append), (gst_caps_append_structure),
(gst_caps_get_size), (gst_caps_get_structure), (gst_caps_copy_1),
(gst_caps_set_simple), (gst_caps_set_simple_valist),
(gst_caps_is_any), (gst_caps_is_empty), (gst_caps_is_chained),
(gst_caps_is_fixed), (gst_caps_is_always_compatible),
(gst_caps_intersect), (gst_caps_normalize),
(gst_caps_transform_to_string): Patch from Tim-Philipp Müller
to fix GST_CAPS() and GST_IS_CAPS(). (bug #141304)
* gst/gstcaps.h: use GST_IS_CAPS().
2004-04-28 20:19:46 +00:00
|
|
|
g_return_val_if_fail (GST_IS_CAPS (caps), NULL);
|
2003-12-22 01:39:35 +00:00
|
|
|
|
gst/gstcaps.c: fix bug when converting from empty string.
Original commit message from CVS:
* gst/gstcaps.c: (gst_caps_from_string_inplace):
fix bug when converting from empty string.
* gst/gstcaps.c: (gst_caps_new_any), (gst_caps_new_simple),
(gst_caps_new_full_valist), (gst_caps_copy), (gst_caps_copy_1):
use gst_caps_new_empty to allocate a new caps. Only that function
allocates memory for caps now.
* gst/gstcaps.c: (gst_caps_remove_and_get_structure),
(gst_caps_remove_structure):
add ability to remove one structure (but not to header yet)
* gst/gstcaps.c: (gst_caps_compare_structures),
(gst_caps_simplify), (gst_caps_structure_figure_out_union),
(gst_caps_structure_simplify), (gst_caps_do_simplify),
* gst/gstcaps.h:
add gst_caps_do_simplify that tries to simplify a caps in place.
Deprecate old gst_caps_simplify function.
* testsuite/caps/caps.h:
add caps.h containing a common set of caps to test against.
* testsuite/caps/sets.c: (check_caps), (main):
use it.
* testsuite/caps/.cvsignore:
* testsuite/caps/Makefile.am:
* testsuite/caps/simplify.c: (check_caps), (main):
add test to check correctness and efficency of caps simplification.
2004-04-22 02:35:13 +00:00
|
|
|
newcaps = gst_caps_new_empty ();
|
2003-11-11 19:14:14 +00:00
|
|
|
newcaps->flags = caps->flags;
|
|
|
|
|
2005-03-07 18:27:42 +00:00
|
|
|
if (caps->structs->len > nth) {
|
|
|
|
structure = gst_caps_get_structure (caps, nth);
|
2004-03-13 15:27:01 +00:00
|
|
|
gst_caps_append_structure (newcaps, gst_structure_copy (structure));
|
2003-11-11 19:14:14 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
return newcaps;
|
|
|
|
}
|
|
|
|
|
2005-10-15 15:30:24 +00:00
|
|
|
/**
|
|
|
|
* gst_caps_truncate:
|
2005-11-09 12:01:46 +00:00
|
|
|
* @caps: the #GstCaps to truncate
|
2005-10-15 15:30:24 +00:00
|
|
|
*
|
2005-07-15 11:04:18 +00:00
|
|
|
* Destructively discard all but the first structure from @caps. Useful when
|
|
|
|
* fixating. @caps must be writable.
|
|
|
|
*/
|
|
|
|
void
|
|
|
|
gst_caps_truncate (GstCaps * caps)
|
|
|
|
{
|
|
|
|
gint i;
|
|
|
|
|
|
|
|
g_return_if_fail (GST_IS_CAPS (caps));
|
|
|
|
g_return_if_fail (IS_WRITABLE (caps));
|
|
|
|
|
|
|
|
i = caps->structs->len - 1;
|
|
|
|
|
|
|
|
while (i > 0)
|
|
|
|
gst_caps_remove_structure (caps, i--);
|
|
|
|
}
|
|
|
|
|
2004-01-15 09:03:42 +00:00
|
|
|
/**
|
|
|
|
* gst_caps_set_simple:
|
2005-11-09 12:01:46 +00:00
|
|
|
* @caps: the #GstCaps to set
|
2004-01-15 09:03:42 +00:00
|
|
|
* @field: first field to set
|
|
|
|
* @...: additional parameters
|
|
|
|
*
|
|
|
|
* Sets fields in a simple #GstCaps. A simple #GstCaps is one that
|
|
|
|
* only has one structure. The arguments must be passed in the same
|
2005-11-09 12:01:46 +00:00
|
|
|
* manner as gst_structure_set(), and be NULL-terminated.
|
2004-01-15 09:03:42 +00:00
|
|
|
*/
|
2004-03-12 19:32:26 +00:00
|
|
|
void
|
2004-03-13 15:27:01 +00:00
|
|
|
gst_caps_set_simple (GstCaps * caps, char *field, ...)
|
2003-12-22 01:39:35 +00:00
|
|
|
{
|
|
|
|
GstStructure *structure;
|
|
|
|
va_list var_args;
|
|
|
|
|
gst/gstcaps.c: Patch from Tim-Philipp Müller to fix GST_CAPS() and GST_IS_CAPS(). (bug #141304)
Original commit message from CVS:
* gst/gstcaps.c: (gst_caps_copy), (gst_caps_free),
(gst_caps_append), (gst_caps_append_structure),
(gst_caps_get_size), (gst_caps_get_structure), (gst_caps_copy_1),
(gst_caps_set_simple), (gst_caps_set_simple_valist),
(gst_caps_is_any), (gst_caps_is_empty), (gst_caps_is_chained),
(gst_caps_is_fixed), (gst_caps_is_always_compatible),
(gst_caps_intersect), (gst_caps_normalize),
(gst_caps_transform_to_string): Patch from Tim-Philipp Müller
to fix GST_CAPS() and GST_IS_CAPS(). (bug #141304)
* gst/gstcaps.h: use GST_IS_CAPS().
2004-04-28 20:19:46 +00:00
|
|
|
g_return_if_fail (GST_IS_CAPS (caps));
|
2003-12-22 01:39:35 +00:00
|
|
|
g_return_if_fail (caps->structs->len == 1);
|
2005-03-07 18:27:42 +00:00
|
|
|
g_return_if_fail (IS_WRITABLE (caps));
|
2003-12-22 01:39:35 +00:00
|
|
|
|
|
|
|
structure = gst_caps_get_structure (caps, 0);
|
|
|
|
|
|
|
|
va_start (var_args, field);
|
|
|
|
gst_structure_set_valist (structure, field, var_args);
|
2004-03-13 15:27:01 +00:00
|
|
|
va_end (var_args);
|
2003-12-22 01:39:35 +00:00
|
|
|
}
|
|
|
|
|
2004-01-15 09:03:42 +00:00
|
|
|
/**
|
|
|
|
* gst_caps_set_simple_valist:
|
2005-11-09 12:01:46 +00:00
|
|
|
* @caps: the #GstCaps to copy
|
2004-01-15 09:03:42 +00:00
|
|
|
* @field: first field to set
|
|
|
|
* @varargs: additional parameters
|
|
|
|
*
|
|
|
|
* Sets fields in a simple #GstCaps. A simple #GstCaps is one that
|
|
|
|
* only has one structure. The arguments must be passed in the same
|
2005-11-09 12:01:46 +00:00
|
|
|
* manner as gst_structure_set(), and be NULL-terminated.
|
2004-01-15 09:03:42 +00:00
|
|
|
*/
|
2004-03-12 19:32:26 +00:00
|
|
|
void
|
2004-03-13 15:27:01 +00:00
|
|
|
gst_caps_set_simple_valist (GstCaps * caps, char *field, va_list varargs)
|
2003-12-22 01:39:35 +00:00
|
|
|
{
|
|
|
|
GstStructure *structure;
|
|
|
|
|
gst/gstcaps.c: Patch from Tim-Philipp Müller to fix GST_CAPS() and GST_IS_CAPS(). (bug #141304)
Original commit message from CVS:
* gst/gstcaps.c: (gst_caps_copy), (gst_caps_free),
(gst_caps_append), (gst_caps_append_structure),
(gst_caps_get_size), (gst_caps_get_structure), (gst_caps_copy_1),
(gst_caps_set_simple), (gst_caps_set_simple_valist),
(gst_caps_is_any), (gst_caps_is_empty), (gst_caps_is_chained),
(gst_caps_is_fixed), (gst_caps_is_always_compatible),
(gst_caps_intersect), (gst_caps_normalize),
(gst_caps_transform_to_string): Patch from Tim-Philipp Müller
to fix GST_CAPS() and GST_IS_CAPS(). (bug #141304)
* gst/gstcaps.h: use GST_IS_CAPS().
2004-04-28 20:19:46 +00:00
|
|
|
g_return_if_fail (GST_IS_CAPS (caps));
|
2003-12-22 01:39:35 +00:00
|
|
|
g_return_if_fail (caps->structs->len != 1);
|
2005-03-07 18:27:42 +00:00
|
|
|
g_return_if_fail (IS_WRITABLE (caps));
|
2003-12-22 01:39:35 +00:00
|
|
|
|
|
|
|
structure = gst_caps_get_structure (caps, 0);
|
|
|
|
|
|
|
|
gst_structure_set_valist (structure, field, varargs);
|
|
|
|
}
|
|
|
|
|
2003-11-11 19:14:14 +00:00
|
|
|
/* tests */
|
2004-01-15 09:03:42 +00:00
|
|
|
|
|
|
|
/**
|
|
|
|
* gst_caps_is_any:
|
2005-11-09 12:01:46 +00:00
|
|
|
* @caps: the #GstCaps to test
|
2004-01-15 09:03:42 +00:00
|
|
|
*
|
2004-03-26 03:46:16 +00:00
|
|
|
* Determines if @caps represents any media format.
|
|
|
|
*
|
2004-01-15 09:03:42 +00:00
|
|
|
* Returns: TRUE if @caps represents any format.
|
|
|
|
*/
|
2004-03-12 19:32:26 +00:00
|
|
|
gboolean
|
2004-03-13 15:27:01 +00:00
|
|
|
gst_caps_is_any (const GstCaps * caps)
|
2003-11-11 19:14:14 +00:00
|
|
|
{
|
gst/gstcaps.c: Patch from Tim-Philipp Müller to fix GST_CAPS() and GST_IS_CAPS(). (bug #141304)
Original commit message from CVS:
* gst/gstcaps.c: (gst_caps_copy), (gst_caps_free),
(gst_caps_append), (gst_caps_append_structure),
(gst_caps_get_size), (gst_caps_get_structure), (gst_caps_copy_1),
(gst_caps_set_simple), (gst_caps_set_simple_valist),
(gst_caps_is_any), (gst_caps_is_empty), (gst_caps_is_chained),
(gst_caps_is_fixed), (gst_caps_is_always_compatible),
(gst_caps_intersect), (gst_caps_normalize),
(gst_caps_transform_to_string): Patch from Tim-Philipp Müller
to fix GST_CAPS() and GST_IS_CAPS(). (bug #141304)
* gst/gstcaps.h: use GST_IS_CAPS().
2004-04-28 20:19:46 +00:00
|
|
|
g_return_val_if_fail (GST_IS_CAPS (caps), FALSE);
|
2003-12-22 01:39:35 +00:00
|
|
|
|
|
|
|
return (caps->flags & GST_CAPS_FLAGS_ANY);
|
2003-11-11 19:14:14 +00:00
|
|
|
}
|
|
|
|
|
2004-01-15 09:03:42 +00:00
|
|
|
/**
|
|
|
|
* gst_caps_is_empty:
|
2005-11-09 12:01:46 +00:00
|
|
|
* @caps: the #GstCaps to test
|
2004-01-15 09:03:42 +00:00
|
|
|
*
|
2004-03-26 03:46:16 +00:00
|
|
|
* Determines if @caps represents no media formats.
|
|
|
|
*
|
2004-01-15 09:03:42 +00:00
|
|
|
* Returns: TRUE if @caps represents no formats.
|
|
|
|
*/
|
2004-03-12 19:32:26 +00:00
|
|
|
gboolean
|
2004-03-13 15:27:01 +00:00
|
|
|
gst_caps_is_empty (const GstCaps * caps)
|
2003-11-11 19:14:14 +00:00
|
|
|
{
|
gst/gstcaps.c: Patch from Tim-Philipp Müller to fix GST_CAPS() and GST_IS_CAPS(). (bug #141304)
Original commit message from CVS:
* gst/gstcaps.c: (gst_caps_copy), (gst_caps_free),
(gst_caps_append), (gst_caps_append_structure),
(gst_caps_get_size), (gst_caps_get_structure), (gst_caps_copy_1),
(gst_caps_set_simple), (gst_caps_set_simple_valist),
(gst_caps_is_any), (gst_caps_is_empty), (gst_caps_is_chained),
(gst_caps_is_fixed), (gst_caps_is_always_compatible),
(gst_caps_intersect), (gst_caps_normalize),
(gst_caps_transform_to_string): Patch from Tim-Philipp Müller
to fix GST_CAPS() and GST_IS_CAPS(). (bug #141304)
* gst/gstcaps.h: use GST_IS_CAPS().
2004-04-28 20:19:46 +00:00
|
|
|
g_return_val_if_fail (GST_IS_CAPS (caps), FALSE);
|
2003-12-22 01:39:35 +00:00
|
|
|
|
2004-03-13 15:27:01 +00:00
|
|
|
if (caps->flags & GST_CAPS_FLAGS_ANY)
|
|
|
|
return FALSE;
|
2003-11-11 19:14:14 +00:00
|
|
|
|
|
|
|
return (caps->structs == NULL) || (caps->structs->len == 0);
|
|
|
|
}
|
|
|
|
|
2003-12-22 01:39:35 +00:00
|
|
|
static gboolean
|
2005-03-07 18:27:42 +00:00
|
|
|
gst_caps_is_fixed_foreach (GQuark field_id, const GValue * value,
|
|
|
|
gpointer unused)
|
2003-11-11 19:14:14 +00:00
|
|
|
{
|
2004-11-29 17:02:09 +00:00
|
|
|
return gst_value_is_fixed (value);
|
2003-12-22 01:39:35 +00:00
|
|
|
}
|
2003-11-11 19:14:14 +00:00
|
|
|
|
2004-01-15 09:03:42 +00:00
|
|
|
/**
|
|
|
|
* gst_caps_is_fixed:
|
2005-11-09 12:01:46 +00:00
|
|
|
* @caps: the #GstCaps to test
|
2004-01-15 09:03:42 +00:00
|
|
|
*
|
2005-11-09 12:01:46 +00:00
|
|
|
* Fixed #GstCaps describe exactly one format, that is, they have exactly
|
2004-01-15 09:03:42 +00:00
|
|
|
* one structure, and each field in the structure describes a fixed type.
|
|
|
|
* Examples of non-fixed types are GST_TYPE_INT_RANGE and GST_TYPE_LIST.
|
|
|
|
*
|
|
|
|
* Returns: TRUE if @caps is fixed
|
|
|
|
*/
|
2004-03-12 19:32:26 +00:00
|
|
|
gboolean
|
2004-03-13 15:27:01 +00:00
|
|
|
gst_caps_is_fixed (const GstCaps * caps)
|
2003-12-22 01:39:35 +00:00
|
|
|
{
|
|
|
|
GstStructure *structure;
|
2003-11-11 19:14:14 +00:00
|
|
|
|
gst/gstcaps.c: Patch from Tim-Philipp Müller to fix GST_CAPS() and GST_IS_CAPS(). (bug #141304)
Original commit message from CVS:
* gst/gstcaps.c: (gst_caps_copy), (gst_caps_free),
(gst_caps_append), (gst_caps_append_structure),
(gst_caps_get_size), (gst_caps_get_structure), (gst_caps_copy_1),
(gst_caps_set_simple), (gst_caps_set_simple_valist),
(gst_caps_is_any), (gst_caps_is_empty), (gst_caps_is_chained),
(gst_caps_is_fixed), (gst_caps_is_always_compatible),
(gst_caps_intersect), (gst_caps_normalize),
(gst_caps_transform_to_string): Patch from Tim-Philipp Müller
to fix GST_CAPS() and GST_IS_CAPS(). (bug #141304)
* gst/gstcaps.h: use GST_IS_CAPS().
2004-04-28 20:19:46 +00:00
|
|
|
g_return_val_if_fail (GST_IS_CAPS (caps), FALSE);
|
2003-11-11 19:14:14 +00:00
|
|
|
|
2004-03-13 15:27:01 +00:00
|
|
|
if (caps->structs->len != 1)
|
|
|
|
return FALSE;
|
2003-11-11 19:14:14 +00:00
|
|
|
|
2003-12-22 01:39:35 +00:00
|
|
|
structure = gst_caps_get_structure (caps, 0);
|
2003-11-11 19:14:14 +00:00
|
|
|
|
2004-03-12 19:32:26 +00:00
|
|
|
return gst_structure_foreach (structure, gst_caps_is_fixed_foreach, NULL);
|
2003-11-11 19:14:14 +00:00
|
|
|
}
|
|
|
|
|
2004-01-15 09:03:42 +00:00
|
|
|
/**
|
|
|
|
* gst_caps_is_equal_fixed:
|
|
|
|
* @caps1: the #GstCaps to test
|
|
|
|
* @caps2: the #GstCaps to test
|
|
|
|
*
|
|
|
|
* Tests if two #GstCaps are equal. This function only works on fixed
|
|
|
|
* #GstCaps.
|
|
|
|
*
|
|
|
|
* Returns: TRUE if the arguments represent the same format
|
|
|
|
*/
|
2004-03-12 19:32:26 +00:00
|
|
|
gboolean
|
2004-03-13 15:27:01 +00:00
|
|
|
gst_caps_is_equal_fixed (const GstCaps * caps1, const GstCaps * caps2)
|
2004-01-02 23:04:14 +00:00
|
|
|
{
|
|
|
|
GstStructure *struct1, *struct2;
|
|
|
|
|
2004-03-13 15:27:01 +00:00
|
|
|
g_return_val_if_fail (gst_caps_is_fixed (caps1), FALSE);
|
|
|
|
g_return_val_if_fail (gst_caps_is_fixed (caps2), FALSE);
|
2004-01-02 23:04:14 +00:00
|
|
|
|
|
|
|
struct1 = gst_caps_get_structure (caps1, 0);
|
|
|
|
struct2 = gst_caps_get_structure (caps2, 0);
|
|
|
|
|
|
|
|
if (struct1->name != struct2->name) {
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
if (struct1->fields->len != struct2->fields->len) {
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
2004-03-12 19:32:26 +00:00
|
|
|
return gst_structure_foreach (struct1, gst_structure_is_equal_foreach,
|
2004-03-13 15:27:01 +00:00
|
|
|
struct2);
|
2004-01-02 23:04:14 +00:00
|
|
|
}
|
|
|
|
|
2004-01-15 09:03:42 +00:00
|
|
|
/**
|
2004-03-26 03:46:16 +00:00
|
|
|
* gst_caps_is_always_compatible:
|
2004-01-15 09:03:42 +00:00
|
|
|
* @caps1: the #GstCaps to test
|
|
|
|
* @caps2: the #GstCaps to test
|
|
|
|
*
|
2004-03-26 03:46:16 +00:00
|
|
|
* A given #GstCaps structure is always compatible with another if
|
|
|
|
* every media format that is in the first is also contained in the
|
|
|
|
* second. That is, @caps1 is a subset of @caps2.
|
|
|
|
*
|
2004-01-15 09:03:42 +00:00
|
|
|
* Returns: TRUE if @caps1 is a subset of @caps2.
|
|
|
|
*/
|
2003-12-22 01:39:35 +00:00
|
|
|
gboolean
|
2004-03-13 15:27:01 +00:00
|
|
|
gst_caps_is_always_compatible (const GstCaps * caps1, const GstCaps * caps2)
|
2003-11-11 19:14:14 +00:00
|
|
|
{
|
gst/gstcaps.c: Patch from Tim-Philipp Müller to fix GST_CAPS() and GST_IS_CAPS(). (bug #141304)
Original commit message from CVS:
* gst/gstcaps.c: (gst_caps_copy), (gst_caps_free),
(gst_caps_append), (gst_caps_append_structure),
(gst_caps_get_size), (gst_caps_get_structure), (gst_caps_copy_1),
(gst_caps_set_simple), (gst_caps_set_simple_valist),
(gst_caps_is_any), (gst_caps_is_empty), (gst_caps_is_chained),
(gst_caps_is_fixed), (gst_caps_is_always_compatible),
(gst_caps_intersect), (gst_caps_normalize),
(gst_caps_transform_to_string): Patch from Tim-Philipp Müller
to fix GST_CAPS() and GST_IS_CAPS(). (bug #141304)
* gst/gstcaps.h: use GST_IS_CAPS().
2004-04-28 20:19:46 +00:00
|
|
|
g_return_val_if_fail (GST_IS_CAPS (caps1), FALSE);
|
|
|
|
g_return_val_if_fail (GST_IS_CAPS (caps2), FALSE);
|
2004-03-13 15:27:01 +00:00
|
|
|
|
2004-04-23 00:04:50 +00:00
|
|
|
return gst_caps_is_subset (caps1, caps2);
|
2003-11-11 19:14:14 +00:00
|
|
|
}
|
|
|
|
|
2004-04-23 00:00:25 +00:00
|
|
|
/**
|
|
|
|
* gst_caps_is_subset:
|
|
|
|
* @subset: a #GstCaps
|
|
|
|
* @superset: a potentially greater #GstCaps
|
|
|
|
*
|
2007-02-11 19:59:12 +00:00
|
|
|
* Checks if all caps represented by @subset are also represented by @superset.
|
2004-04-23 00:00:25 +00:00
|
|
|
* <note>This function does not work reliably if optional properties for caps
|
|
|
|
* are included on one caps and omitted on the other.</note>
|
|
|
|
*
|
2007-02-11 19:59:12 +00:00
|
|
|
* Returns: %TRUE if @subset is a subset of @superset
|
2004-04-23 00:00:25 +00:00
|
|
|
*/
|
gst/gstcaps.c: check for ANY caps before appending/unioning
Original commit message from CVS:
* gst/gstcaps.c: (gst_caps_append), (gst_caps_union):
check for ANY caps before appending/unioning
* gst/gstcaps.c: (gst_caps_is_subset),
(gst_caps_is_equal), (gst_caps_structure_subtract_field),
(gst_caps_structure_subtract), (gst_caps_subtract):
* gst/gstcaps.h:
add gst_caps_is_equal, gst_caps_is_subset and gst_caps_subtract to
the API. deprecate gst_caps_is_equal_fixed
* gst/gstpad.c: (gst_pad_try_set_caps):
* gst/gstqueue.c: (gst_queue_link):
s/gst_caps_is_equal_fixed/gst_caps_is_equal/
* gst/gststructure.c: (gst_structure_get_name_id):
* gst/gststructure.h:
add function gst_structure_get_name_id
* gst/gstvalue.c: (gst_value_subtract_int_int_range),
(gst_value_create_new_range), (gst_value_subtract_int_range_int),
(gst_value_subtract_int_range_int_range),
(gst_value_subtract_double_double_range),
(gst_value_subtract_double_range_double),
(gst_value_subtract_double_range_double_range),
(gst_value_subtract_from_list), (gst_value_subtract_list),
(gst_value_can_intersect), (gst_value_subtract),
(gst_value_can_subtract), (gst_value_register_subtract_func),
(_gst_value_initialize):
* gst/gstvalue.h:
add support for subtracting values from each other. Note that
subtracting means subtracting as in set theory. Required for caps
stuff above.
* testsuite/caps/.cvsignore:
* testsuite/caps/Makefile.am:
* testsuite/caps/erathostenes.c: (erathostenes), (main):
* testsuite/caps/sets.c: (check_caps), (main):
* testsuite/caps/subtract.c: (check_caps), (main):
add tests for subtraction and equality code.
2004-04-21 03:25:13 +00:00
|
|
|
gboolean
|
|
|
|
gst_caps_is_subset (const GstCaps * subset, const GstCaps * superset)
|
|
|
|
{
|
|
|
|
GstCaps *caps;
|
|
|
|
gboolean ret;
|
|
|
|
|
|
|
|
g_return_val_if_fail (subset != NULL, FALSE);
|
|
|
|
g_return_val_if_fail (superset != NULL, FALSE);
|
|
|
|
|
|
|
|
if (gst_caps_is_empty (subset) || gst_caps_is_any (superset))
|
|
|
|
return TRUE;
|
|
|
|
if (gst_caps_is_any (subset) || gst_caps_is_empty (superset))
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
caps = gst_caps_subtract (subset, superset);
|
|
|
|
ret = gst_caps_is_empty (caps);
|
2005-03-07 18:27:42 +00:00
|
|
|
gst_caps_unref (caps);
|
gst/gstcaps.c: check for ANY caps before appending/unioning
Original commit message from CVS:
* gst/gstcaps.c: (gst_caps_append), (gst_caps_union):
check for ANY caps before appending/unioning
* gst/gstcaps.c: (gst_caps_is_subset),
(gst_caps_is_equal), (gst_caps_structure_subtract_field),
(gst_caps_structure_subtract), (gst_caps_subtract):
* gst/gstcaps.h:
add gst_caps_is_equal, gst_caps_is_subset and gst_caps_subtract to
the API. deprecate gst_caps_is_equal_fixed
* gst/gstpad.c: (gst_pad_try_set_caps):
* gst/gstqueue.c: (gst_queue_link):
s/gst_caps_is_equal_fixed/gst_caps_is_equal/
* gst/gststructure.c: (gst_structure_get_name_id):
* gst/gststructure.h:
add function gst_structure_get_name_id
* gst/gstvalue.c: (gst_value_subtract_int_int_range),
(gst_value_create_new_range), (gst_value_subtract_int_range_int),
(gst_value_subtract_int_range_int_range),
(gst_value_subtract_double_double_range),
(gst_value_subtract_double_range_double),
(gst_value_subtract_double_range_double_range),
(gst_value_subtract_from_list), (gst_value_subtract_list),
(gst_value_can_intersect), (gst_value_subtract),
(gst_value_can_subtract), (gst_value_register_subtract_func),
(_gst_value_initialize):
* gst/gstvalue.h:
add support for subtracting values from each other. Note that
subtracting means subtracting as in set theory. Required for caps
stuff above.
* testsuite/caps/.cvsignore:
* testsuite/caps/Makefile.am:
* testsuite/caps/erathostenes.c: (erathostenes), (main):
* testsuite/caps/sets.c: (check_caps), (main):
* testsuite/caps/subtract.c: (check_caps), (main):
add tests for subtraction and equality code.
2004-04-21 03:25:13 +00:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2004-04-23 00:00:25 +00:00
|
|
|
/**
|
|
|
|
* gst_caps_is_equal:
|
|
|
|
* @caps1: a #GstCaps
|
|
|
|
* @caps2: another #GstCaps
|
|
|
|
*
|
|
|
|
* Checks if the given caps represent the same set of caps.
|
|
|
|
* <note>This function does not work reliably if optional properties for caps
|
|
|
|
* are included on one caps and omitted on the other.</note>
|
|
|
|
*
|
2006-07-02 12:54:03 +00:00
|
|
|
* This function deals correctly with passing NULL for any of the caps.
|
2006-01-20 09:53:24 +00:00
|
|
|
*
|
2006-07-02 12:54:03 +00:00
|
|
|
* Returns: TRUE if both caps are equal.
|
2004-04-23 00:00:25 +00:00
|
|
|
*/
|
gst/gstcaps.c: check for ANY caps before appending/unioning
Original commit message from CVS:
* gst/gstcaps.c: (gst_caps_append), (gst_caps_union):
check for ANY caps before appending/unioning
* gst/gstcaps.c: (gst_caps_is_subset),
(gst_caps_is_equal), (gst_caps_structure_subtract_field),
(gst_caps_structure_subtract), (gst_caps_subtract):
* gst/gstcaps.h:
add gst_caps_is_equal, gst_caps_is_subset and gst_caps_subtract to
the API. deprecate gst_caps_is_equal_fixed
* gst/gstpad.c: (gst_pad_try_set_caps):
* gst/gstqueue.c: (gst_queue_link):
s/gst_caps_is_equal_fixed/gst_caps_is_equal/
* gst/gststructure.c: (gst_structure_get_name_id):
* gst/gststructure.h:
add function gst_structure_get_name_id
* gst/gstvalue.c: (gst_value_subtract_int_int_range),
(gst_value_create_new_range), (gst_value_subtract_int_range_int),
(gst_value_subtract_int_range_int_range),
(gst_value_subtract_double_double_range),
(gst_value_subtract_double_range_double),
(gst_value_subtract_double_range_double_range),
(gst_value_subtract_from_list), (gst_value_subtract_list),
(gst_value_can_intersect), (gst_value_subtract),
(gst_value_can_subtract), (gst_value_register_subtract_func),
(_gst_value_initialize):
* gst/gstvalue.h:
add support for subtracting values from each other. Note that
subtracting means subtracting as in set theory. Required for caps
stuff above.
* testsuite/caps/.cvsignore:
* testsuite/caps/Makefile.am:
* testsuite/caps/erathostenes.c: (erathostenes), (main):
* testsuite/caps/sets.c: (check_caps), (main):
* testsuite/caps/subtract.c: (check_caps), (main):
add tests for subtraction and equality code.
2004-04-21 03:25:13 +00:00
|
|
|
gboolean
|
|
|
|
gst_caps_is_equal (const GstCaps * caps1, const GstCaps * caps2)
|
|
|
|
{
|
2005-11-11 18:25:50 +00:00
|
|
|
/* NULL <-> NULL is allowed here */
|
|
|
|
if (caps1 == caps2)
|
|
|
|
return TRUE;
|
|
|
|
|
2005-12-07 15:16:43 +00:00
|
|
|
/* one of them NULL => they are different (can't be both NULL because
|
|
|
|
* we checked that above) */
|
|
|
|
if (caps1 == NULL || caps2 == NULL)
|
|
|
|
return FALSE;
|
gst/gstcaps.c: check for ANY caps before appending/unioning
Original commit message from CVS:
* gst/gstcaps.c: (gst_caps_append), (gst_caps_union):
check for ANY caps before appending/unioning
* gst/gstcaps.c: (gst_caps_is_subset),
(gst_caps_is_equal), (gst_caps_structure_subtract_field),
(gst_caps_structure_subtract), (gst_caps_subtract):
* gst/gstcaps.h:
add gst_caps_is_equal, gst_caps_is_subset and gst_caps_subtract to
the API. deprecate gst_caps_is_equal_fixed
* gst/gstpad.c: (gst_pad_try_set_caps):
* gst/gstqueue.c: (gst_queue_link):
s/gst_caps_is_equal_fixed/gst_caps_is_equal/
* gst/gststructure.c: (gst_structure_get_name_id):
* gst/gststructure.h:
add function gst_structure_get_name_id
* gst/gstvalue.c: (gst_value_subtract_int_int_range),
(gst_value_create_new_range), (gst_value_subtract_int_range_int),
(gst_value_subtract_int_range_int_range),
(gst_value_subtract_double_double_range),
(gst_value_subtract_double_range_double),
(gst_value_subtract_double_range_double_range),
(gst_value_subtract_from_list), (gst_value_subtract_list),
(gst_value_can_intersect), (gst_value_subtract),
(gst_value_can_subtract), (gst_value_register_subtract_func),
(_gst_value_initialize):
* gst/gstvalue.h:
add support for subtracting values from each other. Note that
subtracting means subtracting as in set theory. Required for caps
stuff above.
* testsuite/caps/.cvsignore:
* testsuite/caps/Makefile.am:
* testsuite/caps/erathostenes.c: (erathostenes), (main):
* testsuite/caps/sets.c: (check_caps), (main):
* testsuite/caps/subtract.c: (check_caps), (main):
add tests for subtraction and equality code.
2004-04-21 03:25:13 +00:00
|
|
|
|
|
|
|
if (gst_caps_is_fixed (caps1) && gst_caps_is_fixed (caps2))
|
|
|
|
return gst_caps_is_equal_fixed (caps1, caps2);
|
|
|
|
|
|
|
|
return gst_caps_is_subset (caps1, caps2) && gst_caps_is_subset (caps2, caps1);
|
|
|
|
}
|
|
|
|
|
2004-03-13 15:27:01 +00:00
|
|
|
typedef struct
|
|
|
|
{
|
2003-11-11 19:14:14 +00:00
|
|
|
GstStructure *dest;
|
2003-12-22 01:39:35 +00:00
|
|
|
const GstStructure *intersect;
|
|
|
|
gboolean first_run;
|
2004-03-15 19:27:17 +00:00
|
|
|
}
|
|
|
|
IntersectData;
|
2003-12-22 01:39:35 +00:00
|
|
|
|
|
|
|
static gboolean
|
2005-03-07 18:27:42 +00:00
|
|
|
gst_caps_structure_intersect_field (GQuark id, const GValue * val1,
|
|
|
|
gpointer data)
|
2003-12-22 01:39:35 +00:00
|
|
|
{
|
|
|
|
IntersectData *idata = (IntersectData *) data;
|
|
|
|
GValue dest_value = { 0 };
|
|
|
|
const GValue *val2 = gst_structure_id_get_value (idata->intersect, id);
|
|
|
|
|
|
|
|
if (val2 == NULL) {
|
|
|
|
gst_structure_id_set_value (idata->dest, id, val1);
|
|
|
|
} else if (idata->first_run) {
|
|
|
|
if (gst_value_intersect (&dest_value, val1, val2)) {
|
|
|
|
gst_structure_id_set_value (idata->dest, id, &dest_value);
|
|
|
|
g_value_unset (&dest_value);
|
2003-11-11 19:14:14 +00:00
|
|
|
} else {
|
2003-12-22 01:39:35 +00:00
|
|
|
return FALSE;
|
2003-11-11 19:14:14 +00:00
|
|
|
}
|
|
|
|
}
|
2004-03-13 15:27:01 +00:00
|
|
|
|
2003-12-22 01:39:35 +00:00
|
|
|
return TRUE;
|
|
|
|
}
|
2003-11-11 19:14:14 +00:00
|
|
|
|
2004-03-12 19:32:26 +00:00
|
|
|
static GstStructure *
|
2004-03-13 15:27:01 +00:00
|
|
|
gst_caps_structure_intersect (const GstStructure * struct1,
|
|
|
|
const GstStructure * struct2)
|
2003-12-22 01:39:35 +00:00
|
|
|
{
|
|
|
|
IntersectData data;
|
2003-11-11 19:14:14 +00:00
|
|
|
|
2004-03-13 15:27:01 +00:00
|
|
|
g_return_val_if_fail (struct1 != NULL, NULL);
|
|
|
|
g_return_val_if_fail (struct2 != NULL, NULL);
|
2003-11-11 19:14:14 +00:00
|
|
|
|
2004-03-13 15:27:01 +00:00
|
|
|
if (struct1->name != struct2->name)
|
|
|
|
return NULL;
|
2003-12-22 01:39:35 +00:00
|
|
|
|
|
|
|
data.dest = gst_structure_id_empty_new (struct1->name);
|
|
|
|
data.intersect = struct2;
|
|
|
|
data.first_run = TRUE;
|
2004-03-13 15:27:01 +00:00
|
|
|
if (!gst_structure_foreach ((GstStructure *) struct1,
|
2004-03-15 19:27:17 +00:00
|
|
|
gst_caps_structure_intersect_field, &data))
|
2003-12-22 01:39:35 +00:00
|
|
|
goto error;
|
2004-03-13 15:27:01 +00:00
|
|
|
|
2003-12-22 01:39:35 +00:00
|
|
|
data.intersect = struct1;
|
|
|
|
data.first_run = FALSE;
|
2004-03-13 15:27:01 +00:00
|
|
|
if (!gst_structure_foreach ((GstStructure *) struct2,
|
2004-03-15 19:27:17 +00:00
|
|
|
gst_caps_structure_intersect_field, &data))
|
2003-12-22 01:39:35 +00:00
|
|
|
goto error;
|
|
|
|
|
|
|
|
return data.dest;
|
|
|
|
|
|
|
|
error:
|
|
|
|
gst_structure_free (data.dest);
|
|
|
|
return NULL;
|
2003-11-11 19:14:14 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
#if 0
|
2004-03-12 19:32:26 +00:00
|
|
|
static GstStructure *
|
2004-03-13 15:27:01 +00:00
|
|
|
gst_caps_structure_union (const GstStructure * struct1,
|
|
|
|
const GstStructure * struct2)
|
2003-11-11 19:14:14 +00:00
|
|
|
{
|
|
|
|
int i;
|
|
|
|
GstStructure *dest;
|
|
|
|
const GstStructureField *field1;
|
|
|
|
const GstStructureField *field2;
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
/* FIXME this doesn't actually work */
|
|
|
|
|
2004-03-13 15:27:01 +00:00
|
|
|
if (struct1->name != struct2->name)
|
|
|
|
return NULL;
|
2003-11-11 19:14:14 +00:00
|
|
|
|
|
|
|
dest = gst_structure_id_empty_new (struct1->name);
|
|
|
|
|
2004-03-13 15:27:01 +00:00
|
|
|
for (i = 0; i < struct1->fields->len; i++) {
|
2003-11-11 19:14:14 +00:00
|
|
|
GValue dest_value = { 0 };
|
|
|
|
|
|
|
|
field1 = GST_STRUCTURE_FIELD (struct1, i);
|
|
|
|
field2 = gst_structure_id_get_field (struct2, field1->name);
|
|
|
|
|
|
|
|
if (field2 == NULL) {
|
|
|
|
continue;
|
|
|
|
} else {
|
|
|
|
if (gst_value_union (&dest_value, &field1->value, &field2->value)) {
|
2004-03-15 19:27:17 +00:00
|
|
|
gst_structure_set_value (dest, g_quark_to_string (field1->name),
|
|
|
|
&dest_value);
|
2003-11-11 19:14:14 +00:00
|
|
|
} else {
|
2004-03-15 19:27:17 +00:00
|
|
|
ret = gst_value_compare (&field1->value, &field2->value);
|
2003-11-11 19:14:14 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return dest;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
/* operations */
|
2004-01-15 09:03:42 +00:00
|
|
|
|
|
|
|
/**
|
|
|
|
* gst_caps_intersect:
|
|
|
|
* @caps1: a #GstCaps to intersect
|
|
|
|
* @caps2: a #GstCaps to intersect
|
|
|
|
*
|
|
|
|
* Creates a new #GstCaps that contains all the formats that are common
|
|
|
|
* to both @caps1 and @caps2.
|
|
|
|
*
|
|
|
|
* Returns: the new #GstCaps
|
|
|
|
*/
|
2004-03-12 19:32:26 +00:00
|
|
|
GstCaps *
|
2004-03-13 15:27:01 +00:00
|
|
|
gst_caps_intersect (const GstCaps * caps1, const GstCaps * caps2)
|
2003-11-11 19:14:14 +00:00
|
|
|
{
|
2005-10-17 14:37:06 +00:00
|
|
|
guint64 i; /* index can be up to 2 * G_MAX_UINT */
|
|
|
|
guint j, k;
|
2005-10-16 12:28:20 +00:00
|
|
|
|
2003-11-11 19:14:14 +00:00
|
|
|
GstStructure *struct1;
|
|
|
|
GstStructure *struct2;
|
2003-12-22 01:39:35 +00:00
|
|
|
GstCaps *dest;
|
2005-03-07 18:27:42 +00:00
|
|
|
GstStructure *istruct;
|
2004-03-13 15:27:01 +00:00
|
|
|
|
gst/gstcaps.c: Patch from Tim-Philipp Müller to fix GST_CAPS() and GST_IS_CAPS(). (bug #141304)
Original commit message from CVS:
* gst/gstcaps.c: (gst_caps_copy), (gst_caps_free),
(gst_caps_append), (gst_caps_append_structure),
(gst_caps_get_size), (gst_caps_get_structure), (gst_caps_copy_1),
(gst_caps_set_simple), (gst_caps_set_simple_valist),
(gst_caps_is_any), (gst_caps_is_empty), (gst_caps_is_chained),
(gst_caps_is_fixed), (gst_caps_is_always_compatible),
(gst_caps_intersect), (gst_caps_normalize),
(gst_caps_transform_to_string): Patch from Tim-Philipp Müller
to fix GST_CAPS() and GST_IS_CAPS(). (bug #141304)
* gst/gstcaps.h: use GST_IS_CAPS().
2004-04-28 20:19:46 +00:00
|
|
|
g_return_val_if_fail (GST_IS_CAPS (caps1), NULL);
|
|
|
|
g_return_val_if_fail (GST_IS_CAPS (caps2), NULL);
|
2003-12-22 01:39:35 +00:00
|
|
|
|
2007-08-07 09:56:08 +00:00
|
|
|
/* caps are exactly the same pointers, just copy one caps */
|
|
|
|
if (caps1 == caps2)
|
|
|
|
return gst_caps_copy (caps1);
|
|
|
|
|
|
|
|
/* empty caps on either side, return empty */
|
|
|
|
if (gst_caps_is_empty (caps1) || gst_caps_is_empty (caps2))
|
2003-12-22 01:39:35 +00:00
|
|
|
return gst_caps_new_empty ();
|
2007-08-07 09:56:08 +00:00
|
|
|
|
|
|
|
/* one of the caps is any, just copy the other caps */
|
2004-03-13 15:27:01 +00:00
|
|
|
if (gst_caps_is_any (caps1))
|
|
|
|
return gst_caps_copy (caps2);
|
|
|
|
if (gst_caps_is_any (caps2))
|
|
|
|
return gst_caps_copy (caps1);
|
2003-11-11 19:14:14 +00:00
|
|
|
|
2004-03-13 15:27:01 +00:00
|
|
|
dest = gst_caps_new_empty ();
|
2003-11-11 19:14:14 +00:00
|
|
|
|
2005-03-07 18:27:42 +00:00
|
|
|
/* run zigzag on top line then right line, this preserves the caps order
|
2005-10-15 15:30:24 +00:00
|
|
|
* much better than a simple loop.
|
|
|
|
*
|
2005-03-07 18:27:42 +00:00
|
|
|
* This algorithm zigzags over the caps structures as demonstrated in
|
|
|
|
* the folowing matrix:
|
|
|
|
*
|
|
|
|
* caps1
|
|
|
|
* +-------------
|
|
|
|
* | 1 2 4 7
|
|
|
|
* caps2 | 3 5 8 10
|
|
|
|
* | 6 9 11 12
|
2005-10-15 15:30:24 +00:00
|
|
|
*
|
2005-03-07 18:27:42 +00:00
|
|
|
* First we iterate over the caps1 structures (top line) intersecting
|
|
|
|
* the structures diagonally down, then we iterate over the caps2
|
2005-10-15 15:30:24 +00:00
|
|
|
* structures.
|
2005-03-07 18:27:42 +00:00
|
|
|
*/
|
|
|
|
for (i = 0; i < caps1->structs->len + caps2->structs->len - 1; i++) {
|
|
|
|
/* caps1 index goes from 0 to caps1->structs->len-1 */
|
|
|
|
j = MIN (i, caps1->structs->len - 1);
|
|
|
|
/* caps2 index stays 0 until i reaches caps1->structs->len, then it counts
|
|
|
|
* up from 1 to caps2->structs->len - 1 */
|
|
|
|
k = MAX (0, i - j);
|
|
|
|
|
|
|
|
/* now run the diagonal line, end condition is the left or bottom
|
|
|
|
* border */
|
2005-10-17 14:37:06 +00:00
|
|
|
while (k < caps2->structs->len) {
|
2005-03-07 18:27:42 +00:00
|
|
|
struct1 = gst_caps_get_structure (caps1, j);
|
|
|
|
struct2 = gst_caps_get_structure (caps2, k);
|
|
|
|
|
2003-12-22 01:39:35 +00:00
|
|
|
istruct = gst_caps_structure_intersect (struct1, struct2);
|
|
|
|
|
2004-03-13 15:27:01 +00:00
|
|
|
gst_caps_append_structure (dest, istruct);
|
2005-03-07 18:27:42 +00:00
|
|
|
/* move down left */
|
|
|
|
k++;
|
2005-10-17 14:37:06 +00:00
|
|
|
if (j == 0)
|
|
|
|
break; /* so we don't roll back to G_MAXUINT */
|
2005-03-07 18:27:42 +00:00
|
|
|
j--;
|
2003-11-11 19:14:14 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
return dest;
|
|
|
|
}
|
|
|
|
|
gst/gstcaps.c: check for ANY caps before appending/unioning
Original commit message from CVS:
* gst/gstcaps.c: (gst_caps_append), (gst_caps_union):
check for ANY caps before appending/unioning
* gst/gstcaps.c: (gst_caps_is_subset),
(gst_caps_is_equal), (gst_caps_structure_subtract_field),
(gst_caps_structure_subtract), (gst_caps_subtract):
* gst/gstcaps.h:
add gst_caps_is_equal, gst_caps_is_subset and gst_caps_subtract to
the API. deprecate gst_caps_is_equal_fixed
* gst/gstpad.c: (gst_pad_try_set_caps):
* gst/gstqueue.c: (gst_queue_link):
s/gst_caps_is_equal_fixed/gst_caps_is_equal/
* gst/gststructure.c: (gst_structure_get_name_id):
* gst/gststructure.h:
add function gst_structure_get_name_id
* gst/gstvalue.c: (gst_value_subtract_int_int_range),
(gst_value_create_new_range), (gst_value_subtract_int_range_int),
(gst_value_subtract_int_range_int_range),
(gst_value_subtract_double_double_range),
(gst_value_subtract_double_range_double),
(gst_value_subtract_double_range_double_range),
(gst_value_subtract_from_list), (gst_value_subtract_list),
(gst_value_can_intersect), (gst_value_subtract),
(gst_value_can_subtract), (gst_value_register_subtract_func),
(_gst_value_initialize):
* gst/gstvalue.h:
add support for subtracting values from each other. Note that
subtracting means subtracting as in set theory. Required for caps
stuff above.
* testsuite/caps/.cvsignore:
* testsuite/caps/Makefile.am:
* testsuite/caps/erathostenes.c: (erathostenes), (main):
* testsuite/caps/sets.c: (check_caps), (main):
* testsuite/caps/subtract.c: (check_caps), (main):
add tests for subtraction and equality code.
2004-04-21 03:25:13 +00:00
|
|
|
typedef struct
|
|
|
|
{
|
|
|
|
const GstStructure *subtract_from;
|
2004-04-22 23:50:46 +00:00
|
|
|
GSList *put_into;
|
gst/gstcaps.c: check for ANY caps before appending/unioning
Original commit message from CVS:
* gst/gstcaps.c: (gst_caps_append), (gst_caps_union):
check for ANY caps before appending/unioning
* gst/gstcaps.c: (gst_caps_is_subset),
(gst_caps_is_equal), (gst_caps_structure_subtract_field),
(gst_caps_structure_subtract), (gst_caps_subtract):
* gst/gstcaps.h:
add gst_caps_is_equal, gst_caps_is_subset and gst_caps_subtract to
the API. deprecate gst_caps_is_equal_fixed
* gst/gstpad.c: (gst_pad_try_set_caps):
* gst/gstqueue.c: (gst_queue_link):
s/gst_caps_is_equal_fixed/gst_caps_is_equal/
* gst/gststructure.c: (gst_structure_get_name_id):
* gst/gststructure.h:
add function gst_structure_get_name_id
* gst/gstvalue.c: (gst_value_subtract_int_int_range),
(gst_value_create_new_range), (gst_value_subtract_int_range_int),
(gst_value_subtract_int_range_int_range),
(gst_value_subtract_double_double_range),
(gst_value_subtract_double_range_double),
(gst_value_subtract_double_range_double_range),
(gst_value_subtract_from_list), (gst_value_subtract_list),
(gst_value_can_intersect), (gst_value_subtract),
(gst_value_can_subtract), (gst_value_register_subtract_func),
(_gst_value_initialize):
* gst/gstvalue.h:
add support for subtracting values from each other. Note that
subtracting means subtracting as in set theory. Required for caps
stuff above.
* testsuite/caps/.cvsignore:
* testsuite/caps/Makefile.am:
* testsuite/caps/erathostenes.c: (erathostenes), (main):
* testsuite/caps/sets.c: (check_caps), (main):
* testsuite/caps/subtract.c: (check_caps), (main):
add tests for subtraction and equality code.
2004-04-21 03:25:13 +00:00
|
|
|
}
|
|
|
|
SubtractionEntry;
|
|
|
|
|
|
|
|
|
2005-03-07 18:27:42 +00:00
|
|
|
static gboolean
|
|
|
|
gst_caps_structure_subtract_field (GQuark field_id, const GValue * value,
|
gst/gstcaps.c: check for ANY caps before appending/unioning
Original commit message from CVS:
* gst/gstcaps.c: (gst_caps_append), (gst_caps_union):
check for ANY caps before appending/unioning
* gst/gstcaps.c: (gst_caps_is_subset),
(gst_caps_is_equal), (gst_caps_structure_subtract_field),
(gst_caps_structure_subtract), (gst_caps_subtract):
* gst/gstcaps.h:
add gst_caps_is_equal, gst_caps_is_subset and gst_caps_subtract to
the API. deprecate gst_caps_is_equal_fixed
* gst/gstpad.c: (gst_pad_try_set_caps):
* gst/gstqueue.c: (gst_queue_link):
s/gst_caps_is_equal_fixed/gst_caps_is_equal/
* gst/gststructure.c: (gst_structure_get_name_id):
* gst/gststructure.h:
add function gst_structure_get_name_id
* gst/gstvalue.c: (gst_value_subtract_int_int_range),
(gst_value_create_new_range), (gst_value_subtract_int_range_int),
(gst_value_subtract_int_range_int_range),
(gst_value_subtract_double_double_range),
(gst_value_subtract_double_range_double),
(gst_value_subtract_double_range_double_range),
(gst_value_subtract_from_list), (gst_value_subtract_list),
(gst_value_can_intersect), (gst_value_subtract),
(gst_value_can_subtract), (gst_value_register_subtract_func),
(_gst_value_initialize):
* gst/gstvalue.h:
add support for subtracting values from each other. Note that
subtracting means subtracting as in set theory. Required for caps
stuff above.
* testsuite/caps/.cvsignore:
* testsuite/caps/Makefile.am:
* testsuite/caps/erathostenes.c: (erathostenes), (main):
* testsuite/caps/sets.c: (check_caps), (main):
* testsuite/caps/subtract.c: (check_caps), (main):
add tests for subtraction and equality code.
2004-04-21 03:25:13 +00:00
|
|
|
gpointer user_data)
|
|
|
|
{
|
|
|
|
SubtractionEntry *e = user_data;
|
|
|
|
GValue subtraction = { 0, };
|
|
|
|
const GValue *other;
|
|
|
|
GstStructure *structure;
|
|
|
|
|
|
|
|
other = gst_structure_id_get_value (e->subtract_from, field_id);
|
2004-04-22 23:50:46 +00:00
|
|
|
if (!other) {
|
|
|
|
return FALSE;
|
|
|
|
}
|
gst/gstcaps.c: check for ANY caps before appending/unioning
Original commit message from CVS:
* gst/gstcaps.c: (gst_caps_append), (gst_caps_union):
check for ANY caps before appending/unioning
* gst/gstcaps.c: (gst_caps_is_subset),
(gst_caps_is_equal), (gst_caps_structure_subtract_field),
(gst_caps_structure_subtract), (gst_caps_subtract):
* gst/gstcaps.h:
add gst_caps_is_equal, gst_caps_is_subset and gst_caps_subtract to
the API. deprecate gst_caps_is_equal_fixed
* gst/gstpad.c: (gst_pad_try_set_caps):
* gst/gstqueue.c: (gst_queue_link):
s/gst_caps_is_equal_fixed/gst_caps_is_equal/
* gst/gststructure.c: (gst_structure_get_name_id):
* gst/gststructure.h:
add function gst_structure_get_name_id
* gst/gstvalue.c: (gst_value_subtract_int_int_range),
(gst_value_create_new_range), (gst_value_subtract_int_range_int),
(gst_value_subtract_int_range_int_range),
(gst_value_subtract_double_double_range),
(gst_value_subtract_double_range_double),
(gst_value_subtract_double_range_double_range),
(gst_value_subtract_from_list), (gst_value_subtract_list),
(gst_value_can_intersect), (gst_value_subtract),
(gst_value_can_subtract), (gst_value_register_subtract_func),
(_gst_value_initialize):
* gst/gstvalue.h:
add support for subtracting values from each other. Note that
subtracting means subtracting as in set theory. Required for caps
stuff above.
* testsuite/caps/.cvsignore:
* testsuite/caps/Makefile.am:
* testsuite/caps/erathostenes.c: (erathostenes), (main):
* testsuite/caps/sets.c: (check_caps), (main):
* testsuite/caps/subtract.c: (check_caps), (main):
add tests for subtraction and equality code.
2004-04-21 03:25:13 +00:00
|
|
|
if (!gst_value_subtract (&subtraction, other, value))
|
|
|
|
return TRUE;
|
|
|
|
if (gst_value_compare (&subtraction, other) == GST_VALUE_EQUAL) {
|
2004-04-22 23:50:46 +00:00
|
|
|
g_value_unset (&subtraction);
|
gst/gstcaps.c: check for ANY caps before appending/unioning
Original commit message from CVS:
* gst/gstcaps.c: (gst_caps_append), (gst_caps_union):
check for ANY caps before appending/unioning
* gst/gstcaps.c: (gst_caps_is_subset),
(gst_caps_is_equal), (gst_caps_structure_subtract_field),
(gst_caps_structure_subtract), (gst_caps_subtract):
* gst/gstcaps.h:
add gst_caps_is_equal, gst_caps_is_subset and gst_caps_subtract to
the API. deprecate gst_caps_is_equal_fixed
* gst/gstpad.c: (gst_pad_try_set_caps):
* gst/gstqueue.c: (gst_queue_link):
s/gst_caps_is_equal_fixed/gst_caps_is_equal/
* gst/gststructure.c: (gst_structure_get_name_id):
* gst/gststructure.h:
add function gst_structure_get_name_id
* gst/gstvalue.c: (gst_value_subtract_int_int_range),
(gst_value_create_new_range), (gst_value_subtract_int_range_int),
(gst_value_subtract_int_range_int_range),
(gst_value_subtract_double_double_range),
(gst_value_subtract_double_range_double),
(gst_value_subtract_double_range_double_range),
(gst_value_subtract_from_list), (gst_value_subtract_list),
(gst_value_can_intersect), (gst_value_subtract),
(gst_value_can_subtract), (gst_value_register_subtract_func),
(_gst_value_initialize):
* gst/gstvalue.h:
add support for subtracting values from each other. Note that
subtracting means subtracting as in set theory. Required for caps
stuff above.
* testsuite/caps/.cvsignore:
* testsuite/caps/Makefile.am:
* testsuite/caps/erathostenes.c: (erathostenes), (main):
* testsuite/caps/sets.c: (check_caps), (main):
* testsuite/caps/subtract.c: (check_caps), (main):
add tests for subtraction and equality code.
2004-04-21 03:25:13 +00:00
|
|
|
return FALSE;
|
|
|
|
} else {
|
2004-04-22 23:50:46 +00:00
|
|
|
structure = gst_structure_copy (e->subtract_from);
|
gst/gstcaps.c: check for ANY caps before appending/unioning
Original commit message from CVS:
* gst/gstcaps.c: (gst_caps_append), (gst_caps_union):
check for ANY caps before appending/unioning
* gst/gstcaps.c: (gst_caps_is_subset),
(gst_caps_is_equal), (gst_caps_structure_subtract_field),
(gst_caps_structure_subtract), (gst_caps_subtract):
* gst/gstcaps.h:
add gst_caps_is_equal, gst_caps_is_subset and gst_caps_subtract to
the API. deprecate gst_caps_is_equal_fixed
* gst/gstpad.c: (gst_pad_try_set_caps):
* gst/gstqueue.c: (gst_queue_link):
s/gst_caps_is_equal_fixed/gst_caps_is_equal/
* gst/gststructure.c: (gst_structure_get_name_id):
* gst/gststructure.h:
add function gst_structure_get_name_id
* gst/gstvalue.c: (gst_value_subtract_int_int_range),
(gst_value_create_new_range), (gst_value_subtract_int_range_int),
(gst_value_subtract_int_range_int_range),
(gst_value_subtract_double_double_range),
(gst_value_subtract_double_range_double),
(gst_value_subtract_double_range_double_range),
(gst_value_subtract_from_list), (gst_value_subtract_list),
(gst_value_can_intersect), (gst_value_subtract),
(gst_value_can_subtract), (gst_value_register_subtract_func),
(_gst_value_initialize):
* gst/gstvalue.h:
add support for subtracting values from each other. Note that
subtracting means subtracting as in set theory. Required for caps
stuff above.
* testsuite/caps/.cvsignore:
* testsuite/caps/Makefile.am:
* testsuite/caps/erathostenes.c: (erathostenes), (main):
* testsuite/caps/sets.c: (check_caps), (main):
* testsuite/caps/subtract.c: (check_caps), (main):
add tests for subtraction and equality code.
2004-04-21 03:25:13 +00:00
|
|
|
gst_structure_id_set_value (structure, field_id, &subtraction);
|
|
|
|
g_value_unset (&subtraction);
|
2004-04-22 23:50:46 +00:00
|
|
|
e->put_into = g_slist_prepend (e->put_into, structure);
|
gst/gstcaps.c: check for ANY caps before appending/unioning
Original commit message from CVS:
* gst/gstcaps.c: (gst_caps_append), (gst_caps_union):
check for ANY caps before appending/unioning
* gst/gstcaps.c: (gst_caps_is_subset),
(gst_caps_is_equal), (gst_caps_structure_subtract_field),
(gst_caps_structure_subtract), (gst_caps_subtract):
* gst/gstcaps.h:
add gst_caps_is_equal, gst_caps_is_subset and gst_caps_subtract to
the API. deprecate gst_caps_is_equal_fixed
* gst/gstpad.c: (gst_pad_try_set_caps):
* gst/gstqueue.c: (gst_queue_link):
s/gst_caps_is_equal_fixed/gst_caps_is_equal/
* gst/gststructure.c: (gst_structure_get_name_id):
* gst/gststructure.h:
add function gst_structure_get_name_id
* gst/gstvalue.c: (gst_value_subtract_int_int_range),
(gst_value_create_new_range), (gst_value_subtract_int_range_int),
(gst_value_subtract_int_range_int_range),
(gst_value_subtract_double_double_range),
(gst_value_subtract_double_range_double),
(gst_value_subtract_double_range_double_range),
(gst_value_subtract_from_list), (gst_value_subtract_list),
(gst_value_can_intersect), (gst_value_subtract),
(gst_value_can_subtract), (gst_value_register_subtract_func),
(_gst_value_initialize):
* gst/gstvalue.h:
add support for subtracting values from each other. Note that
subtracting means subtracting as in set theory. Required for caps
stuff above.
* testsuite/caps/.cvsignore:
* testsuite/caps/Makefile.am:
* testsuite/caps/erathostenes.c: (erathostenes), (main):
* testsuite/caps/sets.c: (check_caps), (main):
* testsuite/caps/subtract.c: (check_caps), (main):
add tests for subtraction and equality code.
2004-04-21 03:25:13 +00:00
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2004-04-22 23:50:46 +00:00
|
|
|
static gboolean
|
|
|
|
gst_caps_structure_subtract (GSList ** into, const GstStructure * minuend,
|
gst/gstcaps.c: check for ANY caps before appending/unioning
Original commit message from CVS:
* gst/gstcaps.c: (gst_caps_append), (gst_caps_union):
check for ANY caps before appending/unioning
* gst/gstcaps.c: (gst_caps_is_subset),
(gst_caps_is_equal), (gst_caps_structure_subtract_field),
(gst_caps_structure_subtract), (gst_caps_subtract):
* gst/gstcaps.h:
add gst_caps_is_equal, gst_caps_is_subset and gst_caps_subtract to
the API. deprecate gst_caps_is_equal_fixed
* gst/gstpad.c: (gst_pad_try_set_caps):
* gst/gstqueue.c: (gst_queue_link):
s/gst_caps_is_equal_fixed/gst_caps_is_equal/
* gst/gststructure.c: (gst_structure_get_name_id):
* gst/gststructure.h:
add function gst_structure_get_name_id
* gst/gstvalue.c: (gst_value_subtract_int_int_range),
(gst_value_create_new_range), (gst_value_subtract_int_range_int),
(gst_value_subtract_int_range_int_range),
(gst_value_subtract_double_double_range),
(gst_value_subtract_double_range_double),
(gst_value_subtract_double_range_double_range),
(gst_value_subtract_from_list), (gst_value_subtract_list),
(gst_value_can_intersect), (gst_value_subtract),
(gst_value_can_subtract), (gst_value_register_subtract_func),
(_gst_value_initialize):
* gst/gstvalue.h:
add support for subtracting values from each other. Note that
subtracting means subtracting as in set theory. Required for caps
stuff above.
* testsuite/caps/.cvsignore:
* testsuite/caps/Makefile.am:
* testsuite/caps/erathostenes.c: (erathostenes), (main):
* testsuite/caps/sets.c: (check_caps), (main):
* testsuite/caps/subtract.c: (check_caps), (main):
add tests for subtraction and equality code.
2004-04-21 03:25:13 +00:00
|
|
|
const GstStructure * subtrahend)
|
|
|
|
{
|
|
|
|
SubtractionEntry e;
|
2004-04-22 23:50:46 +00:00
|
|
|
gboolean ret;
|
gst/gstcaps.c: check for ANY caps before appending/unioning
Original commit message from CVS:
* gst/gstcaps.c: (gst_caps_append), (gst_caps_union):
check for ANY caps before appending/unioning
* gst/gstcaps.c: (gst_caps_is_subset),
(gst_caps_is_equal), (gst_caps_structure_subtract_field),
(gst_caps_structure_subtract), (gst_caps_subtract):
* gst/gstcaps.h:
add gst_caps_is_equal, gst_caps_is_subset and gst_caps_subtract to
the API. deprecate gst_caps_is_equal_fixed
* gst/gstpad.c: (gst_pad_try_set_caps):
* gst/gstqueue.c: (gst_queue_link):
s/gst_caps_is_equal_fixed/gst_caps_is_equal/
* gst/gststructure.c: (gst_structure_get_name_id):
* gst/gststructure.h:
add function gst_structure_get_name_id
* gst/gstvalue.c: (gst_value_subtract_int_int_range),
(gst_value_create_new_range), (gst_value_subtract_int_range_int),
(gst_value_subtract_int_range_int_range),
(gst_value_subtract_double_double_range),
(gst_value_subtract_double_range_double),
(gst_value_subtract_double_range_double_range),
(gst_value_subtract_from_list), (gst_value_subtract_list),
(gst_value_can_intersect), (gst_value_subtract),
(gst_value_can_subtract), (gst_value_register_subtract_func),
(_gst_value_initialize):
* gst/gstvalue.h:
add support for subtracting values from each other. Note that
subtracting means subtracting as in set theory. Required for caps
stuff above.
* testsuite/caps/.cvsignore:
* testsuite/caps/Makefile.am:
* testsuite/caps/erathostenes.c: (erathostenes), (main):
* testsuite/caps/sets.c: (check_caps), (main):
* testsuite/caps/subtract.c: (check_caps), (main):
add tests for subtraction and equality code.
2004-04-21 03:25:13 +00:00
|
|
|
|
|
|
|
e.subtract_from = minuend;
|
2004-04-22 23:50:46 +00:00
|
|
|
e.put_into = NULL;
|
gst/gstcaps.c: check for ANY caps before appending/unioning
Original commit message from CVS:
* gst/gstcaps.c: (gst_caps_append), (gst_caps_union):
check for ANY caps before appending/unioning
* gst/gstcaps.c: (gst_caps_is_subset),
(gst_caps_is_equal), (gst_caps_structure_subtract_field),
(gst_caps_structure_subtract), (gst_caps_subtract):
* gst/gstcaps.h:
add gst_caps_is_equal, gst_caps_is_subset and gst_caps_subtract to
the API. deprecate gst_caps_is_equal_fixed
* gst/gstpad.c: (gst_pad_try_set_caps):
* gst/gstqueue.c: (gst_queue_link):
s/gst_caps_is_equal_fixed/gst_caps_is_equal/
* gst/gststructure.c: (gst_structure_get_name_id):
* gst/gststructure.h:
add function gst_structure_get_name_id
* gst/gstvalue.c: (gst_value_subtract_int_int_range),
(gst_value_create_new_range), (gst_value_subtract_int_range_int),
(gst_value_subtract_int_range_int_range),
(gst_value_subtract_double_double_range),
(gst_value_subtract_double_range_double),
(gst_value_subtract_double_range_double_range),
(gst_value_subtract_from_list), (gst_value_subtract_list),
(gst_value_can_intersect), (gst_value_subtract),
(gst_value_can_subtract), (gst_value_register_subtract_func),
(_gst_value_initialize):
* gst/gstvalue.h:
add support for subtracting values from each other. Note that
subtracting means subtracting as in set theory. Required for caps
stuff above.
* testsuite/caps/.cvsignore:
* testsuite/caps/Makefile.am:
* testsuite/caps/erathostenes.c: (erathostenes), (main):
* testsuite/caps/sets.c: (check_caps), (main):
* testsuite/caps/subtract.c: (check_caps), (main):
add tests for subtraction and equality code.
2004-04-21 03:25:13 +00:00
|
|
|
|
2004-04-22 23:50:46 +00:00
|
|
|
ret = gst_structure_foreach ((GstStructure *) subtrahend,
|
gst/gstcaps.c: check for ANY caps before appending/unioning
Original commit message from CVS:
* gst/gstcaps.c: (gst_caps_append), (gst_caps_union):
check for ANY caps before appending/unioning
* gst/gstcaps.c: (gst_caps_is_subset),
(gst_caps_is_equal), (gst_caps_structure_subtract_field),
(gst_caps_structure_subtract), (gst_caps_subtract):
* gst/gstcaps.h:
add gst_caps_is_equal, gst_caps_is_subset and gst_caps_subtract to
the API. deprecate gst_caps_is_equal_fixed
* gst/gstpad.c: (gst_pad_try_set_caps):
* gst/gstqueue.c: (gst_queue_link):
s/gst_caps_is_equal_fixed/gst_caps_is_equal/
* gst/gststructure.c: (gst_structure_get_name_id):
* gst/gststructure.h:
add function gst_structure_get_name_id
* gst/gstvalue.c: (gst_value_subtract_int_int_range),
(gst_value_create_new_range), (gst_value_subtract_int_range_int),
(gst_value_subtract_int_range_int_range),
(gst_value_subtract_double_double_range),
(gst_value_subtract_double_range_double),
(gst_value_subtract_double_range_double_range),
(gst_value_subtract_from_list), (gst_value_subtract_list),
(gst_value_can_intersect), (gst_value_subtract),
(gst_value_can_subtract), (gst_value_register_subtract_func),
(_gst_value_initialize):
* gst/gstvalue.h:
add support for subtracting values from each other. Note that
subtracting means subtracting as in set theory. Required for caps
stuff above.
* testsuite/caps/.cvsignore:
* testsuite/caps/Makefile.am:
* testsuite/caps/erathostenes.c: (erathostenes), (main):
* testsuite/caps/sets.c: (check_caps), (main):
* testsuite/caps/subtract.c: (check_caps), (main):
add tests for subtraction and equality code.
2004-04-21 03:25:13 +00:00
|
|
|
gst_caps_structure_subtract_field, &e);
|
2004-04-22 23:50:46 +00:00
|
|
|
if (ret) {
|
|
|
|
*into = e.put_into;
|
|
|
|
} else {
|
|
|
|
GSList *walk;
|
|
|
|
|
|
|
|
for (walk = e.put_into; walk; walk = g_slist_next (walk)) {
|
|
|
|
gst_structure_free (walk->data);
|
|
|
|
}
|
|
|
|
g_slist_free (e.put_into);
|
|
|
|
}
|
|
|
|
return ret;
|
gst/gstcaps.c: check for ANY caps before appending/unioning
Original commit message from CVS:
* gst/gstcaps.c: (gst_caps_append), (gst_caps_union):
check for ANY caps before appending/unioning
* gst/gstcaps.c: (gst_caps_is_subset),
(gst_caps_is_equal), (gst_caps_structure_subtract_field),
(gst_caps_structure_subtract), (gst_caps_subtract):
* gst/gstcaps.h:
add gst_caps_is_equal, gst_caps_is_subset and gst_caps_subtract to
the API. deprecate gst_caps_is_equal_fixed
* gst/gstpad.c: (gst_pad_try_set_caps):
* gst/gstqueue.c: (gst_queue_link):
s/gst_caps_is_equal_fixed/gst_caps_is_equal/
* gst/gststructure.c: (gst_structure_get_name_id):
* gst/gststructure.h:
add function gst_structure_get_name_id
* gst/gstvalue.c: (gst_value_subtract_int_int_range),
(gst_value_create_new_range), (gst_value_subtract_int_range_int),
(gst_value_subtract_int_range_int_range),
(gst_value_subtract_double_double_range),
(gst_value_subtract_double_range_double),
(gst_value_subtract_double_range_double_range),
(gst_value_subtract_from_list), (gst_value_subtract_list),
(gst_value_can_intersect), (gst_value_subtract),
(gst_value_can_subtract), (gst_value_register_subtract_func),
(_gst_value_initialize):
* gst/gstvalue.h:
add support for subtracting values from each other. Note that
subtracting means subtracting as in set theory. Required for caps
stuff above.
* testsuite/caps/.cvsignore:
* testsuite/caps/Makefile.am:
* testsuite/caps/erathostenes.c: (erathostenes), (main):
* testsuite/caps/sets.c: (check_caps), (main):
* testsuite/caps/subtract.c: (check_caps), (main):
add tests for subtraction and equality code.
2004-04-21 03:25:13 +00:00
|
|
|
}
|
|
|
|
|
2004-04-23 00:00:25 +00:00
|
|
|
/**
|
|
|
|
* gst_caps_subtract:
|
|
|
|
* @minuend: #GstCaps to substract from
|
|
|
|
* @subtrahend: #GstCaps to substract
|
|
|
|
*
|
|
|
|
* Subtracts the @subtrahend from the @minuend.
|
|
|
|
* <note>This function does not work reliably if optional properties for caps
|
|
|
|
* are included on one caps and omitted on the other.</note>
|
|
|
|
*
|
|
|
|
* Returns: the resulting caps
|
|
|
|
*/
|
gst/gstcaps.c: check for ANY caps before appending/unioning
Original commit message from CVS:
* gst/gstcaps.c: (gst_caps_append), (gst_caps_union):
check for ANY caps before appending/unioning
* gst/gstcaps.c: (gst_caps_is_subset),
(gst_caps_is_equal), (gst_caps_structure_subtract_field),
(gst_caps_structure_subtract), (gst_caps_subtract):
* gst/gstcaps.h:
add gst_caps_is_equal, gst_caps_is_subset and gst_caps_subtract to
the API. deprecate gst_caps_is_equal_fixed
* gst/gstpad.c: (gst_pad_try_set_caps):
* gst/gstqueue.c: (gst_queue_link):
s/gst_caps_is_equal_fixed/gst_caps_is_equal/
* gst/gststructure.c: (gst_structure_get_name_id):
* gst/gststructure.h:
add function gst_structure_get_name_id
* gst/gstvalue.c: (gst_value_subtract_int_int_range),
(gst_value_create_new_range), (gst_value_subtract_int_range_int),
(gst_value_subtract_int_range_int_range),
(gst_value_subtract_double_double_range),
(gst_value_subtract_double_range_double),
(gst_value_subtract_double_range_double_range),
(gst_value_subtract_from_list), (gst_value_subtract_list),
(gst_value_can_intersect), (gst_value_subtract),
(gst_value_can_subtract), (gst_value_register_subtract_func),
(_gst_value_initialize):
* gst/gstvalue.h:
add support for subtracting values from each other. Note that
subtracting means subtracting as in set theory. Required for caps
stuff above.
* testsuite/caps/.cvsignore:
* testsuite/caps/Makefile.am:
* testsuite/caps/erathostenes.c: (erathostenes), (main):
* testsuite/caps/sets.c: (check_caps), (main):
* testsuite/caps/subtract.c: (check_caps), (main):
add tests for subtraction and equality code.
2004-04-21 03:25:13 +00:00
|
|
|
GstCaps *
|
|
|
|
gst_caps_subtract (const GstCaps * minuend, const GstCaps * subtrahend)
|
|
|
|
{
|
2005-10-15 00:12:22 +00:00
|
|
|
guint i, j;
|
gst/gstcaps.c: check for ANY caps before appending/unioning
Original commit message from CVS:
* gst/gstcaps.c: (gst_caps_append), (gst_caps_union):
check for ANY caps before appending/unioning
* gst/gstcaps.c: (gst_caps_is_subset),
(gst_caps_is_equal), (gst_caps_structure_subtract_field),
(gst_caps_structure_subtract), (gst_caps_subtract):
* gst/gstcaps.h:
add gst_caps_is_equal, gst_caps_is_subset and gst_caps_subtract to
the API. deprecate gst_caps_is_equal_fixed
* gst/gstpad.c: (gst_pad_try_set_caps):
* gst/gstqueue.c: (gst_queue_link):
s/gst_caps_is_equal_fixed/gst_caps_is_equal/
* gst/gststructure.c: (gst_structure_get_name_id):
* gst/gststructure.h:
add function gst_structure_get_name_id
* gst/gstvalue.c: (gst_value_subtract_int_int_range),
(gst_value_create_new_range), (gst_value_subtract_int_range_int),
(gst_value_subtract_int_range_int_range),
(gst_value_subtract_double_double_range),
(gst_value_subtract_double_range_double),
(gst_value_subtract_double_range_double_range),
(gst_value_subtract_from_list), (gst_value_subtract_list),
(gst_value_can_intersect), (gst_value_subtract),
(gst_value_can_subtract), (gst_value_register_subtract_func),
(_gst_value_initialize):
* gst/gstvalue.h:
add support for subtracting values from each other. Note that
subtracting means subtracting as in set theory. Required for caps
stuff above.
* testsuite/caps/.cvsignore:
* testsuite/caps/Makefile.am:
* testsuite/caps/erathostenes.c: (erathostenes), (main):
* testsuite/caps/sets.c: (check_caps), (main):
* testsuite/caps/subtract.c: (check_caps), (main):
add tests for subtraction and equality code.
2004-04-21 03:25:13 +00:00
|
|
|
GstStructure *min;
|
|
|
|
GstStructure *sub;
|
|
|
|
GstCaps *dest = NULL, *src;
|
|
|
|
|
|
|
|
g_return_val_if_fail (minuend != NULL, NULL);
|
|
|
|
g_return_val_if_fail (subtrahend != NULL, NULL);
|
|
|
|
|
|
|
|
if (gst_caps_is_empty (minuend) || gst_caps_is_any (subtrahend)) {
|
|
|
|
return gst_caps_new_empty ();
|
|
|
|
}
|
|
|
|
if (gst_caps_is_empty (subtrahend))
|
|
|
|
return gst_caps_copy (minuend);
|
|
|
|
|
2004-04-22 04:41:19 +00:00
|
|
|
/* FIXME: Do we want this here or above?
|
|
|
|
The reason we need this is that there is no definition about what
|
|
|
|
ANY means for specific types, so it's not possible to reduce ANY partially
|
|
|
|
You can only remove everything or nothing and that is done above.
|
|
|
|
Note: there's a test that checks this behaviour. */
|
|
|
|
g_return_val_if_fail (!gst_caps_is_any (minuend), NULL);
|
2004-04-25 17:46:30 +00:00
|
|
|
g_assert (subtrahend->structs->len > 0);
|
2004-04-22 04:41:19 +00:00
|
|
|
|
gst/gstcaps.c: check for ANY caps before appending/unioning
Original commit message from CVS:
* gst/gstcaps.c: (gst_caps_append), (gst_caps_union):
check for ANY caps before appending/unioning
* gst/gstcaps.c: (gst_caps_is_subset),
(gst_caps_is_equal), (gst_caps_structure_subtract_field),
(gst_caps_structure_subtract), (gst_caps_subtract):
* gst/gstcaps.h:
add gst_caps_is_equal, gst_caps_is_subset and gst_caps_subtract to
the API. deprecate gst_caps_is_equal_fixed
* gst/gstpad.c: (gst_pad_try_set_caps):
* gst/gstqueue.c: (gst_queue_link):
s/gst_caps_is_equal_fixed/gst_caps_is_equal/
* gst/gststructure.c: (gst_structure_get_name_id):
* gst/gststructure.h:
add function gst_structure_get_name_id
* gst/gstvalue.c: (gst_value_subtract_int_int_range),
(gst_value_create_new_range), (gst_value_subtract_int_range_int),
(gst_value_subtract_int_range_int_range),
(gst_value_subtract_double_double_range),
(gst_value_subtract_double_range_double),
(gst_value_subtract_double_range_double_range),
(gst_value_subtract_from_list), (gst_value_subtract_list),
(gst_value_can_intersect), (gst_value_subtract),
(gst_value_can_subtract), (gst_value_register_subtract_func),
(_gst_value_initialize):
* gst/gstvalue.h:
add support for subtracting values from each other. Note that
subtracting means subtracting as in set theory. Required for caps
stuff above.
* testsuite/caps/.cvsignore:
* testsuite/caps/Makefile.am:
* testsuite/caps/erathostenes.c: (erathostenes), (main):
* testsuite/caps/sets.c: (check_caps), (main):
* testsuite/caps/subtract.c: (check_caps), (main):
add tests for subtraction and equality code.
2004-04-21 03:25:13 +00:00
|
|
|
src = gst_caps_copy (minuend);
|
|
|
|
for (i = 0; i < subtrahend->structs->len; i++) {
|
|
|
|
sub = gst_caps_get_structure (subtrahend, i);
|
|
|
|
if (dest) {
|
2005-03-07 18:27:42 +00:00
|
|
|
gst_caps_unref (src);
|
gst/gstcaps.c: check for ANY caps before appending/unioning
Original commit message from CVS:
* gst/gstcaps.c: (gst_caps_append), (gst_caps_union):
check for ANY caps before appending/unioning
* gst/gstcaps.c: (gst_caps_is_subset),
(gst_caps_is_equal), (gst_caps_structure_subtract_field),
(gst_caps_structure_subtract), (gst_caps_subtract):
* gst/gstcaps.h:
add gst_caps_is_equal, gst_caps_is_subset and gst_caps_subtract to
the API. deprecate gst_caps_is_equal_fixed
* gst/gstpad.c: (gst_pad_try_set_caps):
* gst/gstqueue.c: (gst_queue_link):
s/gst_caps_is_equal_fixed/gst_caps_is_equal/
* gst/gststructure.c: (gst_structure_get_name_id):
* gst/gststructure.h:
add function gst_structure_get_name_id
* gst/gstvalue.c: (gst_value_subtract_int_int_range),
(gst_value_create_new_range), (gst_value_subtract_int_range_int),
(gst_value_subtract_int_range_int_range),
(gst_value_subtract_double_double_range),
(gst_value_subtract_double_range_double),
(gst_value_subtract_double_range_double_range),
(gst_value_subtract_from_list), (gst_value_subtract_list),
(gst_value_can_intersect), (gst_value_subtract),
(gst_value_can_subtract), (gst_value_register_subtract_func),
(_gst_value_initialize):
* gst/gstvalue.h:
add support for subtracting values from each other. Note that
subtracting means subtracting as in set theory. Required for caps
stuff above.
* testsuite/caps/.cvsignore:
* testsuite/caps/Makefile.am:
* testsuite/caps/erathostenes.c: (erathostenes), (main):
* testsuite/caps/sets.c: (check_caps), (main):
* testsuite/caps/subtract.c: (check_caps), (main):
add tests for subtraction and equality code.
2004-04-21 03:25:13 +00:00
|
|
|
src = dest;
|
|
|
|
}
|
|
|
|
dest = gst_caps_new_empty ();
|
|
|
|
for (j = 0; j < src->structs->len; j++) {
|
|
|
|
min = gst_caps_get_structure (src, j);
|
|
|
|
if (gst_structure_get_name_id (min) == gst_structure_get_name_id (sub)) {
|
2004-04-22 23:50:46 +00:00
|
|
|
GSList *list;
|
|
|
|
|
|
|
|
if (gst_caps_structure_subtract (&list, min, sub)) {
|
|
|
|
GSList *walk;
|
|
|
|
|
|
|
|
for (walk = list; walk; walk = g_slist_next (walk)) {
|
|
|
|
gst_caps_append_structure (dest, (GstStructure *) walk->data);
|
|
|
|
}
|
|
|
|
g_slist_free (list);
|
|
|
|
} else {
|
|
|
|
gst_caps_append_structure (dest, gst_structure_copy (min));
|
|
|
|
}
|
gst/gstcaps.c: check for ANY caps before appending/unioning
Original commit message from CVS:
* gst/gstcaps.c: (gst_caps_append), (gst_caps_union):
check for ANY caps before appending/unioning
* gst/gstcaps.c: (gst_caps_is_subset),
(gst_caps_is_equal), (gst_caps_structure_subtract_field),
(gst_caps_structure_subtract), (gst_caps_subtract):
* gst/gstcaps.h:
add gst_caps_is_equal, gst_caps_is_subset and gst_caps_subtract to
the API. deprecate gst_caps_is_equal_fixed
* gst/gstpad.c: (gst_pad_try_set_caps):
* gst/gstqueue.c: (gst_queue_link):
s/gst_caps_is_equal_fixed/gst_caps_is_equal/
* gst/gststructure.c: (gst_structure_get_name_id):
* gst/gststructure.h:
add function gst_structure_get_name_id
* gst/gstvalue.c: (gst_value_subtract_int_int_range),
(gst_value_create_new_range), (gst_value_subtract_int_range_int),
(gst_value_subtract_int_range_int_range),
(gst_value_subtract_double_double_range),
(gst_value_subtract_double_range_double),
(gst_value_subtract_double_range_double_range),
(gst_value_subtract_from_list), (gst_value_subtract_list),
(gst_value_can_intersect), (gst_value_subtract),
(gst_value_can_subtract), (gst_value_register_subtract_func),
(_gst_value_initialize):
* gst/gstvalue.h:
add support for subtracting values from each other. Note that
subtracting means subtracting as in set theory. Required for caps
stuff above.
* testsuite/caps/.cvsignore:
* testsuite/caps/Makefile.am:
* testsuite/caps/erathostenes.c: (erathostenes), (main):
* testsuite/caps/sets.c: (check_caps), (main):
* testsuite/caps/subtract.c: (check_caps), (main):
add tests for subtraction and equality code.
2004-04-21 03:25:13 +00:00
|
|
|
} else {
|
|
|
|
gst_caps_append_structure (dest, gst_structure_copy (min));
|
|
|
|
}
|
|
|
|
}
|
2004-08-17 09:16:42 +00:00
|
|
|
if (gst_caps_is_empty (dest)) {
|
2005-03-07 18:27:42 +00:00
|
|
|
gst_caps_unref (src);
|
gst/gstcaps.c: check for ANY caps before appending/unioning
Original commit message from CVS:
* gst/gstcaps.c: (gst_caps_append), (gst_caps_union):
check for ANY caps before appending/unioning
* gst/gstcaps.c: (gst_caps_is_subset),
(gst_caps_is_equal), (gst_caps_structure_subtract_field),
(gst_caps_structure_subtract), (gst_caps_subtract):
* gst/gstcaps.h:
add gst_caps_is_equal, gst_caps_is_subset and gst_caps_subtract to
the API. deprecate gst_caps_is_equal_fixed
* gst/gstpad.c: (gst_pad_try_set_caps):
* gst/gstqueue.c: (gst_queue_link):
s/gst_caps_is_equal_fixed/gst_caps_is_equal/
* gst/gststructure.c: (gst_structure_get_name_id):
* gst/gststructure.h:
add function gst_structure_get_name_id
* gst/gstvalue.c: (gst_value_subtract_int_int_range),
(gst_value_create_new_range), (gst_value_subtract_int_range_int),
(gst_value_subtract_int_range_int_range),
(gst_value_subtract_double_double_range),
(gst_value_subtract_double_range_double),
(gst_value_subtract_double_range_double_range),
(gst_value_subtract_from_list), (gst_value_subtract_list),
(gst_value_can_intersect), (gst_value_subtract),
(gst_value_can_subtract), (gst_value_register_subtract_func),
(_gst_value_initialize):
* gst/gstvalue.h:
add support for subtracting values from each other. Note that
subtracting means subtracting as in set theory. Required for caps
stuff above.
* testsuite/caps/.cvsignore:
* testsuite/caps/Makefile.am:
* testsuite/caps/erathostenes.c: (erathostenes), (main):
* testsuite/caps/sets.c: (check_caps), (main):
* testsuite/caps/subtract.c: (check_caps), (main):
add tests for subtraction and equality code.
2004-04-21 03:25:13 +00:00
|
|
|
return dest;
|
2004-08-17 09:16:42 +00:00
|
|
|
}
|
gst/gstcaps.c: check for ANY caps before appending/unioning
Original commit message from CVS:
* gst/gstcaps.c: (gst_caps_append), (gst_caps_union):
check for ANY caps before appending/unioning
* gst/gstcaps.c: (gst_caps_is_subset),
(gst_caps_is_equal), (gst_caps_structure_subtract_field),
(gst_caps_structure_subtract), (gst_caps_subtract):
* gst/gstcaps.h:
add gst_caps_is_equal, gst_caps_is_subset and gst_caps_subtract to
the API. deprecate gst_caps_is_equal_fixed
* gst/gstpad.c: (gst_pad_try_set_caps):
* gst/gstqueue.c: (gst_queue_link):
s/gst_caps_is_equal_fixed/gst_caps_is_equal/
* gst/gststructure.c: (gst_structure_get_name_id):
* gst/gststructure.h:
add function gst_structure_get_name_id
* gst/gstvalue.c: (gst_value_subtract_int_int_range),
(gst_value_create_new_range), (gst_value_subtract_int_range_int),
(gst_value_subtract_int_range_int_range),
(gst_value_subtract_double_double_range),
(gst_value_subtract_double_range_double),
(gst_value_subtract_double_range_double_range),
(gst_value_subtract_from_list), (gst_value_subtract_list),
(gst_value_can_intersect), (gst_value_subtract),
(gst_value_can_subtract), (gst_value_register_subtract_func),
(_gst_value_initialize):
* gst/gstvalue.h:
add support for subtracting values from each other. Note that
subtracting means subtracting as in set theory. Required for caps
stuff above.
* testsuite/caps/.cvsignore:
* testsuite/caps/Makefile.am:
* testsuite/caps/erathostenes.c: (erathostenes), (main):
* testsuite/caps/sets.c: (check_caps), (main):
* testsuite/caps/subtract.c: (check_caps), (main):
add tests for subtraction and equality code.
2004-04-21 03:25:13 +00:00
|
|
|
}
|
|
|
|
|
2005-03-07 18:27:42 +00:00
|
|
|
gst_caps_unref (src);
|
2004-04-22 23:50:46 +00:00
|
|
|
gst_caps_do_simplify (dest);
|
gst/gstcaps.c: check for ANY caps before appending/unioning
Original commit message from CVS:
* gst/gstcaps.c: (gst_caps_append), (gst_caps_union):
check for ANY caps before appending/unioning
* gst/gstcaps.c: (gst_caps_is_subset),
(gst_caps_is_equal), (gst_caps_structure_subtract_field),
(gst_caps_structure_subtract), (gst_caps_subtract):
* gst/gstcaps.h:
add gst_caps_is_equal, gst_caps_is_subset and gst_caps_subtract to
the API. deprecate gst_caps_is_equal_fixed
* gst/gstpad.c: (gst_pad_try_set_caps):
* gst/gstqueue.c: (gst_queue_link):
s/gst_caps_is_equal_fixed/gst_caps_is_equal/
* gst/gststructure.c: (gst_structure_get_name_id):
* gst/gststructure.h:
add function gst_structure_get_name_id
* gst/gstvalue.c: (gst_value_subtract_int_int_range),
(gst_value_create_new_range), (gst_value_subtract_int_range_int),
(gst_value_subtract_int_range_int_range),
(gst_value_subtract_double_double_range),
(gst_value_subtract_double_range_double),
(gst_value_subtract_double_range_double_range),
(gst_value_subtract_from_list), (gst_value_subtract_list),
(gst_value_can_intersect), (gst_value_subtract),
(gst_value_can_subtract), (gst_value_register_subtract_func),
(_gst_value_initialize):
* gst/gstvalue.h:
add support for subtracting values from each other. Note that
subtracting means subtracting as in set theory. Required for caps
stuff above.
* testsuite/caps/.cvsignore:
* testsuite/caps/Makefile.am:
* testsuite/caps/erathostenes.c: (erathostenes), (main):
* testsuite/caps/sets.c: (check_caps), (main):
* testsuite/caps/subtract.c: (check_caps), (main):
add tests for subtraction and equality code.
2004-04-21 03:25:13 +00:00
|
|
|
return dest;
|
|
|
|
}
|
|
|
|
|
2004-01-15 09:03:42 +00:00
|
|
|
/**
|
|
|
|
* gst_caps_union:
|
|
|
|
* @caps1: a #GstCaps to union
|
|
|
|
* @caps2: a #GstCaps to union
|
|
|
|
*
|
|
|
|
* Creates a new #GstCaps that contains all the formats that are in
|
|
|
|
* either @caps1 and @caps2.
|
|
|
|
*
|
|
|
|
* Returns: the new #GstCaps
|
|
|
|
*/
|
2004-03-12 19:32:26 +00:00
|
|
|
GstCaps *
|
2004-03-13 15:27:01 +00:00
|
|
|
gst_caps_union (const GstCaps * caps1, const GstCaps * caps2)
|
2003-11-11 19:14:14 +00:00
|
|
|
{
|
2003-12-22 01:39:35 +00:00
|
|
|
GstCaps *dest1;
|
|
|
|
GstCaps *dest2;
|
2003-11-11 19:14:14 +00:00
|
|
|
|
gst/gstcaps.c: check for ANY caps before appending/unioning
Original commit message from CVS:
* gst/gstcaps.c: (gst_caps_append), (gst_caps_union):
check for ANY caps before appending/unioning
* gst/gstcaps.c: (gst_caps_is_subset),
(gst_caps_is_equal), (gst_caps_structure_subtract_field),
(gst_caps_structure_subtract), (gst_caps_subtract):
* gst/gstcaps.h:
add gst_caps_is_equal, gst_caps_is_subset and gst_caps_subtract to
the API. deprecate gst_caps_is_equal_fixed
* gst/gstpad.c: (gst_pad_try_set_caps):
* gst/gstqueue.c: (gst_queue_link):
s/gst_caps_is_equal_fixed/gst_caps_is_equal/
* gst/gststructure.c: (gst_structure_get_name_id):
* gst/gststructure.h:
add function gst_structure_get_name_id
* gst/gstvalue.c: (gst_value_subtract_int_int_range),
(gst_value_create_new_range), (gst_value_subtract_int_range_int),
(gst_value_subtract_int_range_int_range),
(gst_value_subtract_double_double_range),
(gst_value_subtract_double_range_double),
(gst_value_subtract_double_range_double_range),
(gst_value_subtract_from_list), (gst_value_subtract_list),
(gst_value_can_intersect), (gst_value_subtract),
(gst_value_can_subtract), (gst_value_register_subtract_func),
(_gst_value_initialize):
* gst/gstvalue.h:
add support for subtracting values from each other. Note that
subtracting means subtracting as in set theory. Required for caps
stuff above.
* testsuite/caps/.cvsignore:
* testsuite/caps/Makefile.am:
* testsuite/caps/erathostenes.c: (erathostenes), (main):
* testsuite/caps/sets.c: (check_caps), (main):
* testsuite/caps/subtract.c: (check_caps), (main):
add tests for subtraction and equality code.
2004-04-21 03:25:13 +00:00
|
|
|
if (gst_caps_is_any (caps1) || gst_caps_is_any (caps2))
|
|
|
|
return gst_caps_new_any ();
|
|
|
|
|
2003-12-22 01:39:35 +00:00
|
|
|
dest1 = gst_caps_copy (caps1);
|
|
|
|
dest2 = gst_caps_copy (caps2);
|
|
|
|
gst_caps_append (dest1, dest2);
|
2003-11-11 19:14:14 +00:00
|
|
|
|
2004-04-22 04:29:18 +00:00
|
|
|
gst_caps_do_simplify (dest1);
|
2003-11-11 19:14:14 +00:00
|
|
|
return dest1;
|
|
|
|
}
|
|
|
|
|
2004-03-13 15:27:01 +00:00
|
|
|
typedef struct _NormalizeForeach
|
|
|
|
{
|
2004-01-01 02:17:44 +00:00
|
|
|
GstCaps *caps;
|
|
|
|
GstStructure *structure;
|
2004-03-15 19:27:17 +00:00
|
|
|
}
|
|
|
|
NormalizeForeach;
|
2004-01-01 02:17:44 +00:00
|
|
|
|
|
|
|
static gboolean
|
2005-03-07 18:27:42 +00:00
|
|
|
gst_caps_normalize_foreach (GQuark field_id, const GValue * value, gpointer ptr)
|
2004-01-01 02:17:44 +00:00
|
|
|
{
|
|
|
|
NormalizeForeach *nf = (NormalizeForeach *) ptr;
|
|
|
|
GValue val = { 0 };
|
2005-10-15 00:12:22 +00:00
|
|
|
guint i;
|
2004-01-01 02:17:44 +00:00
|
|
|
|
|
|
|
if (G_VALUE_TYPE (value) == GST_TYPE_LIST) {
|
2004-03-13 15:27:01 +00:00
|
|
|
for (i = 1; i < gst_value_list_get_size (value); i++) {
|
2004-01-01 02:17:44 +00:00
|
|
|
const GValue *v = gst_value_list_get_value (value, i);
|
|
|
|
GstStructure *structure = gst_structure_copy (nf->structure);
|
|
|
|
|
|
|
|
gst_structure_id_set_value (structure, field_id, v);
|
|
|
|
gst_caps_append_structure (nf->caps, structure);
|
|
|
|
}
|
|
|
|
|
|
|
|
gst_value_init_and_copy (&val, gst_value_list_get_value (value, 0));
|
|
|
|
gst_structure_id_set_value (nf->structure, field_id, &val);
|
|
|
|
g_value_unset (&val);
|
|
|
|
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
2004-01-15 09:03:42 +00:00
|
|
|
/**
|
|
|
|
* gst_caps_normalize:
|
|
|
|
* @caps: a #GstCaps to normalize
|
|
|
|
*
|
|
|
|
* Creates a new #GstCaps that represents the same set of formats as
|
|
|
|
* @caps, but contains no lists. Each list is expanded into separate
|
|
|
|
* @GstStructures.
|
|
|
|
*
|
|
|
|
* Returns: the new #GstCaps
|
|
|
|
*/
|
2004-03-12 19:32:26 +00:00
|
|
|
GstCaps *
|
2004-03-13 15:27:01 +00:00
|
|
|
gst_caps_normalize (const GstCaps * caps)
|
2003-11-11 19:14:14 +00:00
|
|
|
{
|
2004-01-01 02:17:44 +00:00
|
|
|
NormalizeForeach nf;
|
|
|
|
GstCaps *newcaps;
|
2005-10-15 00:12:22 +00:00
|
|
|
guint i;
|
2003-11-11 19:14:14 +00:00
|
|
|
|
gst/gstcaps.c: Patch from Tim-Philipp Müller to fix GST_CAPS() and GST_IS_CAPS(). (bug #141304)
Original commit message from CVS:
* gst/gstcaps.c: (gst_caps_copy), (gst_caps_free),
(gst_caps_append), (gst_caps_append_structure),
(gst_caps_get_size), (gst_caps_get_structure), (gst_caps_copy_1),
(gst_caps_set_simple), (gst_caps_set_simple_valist),
(gst_caps_is_any), (gst_caps_is_empty), (gst_caps_is_chained),
(gst_caps_is_fixed), (gst_caps_is_always_compatible),
(gst_caps_intersect), (gst_caps_normalize),
(gst_caps_transform_to_string): Patch from Tim-Philipp Müller
to fix GST_CAPS() and GST_IS_CAPS(). (bug #141304)
* gst/gstcaps.h: use GST_IS_CAPS().
2004-04-28 20:19:46 +00:00
|
|
|
g_return_val_if_fail (GST_IS_CAPS (caps), NULL);
|
2004-01-01 02:17:44 +00:00
|
|
|
|
|
|
|
newcaps = gst_caps_copy (caps);
|
|
|
|
nf.caps = newcaps;
|
|
|
|
|
2004-03-13 15:27:01 +00:00
|
|
|
for (i = 0; i < newcaps->structs->len; i++) {
|
2004-01-01 02:17:44 +00:00
|
|
|
nf.structure = gst_caps_get_structure (newcaps, i);
|
|
|
|
|
2004-03-12 19:32:26 +00:00
|
|
|
while (!gst_structure_foreach (nf.structure,
|
2004-03-15 19:27:17 +00:00
|
|
|
gst_caps_normalize_foreach, &nf));
|
2004-01-01 02:17:44 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
return newcaps;
|
2003-11-11 19:14:14 +00:00
|
|
|
}
|
|
|
|
|
gst/gstcaps.c: fix bug when converting from empty string.
Original commit message from CVS:
* gst/gstcaps.c: (gst_caps_from_string_inplace):
fix bug when converting from empty string.
* gst/gstcaps.c: (gst_caps_new_any), (gst_caps_new_simple),
(gst_caps_new_full_valist), (gst_caps_copy), (gst_caps_copy_1):
use gst_caps_new_empty to allocate a new caps. Only that function
allocates memory for caps now.
* gst/gstcaps.c: (gst_caps_remove_and_get_structure),
(gst_caps_remove_structure):
add ability to remove one structure (but not to header yet)
* gst/gstcaps.c: (gst_caps_compare_structures),
(gst_caps_simplify), (gst_caps_structure_figure_out_union),
(gst_caps_structure_simplify), (gst_caps_do_simplify),
* gst/gstcaps.h:
add gst_caps_do_simplify that tries to simplify a caps in place.
Deprecate old gst_caps_simplify function.
* testsuite/caps/caps.h:
add caps.h containing a common set of caps to test against.
* testsuite/caps/sets.c: (check_caps), (main):
use it.
* testsuite/caps/.cvsignore:
* testsuite/caps/Makefile.am:
* testsuite/caps/simplify.c: (check_caps), (main):
add test to check correctness and efficency of caps simplification.
2004-04-22 02:35:13 +00:00
|
|
|
static gint
|
|
|
|
gst_caps_compare_structures (gconstpointer one, gconstpointer two)
|
2003-12-30 04:59:48 +00:00
|
|
|
{
|
gst/gstcaps.c: fix bug when converting from empty string.
Original commit message from CVS:
* gst/gstcaps.c: (gst_caps_from_string_inplace):
fix bug when converting from empty string.
* gst/gstcaps.c: (gst_caps_new_any), (gst_caps_new_simple),
(gst_caps_new_full_valist), (gst_caps_copy), (gst_caps_copy_1):
use gst_caps_new_empty to allocate a new caps. Only that function
allocates memory for caps now.
* gst/gstcaps.c: (gst_caps_remove_and_get_structure),
(gst_caps_remove_structure):
add ability to remove one structure (but not to header yet)
* gst/gstcaps.c: (gst_caps_compare_structures),
(gst_caps_simplify), (gst_caps_structure_figure_out_union),
(gst_caps_structure_simplify), (gst_caps_do_simplify),
* gst/gstcaps.h:
add gst_caps_do_simplify that tries to simplify a caps in place.
Deprecate old gst_caps_simplify function.
* testsuite/caps/caps.h:
add caps.h containing a common set of caps to test against.
* testsuite/caps/sets.c: (check_caps), (main):
use it.
* testsuite/caps/.cvsignore:
* testsuite/caps/Makefile.am:
* testsuite/caps/simplify.c: (check_caps), (main):
add test to check correctness and efficency of caps simplification.
2004-04-22 02:35:13 +00:00
|
|
|
gint ret;
|
|
|
|
const GstStructure *struct1 = *((const GstStructure **) one);
|
|
|
|
const GstStructure *struct2 = *((const GstStructure **) two);
|
|
|
|
|
2006-07-02 12:54:03 +00:00
|
|
|
/* FIXME: this orders alphabetically, but ordering the quarks might be faster
|
gst/gstcaps.c: fix bug when converting from empty string.
Original commit message from CVS:
* gst/gstcaps.c: (gst_caps_from_string_inplace):
fix bug when converting from empty string.
* gst/gstcaps.c: (gst_caps_new_any), (gst_caps_new_simple),
(gst_caps_new_full_valist), (gst_caps_copy), (gst_caps_copy_1):
use gst_caps_new_empty to allocate a new caps. Only that function
allocates memory for caps now.
* gst/gstcaps.c: (gst_caps_remove_and_get_structure),
(gst_caps_remove_structure):
add ability to remove one structure (but not to header yet)
* gst/gstcaps.c: (gst_caps_compare_structures),
(gst_caps_simplify), (gst_caps_structure_figure_out_union),
(gst_caps_structure_simplify), (gst_caps_do_simplify),
* gst/gstcaps.h:
add gst_caps_do_simplify that tries to simplify a caps in place.
Deprecate old gst_caps_simplify function.
* testsuite/caps/caps.h:
add caps.h containing a common set of caps to test against.
* testsuite/caps/sets.c: (check_caps), (main):
use it.
* testsuite/caps/.cvsignore:
* testsuite/caps/Makefile.am:
* testsuite/caps/simplify.c: (check_caps), (main):
add test to check correctness and efficency of caps simplification.
2004-04-22 02:35:13 +00:00
|
|
|
So what's the best way? */
|
|
|
|
ret = strcmp (gst_structure_get_name (struct1),
|
|
|
|
gst_structure_get_name (struct2));
|
|
|
|
if (ret)
|
|
|
|
return ret;
|
|
|
|
|
2005-03-07 18:27:42 +00:00
|
|
|
return gst_structure_n_fields (struct2) - gst_structure_n_fields (struct1);
|
2003-12-30 04:59:48 +00:00
|
|
|
}
|
|
|
|
|
gst/gstcaps.c: fix bug when converting from empty string.
Original commit message from CVS:
* gst/gstcaps.c: (gst_caps_from_string_inplace):
fix bug when converting from empty string.
* gst/gstcaps.c: (gst_caps_new_any), (gst_caps_new_simple),
(gst_caps_new_full_valist), (gst_caps_copy), (gst_caps_copy_1):
use gst_caps_new_empty to allocate a new caps. Only that function
allocates memory for caps now.
* gst/gstcaps.c: (gst_caps_remove_and_get_structure),
(gst_caps_remove_structure):
add ability to remove one structure (but not to header yet)
* gst/gstcaps.c: (gst_caps_compare_structures),
(gst_caps_simplify), (gst_caps_structure_figure_out_union),
(gst_caps_structure_simplify), (gst_caps_do_simplify),
* gst/gstcaps.h:
add gst_caps_do_simplify that tries to simplify a caps in place.
Deprecate old gst_caps_simplify function.
* testsuite/caps/caps.h:
add caps.h containing a common set of caps to test against.
* testsuite/caps/sets.c: (check_caps), (main):
use it.
* testsuite/caps/.cvsignore:
* testsuite/caps/Makefile.am:
* testsuite/caps/simplify.c: (check_caps), (main):
add test to check correctness and efficency of caps simplification.
2004-04-22 02:35:13 +00:00
|
|
|
typedef struct
|
|
|
|
{
|
|
|
|
GQuark name;
|
|
|
|
GValue value;
|
|
|
|
GstStructure *compare;
|
|
|
|
}
|
|
|
|
UnionField;
|
|
|
|
|
2004-04-22 23:50:46 +00:00
|
|
|
static gboolean
|
2005-03-07 18:27:42 +00:00
|
|
|
gst_caps_structure_figure_out_union (GQuark field_id, const GValue * value,
|
gst/gstcaps.c: fix bug when converting from empty string.
Original commit message from CVS:
* gst/gstcaps.c: (gst_caps_from_string_inplace):
fix bug when converting from empty string.
* gst/gstcaps.c: (gst_caps_new_any), (gst_caps_new_simple),
(gst_caps_new_full_valist), (gst_caps_copy), (gst_caps_copy_1):
use gst_caps_new_empty to allocate a new caps. Only that function
allocates memory for caps now.
* gst/gstcaps.c: (gst_caps_remove_and_get_structure),
(gst_caps_remove_structure):
add ability to remove one structure (but not to header yet)
* gst/gstcaps.c: (gst_caps_compare_structures),
(gst_caps_simplify), (gst_caps_structure_figure_out_union),
(gst_caps_structure_simplify), (gst_caps_do_simplify),
* gst/gstcaps.h:
add gst_caps_do_simplify that tries to simplify a caps in place.
Deprecate old gst_caps_simplify function.
* testsuite/caps/caps.h:
add caps.h containing a common set of caps to test against.
* testsuite/caps/sets.c: (check_caps), (main):
use it.
* testsuite/caps/.cvsignore:
* testsuite/caps/Makefile.am:
* testsuite/caps/simplify.c: (check_caps), (main):
add test to check correctness and efficency of caps simplification.
2004-04-22 02:35:13 +00:00
|
|
|
gpointer user_data)
|
|
|
|
{
|
|
|
|
UnionField *u = user_data;
|
|
|
|
const GValue *val = gst_structure_id_get_value (u->compare, field_id);
|
|
|
|
|
2004-04-22 23:50:46 +00:00
|
|
|
if (!val) {
|
|
|
|
if (u->name)
|
|
|
|
g_value_unset (&u->value);
|
|
|
|
return FALSE;
|
|
|
|
}
|
gst/gstcaps.c: fix bug when converting from empty string.
Original commit message from CVS:
* gst/gstcaps.c: (gst_caps_from_string_inplace):
fix bug when converting from empty string.
* gst/gstcaps.c: (gst_caps_new_any), (gst_caps_new_simple),
(gst_caps_new_full_valist), (gst_caps_copy), (gst_caps_copy_1):
use gst_caps_new_empty to allocate a new caps. Only that function
allocates memory for caps now.
* gst/gstcaps.c: (gst_caps_remove_and_get_structure),
(gst_caps_remove_structure):
add ability to remove one structure (but not to header yet)
* gst/gstcaps.c: (gst_caps_compare_structures),
(gst_caps_simplify), (gst_caps_structure_figure_out_union),
(gst_caps_structure_simplify), (gst_caps_do_simplify),
* gst/gstcaps.h:
add gst_caps_do_simplify that tries to simplify a caps in place.
Deprecate old gst_caps_simplify function.
* testsuite/caps/caps.h:
add caps.h containing a common set of caps to test against.
* testsuite/caps/sets.c: (check_caps), (main):
use it.
* testsuite/caps/.cvsignore:
* testsuite/caps/Makefile.am:
* testsuite/caps/simplify.c: (check_caps), (main):
add test to check correctness and efficency of caps simplification.
2004-04-22 02:35:13 +00:00
|
|
|
if (gst_value_compare (val, value) == GST_VALUE_EQUAL)
|
|
|
|
return TRUE;
|
|
|
|
if (u->name) {
|
|
|
|
g_value_unset (&u->value);
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
u->name = field_id;
|
|
|
|
gst_value_union (&u->value, val, value);
|
|
|
|
return TRUE;
|
|
|
|
}
|
2003-12-30 04:59:48 +00:00
|
|
|
|
2004-04-22 23:50:46 +00:00
|
|
|
static gboolean
|
|
|
|
gst_caps_structure_simplify (GstStructure ** result,
|
|
|
|
const GstStructure * simplify, GstStructure * compare)
|
gst/gstcaps.c: fix bug when converting from empty string.
Original commit message from CVS:
* gst/gstcaps.c: (gst_caps_from_string_inplace):
fix bug when converting from empty string.
* gst/gstcaps.c: (gst_caps_new_any), (gst_caps_new_simple),
(gst_caps_new_full_valist), (gst_caps_copy), (gst_caps_copy_1):
use gst_caps_new_empty to allocate a new caps. Only that function
allocates memory for caps now.
* gst/gstcaps.c: (gst_caps_remove_and_get_structure),
(gst_caps_remove_structure):
add ability to remove one structure (but not to header yet)
* gst/gstcaps.c: (gst_caps_compare_structures),
(gst_caps_simplify), (gst_caps_structure_figure_out_union),
(gst_caps_structure_simplify), (gst_caps_do_simplify),
* gst/gstcaps.h:
add gst_caps_do_simplify that tries to simplify a caps in place.
Deprecate old gst_caps_simplify function.
* testsuite/caps/caps.h:
add caps.h containing a common set of caps to test against.
* testsuite/caps/sets.c: (check_caps), (main):
use it.
* testsuite/caps/.cvsignore:
* testsuite/caps/Makefile.am:
* testsuite/caps/simplify.c: (check_caps), (main):
add test to check correctness and efficency of caps simplification.
2004-04-22 02:35:13 +00:00
|
|
|
{
|
2004-04-22 23:50:46 +00:00
|
|
|
GSList *list;
|
gst/gstcaps.c: fix bug when converting from empty string.
Original commit message from CVS:
* gst/gstcaps.c: (gst_caps_from_string_inplace):
fix bug when converting from empty string.
* gst/gstcaps.c: (gst_caps_new_any), (gst_caps_new_simple),
(gst_caps_new_full_valist), (gst_caps_copy), (gst_caps_copy_1):
use gst_caps_new_empty to allocate a new caps. Only that function
allocates memory for caps now.
* gst/gstcaps.c: (gst_caps_remove_and_get_structure),
(gst_caps_remove_structure):
add ability to remove one structure (but not to header yet)
* gst/gstcaps.c: (gst_caps_compare_structures),
(gst_caps_simplify), (gst_caps_structure_figure_out_union),
(gst_caps_structure_simplify), (gst_caps_do_simplify),
* gst/gstcaps.h:
add gst_caps_do_simplify that tries to simplify a caps in place.
Deprecate old gst_caps_simplify function.
* testsuite/caps/caps.h:
add caps.h containing a common set of caps to test against.
* testsuite/caps/sets.c: (check_caps), (main):
use it.
* testsuite/caps/.cvsignore:
* testsuite/caps/Makefile.am:
* testsuite/caps/simplify.c: (check_caps), (main):
add test to check correctness and efficency of caps simplification.
2004-04-22 02:35:13 +00:00
|
|
|
UnionField field = { 0, {0,}, NULL };
|
|
|
|
|
|
|
|
/* try to subtract to get a real subset */
|
2004-04-22 23:50:46 +00:00
|
|
|
if (gst_caps_structure_subtract (&list, simplify, compare)) {
|
|
|
|
switch (g_slist_length (list)) {
|
|
|
|
case 0:
|
|
|
|
*result = NULL;
|
|
|
|
return TRUE;
|
|
|
|
case 1:
|
|
|
|
*result = list->data;
|
|
|
|
g_slist_free (list);
|
|
|
|
return TRUE;
|
|
|
|
default:
|
|
|
|
{
|
|
|
|
GSList *walk;
|
|
|
|
|
|
|
|
for (walk = list; walk; walk = g_slist_next (walk)) {
|
|
|
|
gst_structure_free (walk->data);
|
|
|
|
}
|
|
|
|
g_slist_free (list);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
2003-12-30 04:59:48 +00:00
|
|
|
}
|
|
|
|
|
gst/gstcaps.c: fix bug when converting from empty string.
Original commit message from CVS:
* gst/gstcaps.c: (gst_caps_from_string_inplace):
fix bug when converting from empty string.
* gst/gstcaps.c: (gst_caps_new_any), (gst_caps_new_simple),
(gst_caps_new_full_valist), (gst_caps_copy), (gst_caps_copy_1):
use gst_caps_new_empty to allocate a new caps. Only that function
allocates memory for caps now.
* gst/gstcaps.c: (gst_caps_remove_and_get_structure),
(gst_caps_remove_structure):
add ability to remove one structure (but not to header yet)
* gst/gstcaps.c: (gst_caps_compare_structures),
(gst_caps_simplify), (gst_caps_structure_figure_out_union),
(gst_caps_structure_simplify), (gst_caps_do_simplify),
* gst/gstcaps.h:
add gst_caps_do_simplify that tries to simplify a caps in place.
Deprecate old gst_caps_simplify function.
* testsuite/caps/caps.h:
add caps.h containing a common set of caps to test against.
* testsuite/caps/sets.c: (check_caps), (main):
use it.
* testsuite/caps/.cvsignore:
* testsuite/caps/Makefile.am:
* testsuite/caps/simplify.c: (check_caps), (main):
add test to check correctness and efficency of caps simplification.
2004-04-22 02:35:13 +00:00
|
|
|
/* try to union both structs */
|
|
|
|
field.compare = compare;
|
2004-04-22 23:50:46 +00:00
|
|
|
if (gst_structure_foreach ((GstStructure *) simplify,
|
|
|
|
gst_caps_structure_figure_out_union, &field)) {
|
|
|
|
gboolean ret = FALSE;
|
|
|
|
|
2004-05-25 19:52:02 +00:00
|
|
|
/* now we know all of simplify's fields are the same in compare
|
|
|
|
* but at most one field: field.name */
|
2004-04-25 17:46:30 +00:00
|
|
|
if (G_IS_VALUE (&field.value)) {
|
|
|
|
if (gst_structure_n_fields (simplify) == gst_structure_n_fields (compare)) {
|
|
|
|
gst_structure_id_set_value (compare, field.name, &field.value);
|
|
|
|
*result = NULL;
|
|
|
|
ret = TRUE;
|
|
|
|
}
|
|
|
|
g_value_unset (&field.value);
|
2004-05-25 19:52:02 +00:00
|
|
|
} else if (gst_structure_n_fields (simplify) <=
|
|
|
|
gst_structure_n_fields (compare)) {
|
|
|
|
/* compare is just more specific, will be optimized away later */
|
|
|
|
/* FIXME: do this here? */
|
|
|
|
GST_LOG ("found a case that will be optimized later.");
|
2004-04-25 17:46:30 +00:00
|
|
|
} else {
|
|
|
|
gchar *one = gst_structure_to_string (simplify);
|
|
|
|
gchar *two = gst_structure_to_string (compare);
|
|
|
|
|
|
|
|
GST_ERROR
|
|
|
|
("caps mismatch: structures %s and %s claim to be possible to unify, but aren't",
|
|
|
|
one, two);
|
|
|
|
g_free (one);
|
|
|
|
g_free (two);
|
2004-04-22 23:50:46 +00:00
|
|
|
}
|
|
|
|
return ret;
|
gst/gstcaps.c: fix bug when converting from empty string.
Original commit message from CVS:
* gst/gstcaps.c: (gst_caps_from_string_inplace):
fix bug when converting from empty string.
* gst/gstcaps.c: (gst_caps_new_any), (gst_caps_new_simple),
(gst_caps_new_full_valist), (gst_caps_copy), (gst_caps_copy_1):
use gst_caps_new_empty to allocate a new caps. Only that function
allocates memory for caps now.
* gst/gstcaps.c: (gst_caps_remove_and_get_structure),
(gst_caps_remove_structure):
add ability to remove one structure (but not to header yet)
* gst/gstcaps.c: (gst_caps_compare_structures),
(gst_caps_simplify), (gst_caps_structure_figure_out_union),
(gst_caps_structure_simplify), (gst_caps_do_simplify),
* gst/gstcaps.h:
add gst_caps_do_simplify that tries to simplify a caps in place.
Deprecate old gst_caps_simplify function.
* testsuite/caps/caps.h:
add caps.h containing a common set of caps to test against.
* testsuite/caps/sets.c: (check_caps), (main):
use it.
* testsuite/caps/.cvsignore:
* testsuite/caps/Makefile.am:
* testsuite/caps/simplify.c: (check_caps), (main):
add test to check correctness and efficency of caps simplification.
2004-04-22 02:35:13 +00:00
|
|
|
}
|
2003-12-30 04:59:48 +00:00
|
|
|
|
2004-04-22 23:50:46 +00:00
|
|
|
return FALSE;
|
gst/gstcaps.c: fix bug when converting from empty string.
Original commit message from CVS:
* gst/gstcaps.c: (gst_caps_from_string_inplace):
fix bug when converting from empty string.
* gst/gstcaps.c: (gst_caps_new_any), (gst_caps_new_simple),
(gst_caps_new_full_valist), (gst_caps_copy), (gst_caps_copy_1):
use gst_caps_new_empty to allocate a new caps. Only that function
allocates memory for caps now.
* gst/gstcaps.c: (gst_caps_remove_and_get_structure),
(gst_caps_remove_structure):
add ability to remove one structure (but not to header yet)
* gst/gstcaps.c: (gst_caps_compare_structures),
(gst_caps_simplify), (gst_caps_structure_figure_out_union),
(gst_caps_structure_simplify), (gst_caps_do_simplify),
* gst/gstcaps.h:
add gst_caps_do_simplify that tries to simplify a caps in place.
Deprecate old gst_caps_simplify function.
* testsuite/caps/caps.h:
add caps.h containing a common set of caps to test against.
* testsuite/caps/sets.c: (check_caps), (main):
use it.
* testsuite/caps/.cvsignore:
* testsuite/caps/Makefile.am:
* testsuite/caps/simplify.c: (check_caps), (main):
add test to check correctness and efficency of caps simplification.
2004-04-22 02:35:13 +00:00
|
|
|
}
|
2003-12-30 04:59:48 +00:00
|
|
|
|
2005-03-07 18:27:42 +00:00
|
|
|
static void
|
|
|
|
gst_caps_switch_structures (GstCaps * caps, GstStructure * old,
|
|
|
|
GstStructure * new, gint i)
|
|
|
|
{
|
|
|
|
gst_structure_set_parent_refcount (old, NULL);
|
|
|
|
gst_structure_free (old);
|
|
|
|
gst_structure_set_parent_refcount (new, &caps->refcount);
|
|
|
|
g_ptr_array_index (caps->structs, i) = new;
|
|
|
|
}
|
|
|
|
|
2004-04-22 02:43:57 +00:00
|
|
|
/**
|
2004-04-22 03:34:43 +00:00
|
|
|
* gst_caps_do_simplify:
|
2004-04-22 02:43:57 +00:00
|
|
|
* @caps: a #GstCaps to simplify
|
|
|
|
*
|
2005-10-15 15:30:24 +00:00
|
|
|
* Modifies the given @caps inplace into a representation that represents the
|
|
|
|
* same set of formats, but in a simpler form. Component structures that are
|
|
|
|
* identical are merged. Component structures that have values that can be
|
2004-04-22 02:43:57 +00:00
|
|
|
* merged are also merged.
|
2004-04-22 23:50:46 +00:00
|
|
|
*
|
|
|
|
* Returns: TRUE, if the caps could be simplified
|
2004-04-22 02:43:57 +00:00
|
|
|
*/
|
2004-04-22 23:50:46 +00:00
|
|
|
gboolean
|
gst/gstcaps.c: fix bug when converting from empty string.
Original commit message from CVS:
* gst/gstcaps.c: (gst_caps_from_string_inplace):
fix bug when converting from empty string.
* gst/gstcaps.c: (gst_caps_new_any), (gst_caps_new_simple),
(gst_caps_new_full_valist), (gst_caps_copy), (gst_caps_copy_1):
use gst_caps_new_empty to allocate a new caps. Only that function
allocates memory for caps now.
* gst/gstcaps.c: (gst_caps_remove_and_get_structure),
(gst_caps_remove_structure):
add ability to remove one structure (but not to header yet)
* gst/gstcaps.c: (gst_caps_compare_structures),
(gst_caps_simplify), (gst_caps_structure_figure_out_union),
(gst_caps_structure_simplify), (gst_caps_do_simplify),
* gst/gstcaps.h:
add gst_caps_do_simplify that tries to simplify a caps in place.
Deprecate old gst_caps_simplify function.
* testsuite/caps/caps.h:
add caps.h containing a common set of caps to test against.
* testsuite/caps/sets.c: (check_caps), (main):
use it.
* testsuite/caps/.cvsignore:
* testsuite/caps/Makefile.am:
* testsuite/caps/simplify.c: (check_caps), (main):
add test to check correctness and efficency of caps simplification.
2004-04-22 02:35:13 +00:00
|
|
|
gst_caps_do_simplify (GstCaps * caps)
|
|
|
|
{
|
GCC 4 fixen.
Original commit message from CVS:
2005-05-04 Andy Wingo <wingo@pobox.com>
* check/Makefile.am:
* docs/gst/tmpl/gstatomic.sgml:
* docs/gst/tmpl/gstplugin.sgml:
* gst/base/gstbasesink.c: (gst_basesink_activate):
* gst/base/gstbasesrc.c: (gst_basesrc_class_init),
(gst_basesrc_init), (gst_basesrc_set_dataflow_funcs),
(gst_basesrc_query), (gst_basesrc_set_property),
(gst_basesrc_get_property), (gst_basesrc_check_get_range),
(gst_basesrc_activate):
* gst/base/gstbasesrc.h:
* gst/base/gstbasetransform.c: (gst_base_transform_sink_activate),
(gst_base_transform_src_activate):
* gst/elements/gstelements.c:
* gst/elements/gstfakesrc.c: (gst_fakesrc_class_init),
(gst_fakesrc_set_property), (gst_fakesrc_get_property):
* gst/elements/gsttee.c: (gst_tee_sink_activate):
* gst/elements/gsttypefindelement.c: (find_element_get_length),
(gst_type_find_element_checkgetrange),
(gst_type_find_element_activate):
* gst/gstbin.c: (gst_bin_save_thyself), (gst_bin_restore_thyself):
* gst/gstcaps.c: (gst_caps_do_simplify), (gst_caps_save_thyself),
(gst_caps_load_thyself):
* gst/gstelement.c: (gst_element_pads_activate),
(gst_element_save_thyself), (gst_element_restore_thyself):
* gst/gstpad.c: (gst_pad_load_and_link), (gst_pad_save_thyself),
(gst_ghost_pad_save_thyself), (gst_pad_check_pull_range):
* gst/gstpad.h:
* gst/gstxml.c: (gst_xml_write), (gst_xml_parse_doc),
(gst_xml_parse_file), (gst_xml_parse_memory),
(gst_xml_get_element), (gst_xml_make_element):
* gst/indexers/gstfileindex.c: (gst_file_index_load),
(_file_index_id_save_xml), (gst_file_index_commit):
* gst/registries/gstlibxmlregistry.c: (read_string), (read_uint),
(read_enum), (load_pad_template), (load_feature), (load_plugin),
(load_paths):
* libs/gst/dataprotocol/dataprotocol.c: (gst_dp_packet_from_caps),
(gst_dp_packet_from_event), (gst_dp_caps_from_packet):
* tools/gst-complete.c: (main):
* tools/gst-compprep.c: (main):
* tools/gst-inspect.c: (print_element_properties_info):
* tools/gst-launch.c: (xmllaunch_parse_cmdline):
* tools/gst-xmlinspect.c: (print_element_properties):
GCC 4 fixen.
2005-05-04 21:29:44 +00:00
|
|
|
GstStructure *simplify, *compare, *result = NULL;
|
gst/gstcaps.c: fix bug when converting from empty string.
Original commit message from CVS:
* gst/gstcaps.c: (gst_caps_from_string_inplace):
fix bug when converting from empty string.
* gst/gstcaps.c: (gst_caps_new_any), (gst_caps_new_simple),
(gst_caps_new_full_valist), (gst_caps_copy), (gst_caps_copy_1):
use gst_caps_new_empty to allocate a new caps. Only that function
allocates memory for caps now.
* gst/gstcaps.c: (gst_caps_remove_and_get_structure),
(gst_caps_remove_structure):
add ability to remove one structure (but not to header yet)
* gst/gstcaps.c: (gst_caps_compare_structures),
(gst_caps_simplify), (gst_caps_structure_figure_out_union),
(gst_caps_structure_simplify), (gst_caps_do_simplify),
* gst/gstcaps.h:
add gst_caps_do_simplify that tries to simplify a caps in place.
Deprecate old gst_caps_simplify function.
* testsuite/caps/caps.h:
add caps.h containing a common set of caps to test against.
* testsuite/caps/sets.c: (check_caps), (main):
use it.
* testsuite/caps/.cvsignore:
* testsuite/caps/Makefile.am:
* testsuite/caps/simplify.c: (check_caps), (main):
add test to check correctness and efficency of caps simplification.
2004-04-22 02:35:13 +00:00
|
|
|
gint i, j, start;
|
2004-04-22 23:50:46 +00:00
|
|
|
gboolean changed = FALSE;
|
gst/gstcaps.c: fix bug when converting from empty string.
Original commit message from CVS:
* gst/gstcaps.c: (gst_caps_from_string_inplace):
fix bug when converting from empty string.
* gst/gstcaps.c: (gst_caps_new_any), (gst_caps_new_simple),
(gst_caps_new_full_valist), (gst_caps_copy), (gst_caps_copy_1):
use gst_caps_new_empty to allocate a new caps. Only that function
allocates memory for caps now.
* gst/gstcaps.c: (gst_caps_remove_and_get_structure),
(gst_caps_remove_structure):
add ability to remove one structure (but not to header yet)
* gst/gstcaps.c: (gst_caps_compare_structures),
(gst_caps_simplify), (gst_caps_structure_figure_out_union),
(gst_caps_structure_simplify), (gst_caps_do_simplify),
* gst/gstcaps.h:
add gst_caps_do_simplify that tries to simplify a caps in place.
Deprecate old gst_caps_simplify function.
* testsuite/caps/caps.h:
add caps.h containing a common set of caps to test against.
* testsuite/caps/sets.c: (check_caps), (main):
use it.
* testsuite/caps/.cvsignore:
* testsuite/caps/Makefile.am:
* testsuite/caps/simplify.c: (check_caps), (main):
add test to check correctness and efficency of caps simplification.
2004-04-22 02:35:13 +00:00
|
|
|
|
2004-04-22 23:50:46 +00:00
|
|
|
g_return_val_if_fail (caps != NULL, FALSE);
|
2005-03-07 18:27:42 +00:00
|
|
|
g_return_val_if_fail (IS_WRITABLE (caps), FALSE);
|
gst/gstcaps.c: fix bug when converting from empty string.
Original commit message from CVS:
* gst/gstcaps.c: (gst_caps_from_string_inplace):
fix bug when converting from empty string.
* gst/gstcaps.c: (gst_caps_new_any), (gst_caps_new_simple),
(gst_caps_new_full_valist), (gst_caps_copy), (gst_caps_copy_1):
use gst_caps_new_empty to allocate a new caps. Only that function
allocates memory for caps now.
* gst/gstcaps.c: (gst_caps_remove_and_get_structure),
(gst_caps_remove_structure):
add ability to remove one structure (but not to header yet)
* gst/gstcaps.c: (gst_caps_compare_structures),
(gst_caps_simplify), (gst_caps_structure_figure_out_union),
(gst_caps_structure_simplify), (gst_caps_do_simplify),
* gst/gstcaps.h:
add gst_caps_do_simplify that tries to simplify a caps in place.
Deprecate old gst_caps_simplify function.
* testsuite/caps/caps.h:
add caps.h containing a common set of caps to test against.
* testsuite/caps/sets.c: (check_caps), (main):
use it.
* testsuite/caps/.cvsignore:
* testsuite/caps/Makefile.am:
* testsuite/caps/simplify.c: (check_caps), (main):
add test to check correctness and efficency of caps simplification.
2004-04-22 02:35:13 +00:00
|
|
|
|
|
|
|
if (gst_caps_get_size (caps) < 2)
|
2004-04-22 23:50:46 +00:00
|
|
|
return FALSE;
|
gst/gstcaps.c: fix bug when converting from empty string.
Original commit message from CVS:
* gst/gstcaps.c: (gst_caps_from_string_inplace):
fix bug when converting from empty string.
* gst/gstcaps.c: (gst_caps_new_any), (gst_caps_new_simple),
(gst_caps_new_full_valist), (gst_caps_copy), (gst_caps_copy_1):
use gst_caps_new_empty to allocate a new caps. Only that function
allocates memory for caps now.
* gst/gstcaps.c: (gst_caps_remove_and_get_structure),
(gst_caps_remove_structure):
add ability to remove one structure (but not to header yet)
* gst/gstcaps.c: (gst_caps_compare_structures),
(gst_caps_simplify), (gst_caps_structure_figure_out_union),
(gst_caps_structure_simplify), (gst_caps_do_simplify),
* gst/gstcaps.h:
add gst_caps_do_simplify that tries to simplify a caps in place.
Deprecate old gst_caps_simplify function.
* testsuite/caps/caps.h:
add caps.h containing a common set of caps to test against.
* testsuite/caps/sets.c: (check_caps), (main):
use it.
* testsuite/caps/.cvsignore:
* testsuite/caps/Makefile.am:
* testsuite/caps/simplify.c: (check_caps), (main):
add test to check correctness and efficency of caps simplification.
2004-04-22 02:35:13 +00:00
|
|
|
|
|
|
|
g_ptr_array_sort (caps->structs, gst_caps_compare_structures);
|
|
|
|
|
|
|
|
start = caps->structs->len - 1;
|
|
|
|
for (i = caps->structs->len - 1; i >= 0; i--) {
|
|
|
|
simplify = gst_caps_get_structure (caps, i);
|
2004-04-22 23:50:46 +00:00
|
|
|
if (gst_structure_get_name_id (simplify) !=
|
|
|
|
gst_structure_get_name_id (gst_caps_get_structure (caps, start)))
|
|
|
|
start = i;
|
gst/gstcaps.c: fix bug when converting from empty string.
Original commit message from CVS:
* gst/gstcaps.c: (gst_caps_from_string_inplace):
fix bug when converting from empty string.
* gst/gstcaps.c: (gst_caps_new_any), (gst_caps_new_simple),
(gst_caps_new_full_valist), (gst_caps_copy), (gst_caps_copy_1):
use gst_caps_new_empty to allocate a new caps. Only that function
allocates memory for caps now.
* gst/gstcaps.c: (gst_caps_remove_and_get_structure),
(gst_caps_remove_structure):
add ability to remove one structure (but not to header yet)
* gst/gstcaps.c: (gst_caps_compare_structures),
(gst_caps_simplify), (gst_caps_structure_figure_out_union),
(gst_caps_structure_simplify), (gst_caps_do_simplify),
* gst/gstcaps.h:
add gst_caps_do_simplify that tries to simplify a caps in place.
Deprecate old gst_caps_simplify function.
* testsuite/caps/caps.h:
add caps.h containing a common set of caps to test against.
* testsuite/caps/sets.c: (check_caps), (main):
use it.
* testsuite/caps/.cvsignore:
* testsuite/caps/Makefile.am:
* testsuite/caps/simplify.c: (check_caps), (main):
add test to check correctness and efficency of caps simplification.
2004-04-22 02:35:13 +00:00
|
|
|
for (j = start; j >= 0; j--) {
|
|
|
|
if (j == i)
|
|
|
|
continue;
|
2004-04-22 23:50:46 +00:00
|
|
|
compare = gst_caps_get_structure (caps, j);
|
gst/gstcaps.c: fix bug when converting from empty string.
Original commit message from CVS:
* gst/gstcaps.c: (gst_caps_from_string_inplace):
fix bug when converting from empty string.
* gst/gstcaps.c: (gst_caps_new_any), (gst_caps_new_simple),
(gst_caps_new_full_valist), (gst_caps_copy), (gst_caps_copy_1):
use gst_caps_new_empty to allocate a new caps. Only that function
allocates memory for caps now.
* gst/gstcaps.c: (gst_caps_remove_and_get_structure),
(gst_caps_remove_structure):
add ability to remove one structure (but not to header yet)
* gst/gstcaps.c: (gst_caps_compare_structures),
(gst_caps_simplify), (gst_caps_structure_figure_out_union),
(gst_caps_structure_simplify), (gst_caps_do_simplify),
* gst/gstcaps.h:
add gst_caps_do_simplify that tries to simplify a caps in place.
Deprecate old gst_caps_simplify function.
* testsuite/caps/caps.h:
add caps.h containing a common set of caps to test against.
* testsuite/caps/sets.c: (check_caps), (main):
use it.
* testsuite/caps/.cvsignore:
* testsuite/caps/Makefile.am:
* testsuite/caps/simplify.c: (check_caps), (main):
add test to check correctness and efficency of caps simplification.
2004-04-22 02:35:13 +00:00
|
|
|
if (gst_structure_get_name_id (simplify) !=
|
|
|
|
gst_structure_get_name_id (compare)) {
|
2004-03-15 19:27:17 +00:00
|
|
|
break;
|
2003-12-30 04:59:48 +00:00
|
|
|
}
|
2004-04-22 23:50:46 +00:00
|
|
|
if (gst_caps_structure_simplify (&result, simplify, compare)) {
|
|
|
|
if (result) {
|
2005-03-07 18:27:42 +00:00
|
|
|
gst_caps_switch_structures (caps, simplify, result, i);
|
2005-09-29 10:56:57 +00:00
|
|
|
simplify = result;
|
2004-04-22 23:50:46 +00:00
|
|
|
} else {
|
|
|
|
gst_caps_remove_structure (caps, i);
|
|
|
|
start--;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
changed = TRUE;
|
gst/gstcaps.c: fix bug when converting from empty string.
Original commit message from CVS:
* gst/gstcaps.c: (gst_caps_from_string_inplace):
fix bug when converting from empty string.
* gst/gstcaps.c: (gst_caps_new_any), (gst_caps_new_simple),
(gst_caps_new_full_valist), (gst_caps_copy), (gst_caps_copy_1):
use gst_caps_new_empty to allocate a new caps. Only that function
allocates memory for caps now.
* gst/gstcaps.c: (gst_caps_remove_and_get_structure),
(gst_caps_remove_structure):
add ability to remove one structure (but not to header yet)
* gst/gstcaps.c: (gst_caps_compare_structures),
(gst_caps_simplify), (gst_caps_structure_figure_out_union),
(gst_caps_structure_simplify), (gst_caps_do_simplify),
* gst/gstcaps.h:
add gst_caps_do_simplify that tries to simplify a caps in place.
Deprecate old gst_caps_simplify function.
* testsuite/caps/caps.h:
add caps.h containing a common set of caps to test against.
* testsuite/caps/sets.c: (check_caps), (main):
use it.
* testsuite/caps/.cvsignore:
* testsuite/caps/Makefile.am:
* testsuite/caps/simplify.c: (check_caps), (main):
add test to check correctness and efficency of caps simplification.
2004-04-22 02:35:13 +00:00
|
|
|
}
|
2003-12-30 04:59:48 +00:00
|
|
|
}
|
|
|
|
}
|
2004-04-22 23:50:46 +00:00
|
|
|
|
|
|
|
if (!changed)
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
/* gst_caps_do_simplify (caps); */
|
|
|
|
return TRUE;
|
2003-12-30 04:59:48 +00:00
|
|
|
}
|
|
|
|
|
2003-11-11 19:14:14 +00:00
|
|
|
#ifndef GST_DISABLE_LOADSAVE
|
2004-03-26 03:46:16 +00:00
|
|
|
/**
|
|
|
|
* gst_caps_save_thyself:
|
|
|
|
* @caps: a #GstCaps structure
|
|
|
|
* @parent: a XML parent node
|
|
|
|
*
|
|
|
|
* Serializes a #GstCaps to XML and adds it as a child node of @parent.
|
|
|
|
*
|
|
|
|
* Returns: a XML node pointer
|
|
|
|
*/
|
2004-03-12 19:32:26 +00:00
|
|
|
xmlNodePtr
|
2004-03-13 15:27:01 +00:00
|
|
|
gst_caps_save_thyself (const GstCaps * caps, xmlNodePtr parent)
|
2003-11-11 19:14:14 +00:00
|
|
|
{
|
2004-07-06 22:33:04 +00:00
|
|
|
char *s = gst_caps_to_string (caps);
|
|
|
|
|
GCC 4 fixen.
Original commit message from CVS:
2005-05-04 Andy Wingo <wingo@pobox.com>
* check/Makefile.am:
* docs/gst/tmpl/gstatomic.sgml:
* docs/gst/tmpl/gstplugin.sgml:
* gst/base/gstbasesink.c: (gst_basesink_activate):
* gst/base/gstbasesrc.c: (gst_basesrc_class_init),
(gst_basesrc_init), (gst_basesrc_set_dataflow_funcs),
(gst_basesrc_query), (gst_basesrc_set_property),
(gst_basesrc_get_property), (gst_basesrc_check_get_range),
(gst_basesrc_activate):
* gst/base/gstbasesrc.h:
* gst/base/gstbasetransform.c: (gst_base_transform_sink_activate),
(gst_base_transform_src_activate):
* gst/elements/gstelements.c:
* gst/elements/gstfakesrc.c: (gst_fakesrc_class_init),
(gst_fakesrc_set_property), (gst_fakesrc_get_property):
* gst/elements/gsttee.c: (gst_tee_sink_activate):
* gst/elements/gsttypefindelement.c: (find_element_get_length),
(gst_type_find_element_checkgetrange),
(gst_type_find_element_activate):
* gst/gstbin.c: (gst_bin_save_thyself), (gst_bin_restore_thyself):
* gst/gstcaps.c: (gst_caps_do_simplify), (gst_caps_save_thyself),
(gst_caps_load_thyself):
* gst/gstelement.c: (gst_element_pads_activate),
(gst_element_save_thyself), (gst_element_restore_thyself):
* gst/gstpad.c: (gst_pad_load_and_link), (gst_pad_save_thyself),
(gst_ghost_pad_save_thyself), (gst_pad_check_pull_range):
* gst/gstpad.h:
* gst/gstxml.c: (gst_xml_write), (gst_xml_parse_doc),
(gst_xml_parse_file), (gst_xml_parse_memory),
(gst_xml_get_element), (gst_xml_make_element):
* gst/indexers/gstfileindex.c: (gst_file_index_load),
(_file_index_id_save_xml), (gst_file_index_commit):
* gst/registries/gstlibxmlregistry.c: (read_string), (read_uint),
(read_enum), (load_pad_template), (load_feature), (load_plugin),
(load_paths):
* libs/gst/dataprotocol/dataprotocol.c: (gst_dp_packet_from_caps),
(gst_dp_packet_from_event), (gst_dp_caps_from_packet):
* tools/gst-complete.c: (main):
* tools/gst-compprep.c: (main):
* tools/gst-inspect.c: (print_element_properties_info):
* tools/gst-launch.c: (xmllaunch_parse_cmdline):
* tools/gst-xmlinspect.c: (print_element_properties):
GCC 4 fixen.
2005-05-04 21:29:44 +00:00
|
|
|
xmlNewChild (parent, NULL, (xmlChar *) "caps", (xmlChar *) s);
|
2004-07-06 22:33:04 +00:00
|
|
|
g_free (s);
|
2004-07-03 23:49:51 +00:00
|
|
|
return parent;
|
2003-11-11 19:14:14 +00:00
|
|
|
}
|
|
|
|
|
2004-03-26 03:46:16 +00:00
|
|
|
/**
|
|
|
|
* gst_caps_load_thyself:
|
|
|
|
* @parent: a XML node
|
|
|
|
*
|
|
|
|
* Creates a #GstCaps from its XML serialization.
|
|
|
|
*
|
|
|
|
* Returns: a new #GstCaps structure
|
|
|
|
*/
|
2004-03-12 19:32:26 +00:00
|
|
|
GstCaps *
|
|
|
|
gst_caps_load_thyself (xmlNodePtr parent)
|
2003-11-11 19:14:14 +00:00
|
|
|
{
|
GCC 4 fixen.
Original commit message from CVS:
2005-05-04 Andy Wingo <wingo@pobox.com>
* check/Makefile.am:
* docs/gst/tmpl/gstatomic.sgml:
* docs/gst/tmpl/gstplugin.sgml:
* gst/base/gstbasesink.c: (gst_basesink_activate):
* gst/base/gstbasesrc.c: (gst_basesrc_class_init),
(gst_basesrc_init), (gst_basesrc_set_dataflow_funcs),
(gst_basesrc_query), (gst_basesrc_set_property),
(gst_basesrc_get_property), (gst_basesrc_check_get_range),
(gst_basesrc_activate):
* gst/base/gstbasesrc.h:
* gst/base/gstbasetransform.c: (gst_base_transform_sink_activate),
(gst_base_transform_src_activate):
* gst/elements/gstelements.c:
* gst/elements/gstfakesrc.c: (gst_fakesrc_class_init),
(gst_fakesrc_set_property), (gst_fakesrc_get_property):
* gst/elements/gsttee.c: (gst_tee_sink_activate):
* gst/elements/gsttypefindelement.c: (find_element_get_length),
(gst_type_find_element_checkgetrange),
(gst_type_find_element_activate):
* gst/gstbin.c: (gst_bin_save_thyself), (gst_bin_restore_thyself):
* gst/gstcaps.c: (gst_caps_do_simplify), (gst_caps_save_thyself),
(gst_caps_load_thyself):
* gst/gstelement.c: (gst_element_pads_activate),
(gst_element_save_thyself), (gst_element_restore_thyself):
* gst/gstpad.c: (gst_pad_load_and_link), (gst_pad_save_thyself),
(gst_ghost_pad_save_thyself), (gst_pad_check_pull_range):
* gst/gstpad.h:
* gst/gstxml.c: (gst_xml_write), (gst_xml_parse_doc),
(gst_xml_parse_file), (gst_xml_parse_memory),
(gst_xml_get_element), (gst_xml_make_element):
* gst/indexers/gstfileindex.c: (gst_file_index_load),
(_file_index_id_save_xml), (gst_file_index_commit):
* gst/registries/gstlibxmlregistry.c: (read_string), (read_uint),
(read_enum), (load_pad_template), (load_feature), (load_plugin),
(load_paths):
* libs/gst/dataprotocol/dataprotocol.c: (gst_dp_packet_from_caps),
(gst_dp_packet_from_event), (gst_dp_caps_from_packet):
* tools/gst-complete.c: (main):
* tools/gst-compprep.c: (main):
* tools/gst-inspect.c: (print_element_properties_info):
* tools/gst-launch.c: (xmllaunch_parse_cmdline):
* tools/gst-xmlinspect.c: (print_element_properties):
GCC 4 fixen.
2005-05-04 21:29:44 +00:00
|
|
|
if (strcmp ("caps", (char *) parent->name) == 0) {
|
|
|
|
return gst_caps_from_string ((gchar *) xmlNodeGetContent (parent));
|
2004-07-03 23:49:51 +00:00
|
|
|
}
|
2003-11-11 19:14:14 +00:00
|
|
|
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
/* utility */
|
2004-01-15 09:03:42 +00:00
|
|
|
|
|
|
|
/**
|
|
|
|
* gst_caps_replace:
|
|
|
|
* @caps: a pointer to #GstCaps
|
|
|
|
* @newcaps: a #GstCaps to replace *caps
|
|
|
|
*
|
2005-11-11 18:25:50 +00:00
|
|
|
* Replaces *caps with @newcaps. Unrefs the #GstCaps in the location
|
2004-01-15 09:03:42 +00:00
|
|
|
* pointed to by @caps, if applicable, then modifies @caps to point to
|
2005-11-11 18:25:50 +00:00
|
|
|
* @newcaps. An additional ref on @newcaps is taken.
|
2006-06-22 13:51:19 +00:00
|
|
|
*
|
|
|
|
* This function does not take any locks so you might want to lock
|
|
|
|
* the object owning @caps pointer.
|
2004-01-15 09:03:42 +00:00
|
|
|
*/
|
2004-03-12 19:32:26 +00:00
|
|
|
void
|
2004-03-13 15:27:01 +00:00
|
|
|
gst_caps_replace (GstCaps ** caps, GstCaps * newcaps)
|
2003-11-11 19:14:14 +00:00
|
|
|
{
|
gst/: Make gst_caps_replace() work like other _replace() functions.
Original commit message from CVS:
* gst/base/gstbasesink.c: (gst_basesink_base_init),
(gst_basesink_pad_getcaps), (gst_basesink_init),
(gst_basesink_chain_unlocked):
* gst/base/gsttypefindhelper.c: (helper_find_suggest),
(gst_type_find_helper):
* gst/elements/gsttypefindelement.c:
(gst_type_find_element_have_type), (gst_type_find_element_init),
(stop_typefinding), (gst_type_find_element_handle_event),
(find_suggest), (gst_type_find_element_chain),
(gst_type_find_element_checkgetrange),
(gst_type_find_element_getrange), (do_typefind),
(gst_type_find_element_activate):
* gst/gstbuffer.c: (_gst_buffer_sub_free),
(gst_buffer_default_free), (gst_buffer_default_copy),
(gst_buffer_set_caps):
* gst/gstcaps.c: (gst_caps_ref), (gst_caps_unref),
(gst_caps_replace):
* gst/gstmessage.c: (gst_message_new),
(gst_message_new_state_changed):
* gst/gstpad.c: (gst_pad_set_active), (gst_pad_peer_set_active),
(gst_pad_set_checkgetrange_function),
(gst_pad_link_prepare_filtered), (gst_pad_relink_filtered),
(gst_pad_set_caps), (gst_pad_check_pull_range),
(gst_pad_pull_range), (gst_static_pad_template_get_caps):
* gst/gstpad.h:
* gst/gsttypefind.c: (gst_type_find_register):
Make gst_caps_replace() work like other _replace() functions.
Use _caps_replace() where possible.
Make sure _message_new() initialises its field.
Add gst_static_pad_template_get_caps()
2005-04-20 09:10:42 +00:00
|
|
|
GstCaps *oldcaps;
|
|
|
|
|
2006-06-22 13:51:19 +00:00
|
|
|
g_return_if_fail (caps != NULL);
|
|
|
|
|
gst/: Make gst_caps_replace() work like other _replace() functions.
Original commit message from CVS:
* gst/base/gstbasesink.c: (gst_basesink_base_init),
(gst_basesink_pad_getcaps), (gst_basesink_init),
(gst_basesink_chain_unlocked):
* gst/base/gsttypefindhelper.c: (helper_find_suggest),
(gst_type_find_helper):
* gst/elements/gsttypefindelement.c:
(gst_type_find_element_have_type), (gst_type_find_element_init),
(stop_typefinding), (gst_type_find_element_handle_event),
(find_suggest), (gst_type_find_element_chain),
(gst_type_find_element_checkgetrange),
(gst_type_find_element_getrange), (do_typefind),
(gst_type_find_element_activate):
* gst/gstbuffer.c: (_gst_buffer_sub_free),
(gst_buffer_default_free), (gst_buffer_default_copy),
(gst_buffer_set_caps):
* gst/gstcaps.c: (gst_caps_ref), (gst_caps_unref),
(gst_caps_replace):
* gst/gstmessage.c: (gst_message_new),
(gst_message_new_state_changed):
* gst/gstpad.c: (gst_pad_set_active), (gst_pad_peer_set_active),
(gst_pad_set_checkgetrange_function),
(gst_pad_link_prepare_filtered), (gst_pad_relink_filtered),
(gst_pad_set_caps), (gst_pad_check_pull_range),
(gst_pad_pull_range), (gst_static_pad_template_get_caps):
* gst/gstpad.h:
* gst/gsttypefind.c: (gst_type_find_register):
Make gst_caps_replace() work like other _replace() functions.
Use _caps_replace() where possible.
Make sure _message_new() initialises its field.
Add gst_static_pad_template_get_caps()
2005-04-20 09:10:42 +00:00
|
|
|
oldcaps = *caps;
|
|
|
|
|
2006-06-22 13:51:19 +00:00
|
|
|
if (newcaps != oldcaps) {
|
|
|
|
if (newcaps)
|
|
|
|
gst_caps_ref (newcaps);
|
gst/: Make gst_caps_replace() work like other _replace() functions.
Original commit message from CVS:
* gst/base/gstbasesink.c: (gst_basesink_base_init),
(gst_basesink_pad_getcaps), (gst_basesink_init),
(gst_basesink_chain_unlocked):
* gst/base/gsttypefindhelper.c: (helper_find_suggest),
(gst_type_find_helper):
* gst/elements/gsttypefindelement.c:
(gst_type_find_element_have_type), (gst_type_find_element_init),
(stop_typefinding), (gst_type_find_element_handle_event),
(find_suggest), (gst_type_find_element_chain),
(gst_type_find_element_checkgetrange),
(gst_type_find_element_getrange), (do_typefind),
(gst_type_find_element_activate):
* gst/gstbuffer.c: (_gst_buffer_sub_free),
(gst_buffer_default_free), (gst_buffer_default_copy),
(gst_buffer_set_caps):
* gst/gstcaps.c: (gst_caps_ref), (gst_caps_unref),
(gst_caps_replace):
* gst/gstmessage.c: (gst_message_new),
(gst_message_new_state_changed):
* gst/gstpad.c: (gst_pad_set_active), (gst_pad_peer_set_active),
(gst_pad_set_checkgetrange_function),
(gst_pad_link_prepare_filtered), (gst_pad_relink_filtered),
(gst_pad_set_caps), (gst_pad_check_pull_range),
(gst_pad_pull_range), (gst_static_pad_template_get_caps):
* gst/gstpad.h:
* gst/gsttypefind.c: (gst_type_find_register):
Make gst_caps_replace() work like other _replace() functions.
Use _caps_replace() where possible.
Make sure _message_new() initialises its field.
Add gst_static_pad_template_get_caps()
2005-04-20 09:10:42 +00:00
|
|
|
|
2006-06-22 13:51:19 +00:00
|
|
|
*caps = newcaps;
|
gst/: Make gst_caps_replace() work like other _replace() functions.
Original commit message from CVS:
* gst/base/gstbasesink.c: (gst_basesink_base_init),
(gst_basesink_pad_getcaps), (gst_basesink_init),
(gst_basesink_chain_unlocked):
* gst/base/gsttypefindhelper.c: (helper_find_suggest),
(gst_type_find_helper):
* gst/elements/gsttypefindelement.c:
(gst_type_find_element_have_type), (gst_type_find_element_init),
(stop_typefinding), (gst_type_find_element_handle_event),
(find_suggest), (gst_type_find_element_chain),
(gst_type_find_element_checkgetrange),
(gst_type_find_element_getrange), (do_typefind),
(gst_type_find_element_activate):
* gst/gstbuffer.c: (_gst_buffer_sub_free),
(gst_buffer_default_free), (gst_buffer_default_copy),
(gst_buffer_set_caps):
* gst/gstcaps.c: (gst_caps_ref), (gst_caps_unref),
(gst_caps_replace):
* gst/gstmessage.c: (gst_message_new),
(gst_message_new_state_changed):
* gst/gstpad.c: (gst_pad_set_active), (gst_pad_peer_set_active),
(gst_pad_set_checkgetrange_function),
(gst_pad_link_prepare_filtered), (gst_pad_relink_filtered),
(gst_pad_set_caps), (gst_pad_check_pull_range),
(gst_pad_pull_range), (gst_static_pad_template_get_caps):
* gst/gstpad.h:
* gst/gsttypefind.c: (gst_type_find_register):
Make gst_caps_replace() work like other _replace() functions.
Use _caps_replace() where possible.
Make sure _message_new() initialises its field.
Add gst_static_pad_template_get_caps()
2005-04-20 09:10:42 +00:00
|
|
|
|
2006-06-22 13:51:19 +00:00
|
|
|
if (oldcaps)
|
|
|
|
gst_caps_unref (oldcaps);
|
|
|
|
}
|
2003-11-11 19:14:14 +00:00
|
|
|
}
|
|
|
|
|
2004-01-15 09:03:42 +00:00
|
|
|
/**
|
|
|
|
* gst_caps_to_string:
|
|
|
|
* @caps: a #GstCaps
|
|
|
|
*
|
|
|
|
* Converts @caps to a string representation. This string representation
|
2006-01-27 22:34:51 +00:00
|
|
|
* can be converted back to a #GstCaps by gst_caps_from_string().
|
2004-01-15 09:03:42 +00:00
|
|
|
*
|
2006-05-07 19:57:48 +00:00
|
|
|
* For debugging purposes its easier to do something like this:
|
|
|
|
* <programlisting>
|
|
|
|
* GST_LOG ("caps are %" GST_PTR_FORMAT, caps);
|
|
|
|
* </programlisting>
|
|
|
|
* This prints the caps in human readble form.
|
|
|
|
*
|
2004-04-29 10:16:11 +00:00
|
|
|
* Returns: a newly allocated string representing @caps.
|
2004-01-15 09:03:42 +00:00
|
|
|
*/
|
2004-03-12 19:32:26 +00:00
|
|
|
gchar *
|
2004-03-13 15:27:01 +00:00
|
|
|
gst_caps_to_string (const GstCaps * caps)
|
2003-11-11 19:14:14 +00:00
|
|
|
{
|
2005-10-15 00:12:22 +00:00
|
|
|
guint i;
|
2003-11-11 19:14:14 +00:00
|
|
|
GString *s;
|
|
|
|
|
configure.ac: Add detection for HAVE_PRINTF_EXTENSION and
Original commit message from CVS:
* configure.ac: Add detection for HAVE_PRINTF_EXTENSION and
GST_PRINTF_EXTENSION_FORMAT_DEFINE.
* docs/random/ds/0.9-suggested-changes: Notes from Company.
* gst/gstcaps.c: (gst_caps_to_string): Add comment.
* gst/gstconfig.h.in: Add define for GST_PTR_FORMAT
* gst/gstinfo.c: (_gst_debug_init), (gst_debug_print_object),
(gst_debug_log_default), (_gst_info_printf_extension),
(_gst_info_printf_extension_arginfo): Add printf extension.
* gst/gstinfo.h: remove G_GNUC_PRINTF, because it doesn't work with %P
* gst/gststructure.c: (gst_structure_to_string),
(_gst_structure_parse_value): Use gst_value_deserialize() and
remove old code.
* gst/gstvalue.c: (gst_value_deserialize_fourcc),
(gst_value_deserialize_boolean), (gst_strtoi),
(gst_value_deserialize_int), (gst_value_deserialize_double),
(gst_value_deserialize_string), (gst_value_deserialize): Implement
a bunch of deserialize functions and gst_value_deserialize.
* gst/gstvalue.h: er, _de_serialize, not unserialize
* testsuite/caps/string-conversions.c: (main): We don't currently
handle (float) in caps, so convert these to (double).
* testsuite/debug/Makefile.am: Add new test for the printf extension
* testsuite/debug/printf_extension.c: (main): same
2004-01-29 01:20:23 +00:00
|
|
|
/* NOTE: This function is potentially called by the debug system,
|
|
|
|
* so any calls to gst_log() (and GST_DEBUG(), GST_LOG(), etc.)
|
|
|
|
* should be careful to avoid recursion. This includes any functions
|
|
|
|
* called by gst_caps_to_string. In particular, calls should
|
|
|
|
* not use the GST_PTR_FORMAT extension. */
|
|
|
|
|
2003-12-22 01:39:35 +00:00
|
|
|
if (caps == NULL) {
|
2004-03-13 15:27:01 +00:00
|
|
|
return g_strdup ("NULL");
|
2003-12-22 01:39:35 +00:00
|
|
|
}
|
2004-03-13 15:27:01 +00:00
|
|
|
if (gst_caps_is_any (caps)) {
|
|
|
|
return g_strdup ("ANY");
|
2003-11-11 19:14:14 +00:00
|
|
|
}
|
2004-03-13 15:27:01 +00:00
|
|
|
if (gst_caps_is_empty (caps)) {
|
|
|
|
return g_strdup ("EMPTY");
|
2003-11-11 19:14:14 +00:00
|
|
|
}
|
check/gst/gstvalue.c: Added subtract checks.
Original commit message from CVS:
* check/gst/gstvalue.c: (GST_START_TEST), (gst_value_suite):
Added subtract checks.
* docs/design/part-events.txt:
Some more docs about newsegment
* gst/gstbin.c: (gst_bin_change_state), (bin_bus_handler):
Fix FIXME
* gst/gstcaps.c: (gst_caps_to_string):
Add comments, cleanups.
* gst/gstelement.c: (gst_element_save_thyself):
cleanups
* gst/gstvalue.c: (gst_value_collect_int_range),
(gst_string_unwrap), (gst_value_union_int_int_range),
(gst_value_union_int_range_int_range),
(gst_value_intersect_int_int_range),
(gst_value_intersect_int_range_int_range),
(gst_value_intersect_double_double_range),
(gst_value_intersect_double_range_double_range),
(gst_value_intersect_list), (gst_value_subtract_int_int_range),
(gst_value_subtract_int_range_int),
(gst_value_subtract_double_range_double),
(gst_value_subtract_double_range_double_range),
(gst_value_subtract_from_list), (gst_value_subtract_list),
(gst_value_can_compare), (gst_value_compare_fraction):
Cleanups, add comments, remove unneeded asserts.
2005-08-16 09:42:50 +00:00
|
|
|
|
2004-03-13 15:27:01 +00:00
|
|
|
s = g_string_new ("");
|
check/gst/gstvalue.c: Added subtract checks.
Original commit message from CVS:
* check/gst/gstvalue.c: (GST_START_TEST), (gst_value_suite):
Added subtract checks.
* docs/design/part-events.txt:
Some more docs about newsegment
* gst/gstbin.c: (gst_bin_change_state), (bin_bus_handler):
Fix FIXME
* gst/gstcaps.c: (gst_caps_to_string):
Add comments, cleanups.
* gst/gstelement.c: (gst_element_save_thyself):
cleanups
* gst/gstvalue.c: (gst_value_collect_int_range),
(gst_string_unwrap), (gst_value_union_int_int_range),
(gst_value_union_int_range_int_range),
(gst_value_intersect_int_int_range),
(gst_value_intersect_int_range_int_range),
(gst_value_intersect_double_double_range),
(gst_value_intersect_double_range_double_range),
(gst_value_intersect_list), (gst_value_subtract_int_int_range),
(gst_value_subtract_int_range_int),
(gst_value_subtract_double_range_double),
(gst_value_subtract_double_range_double_range),
(gst_value_subtract_from_list), (gst_value_subtract_list),
(gst_value_can_compare), (gst_value_compare_fraction):
Cleanups, add comments, remove unneeded asserts.
2005-08-16 09:42:50 +00:00
|
|
|
for (i = 0; i < caps->structs->len; i++) {
|
|
|
|
GstStructure *structure;
|
|
|
|
char *sstr;
|
2003-11-11 19:14:14 +00:00
|
|
|
|
check/gst/gstvalue.c: Added subtract checks.
Original commit message from CVS:
* check/gst/gstvalue.c: (GST_START_TEST), (gst_value_suite):
Added subtract checks.
* docs/design/part-events.txt:
Some more docs about newsegment
* gst/gstbin.c: (gst_bin_change_state), (bin_bus_handler):
Fix FIXME
* gst/gstcaps.c: (gst_caps_to_string):
Add comments, cleanups.
* gst/gstelement.c: (gst_element_save_thyself):
cleanups
* gst/gstvalue.c: (gst_value_collect_int_range),
(gst_string_unwrap), (gst_value_union_int_int_range),
(gst_value_union_int_range_int_range),
(gst_value_intersect_int_int_range),
(gst_value_intersect_int_range_int_range),
(gst_value_intersect_double_double_range),
(gst_value_intersect_double_range_double_range),
(gst_value_intersect_list), (gst_value_subtract_int_int_range),
(gst_value_subtract_int_range_int),
(gst_value_subtract_double_range_double),
(gst_value_subtract_double_range_double_range),
(gst_value_subtract_from_list), (gst_value_subtract_list),
(gst_value_can_compare), (gst_value_compare_fraction):
Cleanups, add comments, remove unneeded asserts.
2005-08-16 09:42:50 +00:00
|
|
|
if (i > 0)
|
|
|
|
g_string_append (s, "; ");
|
2003-11-11 19:14:14 +00:00
|
|
|
|
check/gst/gstvalue.c: Added subtract checks.
Original commit message from CVS:
* check/gst/gstvalue.c: (GST_START_TEST), (gst_value_suite):
Added subtract checks.
* docs/design/part-events.txt:
Some more docs about newsegment
* gst/gstbin.c: (gst_bin_change_state), (bin_bus_handler):
Fix FIXME
* gst/gstcaps.c: (gst_caps_to_string):
Add comments, cleanups.
* gst/gstelement.c: (gst_element_save_thyself):
cleanups
* gst/gstvalue.c: (gst_value_collect_int_range),
(gst_string_unwrap), (gst_value_union_int_int_range),
(gst_value_union_int_range_int_range),
(gst_value_intersect_int_int_range),
(gst_value_intersect_int_range_int_range),
(gst_value_intersect_double_double_range),
(gst_value_intersect_double_range_double_range),
(gst_value_intersect_list), (gst_value_subtract_int_int_range),
(gst_value_subtract_int_range_int),
(gst_value_subtract_double_range_double),
(gst_value_subtract_double_range_double_range),
(gst_value_subtract_from_list), (gst_value_subtract_list),
(gst_value_can_compare), (gst_value_compare_fraction):
Cleanups, add comments, remove unneeded asserts.
2005-08-16 09:42:50 +00:00
|
|
|
structure = gst_caps_get_structure (caps, i);
|
2004-03-13 15:27:01 +00:00
|
|
|
sstr = gst_structure_to_string (structure);
|
|
|
|
g_string_append (s, sstr);
|
|
|
|
g_free (sstr);
|
2003-11-11 19:14:14 +00:00
|
|
|
}
|
|
|
|
|
2004-03-13 15:27:01 +00:00
|
|
|
return g_string_free (s, FALSE);
|
2003-11-11 19:14:14 +00:00
|
|
|
}
|
|
|
|
|
2004-03-12 19:32:26 +00:00
|
|
|
static gboolean
|
2004-03-13 15:27:01 +00:00
|
|
|
gst_caps_from_string_inplace (GstCaps * caps, const gchar * string)
|
2003-11-11 19:14:14 +00:00
|
|
|
{
|
|
|
|
GstStructure *structure;
|
2003-12-22 01:39:35 +00:00
|
|
|
gchar *s;
|
2003-11-11 19:14:14 +00:00
|
|
|
|
2004-03-30 11:21:40 +00:00
|
|
|
g_return_val_if_fail (string, FALSE);
|
2004-03-13 15:27:01 +00:00
|
|
|
if (strcmp ("ANY", string) == 0) {
|
2003-12-22 01:39:35 +00:00
|
|
|
caps->flags = GST_CAPS_FLAGS_ANY;
|
|
|
|
return TRUE;
|
2003-11-11 19:14:14 +00:00
|
|
|
}
|
gst/gstcaps.c: fix bug when converting from empty string.
Original commit message from CVS:
* gst/gstcaps.c: (gst_caps_from_string_inplace):
fix bug when converting from empty string.
* gst/gstcaps.c: (gst_caps_new_any), (gst_caps_new_simple),
(gst_caps_new_full_valist), (gst_caps_copy), (gst_caps_copy_1):
use gst_caps_new_empty to allocate a new caps. Only that function
allocates memory for caps now.
* gst/gstcaps.c: (gst_caps_remove_and_get_structure),
(gst_caps_remove_structure):
add ability to remove one structure (but not to header yet)
* gst/gstcaps.c: (gst_caps_compare_structures),
(gst_caps_simplify), (gst_caps_structure_figure_out_union),
(gst_caps_structure_simplify), (gst_caps_do_simplify),
* gst/gstcaps.h:
add gst_caps_do_simplify that tries to simplify a caps in place.
Deprecate old gst_caps_simplify function.
* testsuite/caps/caps.h:
add caps.h containing a common set of caps to test against.
* testsuite/caps/sets.c: (check_caps), (main):
use it.
* testsuite/caps/.cvsignore:
* testsuite/caps/Makefile.am:
* testsuite/caps/simplify.c: (check_caps), (main):
add test to check correctness and efficency of caps simplification.
2004-04-22 02:35:13 +00:00
|
|
|
if (strcmp ("EMPTY", string) == 0) {
|
2003-12-22 01:39:35 +00:00
|
|
|
return TRUE;
|
2003-11-11 19:14:14 +00:00
|
|
|
}
|
|
|
|
|
2004-03-13 15:27:01 +00:00
|
|
|
structure = gst_structure_from_string (string, &s);
|
2003-12-22 01:39:35 +00:00
|
|
|
if (structure == NULL) {
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
gst_caps_append_structure (caps, structure);
|
|
|
|
|
|
|
|
while (*s == ';') {
|
|
|
|
s++;
|
2004-03-13 15:27:01 +00:00
|
|
|
while (g_ascii_isspace (*s))
|
|
|
|
s++;
|
|
|
|
structure = gst_structure_from_string (s, &s);
|
2003-12-22 01:39:35 +00:00
|
|
|
if (structure == NULL) {
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
gst_caps_append_structure (caps, structure);
|
2004-03-13 15:27:01 +00:00
|
|
|
while (g_ascii_isspace (*s))
|
|
|
|
s++;
|
2003-12-22 01:39:35 +00:00
|
|
|
}
|
|
|
|
|
2004-03-13 15:27:01 +00:00
|
|
|
if (*s != 0) {
|
2003-12-22 01:39:35 +00:00
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
return TRUE;
|
2003-11-11 19:14:14 +00:00
|
|
|
}
|
|
|
|
|
2004-01-15 09:03:42 +00:00
|
|
|
/**
|
|
|
|
* gst_caps_from_string:
|
2004-03-30 07:36:19 +00:00
|
|
|
* @string: a string to convert to #GstCaps
|
2004-01-15 09:03:42 +00:00
|
|
|
*
|
|
|
|
* Converts @caps from a string representation.
|
|
|
|
*
|
2004-04-29 10:16:11 +00:00
|
|
|
* Returns: a newly allocated #GstCaps
|
2004-01-15 09:03:42 +00:00
|
|
|
*/
|
2004-03-12 19:32:26 +00:00
|
|
|
GstCaps *
|
2004-03-13 15:27:01 +00:00
|
|
|
gst_caps_from_string (const gchar * string)
|
2003-11-11 19:14:14 +00:00
|
|
|
{
|
2003-12-22 01:39:35 +00:00
|
|
|
GstCaps *caps;
|
2003-11-11 19:14:14 +00:00
|
|
|
|
2004-03-13 15:27:01 +00:00
|
|
|
caps = gst_caps_new_empty ();
|
2004-03-12 19:32:26 +00:00
|
|
|
if (gst_caps_from_string_inplace (caps, string)) {
|
2003-12-22 01:39:35 +00:00
|
|
|
return caps;
|
|
|
|
} else {
|
2005-03-07 18:27:42 +00:00
|
|
|
gst_caps_unref (caps);
|
2003-12-22 01:39:35 +00:00
|
|
|
return NULL;
|
|
|
|
}
|
2003-11-11 19:14:14 +00:00
|
|
|
}
|
|
|
|
|
2004-03-12 19:32:26 +00:00
|
|
|
static void
|
2004-03-13 15:27:01 +00:00
|
|
|
gst_caps_transform_to_string (const GValue * src_value, GValue * dest_value)
|
2003-11-11 19:14:14 +00:00
|
|
|
{
|
gst/gstcaps.c: Patch from Tim-Philipp Müller to fix GST_CAPS() and GST_IS_CAPS(). (bug #141304)
Original commit message from CVS:
* gst/gstcaps.c: (gst_caps_copy), (gst_caps_free),
(gst_caps_append), (gst_caps_append_structure),
(gst_caps_get_size), (gst_caps_get_structure), (gst_caps_copy_1),
(gst_caps_set_simple), (gst_caps_set_simple_valist),
(gst_caps_is_any), (gst_caps_is_empty), (gst_caps_is_chained),
(gst_caps_is_fixed), (gst_caps_is_always_compatible),
(gst_caps_intersect), (gst_caps_normalize),
(gst_caps_transform_to_string): Patch from Tim-Philipp Müller
to fix GST_CAPS() and GST_IS_CAPS(). (bug #141304)
* gst/gstcaps.h: use GST_IS_CAPS().
2004-04-28 20:19:46 +00:00
|
|
|
g_return_if_fail (G_IS_VALUE (src_value));
|
|
|
|
g_return_if_fail (G_IS_VALUE (dest_value));
|
|
|
|
g_return_if_fail (G_VALUE_HOLDS (src_value, GST_TYPE_CAPS));
|
|
|
|
g_return_if_fail (G_VALUE_HOLDS (dest_value, G_TYPE_STRING)
|
|
|
|
|| G_VALUE_HOLDS (dest_value, G_TYPE_POINTER));
|
2003-11-11 19:14:14 +00:00
|
|
|
|
|
|
|
dest_value->data[0].v_pointer =
|
2004-03-13 15:27:01 +00:00
|
|
|
gst_caps_to_string (src_value->data[0].v_pointer);
|
2003-11-11 19:14:14 +00:00
|
|
|
}
|
|
|
|
|
2004-03-12 19:32:26 +00:00
|
|
|
static GstCaps *
|
2005-03-07 18:27:42 +00:00
|
|
|
gst_caps_copy_conditional (GstCaps * src)
|
2003-11-11 19:14:14 +00:00
|
|
|
{
|
2004-02-18 05:26:59 +00:00
|
|
|
if (src) {
|
2005-03-07 18:27:42 +00:00
|
|
|
return gst_caps_ref (src);
|
2003-12-22 01:39:35 +00:00
|
|
|
} else {
|
2004-02-18 05:26:59 +00:00
|
|
|
return NULL;
|
2003-12-22 01:39:35 +00:00
|
|
|
}
|
2003-11-11 19:14:14 +00:00
|
|
|
}
|