From: <wt...@fr...> - 2005-05-17 14:11:47
|
CVS Root: /cvs/gstreamer Module: gstreamer Changes by: wtay Date: Tue May 17 2005 07:11:45 PDT Log message: * gst/gstpad.c: (gst_pad_accept_caps), (gst_pad_set_caps), (gst_pad_alloc_buffer), (gst_pad_query), (gst_pad_push): * gst/gstqueue.c: (gst_queue_change_state): Clear queue when going to READY. Remove IN_SETCAPS flag too. Modified files: . : ChangeLog gst : gstpad.c Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/ChangeLog.diff?r1=1.1078&r2=1.1079 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/gstpad.c.diff?r1=1.382&r2=1.383 ====Begin Diffs==== Index: ChangeLog =================================================================== RCS file: /cvs/gstreamer/gstreamer/ChangeLog,v retrieving revision 1.1078 retrieving revision 1.1079 diff -u -d -r1.1078 -r1.1079 --- ChangeLog 17 May 2005 14:01:49 -0000 1.1078 +++ ChangeLog 17 May 2005 14:11:32 -0000 1.1079 @@ -1,3 +1,11 @@ +2005-05-17 Wim Taymans <wi...@fl...> + + * gst/gstpad.c: (gst_pad_accept_caps), (gst_pad_set_caps), + (gst_pad_alloc_buffer), (gst_pad_query), (gst_pad_push): + * gst/gstqueue.c: (gst_queue_change_state): + Clear queue when going to READY. + Remove IN_SETCAPS flag too. 2005-05-17 Tim-Philipp Müller <tim at centricular dot net> * gst/base/gstbasesrc.c: (gst_basesrc_change_state): Index: gstpad.c RCS file: /cvs/gstreamer/gstreamer/gst/gstpad.c,v retrieving revision 1.382 retrieving revision 1.383 diff -u -d -r1.382 -r1.383 --- gstpad.c 9 May 2005 14:47:14 -0000 1.382 +++ gstpad.c 17 May 2005 14:11:32 -0000 1.383 @@ -1893,6 +1893,7 @@ if (!setcaps (pad, caps)) goto could_not_set; GST_LOCK (pad); + GST_FLAG_UNSET (pad, GST_PAD_IN_SETCAPS); } else { GST_CAT_DEBUG (GST_CAT_CAPS, "pad %s:%s was dispatching", GST_DEBUG_PAD_NAME (pad)); @@ -2263,6 +2264,7 @@ caps_changed = caps && caps != GST_RPAD_CAPS (pad); /* we got a new datatype on the pad, see if it can handle it */ if (G_UNLIKELY (caps_changed)) { + GST_DEBUG ("caps changed to %" GST_PTR_FORMAT, caps); if (G_UNLIKELY (!gst_pad_configure_src (GST_PAD_CAST (pad), caps))) goto not_negotiated; } @@ -2872,9 +2874,9 @@ /* FIXME, move capnego this into a base class? */ caps = GST_BUFFER_CAPS (buffer); caps_changed = caps && caps != GST_RPAD_CAPS (peer); - GST_DEBUG ("caps changed %d %" GST_PTR_FORMAT, caps_changed, caps); /* we got a new datatype on the peer pad, see if it can handle it */ if (G_UNLIKELY (!gst_pad_configure_sink (GST_PAD_CAST (peer), caps))) |