From: David Schleef Date: Mon, 26 Jan 2004 23:16:21 +0000 (+0000) Subject: Revert accidental checkin and start over X-Git-Tag: BRANCH-RELEASE-0_7_4-ROOT~89 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=aeca198ddaec2eb3e8fdee5ba53380ff30658de8;p=platform%2Fupstream%2Fgstreamer.git Revert accidental checkin and start over Original commit message from CVS: Revert accidental checkin and start over --- diff --git a/ChangeLog b/ChangeLog index 4b86bda982..e461920d3e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,16 +1,3 @@ -2004-01-26 David Schleef - - reviewed by: - - * 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 * docs/pwg/advanced_types.xml: diff --git a/docs/gst/tmpl/gstelement.sgml b/docs/gst/tmpl/gstelement.sgml index 01e0130f8b..10bef0cf5a 100644 --- a/docs/gst/tmpl/gstelement.sgml +++ b/docs/gst/tmpl/gstelement.sgml @@ -389,7 +389,6 @@ Sets the name of the element, getting rid of the old name if there was one. @code: @message: @debug: -@...: @element: @error: @@ -988,12 +987,6 @@ Is triggered whenever an error occured. @gstelement: the object which received the signal. @arg1: the error message @arg2: -<<<<<<< gstelement.sgml -@: -======= -@: -@: ->>>>>>> 1.59 @: @: @: diff --git a/docs/gst/tmpl/gstplugin.sgml b/docs/gst/tmpl/gstplugin.sgml index e265e785b0..c418c8a990 100644 --- a/docs/gst/tmpl/gstplugin.sgml +++ b/docs/gst/tmpl/gstplugin.sgml @@ -101,6 +101,15 @@ loaded will use this variable to initialize the plugin. @origin: @_gst_reserved: + + + + + +@plugin: +@name: + + @@ -110,6 +119,15 @@ loaded will use this variable to initialize the plugin. @Returns: + + + + + +@plugin: +@Returns: + + diff --git a/docs/gst/tmpl/gstreamer-unused.sgml b/docs/gst/tmpl/gstreamer-unused.sgml index cc6fc05def..a987da6a61 100644 --- a/docs/gst/tmpl/gstreamer-unused.sgml +++ b/docs/gst/tmpl/gstreamer-unused.sgml @@ -9634,14 +9634,6 @@ Destroys the pipeline. @Returns: - - - - - -@plugin: -@Returns: - @@ -9733,14 +9725,6 @@ Destroys the pipeline. @plugin: @longname: - - - - - -@plugin: -@name: - diff --git a/docs/gst/tmpl/gstxml.sgml b/docs/gst/tmpl/gstxml.sgml index 08450b21b9..32d00bc1f9 100644 --- a/docs/gst/tmpl/gstxml.sgml +++ b/docs/gst/tmpl/gstxml.sgml @@ -110,10 +110,6 @@ All GstElements can be serialized to an XML presentation and subsequently loaded -@: -@: -@: - @gstxml: the object which received the signal. @arg1: @arg2: @@ -123,7 +119,7 @@ All GstElements can be serialized to an XML presentation and subsequently loaded -@gstxml: the object which received the signal. -@arg1: -@arg2: +@: +@: +@: diff --git a/gst/gstelement.h b/gst/gstelement.h index b640ef3ea6..13eb2f4798 100644 --- a/gst/gstelement.h +++ b/gst/gstelement.h @@ -139,14 +139,12 @@ 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; diff --git a/gst/gstpad.c b/gst/gstpad.c index db6d0d7e47..6d1a346964 100644 --- a/gst/gstpad.c +++ b/gst/gstpad.c @@ -1322,28 +1322,21 @@ gst_pad_try_set_caps (GstPad *pad, const GstCaps *caps) g_return_val_if_fail (GST_IS_REAL_PAD (pad), GST_PAD_LINK_REFUSED); 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) && gst_caps_is_equal_fixed (caps, - GST_PAD_CAPS (pad))) { - return GST_PAD_LINK_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); + return GST_PAD_LINK_OK; + } + gst_caps_free (intersection); } g_return_val_if_fail (GST_PAD_LINK_SRC (pad), GST_PAD_LINK_REFUSED); diff --git a/gst/gstqueue.c b/gst/gstqueue.c index 3f81a98753..d9a2155374 100644 --- a/gst/gstqueue.c +++ b/gst/gstqueue.c @@ -510,6 +510,7 @@ 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); @@ -605,6 +606,7 @@ 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); diff --git a/plugins/elements/gstqueue.c b/plugins/elements/gstqueue.c index 3f81a98753..d9a2155374 100644 --- a/plugins/elements/gstqueue.c +++ b/plugins/elements/gstqueue.c @@ -510,6 +510,7 @@ 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); @@ -605,6 +606,7 @@ 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); diff --git a/tests/old/testsuite/caps/Makefile.am b/tests/old/testsuite/caps/Makefile.am index 3034b5f066..10d217aa1a 100644 --- a/tests/old/testsuite/caps/Makefile.am +++ b/tests/old/testsuite/caps/Makefile.am @@ -12,8 +12,7 @@ tests_pass = \ intersect2 \ caps \ value_compare \ - value_intersect \ - it + value_intersect tests_fail = @@ -35,7 +34,5 @@ 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) diff --git a/testsuite/caps/Makefile.am b/testsuite/caps/Makefile.am index 3034b5f066..10d217aa1a 100644 --- a/testsuite/caps/Makefile.am +++ b/testsuite/caps/Makefile.am @@ -12,8 +12,7 @@ tests_pass = \ intersect2 \ caps \ value_compare \ - value_intersect \ - it + value_intersect tests_fail = @@ -35,7 +34,5 @@ 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)