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.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#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
|
|
|
|
2004-01-29 02:24:52 +00:00
|
|
|
#define CAPS_POISON(caps) G_STMT_START{ \
|
|
|
|
if (caps) { \
|
|
|
|
GstCaps *_newcaps = gst_caps_copy (caps); \
|
|
|
|
gst_caps_free(caps); \
|
|
|
|
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
|
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
|
|
|
|
|
|
|
|
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);
|
|
|
|
static GstCaps *gst_caps_copy_conditional (const 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
|
|
|
|
2004-03-12 19:32:26 +00:00
|
|
|
if (!gst_caps_type) {
|
|
|
|
gst_caps_type = g_boxed_type_register_static ("GstCaps",
|
2004-03-15 19:27:17 +00:00
|
|
|
(GBoxedCopyFunc) gst_caps_copy_conditional,
|
|
|
|
(GBoxedFreeFunc) gst_caps_free);
|
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.
|
|
|
|
*
|
|
|
|
* 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
|
|
|
{
|
2004-03-13 15:27:01 +00:00
|
|
|
GstCaps *caps = g_new0 (GstCaps, 1);
|
2003-11-11 19:14:14 +00:00
|
|
|
|
2004-03-12 19:32:26 +00:00
|
|
|
caps->type = GST_TYPE_CAPS;
|
2004-03-13 15:27:01 +00:00
|
|
|
caps->structs = g_ptr_array_new ();
|
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
|
|
|
|
* as @gst_structure_new().
|
|
|
|
*
|
|
|
|
* 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
|
|
|
|
*
|
|
|
|
* Deeply copies a #GstCaps, including all structures and all the
|
|
|
|
* structures' values.
|
|
|
|
*
|
|
|
|
* 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;
|
2004-02-07 15:37:21 +00:00
|
|
|
int 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
|
|
|
}
|
|
|
|
|
docs/gst/Makefile.am: Remove --ignore-fail-on-non-empty (#150331)
Original commit message from CVS:
* docs/gst/Makefile.am: Remove --ignore-fail-on-non-empty (#150331)
* docs/libs/Makefile.am: same
* docs/gst/tmpl/gstxml.sgml: Remove GstXMLNs
* docs/random/ds/0.9-planning: random additions
* docs/random/ds/0.9-suggested-changes: same
* gst/gstxml.h: remove vestigal GstXMLNs definition
Preferred caps: (#147789)
* docs/gst/gstreamer-sections.txt: Add symbols
* docs/gst/tmpl/gstcaps.sgml: Add symbols
* gst/gstcaps.c: (gst_caps_copy), (gst_caps_free),
(gst_caps_append), (gst_caps_copy_1), (gst_caps_intersect),
(gst_caps_union), (gst_caps_save_thyself), (gst_caps_load_thyself),
(gst_caps_get_preferred), (gst_caps_set_preferred),
(gst_caps_get_structure_by_id), (gst_caps_prefer_foreach),
(gst_caps_use_preferred): Handle caps preferences
* gst/gstcaps.h: Add caps preferences
* gst/gstpad.c: (gst_pad_link_get_preferred),
(gst_pad_link_fixate), (gst_pad_link_call_link_functions),
(gst_pad_renegotiate), (gst_pad_guess_preferred),
(gst_pad_get_caps), (gst_pad_push): Use caps preferences for
negotiation.
2004-08-18 21:46:55 +00:00
|
|
|
if (caps->preferred) {
|
|
|
|
newcaps->preferred = gst_structure_copy (caps->preferred);
|
|
|
|
}
|
|
|
|
|
2003-11-11 19:14:14 +00:00
|
|
|
return newcaps;
|
|
|
|
}
|
|
|
|
|
2004-01-15 09:03:42 +00:00
|
|
|
/**
|
|
|
|
* gst_caps_free:
|
|
|
|
* @caps: the #GstCaps to free
|
|
|
|
*
|
|
|
|
* Frees a #GstCaps and all its structures and the structures'
|
|
|
|
* values.
|
|
|
|
*/
|
2004-03-12 19:32:26 +00:00
|
|
|
void
|
2004-03-13 15:27:01 +00:00
|
|
|
gst_caps_free (GstCaps * caps)
|
2003-11-11 19:14:14 +00:00
|
|
|
{
|
|
|
|
GstStructure *structure;
|
2004-02-07 15:37:21 +00:00
|
|
|
int i;
|
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_if_fail (GST_IS_CAPS (caps));
|
2004-03-13 15:27:01 +00:00
|
|
|
|
docs/gst/Makefile.am: Remove --ignore-fail-on-non-empty (#150331)
Original commit message from CVS:
* docs/gst/Makefile.am: Remove --ignore-fail-on-non-empty (#150331)
* docs/libs/Makefile.am: same
* docs/gst/tmpl/gstxml.sgml: Remove GstXMLNs
* docs/random/ds/0.9-planning: random additions
* docs/random/ds/0.9-suggested-changes: same
* gst/gstxml.h: remove vestigal GstXMLNs definition
Preferred caps: (#147789)
* docs/gst/gstreamer-sections.txt: Add symbols
* docs/gst/tmpl/gstcaps.sgml: Add symbols
* gst/gstcaps.c: (gst_caps_copy), (gst_caps_free),
(gst_caps_append), (gst_caps_copy_1), (gst_caps_intersect),
(gst_caps_union), (gst_caps_save_thyself), (gst_caps_load_thyself),
(gst_caps_get_preferred), (gst_caps_set_preferred),
(gst_caps_get_structure_by_id), (gst_caps_prefer_foreach),
(gst_caps_use_preferred): Handle caps preferences
* gst/gstcaps.h: Add caps preferences
* gst/gstpad.c: (gst_pad_link_get_preferred),
(gst_pad_link_fixate), (gst_pad_link_call_link_functions),
(gst_pad_renegotiate), (gst_pad_guess_preferred),
(gst_pad_get_caps), (gst_pad_push): Use caps preferences for
negotiation.
2004-08-18 21:46:55 +00:00
|
|
|
if (caps->preferred) {
|
|
|
|
gst_structure_free (caps->preferred);
|
|
|
|
}
|
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);
|
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
|
2004-03-13 15:27:01 +00:00
|
|
|
g_free (caps);
|
2003-11-11 19:14:14 +00:00
|
|
|
}
|
|
|
|
|
2004-01-15 09:03:42 +00:00
|
|
|
/**
|
|
|
|
* gst_static_caps_get:
|
|
|
|
* @static_caps: the #GstStaticCaps to convert
|
|
|
|
*
|
|
|
|
* Converts a #GstStaticCaps to a #GstCaps.
|
|
|
|
*
|
|
|
|
* Returns: the new #GstCaps
|
|
|
|
*/
|
2004-03-12 19:32:26 +00:00
|
|
|
const GstCaps *
|
2004-03-13 15:27:01 +00:00
|
|
|
gst_static_caps_get (GstStaticCaps * static_caps)
|
2003-11-11 19:14:14 +00:00
|
|
|
{
|
2004-03-13 15:27:01 +00:00
|
|
|
GstCaps *caps = (GstCaps *) static_caps;
|
2003-12-22 01:39:35 +00:00
|
|
|
gboolean ret;
|
2003-11-11 19:14:14 +00:00
|
|
|
|
|
|
|
if (caps->type == 0) {
|
2004-03-12 19:32:26 +00:00
|
|
|
caps->type = GST_TYPE_CAPS;
|
2004-03-13 15:27:01 +00:00
|
|
|
caps->structs = g_ptr_array_new ();
|
2004-03-12 19:32:26 +00:00
|
|
|
ret = gst_caps_from_string_inplace (caps, static_caps->string);
|
2003-12-22 01:39:35 +00:00
|
|
|
|
|
|
|
if (!ret) {
|
|
|
|
g_critical ("Could not convert static caps \"%s\"", static_caps->string);
|
|
|
|
}
|
2003-11-11 19:14:14 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
return caps;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* manipulation */
|
2004-01-15 09:03:42 +00:00
|
|
|
|
|
|
|
/**
|
|
|
|
* gst_caps_append:
|
|
|
|
* @caps1: the #GstCaps that will be appended to
|
|
|
|
* @caps2: the #GstCaps to append
|
|
|
|
*
|
|
|
|
* 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.
|
|
|
|
*/
|
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));
|
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;
|
|
|
|
for (i = 0; i < caps2->structs->len; i++) {
|
|
|
|
structure = gst_caps_get_structure (caps2, i);
|
|
|
|
gst_structure_remove_all_fields (structure);
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
for (i = 0; i < caps2->structs->len; i++) {
|
|
|
|
structure = gst_caps_get_structure (caps2, i);
|
|
|
|
gst_caps_append_structure (caps1, structure);
|
|
|
|
}
|
2003-11-11 19:14:14 +00:00
|
|
|
}
|
docs/gst/Makefile.am: Remove --ignore-fail-on-non-empty (#150331)
Original commit message from CVS:
* docs/gst/Makefile.am: Remove --ignore-fail-on-non-empty (#150331)
* docs/libs/Makefile.am: same
* docs/gst/tmpl/gstxml.sgml: Remove GstXMLNs
* docs/random/ds/0.9-planning: random additions
* docs/random/ds/0.9-suggested-changes: same
* gst/gstxml.h: remove vestigal GstXMLNs definition
Preferred caps: (#147789)
* docs/gst/gstreamer-sections.txt: Add symbols
* docs/gst/tmpl/gstcaps.sgml: Add symbols
* gst/gstcaps.c: (gst_caps_copy), (gst_caps_free),
(gst_caps_append), (gst_caps_copy_1), (gst_caps_intersect),
(gst_caps_union), (gst_caps_save_thyself), (gst_caps_load_thyself),
(gst_caps_get_preferred), (gst_caps_set_preferred),
(gst_caps_get_structure_by_id), (gst_caps_prefer_foreach),
(gst_caps_use_preferred): Handle caps preferences
* gst/gstcaps.h: Add caps preferences
* gst/gstpad.c: (gst_pad_link_get_preferred),
(gst_pad_link_fixate), (gst_pad_link_call_link_functions),
(gst_pad_renegotiate), (gst_pad_guess_preferred),
(gst_pad_get_caps), (gst_pad_push): Use caps preferences for
negotiation.
2004-08-18 21:46:55 +00:00
|
|
|
|
|
|
|
if (caps2->preferred) {
|
|
|
|
if (caps1->preferred) {
|
|
|
|
gst_structure_free (caps2->preferred);
|
|
|
|
} else {
|
|
|
|
caps1->preferred = caps2->preferred;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2004-03-13 15:27:01 +00:00
|
|
|
g_ptr_array_free (caps2->structs, TRUE);
|
2003-12-22 01:39:35 +00:00
|
|
|
#ifdef USE_POISONING
|
2004-03-13 15:27:01 +00:00
|
|
|
memset (caps2, 0xff, sizeof (GstCaps));
|
2003-12-22 01:39:35 +00:00
|
|
|
#endif
|
2004-03-13 15:27:01 +00:00
|
|
|
g_free (caps2);
|
2003-11-11 19:14:14 +00:00
|
|
|
}
|
|
|
|
|
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));
|
2003-12-22 01:39:35 +00:00
|
|
|
|
2004-03-13 15:27:01 +00:00
|
|
|
if (structure) {
|
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
|
2003-12-22 01:39:35 +00:00
|
|
|
g_ptr_array_add (caps->structs, structure);
|
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 GstStructure *
|
|
|
|
gst_caps_remove_and_get_structure (GstCaps * caps, guint idx)
|
|
|
|
{
|
|
|
|
/* don't use index_fast, gst_caps_simplify relies on the order */
|
|
|
|
return g_ptr_array_remove_index (caps->structs, idx);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* gst_caps_remove_structure:
|
|
|
|
* @caps: the #GstCaps to remove from
|
|
|
|
* @idx: Index of the structure to remove
|
|
|
|
*
|
|
|
|
* removes the stucture with the given index from the list of structures
|
|
|
|
* 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));
|
|
|
|
|
|
|
|
structure = gst_caps_remove_and_get_structure (caps, idx);
|
|
|
|
gst_structure_free (structure);
|
|
|
|
}
|
|
|
|
|
2004-01-15 09:03:42 +00:00
|
|
|
/**
|
|
|
|
* gst_caps_split_one:
|
|
|
|
* @caps:
|
|
|
|
*
|
2004-03-26 03:46:16 +00:00
|
|
|
* This function is not implemented.
|
|
|
|
*
|
2004-01-15 09:03:42 +00:00
|
|
|
* Returns:
|
|
|
|
*/
|
2004-03-12 19:32:26 +00:00
|
|
|
GstCaps *
|
2004-03-13 15:27:01 +00:00
|
|
|
gst_caps_split_one (GstCaps * caps)
|
2003-11-11 19:14:14 +00:00
|
|
|
{
|
|
|
|
/* FIXME */
|
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
|
|
|
g_critical ("unimplemented");
|
2003-11-11 19:14:14 +00:00
|
|
|
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
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
|
|
|
|
*/
|
2004-03-12 19:32:26 +00:00
|
|
|
int
|
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
|
|
|
|
*
|
|
|
|
* Finds the structure in @caps that has the index @index, and
|
|
|
|
* 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
|
|
|
|
* @GstCaps should not be modified.
|
|
|
|
*
|
|
|
|
* Returns: a pointer to the #GstStructure corresponding to @index
|
|
|
|
*/
|
2004-03-12 19:32:26 +00:00
|
|
|
GstStructure *
|
2004-03-13 15:27:01 +00:00
|
|
|
gst_caps_get_structure (const GstCaps * caps, int 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 >= 0, NULL);
|
|
|
|
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
|
|
|
}
|
|
|
|
|
2004-01-15 09:03:42 +00:00
|
|
|
/**
|
|
|
|
* gst_caps_copy_1:
|
|
|
|
* @caps: the @GstCaps to copy
|
|
|
|
*
|
|
|
|
* Creates a new @GstCaps and appends a copy of the first structure
|
|
|
|
* contained in @caps.
|
|
|
|
*
|
|
|
|
* Returns: the new @GstCaps
|
|
|
|
*/
|
2004-03-12 19:32:26 +00:00
|
|
|
GstCaps *
|
2004-03-13 15:27:01 +00:00
|
|
|
gst_caps_copy_1 (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;
|
|
|
|
|
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
|
|
|
if (caps->structs->len > 0) {
|
2003-12-22 01:39:35 +00:00
|
|
|
structure = gst_caps_get_structure (caps, 0);
|
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
|
|
|
}
|
|
|
|
|
docs/gst/Makefile.am: Remove --ignore-fail-on-non-empty (#150331)
Original commit message from CVS:
* docs/gst/Makefile.am: Remove --ignore-fail-on-non-empty (#150331)
* docs/libs/Makefile.am: same
* docs/gst/tmpl/gstxml.sgml: Remove GstXMLNs
* docs/random/ds/0.9-planning: random additions
* docs/random/ds/0.9-suggested-changes: same
* gst/gstxml.h: remove vestigal GstXMLNs definition
Preferred caps: (#147789)
* docs/gst/gstreamer-sections.txt: Add symbols
* docs/gst/tmpl/gstcaps.sgml: Add symbols
* gst/gstcaps.c: (gst_caps_copy), (gst_caps_free),
(gst_caps_append), (gst_caps_copy_1), (gst_caps_intersect),
(gst_caps_union), (gst_caps_save_thyself), (gst_caps_load_thyself),
(gst_caps_get_preferred), (gst_caps_set_preferred),
(gst_caps_get_structure_by_id), (gst_caps_prefer_foreach),
(gst_caps_use_preferred): Handle caps preferences
* gst/gstcaps.h: Add caps preferences
* gst/gstpad.c: (gst_pad_link_get_preferred),
(gst_pad_link_fixate), (gst_pad_link_call_link_functions),
(gst_pad_renegotiate), (gst_pad_guess_preferred),
(gst_pad_get_caps), (gst_pad_push): Use caps preferences for
negotiation.
2004-08-18 21:46:55 +00:00
|
|
|
if (caps->preferred) {
|
|
|
|
newcaps->preferred = gst_structure_copy (caps->preferred);
|
|
|
|
}
|
|
|
|
|
2003-11-11 19:14:14 +00:00
|
|
|
return newcaps;
|
|
|
|
}
|
|
|
|
|
2004-01-15 09:03:42 +00:00
|
|
|
/**
|
|
|
|
* gst_caps_set_simple:
|
|
|
|
* @caps: the @GstCaps to set
|
|
|
|
* @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
|
|
|
|
* manner as @gst_structure_set(), and be NULL-terminated.
|
|
|
|
*/
|
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);
|
|
|
|
|
|
|
|
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:
|
|
|
|
* @caps: the @GstCaps to copy
|
|
|
|
* @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
|
|
|
|
* manner as @gst_structure_set(), and be NULL-terminated.
|
|
|
|
*/
|
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);
|
|
|
|
|
|
|
|
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:
|
|
|
|
* @caps: the @GstCaps to test
|
|
|
|
*
|
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:
|
|
|
|
* @caps: the @GstCaps to test
|
|
|
|
*
|
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);
|
|
|
|
}
|
|
|
|
|
2004-01-15 09:03:42 +00:00
|
|
|
/**
|
|
|
|
* gst_caps_is_chained:
|
|
|
|
* @caps: the @GstCaps to test
|
|
|
|
*
|
2004-03-26 03:46:16 +00:00
|
|
|
* Determines if @caps contains multiple #GstStructures.
|
|
|
|
*
|
|
|
|
* This function is deprecated, and should not be used in new code.
|
|
|
|
* Use #gst_caps_is_simple() instead.
|
|
|
|
*
|
2004-01-15 09:03:42 +00:00
|
|
|
* Returns: TRUE if @caps contains more than one structure
|
|
|
|
*/
|
2004-03-12 19:32:26 +00:00
|
|
|
gboolean
|
2004-03-13 15:27:01 +00:00
|
|
|
gst_caps_is_chained (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
|
|
|
|
2003-11-11 19:14:14 +00:00
|
|
|
return (caps->structs->len > 1);
|
|
|
|
}
|
|
|
|
|
2003-12-22 01:39:35 +00:00
|
|
|
static gboolean
|
2004-03-13 15:27:01 +00:00
|
|
|
gst_caps_is_fixed_foreach (GQuark field_id, GValue * value, gpointer unused)
|
2003-11-11 19:14:14 +00:00
|
|
|
{
|
2003-12-22 01:39:35 +00:00
|
|
|
GType type = G_VALUE_TYPE (value);
|
2004-03-13 15:27:01 +00:00
|
|
|
|
2004-04-17 02:21:54 +00:00
|
|
|
return gst_type_is_fixed (type);
|
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:
|
|
|
|
* @caps: the @GstCaps to test
|
|
|
|
*
|
|
|
|
* Fixed @GstCaps describe exactly one format, that is, they have exactly
|
|
|
|
* 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-02 23:04:14 +00:00
|
|
|
static gboolean
|
2004-03-13 15:27:01 +00:00
|
|
|
gst_structure_is_equal_foreach (GQuark field_id, GValue * val2, gpointer data)
|
2004-01-02 23:04:14 +00:00
|
|
|
{
|
|
|
|
GstStructure *struct1 = (GstStructure *) data;
|
|
|
|
const GValue *val1 = gst_structure_id_get_value (struct1, field_id);
|
|
|
|
|
2004-03-13 15:27:01 +00:00
|
|
|
if (val1 == NULL)
|
|
|
|
return FALSE;
|
2004-01-02 23:04:14 +00:00
|
|
|
if (gst_value_compare (val1, val2) == GST_VALUE_EQUAL) {
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
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
|
|
|
|
*
|
|
|
|
* Checks if all caps represented by @subset are also represented by @superset
|
|
|
|
* <note>This function does not work reliably if optional properties for caps
|
|
|
|
* are included on one caps and omitted on the other.</note>
|
|
|
|
*
|
|
|
|
* Returns: TRUE if @subset is a subset of @superset
|
|
|
|
*/
|
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);
|
|
|
|
gst_caps_free (caps);
|
|
|
|
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>
|
|
|
|
*
|
|
|
|
* Returns: TRUE if both caps are equal
|
|
|
|
*/
|
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)
|
|
|
|
{
|
|
|
|
g_return_val_if_fail (caps1 != NULL, FALSE);
|
|
|
|
g_return_val_if_fail (caps2 != NULL, FALSE);
|
|
|
|
|
|
|
|
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
|
2004-03-13 15:27:01 +00:00
|
|
|
gst_caps_structure_intersect_field (GQuark id, 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
|
|
|
{
|
2004-03-13 15:27:01 +00:00
|
|
|
int i, j;
|
2003-11-11 19:14:14 +00:00
|
|
|
GstStructure *struct1;
|
|
|
|
GstStructure *struct2;
|
2003-12-22 01:39:35 +00:00
|
|
|
GstCaps *dest;
|
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
|
|
|
|
2004-03-13 15:27:01 +00:00
|
|
|
if (gst_caps_is_empty (caps1) || gst_caps_is_empty (caps2)) {
|
2003-12-22 01:39:35 +00:00
|
|
|
return gst_caps_new_empty ();
|
|
|
|
}
|
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 ();
|
|
|
|
for (i = 0; i < caps1->structs->len; i++) {
|
2003-12-22 01:39:35 +00:00
|
|
|
struct1 = gst_caps_get_structure (caps1, i);
|
2004-03-13 15:27:01 +00:00
|
|
|
for (j = 0; j < caps2->structs->len; j++) {
|
2003-12-22 01:39:35 +00:00
|
|
|
GstStructure *istruct;
|
2003-11-11 19:14:14 +00:00
|
|
|
|
2003-12-22 01:39:35 +00:00
|
|
|
struct2 = gst_caps_get_structure (caps2, j);
|
|
|
|
istruct = gst_caps_structure_intersect (struct1, struct2);
|
|
|
|
|
2004-03-13 15:27:01 +00:00
|
|
|
gst_caps_append_structure (dest, istruct);
|
2003-11-11 19:14:14 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
docs/gst/Makefile.am: Remove --ignore-fail-on-non-empty (#150331)
Original commit message from CVS:
* docs/gst/Makefile.am: Remove --ignore-fail-on-non-empty (#150331)
* docs/libs/Makefile.am: same
* docs/gst/tmpl/gstxml.sgml: Remove GstXMLNs
* docs/random/ds/0.9-planning: random additions
* docs/random/ds/0.9-suggested-changes: same
* gst/gstxml.h: remove vestigal GstXMLNs definition
Preferred caps: (#147789)
* docs/gst/gstreamer-sections.txt: Add symbols
* docs/gst/tmpl/gstcaps.sgml: Add symbols
* gst/gstcaps.c: (gst_caps_copy), (gst_caps_free),
(gst_caps_append), (gst_caps_copy_1), (gst_caps_intersect),
(gst_caps_union), (gst_caps_save_thyself), (gst_caps_load_thyself),
(gst_caps_get_preferred), (gst_caps_set_preferred),
(gst_caps_get_structure_by_id), (gst_caps_prefer_foreach),
(gst_caps_use_preferred): Handle caps preferences
* gst/gstcaps.h: Add caps preferences
* gst/gstpad.c: (gst_pad_link_get_preferred),
(gst_pad_link_fixate), (gst_pad_link_call_link_functions),
(gst_pad_renegotiate), (gst_pad_guess_preferred),
(gst_pad_get_caps), (gst_pad_push): Use caps preferences for
negotiation.
2004-08-18 21:46:55 +00:00
|
|
|
if (caps1->preferred) {
|
|
|
|
dest->preferred = gst_structure_copy (caps1->preferred);
|
|
|
|
} else if (caps2->preferred) {
|
|
|
|
dest->preferred = gst_structure_copy (caps2->preferred);
|
|
|
|
}
|
|
|
|
|
2004-04-22 04:29:18 +00:00
|
|
|
gst_caps_do_simplify (dest);
|
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;
|
|
|
|
|
|
|
|
|
|
|
|
gboolean
|
|
|
|
gst_caps_structure_subtract_field (GQuark field_id, GValue * value,
|
|
|
|
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)
|
|
|
|
{
|
|
|
|
int i, j;
|
|
|
|
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) {
|
|
|
|
gst_caps_free (src);
|
|
|
|
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)) {
|
|
|
|
gst_caps_free (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
|
|
|
}
|
|
|
|
|
2004-04-25 17:46:30 +00:00
|
|
|
gst_caps_free (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
|
|
|
|
docs/gst/Makefile.am: Remove --ignore-fail-on-non-empty (#150331)
Original commit message from CVS:
* docs/gst/Makefile.am: Remove --ignore-fail-on-non-empty (#150331)
* docs/libs/Makefile.am: same
* docs/gst/tmpl/gstxml.sgml: Remove GstXMLNs
* docs/random/ds/0.9-planning: random additions
* docs/random/ds/0.9-suggested-changes: same
* gst/gstxml.h: remove vestigal GstXMLNs definition
Preferred caps: (#147789)
* docs/gst/gstreamer-sections.txt: Add symbols
* docs/gst/tmpl/gstcaps.sgml: Add symbols
* gst/gstcaps.c: (gst_caps_copy), (gst_caps_free),
(gst_caps_append), (gst_caps_copy_1), (gst_caps_intersect),
(gst_caps_union), (gst_caps_save_thyself), (gst_caps_load_thyself),
(gst_caps_get_preferred), (gst_caps_set_preferred),
(gst_caps_get_structure_by_id), (gst_caps_prefer_foreach),
(gst_caps_use_preferred): Handle caps preferences
* gst/gstcaps.h: Add caps preferences
* gst/gstpad.c: (gst_pad_link_get_preferred),
(gst_pad_link_fixate), (gst_pad_link_call_link_functions),
(gst_pad_renegotiate), (gst_pad_guess_preferred),
(gst_pad_get_caps), (gst_pad_push): Use caps preferences for
negotiation.
2004-08-18 21:46:55 +00:00
|
|
|
if (caps1->preferred) {
|
|
|
|
dest1->preferred = gst_structure_copy (caps1->preferred);
|
|
|
|
} else if (caps2->preferred) {
|
|
|
|
dest1->preferred = gst_structure_copy (caps2->preferred);
|
|
|
|
}
|
|
|
|
|
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
|
2004-03-13 15:27:01 +00:00
|
|
|
gst_caps_normalize_foreach (GQuark field_id, GValue * value, gpointer ptr)
|
2004-01-01 02:17:44 +00:00
|
|
|
{
|
|
|
|
NormalizeForeach *nf = (NormalizeForeach *) ptr;
|
|
|
|
GValue val = { 0 };
|
2004-02-07 15:37:21 +00:00
|
|
|
int 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;
|
2004-02-07 15:37:21 +00:00
|
|
|
int 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);
|
|
|
|
|
|
|
|
/* FIXME: this orders aphabetically, but ordering the quarks might be faster
|
|
|
|
So what's the best way? */
|
|
|
|
ret = strcmp (gst_structure_get_name (struct1),
|
|
|
|
gst_structure_get_name (struct2));
|
|
|
|
if (ret)
|
|
|
|
return ret;
|
|
|
|
|
|
|
|
return gst_structure_n_fields (struct2) - gst_structure_n_fields (struct1);
|
2003-12-30 04:59:48 +00:00
|
|
|
}
|
|
|
|
|
2004-01-15 09:03:42 +00:00
|
|
|
/**
|
|
|
|
* gst_caps_simplify:
|
|
|
|
* @caps: a #GstCaps to simplify
|
|
|
|
*
|
|
|
|
* Creates a new #GstCaps that represents the same set of formats as
|
|
|
|
* @caps, but simpler. Component structures that are identical are
|
|
|
|
* merged. Component structures that have ranges or lists that can
|
|
|
|
* be merged are also merged.
|
|
|
|
*
|
|
|
|
* Returns: the new #GstCaps
|
|
|
|
*/
|
2004-03-12 19:32:26 +00:00
|
|
|
GstCaps *
|
2004-03-13 15:27:01 +00:00
|
|
|
gst_caps_simplify (const GstCaps * caps)
|
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
|
|
|
GstCaps *ret;
|
|
|
|
|
|
|
|
g_return_val_if_fail (caps != NULL, NULL);
|
|
|
|
|
|
|
|
ret = gst_caps_copy (caps);
|
|
|
|
gst_caps_do_simplify (ret);
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
typedef struct
|
|
|
|
{
|
|
|
|
GQuark name;
|
|
|
|
GValue value;
|
|
|
|
GstStructure *compare;
|
|
|
|
}
|
|
|
|
UnionField;
|
|
|
|
|
2004-04-22 23:50:46 +00:00
|
|
|
static 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_structure_figure_out_union (GQuark field_id, GValue * value,
|
|
|
|
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
|
|
|
|
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
|
|
|
|
*
|
|
|
|
* 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
|
|
|
|
* 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)
|
|
|
|
{
|
|
|
|
GstStructure *simplify, *compare, *result;
|
|
|
|
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);
|
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)) {
|
2004-04-22 16:39:23 +00:00
|
|
|
#if 0
|
2004-04-22 23:50:46 +00:00
|
|
|
g_print ("%s - %s = %s\n",
|
|
|
|
gst_structure_to_string (simplify),
|
|
|
|
gst_structure_to_string (compare),
|
|
|
|
result ? gst_structure_to_string (result) : "---");
|
2004-04-22 16:39:23 +00:00
|
|
|
#endif
|
2004-04-22 23:50:46 +00:00
|
|
|
if (result) {
|
|
|
|
gst_structure_free (simplify);
|
|
|
|
g_ptr_array_index (caps->structs, i) = result;
|
|
|
|
simplify = result;
|
|
|
|
} 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);
|
|
|
|
|
|
|
|
xmlNewChild (parent, NULL, "caps", s);
|
|
|
|
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
|
|
|
{
|
2004-07-03 23:49:51 +00:00
|
|
|
if (strcmp ("caps", parent->name) == 0) {
|
|
|
|
return gst_caps_from_string (xmlNodeGetContent (parent));
|
|
|
|
}
|
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
|
|
|
|
*
|
|
|
|
* Replaces *caps with @newcaps. Frees the #GstCaps in the location
|
|
|
|
* pointed to by @caps, if applicable, then modifies @caps to point to
|
|
|
|
* @newcaps.
|
|
|
|
*/
|
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
|
|
|
{
|
2004-03-15 19:27:17 +00:00
|
|
|
#if 0 /* disable this, since too many plugins rely on undefined behavior */
|
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-06 21:39:53 +00:00
|
|
|
//if (newcaps) CAPS_POISON (newcaps);
|
|
|
|
#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
|
2004-03-13 15:27:01 +00:00
|
|
|
if (*caps)
|
|
|
|
gst_caps_free (*caps);
|
2003-12-22 01:39:35 +00:00
|
|
|
*caps = newcaps;
|
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
|
2004-04-29 10:16:11 +00:00
|
|
|
* can be converted back to a #GstCaps by #gst_caps_from_string.
|
2004-01-15 09:03:42 +00:00
|
|
|
*
|
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
|
|
|
{
|
2004-02-07 15:37:21 +00:00
|
|
|
int i;
|
2003-11-11 19:14:14 +00:00
|
|
|
GstStructure *structure;
|
|
|
|
GString *s;
|
2004-02-02 20:25:02 +00:00
|
|
|
char *sstr;
|
2003-11-11 19:14:14 +00:00
|
|
|
|
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-11-11 19:14:14 +00:00
|
|
|
/* FIXME does this leak? */
|
|
|
|
|
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
|
|
|
}
|
2004-03-13 15:27:01 +00:00
|
|
|
s = g_string_new ("");
|
2003-12-22 01:39:35 +00:00
|
|
|
structure = gst_caps_get_structure (caps, 0);
|
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
|
|
|
for (i = 1; i < caps->structs->len; i++) {
|
2003-12-22 01:39:35 +00:00
|
|
|
structure = gst_caps_get_structure (caps, i);
|
2003-11-11 19:14:14 +00:00
|
|
|
|
2004-03-13 15:27:01 +00:00
|
|
|
g_string_append (s, "; ");
|
|
|
|
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 {
|
|
|
|
gst_caps_free (caps);
|
|
|
|
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 *
|
2004-03-13 15:27:01 +00:00
|
|
|
gst_caps_copy_conditional (const GstCaps * src)
|
2003-11-11 19:14:14 +00:00
|
|
|
{
|
2004-02-18 05:26:59 +00:00
|
|
|
if (src) {
|
|
|
|
return gst_caps_copy (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
|
|
|
}
|
|
|
|
|
2003-12-22 01:39:35 +00:00
|
|
|
/* fixate utility functions */
|
|
|
|
|
2004-03-26 03:46:16 +00:00
|
|
|
/**
|
|
|
|
* gst_caps_structure_fixate_field_nearest_int:
|
|
|
|
* @structure: a #GstStructure
|
|
|
|
* @field_name: a field in @structure
|
|
|
|
* @target: the target value of the fixation
|
|
|
|
*
|
|
|
|
* Fixates a #GstStructure by changing the given field to the nearest
|
|
|
|
* integer to @target that is a subset of the existing field.
|
|
|
|
*
|
|
|
|
* Returns: TRUE if the structure could be fixated
|
|
|
|
*/
|
2004-03-12 19:32:26 +00:00
|
|
|
gboolean
|
2004-03-13 15:27:01 +00:00
|
|
|
gst_caps_structure_fixate_field_nearest_int (GstStructure * structure,
|
|
|
|
const char *field_name, int target)
|
2003-12-22 01:39:35 +00:00
|
|
|
{
|
|
|
|
const GValue *value;
|
|
|
|
|
2004-03-13 15:27:01 +00:00
|
|
|
g_return_val_if_fail (gst_structure_has_field (structure, field_name), FALSE);
|
2003-12-22 01:39:35 +00:00
|
|
|
|
|
|
|
value = gst_structure_get_value (structure, field_name);
|
|
|
|
|
|
|
|
if (G_VALUE_TYPE (value) == G_TYPE_INT) {
|
|
|
|
/* already fixed */
|
|
|
|
return FALSE;
|
|
|
|
} else if (G_VALUE_TYPE (value) == GST_TYPE_INT_RANGE) {
|
|
|
|
int x;
|
2004-03-13 15:27:01 +00:00
|
|
|
|
2003-12-22 01:39:35 +00:00
|
|
|
x = gst_value_get_int_range_min (value);
|
2004-03-13 15:27:01 +00:00
|
|
|
if (target < x)
|
|
|
|
target = x;
|
2003-12-22 01:39:35 +00:00
|
|
|
x = gst_value_get_int_range_max (value);
|
2004-03-13 15:27:01 +00:00
|
|
|
if (target > x)
|
|
|
|
target = x;
|
2003-12-22 01:39:35 +00:00
|
|
|
gst_structure_set (structure, field_name, G_TYPE_INT, target, NULL);
|
|
|
|
return TRUE;
|
|
|
|
} else if (G_VALUE_TYPE (value) == GST_TYPE_LIST) {
|
|
|
|
const GValue *list_value;
|
|
|
|
int i, n;
|
|
|
|
int best = 0;
|
|
|
|
int best_index = -1;
|
|
|
|
|
|
|
|
n = gst_value_list_get_size (value);
|
2004-03-13 15:27:01 +00:00
|
|
|
for (i = 0; i < n; i++) {
|
2003-12-22 01:39:35 +00:00
|
|
|
list_value = gst_value_list_get_value (value, i);
|
|
|
|
if (G_VALUE_TYPE (list_value) == G_TYPE_INT) {
|
2004-03-15 19:27:17 +00:00
|
|
|
int x = g_value_get_int (list_value);
|
2004-03-13 15:27:01 +00:00
|
|
|
|
2004-04-13 20:50:53 +00:00
|
|
|
if (best_index == -1 || (ABS (target - x) < ABS (target - best))) {
|
2004-03-15 19:27:17 +00:00
|
|
|
best_index = i;
|
|
|
|
best = x;
|
|
|
|
}
|
2003-12-22 01:39:35 +00:00
|
|
|
}
|
|
|
|
}
|
2004-03-13 15:27:01 +00:00
|
|
|
if (best_index != -1) {
|
2003-12-22 01:39:35 +00:00
|
|
|
gst_structure_set (structure, field_name, G_TYPE_INT, best, NULL);
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
2004-03-26 03:46:16 +00:00
|
|
|
/**
|
|
|
|
* gst_caps_structure_fixate_field_nearest_double:
|
|
|
|
* @structure: a #GstStructure
|
|
|
|
* @field_name: a field in @structure
|
|
|
|
* @target: the target value of the fixation
|
|
|
|
*
|
|
|
|
* Fixates a #GstStructure by changing the given field to the nearest
|
|
|
|
* double to @target that is a subset of the existing field.
|
|
|
|
*
|
|
|
|
* Returns: TRUE if the structure could be fixated
|
|
|
|
*/
|
2004-03-12 19:32:26 +00:00
|
|
|
gboolean
|
2004-03-13 15:27:01 +00:00
|
|
|
gst_caps_structure_fixate_field_nearest_double (GstStructure * structure,
|
|
|
|
const char *field_name, double target)
|
2003-12-22 01:39:35 +00:00
|
|
|
{
|
|
|
|
const GValue *value;
|
|
|
|
|
2004-03-13 15:27:01 +00:00
|
|
|
g_return_val_if_fail (gst_structure_has_field (structure, field_name), FALSE);
|
2003-12-22 01:39:35 +00:00
|
|
|
|
|
|
|
value = gst_structure_get_value (structure, field_name);
|
|
|
|
|
|
|
|
if (G_VALUE_TYPE (value) == G_TYPE_DOUBLE) {
|
|
|
|
/* already fixed */
|
|
|
|
return FALSE;
|
|
|
|
} else if (G_VALUE_TYPE (value) == GST_TYPE_DOUBLE_RANGE) {
|
|
|
|
double x;
|
2004-03-13 15:27:01 +00:00
|
|
|
|
2003-12-22 01:39:35 +00:00
|
|
|
x = gst_value_get_double_range_min (value);
|
2004-03-13 15:27:01 +00:00
|
|
|
if (target < x)
|
|
|
|
target = x;
|
2003-12-22 01:39:35 +00:00
|
|
|
x = gst_value_get_double_range_max (value);
|
2004-03-13 15:27:01 +00:00
|
|
|
if (target > x)
|
|
|
|
target = x;
|
2003-12-22 01:39:35 +00:00
|
|
|
gst_structure_set (structure, field_name, G_TYPE_DOUBLE, target, NULL);
|
|
|
|
return TRUE;
|
|
|
|
} else if (G_VALUE_TYPE (value) == GST_TYPE_LIST) {
|
|
|
|
const GValue *list_value;
|
|
|
|
int i, n;
|
|
|
|
double best = 0;
|
|
|
|
int best_index = -1;
|
|
|
|
|
|
|
|
n = gst_value_list_get_size (value);
|
2004-03-13 15:27:01 +00:00
|
|
|
for (i = 0; i < n; i++) {
|
2003-12-22 01:39:35 +00:00
|
|
|
list_value = gst_value_list_get_value (value, i);
|
|
|
|
if (G_VALUE_TYPE (list_value) == G_TYPE_DOUBLE) {
|
2004-03-15 19:27:17 +00:00
|
|
|
double x = g_value_get_double (list_value);
|
2004-03-13 15:27:01 +00:00
|
|
|
|
2004-04-13 20:50:53 +00:00
|
|
|
if (best_index == -1 || (ABS (target - x) < ABS (target - best))) {
|
2004-03-15 19:27:17 +00:00
|
|
|
best_index = i;
|
|
|
|
best = x;
|
|
|
|
}
|
2003-12-22 01:39:35 +00:00
|
|
|
}
|
|
|
|
}
|
2004-03-13 15:27:01 +00:00
|
|
|
if (best_index != -1) {
|
2003-12-22 01:39:35 +00:00
|
|
|
gst_structure_set (structure, field_name, G_TYPE_DOUBLE, best, NULL);
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
}
|
docs/gst/Makefile.am: Remove --ignore-fail-on-non-empty (#150331)
Original commit message from CVS:
* docs/gst/Makefile.am: Remove --ignore-fail-on-non-empty (#150331)
* docs/libs/Makefile.am: same
* docs/gst/tmpl/gstxml.sgml: Remove GstXMLNs
* docs/random/ds/0.9-planning: random additions
* docs/random/ds/0.9-suggested-changes: same
* gst/gstxml.h: remove vestigal GstXMLNs definition
Preferred caps: (#147789)
* docs/gst/gstreamer-sections.txt: Add symbols
* docs/gst/tmpl/gstcaps.sgml: Add symbols
* gst/gstcaps.c: (gst_caps_copy), (gst_caps_free),
(gst_caps_append), (gst_caps_copy_1), (gst_caps_intersect),
(gst_caps_union), (gst_caps_save_thyself), (gst_caps_load_thyself),
(gst_caps_get_preferred), (gst_caps_set_preferred),
(gst_caps_get_structure_by_id), (gst_caps_prefer_foreach),
(gst_caps_use_preferred): Handle caps preferences
* gst/gstcaps.h: Add caps preferences
* gst/gstpad.c: (gst_pad_link_get_preferred),
(gst_pad_link_fixate), (gst_pad_link_call_link_functions),
(gst_pad_renegotiate), (gst_pad_guess_preferred),
(gst_pad_get_caps), (gst_pad_push): Use caps preferences for
negotiation.
2004-08-18 21:46:55 +00:00
|
|
|
|
|
|
|
|
|
|
|
const GstStructure *
|
|
|
|
gst_caps_get_preferred (const GstCaps * caps)
|
|
|
|
{
|
|
|
|
g_return_val_if_fail (GST_IS_CAPS (caps), NULL);
|
|
|
|
|
|
|
|
return caps->preferred;
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
gst_caps_set_preferred (GstCaps * caps, const GstStructure * structure)
|
|
|
|
{
|
|
|
|
g_return_if_fail (GST_IS_CAPS (caps));
|
|
|
|
g_return_if_fail (GST_IS_STRUCTURE (structure));
|
|
|
|
|
|
|
|
if (caps->preferred)
|
|
|
|
gst_structure_free (caps->preferred);
|
|
|
|
caps->preferred = gst_structure_copy (structure);
|
|
|
|
}
|
|
|
|
|
|
|
|
GstStructure *
|
|
|
|
gst_caps_get_structure_by_id (const GstCaps * caps, GQuark id)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
GstStructure *structure;
|
|
|
|
|
|
|
|
g_return_val_if_fail (GST_IS_CAPS (caps), NULL);
|
|
|
|
|
|
|
|
for (i = 0; i < gst_caps_get_size (caps); i++) {
|
|
|
|
structure = gst_caps_get_structure (caps, i);
|
|
|
|
if (structure->name == id) {
|
|
|
|
return structure;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
static gboolean
|
|
|
|
gst_caps_prefer_foreach (GQuark name, GValue * value, gpointer user_data)
|
|
|
|
{
|
|
|
|
GstStructure *structure = (GstStructure *) user_data;
|
|
|
|
const GValue *svalue;
|
|
|
|
GValue ivalue = { 0 };
|
|
|
|
gboolean ret;
|
|
|
|
|
|
|
|
svalue = gst_structure_id_get_value (structure, name);
|
|
|
|
if (svalue == NULL)
|
|
|
|
return TRUE;
|
|
|
|
|
|
|
|
if (G_VALUE_TYPE (value) == G_TYPE_INT) {
|
|
|
|
int target = g_value_get_int (value);
|
|
|
|
|
|
|
|
gst_caps_structure_fixate_field_nearest_int (structure,
|
|
|
|
g_quark_to_string (name), target);
|
|
|
|
} else if (G_VALUE_TYPE (value) == G_TYPE_DOUBLE) {
|
|
|
|
double target = g_value_get_double (value);
|
|
|
|
|
|
|
|
gst_caps_structure_fixate_field_nearest_double (structure,
|
|
|
|
g_quark_to_string (name), target);
|
|
|
|
} else {
|
|
|
|
ret = gst_value_intersect (&ivalue, value, svalue);
|
|
|
|
if (ret) {
|
|
|
|
gst_structure_id_set_value (structure, name, &ivalue);
|
|
|
|
g_value_unset (&ivalue);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
GstCaps *
|
|
|
|
gst_caps_use_preferred (const GstCaps * caps)
|
|
|
|
{
|
|
|
|
GstCaps *pcaps;
|
|
|
|
GstStructure *structure;
|
|
|
|
|
|
|
|
g_return_val_if_fail (GST_IS_CAPS (caps), NULL);
|
|
|
|
|
|
|
|
if (!caps->preferred || gst_caps_is_any (caps) || gst_caps_is_empty (caps)
|
|
|
|
|| gst_caps_is_fixed (caps)) {
|
|
|
|
return gst_caps_copy (caps);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (gst_caps_is_simple (caps)) {
|
|
|
|
structure = gst_caps_get_structure (caps, 0);
|
|
|
|
} else {
|
|
|
|
structure = gst_caps_get_structure_by_id (caps, caps->preferred->name);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (structure) {
|
|
|
|
structure = gst_structure_copy (structure);
|
|
|
|
|
|
|
|
gst_structure_foreach (caps->preferred, gst_caps_prefer_foreach, structure);
|
|
|
|
|
|
|
|
pcaps = gst_caps_new_full (structure, NULL);
|
|
|
|
|
|
|
|
return pcaps;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* FIXME */
|
|
|
|
|
|
|
|
return NULL;
|
|
|
|
}
|