gstvalue.h   gstvalue.h 
skipping to change at line 44 skipping to change at line 44
* @d: the fourth character * @d: the fourth character
* *
* Transform four characters into a #guint32 fourcc value with host * Transform four characters into a #guint32 fourcc value with host
* endianness. * endianness.
* <informalexample> * <informalexample>
* <programlisting> * <programlisting>
* guint32 fourcc = GST_MAKE_FOURCC ('M', 'J', 'P', 'G'); * guint32 fourcc = GST_MAKE_FOURCC ('M', 'J', 'P', 'G');
* </programlisting> * </programlisting>
* </informalexample> * </informalexample>
*/ */
#define GST_MAKE_FOURCC(a,b,c,d) (guint32)((a)|(b)<<8|(c)<<16|(d)<<2 4) #define GST_MAKE_FOURCC(a,b,c,d) ((guint32)((a)|(b)<<8|(c)<<16|(d)<< 24))
/** /**
* GST_STR_FOURCC: * GST_STR_FOURCC:
* @f: a string with at least four characters * @f: a string with at least four characters
* *
* Transform an input string into a #guint32 fourcc value with host * Transform an input string into a #guint32 fourcc value with host
* endianness. * endianness.
* Caller is responsible for ensuring the input string consists of at least * Caller is responsible for ensuring the input string consists of at least
* four characters. * four characters.
* <informalexample> * <informalexample>
* <programlisting> * <programlisting>
* guint32 fourcc = GST_STR_FOURCC ("MJPG"); * guint32 fourcc = GST_STR_FOURCC ("MJPG");
* </programlisting> * </programlisting>
* </informalexample> * </informalexample>
*/ */
#define GST_STR_FOURCC(f) (guint32)(((f)[0])|((f)[1]<<8)|((f) [2]<<16)|((f)[3]<<24)) #define GST_STR_FOURCC(f) ((guint32)(((f)[0])|((f)[1]<<8)|((f )[2]<<16)|((f)[3]<<24)))
/** /**
* GST_FOURCC_FORMAT: * GST_FOURCC_FORMAT:
* *
* Can be used together with #GST_FOURCC_ARGS to properly output a * Can be used together with #GST_FOURCC_ARGS to properly output a
* #guint32 fourcc value in a printf()-style text message. * #guint32 fourcc value in a printf()-style text message.
* <informalexample> * <informalexample>
* <programlisting> * <programlisting>
* printf ("fourcc: %" GST_FOURCC_FORMAT "\n", GST_FOURCC_ARGS (fcc)); * printf ("fourcc: %" GST_FOURCC_FORMAT "\n", GST_FOURCC_ARGS (fcc));
* </programlisting> * </programlisting>
skipping to change at line 94 skipping to change at line 94
((gchar) (((fourcc)>>8 )&0xff)), \ ((gchar) (((fourcc)>>8 )&0xff)), \
((gchar) (((fourcc)>>16)&0xff)), \ ((gchar) (((fourcc)>>16)&0xff)), \
((gchar) (((fourcc)>>24)&0xff)) ((gchar) (((fourcc)>>24)&0xff))
/** /**
* GST_VALUE_HOLDS_FOURCC: * GST_VALUE_HOLDS_FOURCC:
* @x: the #GValue to check * @x: the #GValue to check
* *
* Checks if the given #GValue contains a #GST_TYPE_FOURCC value. * Checks if the given #GValue contains a #GST_TYPE_FOURCC value.
*/ */
#define GST_VALUE_HOLDS_FOURCC(x) (G_VALUE_HOLDS(x, gst_fourcc_get_ty pe ())) #define GST_VALUE_HOLDS_FOURCC(x) (G_VALUE_HOLDS((x), gst_fourcc_get_ type ()))
/** /**
* GST_VALUE_HOLDS_INT_RANGE: * GST_VALUE_HOLDS_INT_RANGE:
* @x: the #GValue to check * @x: the #GValue to check
* *
* Checks if the given #GValue contains a #GST_TYPE_INT_RANGE value. * Checks if the given #GValue contains a #GST_TYPE_INT_RANGE value.
*/ */
#define GST_VALUE_HOLDS_INT_RANGE(x) (G_VALUE_HOLDS(x, gst_int_range_get #define GST_VALUE_HOLDS_INT_RANGE(x) (G_VALUE_HOLDS((x), gst_int_range_g
_type ())) et_type ()))
/**
* GST_VALUE_HOLDS_INT64_RANGE:
* @x: the #GValue to check
*
* Checks if the given #GValue contains a #GST_TYPE_INT64_RANGE value.
*
* Since: 0.10.31
*/
#define GST_VALUE_HOLDS_INT64_RANGE(x) (G_VALUE_HOLDS((x), gst_int64_ran
ge_get_type ()))
/** /**
* GST_VALUE_HOLDS_DOUBLE_RANGE: * GST_VALUE_HOLDS_DOUBLE_RANGE:
* @x: the #GValue to check * @x: the #GValue to check
* *
* Checks if the given #GValue contains a #GST_TYPE_DOUBLE_RANGE value. * Checks if the given #GValue contains a #GST_TYPE_DOUBLE_RANGE value.
*/ */
#define GST_VALUE_HOLDS_DOUBLE_RANGE(x) (G_VALUE_HOLDS(x, gst_double_range_ get_type ())) #define GST_VALUE_HOLDS_DOUBLE_RANGE(x) (G_VALUE_HOLDS((x), gst_double_rang e_get_type ()))
/** /**
* GST_VALUE_HOLDS_FRACTION_RANGE: * GST_VALUE_HOLDS_FRACTION_RANGE:
* @x: the #GValue to check * @x: the #GValue to check
* *
* Checks if the given #GValue contains a #GST_TYPE_FRACTION_RANGE value. * Checks if the given #GValue contains a #GST_TYPE_FRACTION_RANGE value.
*/ */
#define GST_VALUE_HOLDS_FRACTION_RANGE(x) (G_VALUE_HOLDS(x, gst_fraction _range_get_type ())) #define GST_VALUE_HOLDS_FRACTION_RANGE(x) (G_VALUE_HOLDS((x), gst_fracti on_range_get_type ()))
/** /**
* GST_VALUE_HOLDS_LIST: * GST_VALUE_HOLDS_LIST:
* @x: the #GValue to check * @x: the #GValue to check
* *
* Checks if the given #GValue contains a #GST_TYPE_LIST value. * Checks if the given #GValue contains a #GST_TYPE_LIST value.
*/ */
#define GST_VALUE_HOLDS_LIST(x) (G_VALUE_HOLDS(x, gst_value_ list_get_type ())) #define GST_VALUE_HOLDS_LIST(x) (G_VALUE_HOLDS((x), gst_valu e_list_get_type ()))
/** /**
* GST_VALUE_HOLDS_ARRAY: * GST_VALUE_HOLDS_ARRAY:
* @x: the #GValue to check * @x: the #GValue to check
* *
* Checks if the given #GValue contains a #GST_TYPE_ARRAY value. * Checks if the given #GValue contains a #GST_TYPE_ARRAY value.
*/ */
#define GST_VALUE_HOLDS_ARRAY(x) (G_VALUE_HOLDS(x, gst_value_array_ge t_type ())) #define GST_VALUE_HOLDS_ARRAY(x) (G_VALUE_HOLDS((x), gst_value_array_ get_type ()))
/** /**
* GST_VALUE_HOLDS_CAPS: * GST_VALUE_HOLDS_CAPS:
* @x: the #GValue to check * @x: the #GValue to check
* *
* Checks if the given #GValue contains a #GST_TYPE_CAPS value. * Checks if the given #GValue contains a #GST_TYPE_CAPS value.
*/ */
#define GST_VALUE_HOLDS_CAPS(x) (G_VALUE_HOLDS(x, GST_TYPE_C APS)) #define GST_VALUE_HOLDS_CAPS(x) (G_VALUE_HOLDS((x), GST_TYPE _CAPS))
/** /**
* GST_VALUE_HOLDS_STRUCTURE: * GST_VALUE_HOLDS_STRUCTURE:
* @x: the #GValue to check * @x: the #GValue to check
* *
* Checks if the given #GValue contains a #GST_TYPE_STRUCTURE value. * Checks if the given #GValue contains a #GST_TYPE_STRUCTURE value.
* *
* Since: 0.10.15 * Since: 0.10.15
*/ */
#define GST_VALUE_HOLDS_STRUCTURE(x) (G_VALUE_HOLDS(x, GST_TYPE_S TRUCTURE)) #define GST_VALUE_HOLDS_STRUCTURE(x) (G_VALUE_HOLDS((x), GST_TYPE _STRUCTURE))
/** /**
* GST_VALUE_HOLDS_BUFFER: * GST_VALUE_HOLDS_BUFFER:
* @x: the #GValue to check * @x: the #GValue to check
* *
* Checks if the given #GValue contains a #GST_TYPE_BUFFER value. * Checks if the given #GValue contains a #GST_TYPE_BUFFER value.
*/ */
#define GST_VALUE_HOLDS_BUFFER(x) (G_VALUE_HOLDS(x, GST_TYPE_BUFFER)) #define GST_VALUE_HOLDS_BUFFER(x) (G_VALUE_HOLDS((x), GST_TYPE_BUFFER ))
/** /**
* GST_VALUE_HOLDS_FRACTION: * GST_VALUE_HOLDS_FRACTION:
* @x: the #GValue to check * @x: the #GValue to check
* *
* Checks if the given #GValue contains a #GST_TYPE_FRACTION value. * Checks if the given #GValue contains a #GST_TYPE_FRACTION value.
*/ */
#define GST_VALUE_HOLDS_FRACTION(x) (G_VALUE_HOLDS(x, gst_fraction_get_t ype ())) #define GST_VALUE_HOLDS_FRACTION(x) (G_VALUE_HOLDS((x), gst_fraction_get _type ()))
/** /**
* GST_VALUE_HOLDS_DATE: * GST_VALUE_HOLDS_DATE:
* @x: the #GValue to check * @x: the #GValue to check
* *
* Checks if the given #GValue contains a #GST_TYPE_DATE value. * Checks if the given #GValue contains a #GST_TYPE_DATE value.
*/ */
#define GST_VALUE_HOLDS_DATE(x) (G_VALUE_HOLDS(x, gst_date_get_type #define GST_VALUE_HOLDS_DATE(x) (G_VALUE_HOLDS((x), gst_date_get_ty
())) pe ()))
/**
* GST_VALUE_HOLDS_DATE_TIME:
* @x: the #GValue to check
*
* Checks if the given #GValue contains a #GST_TYPE_DATE_TIME value.
*
* Since: 0.10.31
*/
#define GST_VALUE_HOLDS_DATE_TIME(x) (G_VALUE_HOLDS((x), gst_date_time_g
et_type ()))
/** /**
* GST_TYPE_FOURCC: * GST_TYPE_FOURCC:
* *
* a #GValue type that represents 4 byte identifier (e.g. used for codecs) * a #GValue type that represents 4 byte identifier (e.g. used for codecs)
* *
* Returns: the #GType of GstFourcc * Returns: the #GType of GstFourcc
*/ */
#define GST_TYPE_FOURCC gst_fourcc_get_type () #define GST_TYPE_FOURCC gst_fourcc_get_type ()
/** /**
* GST_TYPE_INT_RANGE: * GST_TYPE_INT_RANGE:
* *
* a #GValue type that represents an integer range * a #GValue type that represents an integer range
* *
* Returns: the #GType of GstIntRange * Returns: the #GType of GstIntRange
*/ */
#define GST_TYPE_INT_RANGE gst_int_range_get_type () #define GST_TYPE_INT_RANGE gst_int_range_get_type ()
/** /**
* GST_TYPE_INT64_RANGE:
*
* a #GValue type that represents an #gint64 range
*
* Returns: the #GType of GstInt64Range
*
* Since: 0.10.31
*/
#define GST_TYPE_INT64_RANGE gst_int64_range_get_type ()
/**
* GST_TYPE_DOUBLE_RANGE: * GST_TYPE_DOUBLE_RANGE:
* *
* a #GValue type that represents a floating point range with double precis sion * a #GValue type that represents a floating point range with double precis sion
* *
* Returns: the #GType of GstIntRange * Returns: the #GType of GstIntRange
*/ */
#define GST_TYPE_DOUBLE_RANGE gst_double_range_get_type () #define GST_TYPE_DOUBLE_RANGE gst_double_range_get_type ()
/** /**
* GST_TYPE_FRACTION_RANGE: * GST_TYPE_FRACTION_RANGE:
skipping to change at line 263 skipping to change at line 294
* GST_TYPE_DATE: * GST_TYPE_DATE:
* *
* a boxed #GValue type for #GDate that represents a date. * a boxed #GValue type for #GDate that represents a date.
* *
* Returns: the #GType of GstDate * Returns: the #GType of GstDate
*/ */
#define GST_TYPE_DATE gst_date_get_type () #define GST_TYPE_DATE gst_date_get_type ()
/** /**
* GST_TYPE_DATE_TIME:
*
* a boxed #GValue type for #GstDateTime that represents a date and time.
*
* Returns: the #GType of GstDateTime
* Since: 0.10.31
*/
#define GST_TYPE_DATE_TIME gst_date_time_get_type ()
/**
* GST_VALUE_LESS_THAN: * GST_VALUE_LESS_THAN:
* *
* Indicates that the first value provided to a comparison function * Indicates that the first value provided to a comparison function
* (gst_value_compare()) is lesser than the second one. * (gst_value_compare()) is lesser than the second one.
*/ */
#define GST_VALUE_LESS_THAN (-1) #define GST_VALUE_LESS_THAN (-1)
/** /**
* GST_VALUE_EQUAL: * GST_VALUE_EQUAL:
* *
skipping to change at line 296 skipping to change at line 338
/** /**
* GST_VALUE_UNORDERED: * GST_VALUE_UNORDERED:
* *
* Indicates that the comparison function (gst_value_compare()) can not * Indicates that the comparison function (gst_value_compare()) can not
* determine a order for the two provided values. * determine a order for the two provided values.
*/ */
#define GST_VALUE_UNORDERED 2 #define GST_VALUE_UNORDERED 2
/** /**
* GstValueCompareFunc: * GstValueCompareFunc:
* @value1: first value for comparission * @value1: first value for comparison
* @value2: second value for comparission * @value2: second value for comparison
* *
* Used together with gst_value_compare() to compare #GValues. * Used together with gst_value_compare() to compare #GValue items.
* *
* Returns: one of GST_VALUE_LESS_THAN, GST_VALUE_EQUAL, GST_VALUE_GREATER_ THAN * Returns: one of GST_VALUE_LESS_THAN, GST_VALUE_EQUAL, GST_VALUE_GREATER_ THAN
* or GST_VALUE_UNORDERED * or GST_VALUE_UNORDERED
*/ */
typedef gint (* GstValueCompareFunc) (const GValue *value1, typedef gint (* GstValueCompareFunc) (const GValue *value1,
const GValue *value2); const GValue *value2);
/** /**
* GstValueSerializeFunc: * GstValueSerializeFunc:
* @value1: a #GValue * @value1: a #GValue
* *
* Used by gst_value_serialize() to obtain a non-binary form of the #GValue . * Used by gst_value_serialize() to obtain a non-binary form of the #GValue .
* *
* Returns: the string representation of the value * Free-function: g_free
*
* Returns: (transfer full): the string representation of the value
*/ */
typedef gchar * (* GstValueSerializeFunc) (const GValue *value1); typedef gchar * (* GstValueSerializeFunc) (const GValue *value1);
/** /**
* GstValueDeserializeFunc: * GstValueDeserializeFunc:
* @dest: a #GValue * @dest: a #GValue
* @s: a string * @s: a string
* *
* Used by gst_value_deserialize() to parse a non-binary form into the #GVa lue. * Used by gst_value_deserialize() to parse a non-binary form into the #GVa lue.
* *
skipping to change at line 346 skipping to change at line 390
* type. Register a new implementation with gst_value_register_union_func() . * type. Register a new implementation with gst_value_register_union_func() .
* *
* Returns: %TRUE if a union was successful * Returns: %TRUE if a union was successful
*/ */
typedef gboolean (* GstValueUnionFunc) (GValue *dest, typedef gboolean (* GstValueUnionFunc) (GValue *dest,
const GValue *value1, const GValue *value1,
const GValue *value2); const GValue *value2);
/** /**
* GstValueIntersectFunc: * GstValueIntersectFunc:
* @dest: a #GValue for the result * @dest: (out caller-allocates): a #GValue for the result
* @value1: a #GValue operand * @value1: a #GValue operand
* @value2: a #GValue operand * @value2: a #GValue operand
* *
* Used by gst_value_intersect() to perform intersection for a specific #GV alue * Used by gst_value_intersect() to perform intersection for a specific #GV alue
* type. If the intersection is non-empty, the result is * type. If the intersection is non-empty, the result is
* placed in @dest and TRUE is returned. If the intersection is * placed in @dest and TRUE is returned. If the intersection is
* empty, @dest is unmodified and FALSE is returned. * empty, @dest is unmodified and FALSE is returned.
* Register a new implementation with gst_value_register_intersection_func( ). * Register a new implementation with gst_value_register_intersect_func().
* *
* Returns: %TRUE if the values can intersect * Returns: %TRUE if the values can intersect
*/ */
typedef gboolean (* GstValueIntersectFunc) (GValue *dest, typedef gboolean (* GstValueIntersectFunc) (GValue *dest,
const GValue *value1, const GValue *value1,
const GValue *value2); const GValue *value2);
/** /**
* GstValueSubtractFunc: * GstValueSubtractFunc:
* @dest: a #GValue for the result * @dest: (out caller-allocates): a #GValue for the result
* @minuend: a #GValue operand * @minuend: a #GValue operand
* @subtrahend: a #GValue operand * @subtrahend: a #GValue operand
* *
* Used by gst_value_subtract() to perform subtraction for a specific #GVal ue * Used by gst_value_subtract() to perform subtraction for a specific #GVal ue
* type. Register a new implementation with gst_value_register_subtract_fun c(). * type. Register a new implementation with gst_value_register_subtract_fun c().
* *
* Returns: %TRUE if the subtraction is not empty * Returns: %TRUE if the subtraction is not empty
*/ */
typedef gboolean (* GstValueSubtractFunc) (GValue *dest, typedef gboolean (* GstValueSubtractFunc) (GValue *dest,
const GValue *minuend, const GValue *minuend,
skipping to change at line 398 skipping to change at line 442
GType type; GType type;
GstValueCompareFunc compare; GstValueCompareFunc compare;
GstValueSerializeFunc serialize; GstValueSerializeFunc serialize;
GstValueDeserializeFunc deserialize; GstValueDeserializeFunc deserialize;
/*< private >*/ /*< private >*/
void *_gst_reserved [GST_PADDING]; void *_gst_reserved [GST_PADDING];
}; };
GType gst_int_range_get_type (void); GType gst_int_range_get_type (void);
GType gst_int64_range_get_type (void);
GType gst_double_range_get_type (void); GType gst_double_range_get_type (void);
GType gst_fraction_range_get_type (void); GType gst_fraction_range_get_type (void);
GType gst_fourcc_get_type (void); GType gst_fourcc_get_type (void);
GType gst_fraction_get_type (void); GType gst_fraction_get_type (void);
GType gst_value_list_get_type (void); GType gst_value_list_get_type (void);
GType gst_value_array_get_type (void); GType gst_value_array_get_type (void);
GType gst_date_get_type (void); GType gst_date_get_type (void);
GType gst_date_time_get_type (void);
void gst_value_register (const GstValueTable *tabl e); void gst_value_register (const GstValueTable *tabl e);
void gst_value_init_and_copy (GValue *dest , void gst_value_init_and_copy (GValue *dest ,
const GValue *src) ; const GValue *src) ;
gchar * gst_value_serialize (const GValue *value); gchar * gst_value_serialize (const GValue *value);
gboolean gst_value_deserialize (GValue *dest , gboolean gst_value_deserialize (GValue *dest ,
const gchar *src) ; const gchar *src) ;
/* list */ /* list */
void gst_value_list_append_value (GValue *value, void gst_value_list_append_value (GValue *value,
const GValue *append_valu e); const GValue *append_valu e);
void gst_value_list_prepend_value (GValue *value, void gst_value_list_prepend_value (GValue *value,
const GValue *prepend_val ue); const GValue *prepend_val ue);
void gst_value_list_concat (GValue *dest, void gst_value_list_concat (GValue *dest,
const GValue *value1, const GValue *value1,
const GValue *value2); const GValue *value2);
void gst_value_list_merge (GValue *dest,
const GValue *value1,
const GValue *value2);
guint gst_value_list_get_size (const GValue *value); guint gst_value_list_get_size (const GValue *value);
G_CONST_RETURN GValue * G_CONST_RETURN GValue *
gst_value_list_get_value (const GValue *value, gst_value_list_get_value (const GValue *value,
guint index); guint index);
/* array */ /* array */
void gst_value_array_append_value (GValue *value, void gst_value_array_append_value (GValue *value,
const GValue *append_valu e); const GValue *append_valu e);
void gst_value_array_prepend_value (GValue *value, void gst_value_array_prepend_value (GValue *value,
const GValue *prepend_val ue); const GValue *prepend_val ue);
skipping to change at line 450 skipping to change at line 499
guint32 fourcc); guint32 fourcc);
guint32 gst_value_get_fourcc (const GValue *val ue); guint32 gst_value_get_fourcc (const GValue *val ue);
/* int range */ /* int range */
void gst_value_set_int_range (GValue *value, void gst_value_set_int_range (GValue *value,
gint start, gint start,
gint end); gint end);
gint gst_value_get_int_range_min (const GValue *value); gint gst_value_get_int_range_min (const GValue *value);
gint gst_value_get_int_range_max (const GValue *value); gint gst_value_get_int_range_max (const GValue *value);
/* int64 range */
void gst_value_set_int64_range (GValue *value,
gint64 start,
gint64 end);
gint64 gst_value_get_int64_range_min (const GValue *value);
gint64 gst_value_get_int64_range_max (const GValue *value);
/* double range */ /* double range */
void gst_value_set_double_range (GValue *value, void gst_value_set_double_range (GValue *value,
gdouble start, gdouble start,
gdouble end); gdouble end);
gdouble gst_value_get_double_range_min (const GValue *val ue); gdouble gst_value_get_double_range_min (const GValue *val ue);
gdouble gst_value_get_double_range_max (const GValue *val ue); gdouble gst_value_get_double_range_max (const GValue *val ue);
/* caps */ /* caps */
G_CONST_RETURN GstCaps * G_CONST_RETURN GstCaps *
gst_value_get_caps (const GValue *value); gst_value_get_caps (const GValue *value);
 End of changes. 25 change blocks. 
22 lines changed or deleted 80 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/