mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-22 16:26:39 +00:00
Code Issues 1 Projects Releases Wiki Activity

gst/adder/gstadder.c: fix adder a bit so it doesn't screw up with events as much anymore

Browse source 
Original commit message from CVS:
* gst/adder/gstadder.c: (gst_adder_loop):
fix adder a bit so it doesn't screw up with events as much anymore
This commit is contained in:
Benjamin Otte 2005-01-12 18:30:39 +00:00
parent b707fb9176
commit f2bbca6587
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2005-01-12 Benjamin Otte <otte@gnome.org>
* gst/adder/gstadder.c: (gst_adder_loop):
fix adder a bit so it doesn't screw up with events as much anymore
2005-01-12 Jan Schmidt <thaytan@mad.scientist.com> 2005-01-12 Jan Schmidt <thaytan@mad.scientist.com>
* ext/gdk_pixbuf/pixbufscale.c: (gst_pixbufscale_link), * ext/gdk_pixbuf/pixbufscale.c: (gst_pixbufscale_link),

8
gst/adder/gstadder.c
View file

@ -349,16 +349,17 @@ gst_adder_loop (GstElement * element)
inputs = inputs->next; inputs = inputs->next;
GST_LOG (" looking into channel %p", input); GST_LOG_OBJECT (adder, " looking into channel %p", input);
if (!GST_PAD_IS_USABLE (input->sinkpad)) { if (!GST_PAD_IS_USABLE (input->sinkpad)) {
GST_LOG (" adder ignoring pad %s:%s", GST_LOG_OBJECT (adder, " adder ignoring pad %s:%s",
GST_DEBUG_PAD_NAME (input->sinkpad)); GST_DEBUG_PAD_NAME (input->sinkpad));
continue; continue;
} }
/* Get data from the bytestream of each input channel. We need to check for /* Get data from the bytestream of each input channel. We need to check for
events before passing on the data to the output buffer. */ events before passing on the data to the output buffer. */
repeat:
got_bytes = gst_bytestream_peek_bytes (input->bytestream, &raw_in, got_bytes = gst_bytestream_peek_bytes (input->bytestream, &raw_in,
GST_BUFFER_SIZE (buf_out)); GST_BUFFER_SIZE (buf_out));
@ -388,7 +389,8 @@ gst_adder_loop (GstElement * element)
return; return;
} }
default: default:
break; GST_LOG_OBJECT (adder, "pulling again after event");
goto repeat;
} }
} }
} else { } else {