From: <rb...@fr...> - 2005-01-31 17:39:44
|
CVS Root: /cvs/gstreamer Module: gstreamer Changes by: rbultje Date: Mon Jan 31 2005 09:39:43 PST Log message: * gst/gstbin.c: (gst_bin_child_state_change_func): Remove a piece of code that could never be reached. * docs/gst/gstreamer-sections.txt: * gst/gstpad.c: (gst_pad_push), (gst_pad_pull), (gst_pad_call_get_function): * gst/gstpad.h: * testsuite/pad/Makefile.am: Fix #150546, enable tests. Modified files: . : ChangeLog docs/gst : gstreamer-sections.txt gst : gstbin.c gstpad.c gstpad.h testsuite/pad : Makefile.am Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/ChangeLog.diff?r1=1.945&r2=1.946 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/docs/gst/gstreamer-sections.txt.diff?r1=1.129&r2=1.130 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/gstbin.c.diff?r1=1.208&r2=1.209 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/gstpad.c.diff?r1=1.355&r2=1.356 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/gstpad.h.diff?r1=1.154&r2=1.155 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/testsuite/pad/Makefile.am.diff?r1=1.1&r2=1.2 ====Begin Diffs==== Index: ChangeLog =================================================================== RCS file: /cvs/gstreamer/gstreamer/ChangeLog,v retrieving revision 1.945 retrieving revision 1.946 diff -u -d -r1.945 -r1.946 --- ChangeLog 31 Jan 2005 15:51:17 -0000 1.945 +++ ChangeLog 31 Jan 2005 17:39:30 -0000 1.946 @@ -1,5 +1,16 @@ 2005-01-31 Ronald S. Bultje <rb...@ro...> + * gst/gstbin.c: (gst_bin_child_state_change_func): + Remove a piece of code that could never be reached. + * docs/gst/gstreamer-sections.txt: + * gst/gstpad.c: (gst_pad_push), (gst_pad_pull), + (gst_pad_call_get_function): + * gst/gstpad.h: + * testsuite/pad/Makefile.am: + Fix #150546, enable tests. + +2005-01-31 Ronald S. Bultje <rb...@ro...> * docs/pwg/advanced-types.xml: Fix description for buffer-frames=0. * docs/gst/tmpl/gstbin.sgml: Index: gstbin.c RCS file: /cvs/gstreamer/gstreamer/gst/gstbin.c,v retrieving revision 1.208 retrieving revision 1.209 diff -u -d -r1.208 -r1.209 --- gstbin.c 31 Jan 2005 15:51:18 -0000 1.208 +++ gstbin.c 31 Jan 2005 17:39:30 -0000 1.209 @@ -705,7 +705,7 @@ bin->child_states[new_idx]++; for (i = GST_NUM_STATES - 1; i >= 0; i--) { - if (bin->child_states[i] != 0 || i == 0) { + if (bin->child_states[i] != 0) { gint state = (1 << i); /* We only change state on the parent if the state is not locked. Index: gstpad.c RCS file: /cvs/gstreamer/gstreamer/gst/gstpad.c,v retrieving revision 1.355 retrieving revision 1.356 diff -u -d -r1.355 -r1.356 --- gstpad.c 29 Jan 2005 17:32:15 -0000 1.355 +++ gstpad.c 31 Jan 2005 17:39:30 -0000 1.356 @@ -3242,6 +3242,8 @@ g_return_if_fail (GST_IS_PAD (pad)); g_return_if_fail (GST_PAD_DIRECTION (pad) == GST_PAD_SRC); + g_return_if_fail (!GST_FLAG_IS_SET (GST_PAD_REALIZE (pad), + GST_RPAD_IN_GETFUNC)); g_return_if_fail (data != NULL); DEBUG_DATA (pad, data, "gst_pad_push"); @@ -3318,6 +3320,9 @@ g_return_val_if_fail (GST_PAD_DIRECTION (pad) == GST_PAD_SINK, GST_DATA (gst_event_new (GST_EVENT_INTERRUPT))); + g_return_val_if_fail (!GST_FLAG_IS_SET (GST_PAD_REALIZE (pad), + GST_RPAD_IN_CHAINFUNC), + GST_DATA (gst_event_new (GST_EVENT_INTERRUPT))); peer = GST_RPAD_PEER (pad); @@ -4428,7 +4433,9 @@ !GST_FLAG_IS_SET (gst_pad_get_parent (pad), GST_ELEMENT_EVENT_AWARE)) { \ gst_pad_send_event (pad, GST_EVENT (__temp)); \ } else { \ + GST_FLAG_SET (pad, GST_RPAD_IN_CHAINFUNC); \ GST_RPAD_CHAINFUNC (pad) (pad, __temp); \ + GST_FLAG_UNSET (pad, GST_RPAD_IN_CHAINFUNC); \ } \ }G_STMT_END /** @@ -4495,7 +4502,9 @@ g_return_val_if_fail (GST_PAD_IS_SRC (pad), NULL); g_return_val_if_fail (GST_RPAD_GETFUNC (pad) != NULL, NULL); + GST_FLAG_SET (pad, GST_RPAD_IN_GETFUNC); data = GST_RPAD_GETFUNC (pad) (pad); + GST_FLAG_UNSET (pad, GST_RPAD_IN_GETFUNC); DEBUG_DATA (pad, data, "getfunction returned"); return data; } Index: gstpad.h RCS file: /cvs/gstreamer/gstreamer/gst/gstpad.h,v retrieving revision 1.154 retrieving revision 1.155 diff -u -d -r1.154 -r1.155 --- gstpad.h 13 Jan 2005 15:29:40 -0000 1.154 +++ gstpad.h 31 Jan 2005 17:39:30 -0000 1.155 @@ -161,6 +161,12 @@ gpointer _gst_reserved[GST_PADDING]; }; +typedef enum { + GST_RPAD_IN_GETFUNC = GST_PAD_FLAG_LAST, + GST_RPAD_IN_CHAINFUNC, + GST_RPAD_FLAG_LAST = GST_PAD_FLAG_LAST + 4 +} GstRealPadFlags; struct _GstRealPad { GstPad pad; Index: gstreamer-sections.txt RCS file: /cvs/gstreamer/gstreamer/docs/gst/gstreamer-sections.txt,v retrieving revision 1.129 retrieving revision 1.130 diff -u -d -r1.129 -r1.130 --- gstreamer-sections.txt 26 Jan 2005 15:15:25 -0000 1.129 +++ gstreamer-sections.txt 31 Jan 2005 17:39:31 -0000 1.130 @@ -1272,6 +1272,7 @@ <FILE>gstrealpad</FILE> <TITLE>GstRealPad</TITLE> GstRealPad +GstRealPadFlags GST_IS_REAL_PAD_FAST GST_RPAD_DIRECTION GST_RPAD_CAPS @@ -1303,7 +1304,9 @@ GST_REAL_PAD_CLASS GST_IS_REAL_PAD_CLASS GST_TYPE_REAL_PAD +GST_TYPE_REAL_PAD_FLAGS <SUBSECTION Private> +gst_real_pad_flags_get_type gst_real_pad_get_type </SECTION> Index: Makefile.am RCS file: /cvs/gstreamer/gstreamer/testsuite/pad/Makefile.am,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Makefile.am 31 Jan 2005 15:51:18 -0000 1.1 +++ Makefile.am 31 Jan 2005 17:39:31 -0000 1.2 @@ -1,5 +1,5 @@ include ../Rules tests_pass = link -tests_fail = -tests_ignore = chainnopull getnopush +tests_fail = chainnopull getnopush +tests_ignore = |