mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 06:54:49 +00:00
Code Issues 1 Projects Releases Wiki Activity

fix for scheduling mode rename

Browse source
This commit is contained in:
Wim Taymans 2011-11-18 12:38:14 +01:00
parent bc6ed0bf97
commit 67d328bbe2
2 changed files with 14 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
gst-libs/gst/signalprocessor/gstsignalprocessor.c
View file

@ -488,8 +488,7 @@ gst_signal_processor_setcaps (GstPad * pad, GstCaps * caps)
self = GST_SIGNAL_PROCESSOR (gst_pad_get_parent (pad)); self = GST_SIGNAL_PROCESSOR (gst_pad_get_parent (pad));
if (self->mode == GST_PAD_ACTIVATE_PULL if (self->mode == GST_PAD_MODE_PULL && !gst_caps_is_equal (caps, self->caps)
&& !gst_caps_is_equal (caps, self->caps)
&& !gst_signal_processor_setcaps_pull (self, pad, caps)) && !gst_signal_processor_setcaps_pull (self, pad, caps))
goto setcaps_pull_failed; goto setcaps_pull_failed;
@ -1072,20 +1071,20 @@ gst_signal_processor_sink_activate_push (GstPad * pad, gboolean active)
self = GST_SIGNAL_PROCESSOR (gst_pad_get_parent (pad)); self = GST_SIGNAL_PROCESSOR (gst_pad_get_parent (pad));
if (active) { if (active) {
if (self->mode == GST_PAD_ACTIVATE_NONE) { if (self->mode == GST_PAD_MODE_NONE) {
self->mode = GST_PAD_ACTIVATE_PUSH; self->mode = GST_PAD_MODE_PUSH;
result = TRUE; result = TRUE;
} else if (self->mode == GST_PAD_ACTIVATE_PUSH) { } else if (self->mode == GST_PAD_MODE_PUSH) {
result = TRUE; result = TRUE;
} else { } else {
g_warning ("foo"); g_warning ("foo");
result = FALSE; result = FALSE;
} }
} else { } else {
if (self->mode == GST_PAD_ACTIVATE_NONE) { if (self->mode == GST_PAD_MODE_NONE) {
result = TRUE; result = TRUE;
} else if (self->mode == GST_PAD_ACTIVATE_PUSH) { } else if (self->mode == GST_PAD_MODE_PUSH) {
self->mode = GST_PAD_ACTIVATE_NONE; self->mode = GST_PAD_MODE_NONE;
result = TRUE; result = TRUE;
} else { } else {
g_warning ("foo"); g_warning ("foo");
@ -1109,29 +1108,29 @@ gst_signal_processor_src_activate_pull (GstPad * pad, gboolean active)
self = GST_SIGNAL_PROCESSOR (gst_pad_get_parent (pad)); self = GST_SIGNAL_PROCESSOR (gst_pad_get_parent (pad));
if (active) { if (active) {
if (self->mode == GST_PAD_ACTIVATE_NONE) { if (self->mode == GST_PAD_MODE_NONE) {
GList *l; GList *l;
for (l = GST_ELEMENT (self)->sinkpads; l; l = l->next) for (l = GST_ELEMENT (self)->sinkpads; l; l = l->next)
result &= gst_pad_activate_pull (pad, active); result &= gst_pad_activate_pull (pad, active);
if (result) if (result)
self->mode = GST_PAD_ACTIVATE_PULL; self->mode = GST_PAD_MODE_PULL;
} else if (self->mode == GST_PAD_ACTIVATE_PULL) { } else if (self->mode == GST_PAD_MODE_PULL) {
result = TRUE; result = TRUE;
} else { } else {
g_warning ("foo"); g_warning ("foo");
result = FALSE; result = FALSE;
} }
} else { } else {
if (self->mode == GST_PAD_ACTIVATE_NONE) { if (self->mode == GST_PAD_MODE_NONE) {
result = TRUE; result = TRUE;
} else if (self->mode == GST_PAD_ACTIVATE_PULL) { } else if (self->mode == GST_PAD_MODE_PULL) {
GList *l; GList *l;
for (l = GST_ELEMENT (self)->sinkpads; l; l = l->next) for (l = GST_ELEMENT (self)->sinkpads; l; l = l->next)
result &= gst_pad_activate_pull (pad, active); result &= gst_pad_activate_pull (pad, active);
if (result) if (result)
self->mode = GST_PAD_ACTIVATE_NONE; self->mode = GST_PAD_MODE_NONE;
result = TRUE; result = TRUE;
} else { } else {
g_warning ("foo"); g_warning ("foo");

2
gst-libs/gst/signalprocessor/gstsignalprocessor.h
View file

@ -82,7 +82,7 @@ struct _GstSignalProcessor {
GstCaps *caps; GstCaps *caps;
GstSignalProcessorState state; GstSignalProcessorState state;
GstFlowReturn flow_state; GstFlowReturn flow_state;
GstPadActivateMode mode; GstPadMode mode;
/* pending inputs before processing can take place */ /* pending inputs before processing can take place */
guint pending_in; guint pending_in;