gst/switch/gstswitch.c: More fixes for correct data refcounting.

Original commit message from CVS:
2004-02-15  Julien MOUTTE  <julien@moutte.net>

* gst/switch/gstswitch.c: (gst_switch_loop): More fixes for
correct data refcounting.
This commit is contained in:
Julien Moutte 2004-02-15 18:20:15 +00:00
parent a6e9759fdf
commit a179e2fe8c
2 changed files with 10 additions and 4 deletions

View file

@ -1,3 +1,8 @@
2004-02-15 Julien MOUTTE <julien@moutte.net>
* gst/switch/gstswitch.c: (gst_switch_loop): More fixes for
correct data refcounting.
2004-02-15 Julien MOUTTE <julien@moutte.net>
* gst/switch/gstswitch.c: (gst_switch_change_state),

View file

@ -241,16 +241,18 @@ gst_switch_loop (GstElement *element)
switchpad = g_list_nth_data (gstswitch->sinkpads, gstswitch->active_sinkpad);
if (switchpad && switchpad->data) {
GstData *data = switchpad->data;
/* Loose our reference to that data */
gst_data_unref (switchpad->data);
switchpad->data = NULL;
GST_CAT_LOG_OBJECT (GST_CAT_DATAFLOW, gstswitch,
"using data from active pad %p",
switchpad->sinkpad);
if (GST_IS_EVENT (switchpad->data)) {
GstEvent *event = GST_EVENT (switchpad->data);
if (GST_IS_EVENT (data)) {
GstEvent *event = GST_EVENT (data);
GST_CAT_LOG_OBJECT (GST_CAT_DATAFLOW, gstswitch,
"handling event from active pad %p",
switchpad->sinkpad);
@ -262,12 +264,11 @@ gst_switch_loop (GstElement *element)
GST_CAT_LOG_OBJECT (GST_CAT_DATAFLOW, gstswitch,
"pushing data from active pad %p to %p",
switchpad->sinkpad, gstswitch->srcpad);
gst_pad_push (gstswitch->srcpad, switchpad->data);
gst_pad_push (gstswitch->srcpad, data);
}
/* Mark this data as forwarded so that it won't get unrefed on next poll */
switchpad->forwarded = TRUE;
switchpad->data = NULL;
}
}