mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 04:01:08 +00:00
Code Issues 1 Projects Releases Wiki Activity

Merge branch 'master' into 0.11

Browse source 
Conflicts:
	win32/common/libgstreamer.def
This commit is contained in:
Sebastian Dröge 2011-05-17 09:40:38 +02:00
commit e34c26b509
5 changed files with 203 additions and 167 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
docs/gst/gstreamer-sections.txt
View file

@ -2240,6 +2240,9 @@ gst_structure_foreach
gst_structure_n_fields
gst_structure_has_field
gst_structure_has_field_typed
gst_structure_is_equal
gst_structure_can_intersect
gst_structure_intersect
gst_structure_id_has_field
gst_structure_id_has_field_typed
gst_structure_get_boolean

127
gst/gstcaps.c
View file

@ -1072,127 +1072,6 @@ gst_caps_is_equal (const GstCaps * caps1, const GstCaps * caps2)
/* intersect operation */
typedef struct
{
GstStructure *dest;
const GstStructure *intersect;
}
IntersectData;
static gboolean
gst_caps_structure_intersect_field1 (GQuark id, const GValue * val1,
gpointer data)
{
IntersectData *idata = (IntersectData *) data;
const GValue *val2 = gst_structure_id_get_value (idata->intersect, id);
if (G_UNLIKELY (val2 == NULL)) {
gst_structure_id_set_value (idata->dest, id, val1);
} else {
GValue dest_value = { 0 };
if (gst_value_intersect (&dest_value, val1, val2)) {
gst_structure_id_set_value (idata->dest, id, &dest_value);
g_value_unset (&dest_value);
} else {
return FALSE;
}
}
return TRUE;
}
static gboolean
gst_caps_structure_intersect_field2 (GQuark id, const GValue * val1,
gpointer data)
{
IntersectData *idata = (IntersectData *) data;
const GValue *val2 = gst_structure_id_get_value (idata->intersect, id);
if (G_UNLIKELY (val2 == NULL)) {
gst_structure_id_set_value (idata->dest, id, val1);
}
return TRUE;
}
static GstStructure *
gst_caps_structure_intersect (const GstStructure * struct1,
const GstStructure * struct2)
{
IntersectData data;
g_assert (struct1 != NULL);
g_assert (struct2 != NULL);
if (G_UNLIKELY (struct1->name != struct2->name))
return NULL;
/* copy fields from struct1 which we have not in struct2 to target
* intersect if we have the field in both */
data.dest = gst_structure_id_empty_new (struct1->name);
data.intersect = struct2;
if (G_UNLIKELY (!gst_structure_foreach ((GstStructure *) struct1,
gst_caps_structure_intersect_field1, &data)))
goto error;
/* copy fields from struct2 which we have not in struct1 to target */
data.intersect = struct1;
if (G_UNLIKELY (!gst_structure_foreach ((GstStructure *) struct2,
gst_caps_structure_intersect_field2, &data)))
goto error;
return data.dest;
error:
gst_structure_free (data.dest);
return NULL;
}
static gboolean
gst_caps_structure_can_intersect_field (GQuark id, const GValue * val1,
gpointer data)
{
GstStructure *other = (GstStructure *) data;
const GValue *val2 = gst_structure_id_get_value (other, id);
if (G_LIKELY (val2)) {
if (!gst_value_can_intersect (val1, val2)) {
return FALSE;
} else {
gint eq = gst_value_compare (val1, val2);
if (eq == GST_VALUE_UNORDERED) {
/* we need to try interseting */
GValue dest_value = { 0 };
if (gst_value_intersect (&dest_value, val1, val2)) {
g_value_unset (&dest_value);
} else {
return FALSE;
}
} else if (eq != GST_VALUE_EQUAL) {
return FALSE;
}
}
}
return TRUE;
}
static gboolean
gst_caps_structure_can_intersect (const GstStructure * struct1,
const GstStructure * struct2)
{
g_assert (struct1 != NULL);
g_assert (struct2 != NULL);
if (G_UNLIKELY (struct1->name != struct2->name))
return FALSE;
/* tries to intersect if we have the field in both */
if (G_UNLIKELY (!gst_structure_foreach ((GstStructure *) struct1,
gst_caps_structure_can_intersect_field, (gpointer) struct2)))
return FALSE;
return TRUE;
}
/**
* gst_caps_can_intersect:
* @caps1: a #GstCaps to intersect
@ -1260,7 +1139,7 @@ gst_caps_can_intersect (const GstCaps * caps1, const GstCaps * caps2)
struct1 = gst_caps_get_structure_unchecked (caps1, j);
struct2 = gst_caps_get_structure_unchecked (caps2, k);
if (gst_caps_structure_can_intersect (struct1, struct2)) {
if (gst_structure_can_intersect (struct1, struct2)) {
return TRUE;
}
/* move down left */
@ -1331,7 +1210,7 @@ gst_caps_intersect_zig_zag (const GstCaps * caps1, const GstCaps * caps2)
struct1 = gst_caps_get_structure_unchecked (caps1, j);
struct2 = gst_caps_get_structure_unchecked (caps2, k);
istruct = gst_caps_structure_intersect (struct1, struct2);
istruct = gst_structure_intersect (struct1, struct2);
gst_caps_merge_structure (dest, istruct);
/* move down left */
@ -1390,7 +1269,7 @@ gst_caps_intersect_first (const GstCaps * caps1, const GstCaps * caps2)
struct1 = gst_caps_get_structure_unchecked (caps1, i);
for (j = 0; j < len2; j++) {
struct2 = gst_caps_get_structure_unchecked (caps2, j);
istruct = gst_caps_structure_intersect (struct1, struct2);
istruct = gst_structure_intersect (struct1, struct2);
if (istruct)
gst_caps_merge_structure (dest, istruct);
}

228
gst/gststructure.c
View file

@ -443,46 +443,6 @@ gst_structure_set_name (GstStructure * structure, const gchar * name)
structure->name = g_quark_from_string (name);
}
static gboolean
gst_structure_is_equal_foreach (GQuark field_id, const GValue * val2,
gpointer data)
{
GstStructure *struct1 = (GstStructure *) data;
const GValue *val1 = gst_structure_id_get_value (struct1, field_id);
if (G_UNLIKELY (val1 == NULL))
return FALSE;
if (gst_value_compare (val1, val2) == GST_VALUE_EQUAL) {
return TRUE;
}
return FALSE;
}
/**
* gst_structure_is_equal:
* @struct1: a #GstStructure
* @struct2: another #GstStructure
*
* Tests if two #GstStructure are equal.
*
* Returns: TRUE if the arguments represent the same structure
*/
gboolean
gst_structure_is_equal (GstStructure * struct1, GstStructure * struct2)
{
if (struct1->name != struct2->name)
return FALSE;
if (GST_STRUCTURE_FIELDS (struct1)->len !=
GST_STRUCTURE_FIELDS (struct2)->len)
return FALSE;
return gst_structure_foreach (struct1, gst_structure_is_equal_foreach,
struct2);
}
static inline void
gst_structure_id_set_value_internal (GstStructure * structure, GQuark field,
const GValue * value)
@ -2978,3 +2938,191 @@ gst_structure_id_get (const GstStructure * structure, GQuark first_field_id,
return ret;
}
static gboolean
gst_structure_is_equal_foreach (GQuark field_id, const GValue * val2,
gpointer data)
{
const GstStructure *struct1 = (const GstStructure *) data;
const GValue *val1 = gst_structure_id_get_value (struct1, field_id);
if (G_UNLIKELY (val1 == NULL))
return FALSE;
if (gst_value_compare (val1, val2) == GST_VALUE_EQUAL) {
return TRUE;
}
return FALSE;
}
/**
* gst_structure_is_equal:
* @structure1: a #GstStructure.
* @structure2: a #GstStructure.
*
* Tests if the two #GstStructure are equal.
*
* Returns: TRUE if the two structures have the same name and field.
*
* Since: 0.10.35
**/
gboolean
gst_structure_is_equal (const GstStructure * structure1,
const GstStructure * structure2)
{
g_return_val_if_fail (GST_IS_STRUCTURE (structure1), FALSE);
g_return_val_if_fail (GST_IS_STRUCTURE (structure2), FALSE);
if (structure1->name != structure2->name) {
return FALSE;
}
if (structure1->fields->len != structure2->fields->len) {
return FALSE;
}
return gst_structure_foreach (structure1, gst_structure_is_equal_foreach,
(gpointer) structure2);
}
typedef struct
{
GstStructure *dest;
const GstStructure *intersect;
}
IntersectData;
static gboolean
gst_structure_intersect_field1 (GQuark id, const GValue * val1, gpointer data)
{
IntersectData *idata = (IntersectData *) data;
const GValue *val2 = gst_structure_id_get_value (idata->intersect, id);
if (G_UNLIKELY (val2 == NULL)) {
gst_structure_id_set_value (idata->dest, id, val1);
} else {
GValue dest_value = { 0 };
if (gst_value_intersect (&dest_value, val1, val2)) {
gst_structure_id_set_value (idata->dest, id, &dest_value);
g_value_unset (&dest_value);
} else {
return FALSE;
}
}
return TRUE;
}
static gboolean
gst_structure_intersect_field2 (GQuark id, const GValue * val1, gpointer data)
{
IntersectData *idata = (IntersectData *) data;
const GValue *val2 = gst_structure_id_get_value (idata->intersect, id);
if (G_UNLIKELY (val2 == NULL)) {
gst_structure_id_set_value (idata->dest, id, val1);
}
return TRUE;
}
/**
* gst_structure_intersect:
* @struct1: a #GstStructure
* @struct2: a #GstStructure
*
* Interesects @struct1 and @struct2 and returns the intersection.
*
* Returns: Intersection of @struct1 and @struct2
*
* Since: 0.10.35
*/
GstStructure *
gst_structure_intersect (const GstStructure * struct1,
const GstStructure * struct2)
{
IntersectData data;
g_assert (struct1 != NULL);
g_assert (struct2 != NULL);
if (G_UNLIKELY (struct1->name != struct2->name))
return NULL;
/* copy fields from struct1 which we have not in struct2 to target
* intersect if we have the field in both */
data.dest = gst_structure_id_empty_new (struct1->name);
data.intersect = struct2;
if (G_UNLIKELY (!gst_structure_foreach ((GstStructure *) struct1,
gst_structure_intersect_field1, &data)))
goto error;
/* copy fields from struct2 which we have not in struct1 to target */
data.intersect = struct1;
if (G_UNLIKELY (!gst_structure_foreach ((GstStructure *) struct2,
gst_structure_intersect_field2, &data)))
goto error;
return data.dest;
error:
gst_structure_free (data.dest);
return NULL;
}
static gboolean
gst_caps_structure_can_intersect_field (GQuark id, const GValue * val1,
gpointer data)
{
GstStructure *other = (GstStructure *) data;
const GValue *val2 = gst_structure_id_get_value (other, id);
if (G_LIKELY (val2)) {
if (!gst_value_can_intersect (val1, val2)) {
return FALSE;
} else {
gint eq = gst_value_compare (val1, val2);
if (eq == GST_VALUE_UNORDERED) {
/* we need to try interseting */
GValue dest_value = { 0 };
if (gst_value_intersect (&dest_value, val1, val2)) {
g_value_unset (&dest_value);
} else {
return FALSE;
}
} else if (eq != GST_VALUE_EQUAL) {
return FALSE;
}
}
}
return TRUE;
}
/**
* gst_structure_can_intersect:
* @struct1: a #GstStructure
* @struct2: a #GstStructure
*
* Tries interesecting @struct1 and @struct2 and reports whether the result
* would not be empty.
*
* Returns: %TRUE if intersection would not be empty
*
* Since: 0.10.35
*/
gboolean
gst_structure_can_intersect (const GstStructure * struct1,
const GstStructure * struct2)
{
g_return_val_if_fail (GST_IS_STRUCTURE (struct1), FALSE);
g_return_val_if_fail (GST_IS_STRUCTURE (struct2), FALSE);
if (G_UNLIKELY (struct1->name != struct2->name))
return FALSE;
/* tries to intersect if we have the field in both */
if (G_UNLIKELY (!gst_structure_foreach ((GstStructure *) struct1,
gst_caps_structure_can_intersect_field, (gpointer) struct2)))
return FALSE;
return TRUE;
}

10
gst/gststructure.h
View file

@ -106,9 +106,6 @@ gboolean gst_structure_has_name (const GstStructure
void gst_structure_set_name (GstStructure *structure,
const gchar *name);
gboolean gst_structure_is_equal (GstStructure *struct1,
GstStructure *struct2);
void gst_structure_id_set_value (GstStructure *structure,
GQuark field,
const GValue *value);
@ -246,6 +243,13 @@ gboolean gst_structure_fixate_field_nearest_fraction (GstStructu
const gint target_numerator,
const gint target_denominator);
gboolean gst_structure_is_equal(const GstStructure *structure1,
const GstStructure *structure2);
gboolean gst_structure_can_intersect(const GstStructure *struct1,
const GstStructure *struct2);
GstStructure* gst_structure_intersect (const GstStructure *struct1,
const GstStructure *struct2);
G_END_DECLS
#endif

2
win32/common/libgstreamer.def
View file

@ -959,6 +959,7 @@ EXPORTS
gst_stream_error_get_type
gst_stream_error_quark
gst_stream_status_type_get_type
gst_structure_can_intersect
gst_structure_change_type_get_type
gst_structure_copy
gst_structure_empty_new
@ -1001,6 +1002,7 @@ EXPORTS
gst_structure_id_set_valist
gst_structure_id_set_value
gst_structure_id_take_value
gst_structure_intersect
gst_structure_is_equal
gst_structure_map_in_place
gst_structure_n_fields