mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-26 19:51:11 +00:00
Code Issues 1 Projects Releases Wiki Activity

Original commit message from CVS:

Browse source 
reviewed by: <delete if not using a buddy>
* docs/gst/tmpl/gstelement.sgml:
* docs/gst/tmpl/gstplugin.sgml:
* docs/gst/tmpl/gstreamer-unused.sgml:
* docs/gst/tmpl/gstxml.sgml:
* gst/gstelement.h:
* gst/gstpad.c: (gst_pad_try_set_caps):
* gst/gstqueue.c: (gst_queue_chain):
* testsuite/caps/Makefile.am:
This commit is contained in:
David Schleef 2004-01-26 23:13:24 +00:00
parent f0e1d945a4
commit 13a292781e
11 changed files with 71 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
ChangeLog
View file

@ -1,3 +1,16 @@
2004-01-26 David Schleef <ds@schleef.org>
reviewed by: <delete if not using a buddy>
* docs/gst/tmpl/gstelement.sgml:
* docs/gst/tmpl/gstplugin.sgml:
* docs/gst/tmpl/gstreamer-unused.sgml:
* docs/gst/tmpl/gstxml.sgml:
* gst/gstelement.h:
* gst/gstpad.c: (gst_pad_try_set_caps):
* gst/gstqueue.c: (gst_queue_chain):
* testsuite/caps/Makefile.am:
2004-01-26 Ronald Bultje <rbultje@ronald.bitfreak.net>
* docs/pwg/advanced_types.xml:

7
docs/gst/tmpl/gstelement.sgml
View file

@ -389,6 +389,7 @@ Sets the name of the element, getting rid of the old name if there was one.
@code:
@message:
@debug:
@...:
<!-- # Unused Parameters # -->
@element:
@error:
@ -987,6 +988,12 @@ Is triggered whenever an error occured.
@gstelement: the object which received the signal.
@arg1: the error message
@arg2:
<<<<<<< gstelement.sgml
@:
=======
@:
@:
>>>>>>> 1.59
@:
@:
@:

18
docs/gst/tmpl/gstplugin.sgml
View file

@ -101,15 +101,6 @@ loaded will use this variable to initialize the plugin.
@origin:
@_gst_reserved:
<!-- ##### FUNCTION gst_plugin_set_name ##### -->
<para>
</para>
@plugin:
@name:
<!-- ##### FUNCTION gst_plugin_get_name ##### -->
<para>
@ -119,15 +110,6 @@ loaded will use this variable to initialize the plugin.
@Returns:
<!-- ##### FUNCTION gst_plugin_get_longname ##### -->
<para>
</para>
@plugin:
@Returns:
<!-- ##### FUNCTION gst_plugin_get_filename ##### -->
<para>

16
docs/gst/tmpl/gstreamer-unused.sgml
View file

@ -9634,6 +9634,14 @@ Destroys the pipeline.
@Returns:
<!-- ##### FUNCTION gst_plugin_get_longname ##### -->
<para>
</para>
@plugin:
@Returns:
<!-- ##### FUNCTION gst_plugin_get_type_list ##### -->
<para>
@ -9725,6 +9733,14 @@ Destroys the pipeline.
@plugin:
@longname:
<!-- ##### FUNCTION gst_plugin_set_name ##### -->
<para>
</para>
@plugin:
@name:
<!-- ##### FUNCTION gst_plugin_unload_all ##### -->
<para>

10
docs/gst/tmpl/gstxml.sgml
View file

@ -110,6 +110,10 @@ All GstElements can be serialized to an XML presentation and subsequently loaded
</para>
@:
@:
@:
@gstxml: the object which received the signal.
@arg1:
@arg2:
@ -119,7 +123,7 @@ All GstElements can be serialized to an XML presentation and subsequently loaded
</para>
@:
@:
@:
@gstxml: the object which received the signal.
@arg1:
@arg2:

6
gst/gstelement.h
View file

@ -139,12 +139,14 @@ typedef enum {
#define GST_ELEMENT_CLOCK(obj) (((GstElement*)(obj))->clock)
#define GST_ELEMENT_PADS(obj) ((obj)->pads)
#define gst_element_error(el, domain, code, message, debug) G_STMT_START { \
#define gst_element_error(el, domain, code, message, debug, ...) \
G_STMT_START { \
gst_element_error_full (GST_ELEMENT(el), \
GST_ ## domain ## _ERROR, GST_ ## domain ## _ERROR_ ## code, \
_gst_element_error_printf message, \
_gst_element_error_printf debug, \
__FILE__, GST_FUNCTION, __LINE__); } G_STMT_END
__FILE__, GST_FUNCTION, __LINE__); \
} G_STMT_END
typedef struct _GstElementFactory GstElementFactory;
typedef struct _GstElementFactoryClass GstElementFactoryClass;

21
gst/gstpad.c
View file

@ -1323,21 +1323,28 @@ gst_pad_try_set_caps (GstPad *pad, const GstCaps *caps)
g_return_val_if_fail (!GST_FLAG_IS_SET (pad, GST_PAD_NEGOTIATING),
GST_PAD_LINK_REFUSED);
/* setting non-fixed caps on a pad is not allowed */
if (!gst_caps_is_fixed (caps)) {
GST_CAT_INFO (GST_CAT_CAPS,
"trying to set unfixed caps on pad %s:%s, not allowed",
GST_DEBUG_PAD_NAME (pad));
g_warning ("trying to set non fixed caps on pad %s:%s, not allowed",
GST_DEBUG_PAD_NAME (pad));
gst_caps_debug (caps, "unfixed caps");
return GST_PAD_LINK_REFUSED;
}
/* we allow setting caps on non-linked pads. It's ignored */
if (!GST_PAD_PEER (pad)) {
return GST_PAD_LINK_OK;
}
/* if the desired caps are already there, it's trivially ok */
if (GST_PAD_CAPS (pad)) {
GstCaps *intersection;
intersection = gst_caps_intersect (caps, GST_PAD_CAPS (pad));
if (!gst_caps_is_empty (intersection)) {
gst_caps_free (intersection);
if (GST_PAD_CAPS (pad) && gst_caps_is_equal_fixed (caps,
GST_PAD_CAPS (pad))) {
return GST_PAD_LINK_OK;
}
gst_caps_free (intersection);
}
g_return_val_if_fail (GST_PAD_LINK_SRC (pad), GST_PAD_LINK_REFUSED);
g_return_val_if_fail (GST_PAD_LINK_SINK (pad), GST_PAD_LINK_REFUSED);

2
gst/gstqueue.c
View file

@ -510,7 +510,6 @@ restart:
* to make things read-only. Also keep our list uptodate. */
queue->cur_level.bytes -= GST_BUFFER_SIZE (data);
queue->cur_level.buffers --;
g_object_notify (G_OBJECT (queue), "current-level-buffers");
if (GST_BUFFER_DURATION (data) != GST_CLOCK_TIME_NONE)
queue->cur_level.time -= GST_BUFFER_DURATION (data);
@ -606,7 +605,6 @@ restart:
/* Note that we only add buffers (not events) to the statistics */
if (GST_IS_BUFFER (data)) {
queue->cur_level.buffers++;
g_object_notify (G_OBJECT (queue), "current-level-buffers");
queue->cur_level.bytes += GST_BUFFER_SIZE (data);
if (GST_BUFFER_DURATION (data) != GST_CLOCK_TIME_NONE)
queue->cur_level.time += GST_BUFFER_DURATION (data);

2
plugins/elements/gstqueue.c
View file

@ -510,7 +510,6 @@ restart:
* to make things read-only. Also keep our list uptodate. */
queue->cur_level.bytes -= GST_BUFFER_SIZE (data);
queue->cur_level.buffers --;
g_object_notify (G_OBJECT (queue), "current-level-buffers");
if (GST_BUFFER_DURATION (data) != GST_CLOCK_TIME_NONE)
queue->cur_level.time -= GST_BUFFER_DURATION (data);
@ -606,7 +605,6 @@ restart:
/* Note that we only add buffers (not events) to the statistics */
if (GST_IS_BUFFER (data)) {
queue->cur_level.buffers++;
g_object_notify (G_OBJECT (queue), "current-level-buffers");
queue->cur_level.bytes += GST_BUFFER_SIZE (data);
if (GST_BUFFER_DURATION (data) != GST_CLOCK_TIME_NONE)
queue->cur_level.time += GST_BUFFER_DURATION (data);

5
tests/old/testsuite/caps/Makefile.am
View file

@ -12,7 +12,8 @@ tests_pass = \
intersect2 \
caps \
value_compare \
value_intersect
value_intersect \
it
tests_fail =
@ -34,5 +35,7 @@ fixed_CFLAGS = $(GST_CFLAGS) $(XML_CFLAGS)
intersect2_LDADD = $(GST_LIBS)
intersect2_CFLAGS = $(GST_CFLAGS) $(XML_CFLAGS)
it_LDADD = $(GST_LIBS)
it_CFLAGS = $(GST_CFLAGS) $(XML_CFLAGS)

5
testsuite/caps/Makefile.am
View file

@ -12,7 +12,8 @@ tests_pass = \
intersect2 \
caps \
value_compare \
value_intersect
value_intersect \
it
tests_fail =
@ -34,5 +35,7 @@ fixed_CFLAGS = $(GST_CFLAGS) $(XML_CFLAGS)
intersect2_LDADD = $(GST_LIBS)
intersect2_CFLAGS = $(GST_CFLAGS) $(XML_CFLAGS)
it_LDADD = $(GST_LIBS)
it_CFLAGS = $(GST_CFLAGS) $(XML_CFLAGS)