mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-07-02 20:55:55 +00:00
Code Issues 1 Projects Releases Wiki Activity

Merge branch 'master' into 0.11

Browse source
This commit is contained in:
Wim Taymans 2011-07-27 12:50:39 +02:00
parent 83e057cdc1 cf6b41aa78
commit cf18fa9ce5
6 changed files with 63 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
docs/pwg/advanced-clock.xml
View file

@ -59,7 +59,7 @@
element will be regarded as the source element for this discussion.
</para>
</footnote>
First, the source element sends a discontinuous event. This event carries information
First, the source element sends a newsegment event. This event carries information
about the current relative time of the next sample. This relative time is
arbitrary, but it must be consistent with the timestamp that will be
placed in buffers. It is expected to be the relative time to the start
@ -81,7 +81,7 @@
<para>
If the stream is seeked, the next samples sent will have a timestamp that
is not adjusted with the element time. Therefore, the source element must
send a discontinuous event.
send a newsegment event.
</para>
</sect1>
<sect1 id="section-clock-obligations-of-each-element" xreflabel="Obligations
@ -101,14 +101,14 @@
Source elements (or parsers of formats that provide notion of time, such
as MPEG, as explained above) must place a timestamp in each buffer that
they deliver. The origin of the time used is arbitrary, but it must
match the time delivered in the discontinuous event (see below).
match the time delivered in the newsegment event (see below).
However, it is expected that the origin is the origin of the media
stream.
</para>
<para>
In order to initialize the element time of the rest of the pipeline, a
source element must send a discontinuous event before starting to play.
In addition, after seeking, a discontinuous event must be sent, because
source element must send a newsegment event before starting to play.
In addition, after seeking, a newsegment event must be sent, because
the timestamp of the next element does not match the element time of the
rest of the pipeline.
</para>

2
docs/pwg/building-chainfn.xml
View file

@ -47,7 +47,7 @@ gst_my_filter_change_state (GstElement * element, GstStateChange transition)
that buffers are not always writeable. In more advanced elements (the ones
that do event processing), you may want to additionally specify an event
handling function, which will be called when stream-events are sent (such
as end-of-stream, discontinuities, tags, etc.).
as end-of-stream, newsegment, tags, etc.).
</para>
<programlisting>
static void

6
gst/gstelementfactory.c
View file

@ -323,7 +323,8 @@ detailserror:
/**
* gst_element_factory_create:
* @factory: factory to instantiate
* @name: name of new element
* @name: (allow-none): name of new element, or NULL to automatically create
* a unique name
*
* Create a new element of the type defined by the given elementfactory.
* It will be given the name supplied, since all elements require a name as
@ -408,7 +409,8 @@ no_element:
/**
* gst_element_factory_make:
* @factoryname: a named factory to instantiate
* @name: (allow-none): name of new element
* @name: (allow-none): name of new element, or NULL to automatically create
* a unique name
*
* Create a new element of the type defined by the given element factory.
* If name is NULL, then the element will receive a guaranteed unique name,

16
libs/gst/base/gstbitreader.c
View file

@ -208,7 +208,7 @@ gst_bit_reader_skip_to_byte (GstBitReader * reader)
/**
* gst_bit_reader_get_bits_uint8:
* @reader: a #GstBitReader instance
* @val: Pointer to a #guint8 to store the result
* @val: (out): Pointer to a #guint8 to store the result
* @nbits: number of bits to read
*
* Read @nbits bits into @val and update the current position.
@ -221,7 +221,7 @@ gst_bit_reader_skip_to_byte (GstBitReader * reader)
/**
* gst_bit_reader_get_bits_uint16:
* @reader: a #GstBitReader instance
* @val: Pointer to a #guint16 to store the result
* @val: (out): Pointer to a #guint16 to store the result
* @nbits: number of bits to read
*
* Read @nbits bits into @val and update the current position.
@ -234,7 +234,7 @@ gst_bit_reader_skip_to_byte (GstBitReader * reader)
/**
* gst_bit_reader_get_bits_uint32:
* @reader: a #GstBitReader instance
* @val: Pointer to a #guint32 to store the result
* @val: (out): Pointer to a #guint32 to store the result
* @nbits: number of bits to read
*
* Read @nbits bits into @val and update the current position.
@ -247,7 +247,7 @@ gst_bit_reader_skip_to_byte (GstBitReader * reader)
/**
* gst_bit_reader_get_bits_uint64:
* @reader: a #GstBitReader instance
* @val: Pointer to a #guint64 to store the result
* @val: (out): Pointer to a #guint64 to store the result
* @nbits: number of bits to read
*
* Read @nbits bits into @val and update the current position.
@ -260,7 +260,7 @@ gst_bit_reader_skip_to_byte (GstBitReader * reader)
/**
* gst_bit_reader_peek_bits_uint8:
* @reader: a #GstBitReader instance
* @val: Pointer to a #guint8 to store the result
* @val: (out): Pointer to a #guint8 to store the result
* @nbits: number of bits to read
*
* Read @nbits bits into @val but keep the current position.
@ -273,7 +273,7 @@ gst_bit_reader_skip_to_byte (GstBitReader * reader)
/**
* gst_bit_reader_peek_bits_uint16:
* @reader: a #GstBitReader instance
* @val: Pointer to a #guint16 to store the result
* @val: (out): Pointer to a #guint16 to store the result
* @nbits: number of bits to read
*
* Read @nbits bits into @val but keep the current position.
@ -286,7 +286,7 @@ gst_bit_reader_skip_to_byte (GstBitReader * reader)
/**
* gst_bit_reader_peek_bits_uint32:
* @reader: a #GstBitReader instance
* @val: Pointer to a #guint32 to store the result
* @val: (out): Pointer to a #guint32 to store the result
* @nbits: number of bits to read
*
* Read @nbits bits into @val but keep the current position.
@ -299,7 +299,7 @@ gst_bit_reader_skip_to_byte (GstBitReader * reader)
/**
* gst_bit_reader_peek_bits_uint64:
* @reader: a #GstBitReader instance
* @val: Pointer to a #guint64 to store the result
* @val: (out): Pointer to a #guint64 to store the result
* @nbits: number of bits to read
*
* Read @nbits bits into @val but keep the current position.

88
libs/gst/base/gstbytereader.c
View file

@ -201,7 +201,7 @@ gst_byte_reader_skip (GstByteReader * reader, guint nbytes)
/**
* gst_byte_reader_get_uint8:
* @reader: a #GstByteReader instance
* @val: Pointer to a #guint8 to store the result
* @val: (out): Pointer to a #guint8 to store the result
*
* Read an unsigned 8 bit integer into @val and update the current position.
*
@ -213,7 +213,7 @@ gst_byte_reader_skip (GstByteReader * reader, guint nbytes)
/**
* gst_byte_reader_get_int8:
* @reader: a #GstByteReader instance
* @val: Pointer to a #gint8 to store the result
* @val: (out): Pointer to a #gint8 to store the result
*
* Read a signed 8 bit integer into @val and update the current position.
*
@ -225,7 +225,7 @@ gst_byte_reader_skip (GstByteReader * reader, guint nbytes)
/**
* gst_byte_reader_peek_uint8:
* @reader: a #GstByteReader instance
* @val: Pointer to a #guint8 to store the result
* @val: (out): Pointer to a #guint8 to store the result
*
* Read an unsigned 8 bit integer into @val but keep the current position.
*
@ -237,7 +237,7 @@ gst_byte_reader_skip (GstByteReader * reader, guint nbytes)
/**
* gst_byte_reader_peek_int8:
* @reader: a #GstByteReader instance
* @val: Pointer to a #gint8 to store the result
* @val: (out): Pointer to a #gint8 to store the result
*
* Read a signed 8 bit integer into @val but keep the current position.
*
@ -249,7 +249,7 @@ gst_byte_reader_skip (GstByteReader * reader, guint nbytes)
/**
* gst_byte_reader_get_uint16_le:
* @reader: a #GstByteReader instance
* @val: Pointer to a #guint16 to store the result
* @val: (out): Pointer to a #guint16 to store the result
*
* Read an unsigned 16 bit little endian integer into @val
* and update the current position.
@ -262,7 +262,7 @@ gst_byte_reader_skip (GstByteReader * reader, guint nbytes)
/**
* gst_byte_reader_get_int16_le:
* @reader: a #GstByteReader instance
* @val: Pointer to a #gint16 to store the result
* @val: (out): Pointer to a #gint16 to store the result
*
* Read a signed 16 bit little endian integer into @val
* and update the current position.
@ -275,7 +275,7 @@ gst_byte_reader_skip (GstByteReader * reader, guint nbytes)
/**
* gst_byte_reader_peek_uint16_le:
* @reader: a #GstByteReader instance
* @val: Pointer to a #guint16 to store the result
* @val: (out): Pointer to a #guint16 to store the result
*
* Read an unsigned 16 bit little endian integer into @val
* but keep the current position.
@ -288,7 +288,7 @@ gst_byte_reader_skip (GstByteReader * reader, guint nbytes)
/**
* gst_byte_reader_peek_int16_le:
* @reader: a #GstByteReader instance
* @val: Pointer to a #gint16 to store the result
* @val: (out): Pointer to a #gint16 to store the result
*
* Read a signed 16 bit little endian integer into @val
* but keep the current position.
@ -301,7 +301,7 @@ gst_byte_reader_skip (GstByteReader * reader, guint nbytes)
/**
* gst_byte_reader_get_uint16_be:
* @reader: a #GstByteReader instance
* @val: Pointer to a #guint16 to store the result
* @val: (out): Pointer to a #guint16 to store the result
*
* Read an unsigned 16 bit big endian integer into @val
* and update the current position.
@ -314,7 +314,7 @@ gst_byte_reader_skip (GstByteReader * reader, guint nbytes)
/**
* gst_byte_reader_get_int16_be:
* @reader: a #GstByteReader instance
* @val: Pointer to a #gint16 to store the result
* @val: (out): Pointer to a #gint16 to store the result
*
* Read a signed 16 bit big endian integer into @val
* and update the current position.
@ -327,7 +327,7 @@ gst_byte_reader_skip (GstByteReader * reader, guint nbytes)
/**
* gst_byte_reader_peek_uint16_be:
* @reader: a #GstByteReader instance
* @val: Pointer to a #guint16 to store the result
* @val: (out): Pointer to a #guint16 to store the result
*
* Read an unsigned 16 bit big endian integer into @val
* but keep the current position.
@ -340,7 +340,7 @@ gst_byte_reader_skip (GstByteReader * reader, guint nbytes)
/**
* gst_byte_reader_peek_int16_be:
* @reader: a #GstByteReader instance
* @val: Pointer to a #gint16 to store the result
* @val: (out): Pointer to a #gint16 to store the result
*
* Read a signed 16 bit big endian integer into @val
* but keep the current position.
@ -353,7 +353,7 @@ gst_byte_reader_skip (GstByteReader * reader, guint nbytes)
/**
* gst_byte_reader_get_uint24_le:
* @reader: a #GstByteReader instance
* @val: Pointer to a #guint32 to store the result
* @val: (out): Pointer to a #guint32 to store the result
*
* Read an unsigned 24 bit little endian integer into @val
* and update the current position.
@ -366,7 +366,7 @@ gst_byte_reader_skip (GstByteReader * reader, guint nbytes)
/**
* gst_byte_reader_get_int24_le:
* @reader: a #GstByteReader instance
* @val: Pointer to a #gint32 to store the result
* @val: (out): Pointer to a #gint32 to store the result
*
* Read a signed 24 bit little endian integer into @val
* and update the current position.
@ -379,7 +379,7 @@ gst_byte_reader_skip (GstByteReader * reader, guint nbytes)
/**
* gst_byte_reader_peek_uint24_le:
* @reader: a #GstByteReader instance
* @val: Pointer to a #guint32 to store the result
* @val: (out): Pointer to a #guint32 to store the result
*
* Read an unsigned 24 bit little endian integer into @val
* but keep the current position.
@ -392,7 +392,7 @@ gst_byte_reader_skip (GstByteReader * reader, guint nbytes)
/**
* gst_byte_reader_peek_int24_le:
* @reader: a #GstByteReader instance
* @val: Pointer to a #gint32 to store the result
* @val: (out): Pointer to a #gint32 to store the result
*
* Read a signed 24 bit little endian integer into @val
* but keep the current position.
@ -405,7 +405,7 @@ gst_byte_reader_skip (GstByteReader * reader, guint nbytes)
/**
* gst_byte_reader_get_uint24_be:
* @reader: a #GstByteReader instance
* @val: Pointer to a #guint32 to store the result
* @val: (out): Pointer to a #guint32 to store the result
*
* Read an unsigned 24 bit big endian integer into @val
* and update the current position.
@ -418,7 +418,7 @@ gst_byte_reader_skip (GstByteReader * reader, guint nbytes)
/**
* gst_byte_reader_get_int24_be:
* @reader: a #GstByteReader instance
* @val: Pointer to a #gint32 to store the result
* @val: (out): Pointer to a #gint32 to store the result
*
* Read a signed 24 bit big endian integer into @val
* and update the current position.
@ -431,7 +431,7 @@ gst_byte_reader_skip (GstByteReader * reader, guint nbytes)
/**
* gst_byte_reader_peek_uint24_be:
* @reader: a #GstByteReader instance
* @val: Pointer to a #guint32 to store the result
* @val: (out): Pointer to a #guint32 to store the result
*
* Read an unsigned 24 bit big endian integer into @val
* but keep the current position.
@ -444,7 +444,7 @@ gst_byte_reader_skip (GstByteReader * reader, guint nbytes)
/**
* gst_byte_reader_peek_int24_be:
* @reader: a #GstByteReader instance
* @val: Pointer to a #gint32 to store the result
* @val: (out): Pointer to a #gint32 to store the result
*
* Read a signed 24 bit big endian integer into @val
* but keep the current position.
@ -458,7 +458,7 @@ gst_byte_reader_skip (GstByteReader * reader, guint nbytes)
/**
* gst_byte_reader_get_uint32_le:
* @reader: a #GstByteReader instance
* @val: Pointer to a #guint32 to store the result
* @val: (out): Pointer to a #guint32 to store the result
*
* Read an unsigned 32 bit little endian integer into @val
* and update the current position.
@ -471,7 +471,7 @@ gst_byte_reader_skip (GstByteReader * reader, guint nbytes)
/**
* gst_byte_reader_get_int32_le:
* @reader: a #GstByteReader instance
* @val: Pointer to a #gint32 to store the result
* @val: (out): Pointer to a #gint32 to store the result
*
* Read a signed 32 bit little endian integer into @val
* and update the current position.
@ -484,7 +484,7 @@ gst_byte_reader_skip (GstByteReader * reader, guint nbytes)
/**
* gst_byte_reader_peek_uint32_le:
* @reader: a #GstByteReader instance
* @val: Pointer to a #guint32 to store the result
* @val: (out): Pointer to a #guint32 to store the result
*
* Read an unsigned 32 bit little endian integer into @val
* but keep the current position.
@ -497,7 +497,7 @@ gst_byte_reader_skip (GstByteReader * reader, guint nbytes)
/**
* gst_byte_reader_peek_int32_le:
* @reader: a #GstByteReader instance
* @val: Pointer to a #gint32 to store the result
* @val: (out): Pointer to a #gint32 to store the result
*
* Read a signed 32 bit little endian integer into @val
* but keep the current position.
@ -510,7 +510,7 @@ gst_byte_reader_skip (GstByteReader * reader, guint nbytes)
/**
* gst_byte_reader_get_uint32_be:
* @reader: a #GstByteReader instance
* @val: Pointer to a #guint32 to store the result
* @val: (out): Pointer to a #guint32 to store the result
*
* Read an unsigned 32 bit big endian integer into @val
* and update the current position.
@ -523,7 +523,7 @@ gst_byte_reader_skip (GstByteReader * reader, guint nbytes)
/**
* gst_byte_reader_get_int32_be:
* @reader: a #GstByteReader instance
* @val: Pointer to a #gint32 to store the result
* @val: (out): Pointer to a #gint32 to store the result
*
* Read a signed 32 bit big endian integer into @val
* and update the current position.
@ -536,7 +536,7 @@ gst_byte_reader_skip (GstByteReader * reader, guint nbytes)
/**
* gst_byte_reader_peek_uint32_be:
* @reader: a #GstByteReader instance
* @val: Pointer to a #guint32 to store the result
* @val: (out): Pointer to a #guint32 to store the result
*
* Read an unsigned 32 bit big endian integer into @val
* but keep the current position.
@ -549,7 +549,7 @@ gst_byte_reader_skip (GstByteReader * reader, guint nbytes)
/**
* gst_byte_reader_peek_int32_be:
* @reader: a #GstByteReader instance
* @val: Pointer to a #gint32 to store the result
* @val: (out): Pointer to a #gint32 to store the result
*
* Read a signed 32 bit big endian integer into @val
* but keep the current position.
@ -562,7 +562,7 @@ gst_byte_reader_skip (GstByteReader * reader, guint nbytes)
/**
* gst_byte_reader_get_uint64_le:
* @reader: a #GstByteReader instance
* @val: Pointer to a #guint64 to store the result
* @val: (out): Pointer to a #guint64 to store the result
*
* Read an unsigned 64 bit little endian integer into @val
* and update the current position.
@ -575,7 +575,7 @@ gst_byte_reader_skip (GstByteReader * reader, guint nbytes)
/**
* gst_byte_reader_get_int64_le:
* @reader: a #GstByteReader instance
* @val: Pointer to a #gint64 to store the result
* @val: (out): Pointer to a #gint64 to store the result
*
* Read a signed 64 bit little endian integer into @val
* and update the current position.
@ -588,7 +588,7 @@ gst_byte_reader_skip (GstByteReader * reader, guint nbytes)
/**
* gst_byte_reader_peek_uint64_le:
* @reader: a #GstByteReader instance
* @val: Pointer to a #guint64 to store the result
* @val: (out): Pointer to a #guint64 to store the result
*
* Read an unsigned 64 bit little endian integer into @val
* but keep the current position.
@ -601,7 +601,7 @@ gst_byte_reader_skip (GstByteReader * reader, guint nbytes)
/**
* gst_byte_reader_peek_int64_le:
* @reader: a #GstByteReader instance
* @val: Pointer to a #gint64 to store the result
* @val: (out): Pointer to a #gint64 to store the result
*
* Read a signed 64 bit little endian integer into @val
* but keep the current position.
@ -614,7 +614,7 @@ gst_byte_reader_skip (GstByteReader * reader, guint nbytes)
/**
* gst_byte_reader_get_uint64_be:
* @reader: a #GstByteReader instance
* @val: Pointer to a #guint64 to store the result
* @val: (out): Pointer to a #guint64 to store the result
*
* Read an unsigned 64 bit big endian integer into @val
* and update the current position.
@ -627,7 +627,7 @@ gst_byte_reader_skip (GstByteReader * reader, guint nbytes)
/**
* gst_byte_reader_get_int64_be:
* @reader: a #GstByteReader instance
* @val: Pointer to a #gint64 to store the result
* @val: (out): Pointer to a #gint64 to store the result
*
* Read a signed 64 bit big endian integer into @val
* and update the current position.
@ -640,7 +640,7 @@ gst_byte_reader_skip (GstByteReader * reader, guint nbytes)
/**
* gst_byte_reader_peek_uint64_be:
* @reader: a #GstByteReader instance
* @val: Pointer to a #guint64 to store the result
* @val: (out): Pointer to a #guint64 to store the result
*
* Read an unsigned 64 bit big endian integer into @val
* but keep the current position.
@ -653,7 +653,7 @@ gst_byte_reader_skip (GstByteReader * reader, guint nbytes)
/**
* gst_byte_reader_peek_int64_be:
* @reader: a #GstByteReader instance
* @val: Pointer to a #gint64 to store the result
* @val: (out): Pointer to a #gint64 to store the result
*
* Read a signed 64 bit big endian integer into @val
* but keep the current position.
@ -704,7 +704,7 @@ GST_BYTE_READER_PEEK_GET(64,gint64,int64_be)
/**
* gst_byte_reader_get_float32_le:
* @reader: a #GstByteReader instance
* @val: Pointer to a #gfloat to store the result
* @val: (out): Pointer to a #gfloat to store the result
*
* Read a 32 bit little endian floating point value into @val
* and update the current position.
@ -717,7 +717,7 @@ GST_BYTE_READER_PEEK_GET(64,gint64,int64_be)
/**
* gst_byte_reader_peek_float32_le:
* @reader: a #GstByteReader instance
* @val: Pointer to a #gfloat to store the result
* @val: (out): Pointer to a #gfloat to store the result
*
* Read a 32 bit little endian floating point value into @val
* but keep the current position.
@ -730,7 +730,7 @@ GST_BYTE_READER_PEEK_GET(64,gint64,int64_be)
/**
* gst_byte_reader_get_float32_be:
* @reader: a #GstByteReader instance
* @val: Pointer to a #gfloat to store the result
* @val: (out): Pointer to a #gfloat to store the result
*
* Read a 32 bit big endian floating point value into @val
* and update the current position.
@ -743,7 +743,7 @@ GST_BYTE_READER_PEEK_GET(64,gint64,int64_be)
/**
* gst_byte_reader_peek_float32_be:
* @reader: a #GstByteReader instance
* @val: Pointer to a #gfloat to store the result
* @val: (out): Pointer to a #gfloat to store the result
*
* Read a 32 bit big endian floating point value into @val
* but keep the current position.
@ -756,7 +756,7 @@ GST_BYTE_READER_PEEK_GET(64,gint64,int64_be)
/**
* gst_byte_reader_get_float64_le:
* @reader: a #GstByteReader instance
* @val: Pointer to a #gdouble to store the result
* @val: (out): Pointer to a #gdouble to store the result
*
* Read a 64 bit little endian floating point value into @val
* and update the current position.
@ -769,7 +769,7 @@ GST_BYTE_READER_PEEK_GET(64,gint64,int64_be)
/**
* gst_byte_reader_peek_float64_le:
* @reader: a #GstByteReader instance
* @val: Pointer to a #gdouble to store the result
* @val: (out): Pointer to a #gdouble to store the result
*
* Read a 64 bit little endian floating point value into @val
* but keep the current position.
@ -782,7 +782,7 @@ GST_BYTE_READER_PEEK_GET(64,gint64,int64_be)
/**
* gst_byte_reader_get_float64_be:
* @reader: a #GstByteReader instance
* @val: Pointer to a #gdouble to store the result
* @val: (out): Pointer to a #gdouble to store the result
*
* Read a 64 bit big endian floating point value into @val
* and update the current position.
@ -795,7 +795,7 @@ GST_BYTE_READER_PEEK_GET(64,gint64,int64_be)
/**
* gst_byte_reader_peek_float64_be:
* @reader: a #GstByteReader instance
* @val: Pointer to a #gdouble to store the result
* @val: (out): Pointer to a #gdouble to store the result
*
* Read a 64 bit big endian floating point value into @val
* but keep the current position.

2
libs/gst/controller/gstcontrollerprivate.h
View file

@ -38,7 +38,7 @@ G_BEGIN_DECLS
typedef struct _GstControlledProperty
{
GParamSpec *pspec; /* GParamSpec for this property */
gchar *name; /* name of the property */
const gchar *name; /* name of the property */
GstControlSource *csource; /* GstControlSource for this property */
gboolean disabled;
GValue last_value;