mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-11 01:45:33 +00:00
Code Issues 1 Projects Releases Wiki Activity

libs/gst/base/gstbasesrc.c: Handle errors from the clock sync better, only UNSCHEDULED indicates a

Browse source 
Original commit message from CVS:
* libs/gst/base/gstbasesrc.c: (gst_base_src_get_range):
Handle errors from the clock sync better, only UNSCHEDULED indicates a
WRONG_STATE and can silently pause the task. All other cases should
error out.
This commit is contained in:
Wim Taymans 2007-03-22 11:19:32 +00:00
parent 88c8547b67
commit 631c5a95de
2 changed files with 21 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2007-03-22 Wim Taymans <wim@fluendo.com>
* libs/gst/base/gstbasesrc.c: (gst_base_src_get_range):
Handle errors from the clock sync better, only UNSCHEDULED indicates a
WRONG_STATE and can silently pause the task. All other cases should
error out.
2007-03-22 Wim Taymans <wim@fluendo.com> 2007-03-22 Wim Taymans <wim@fluendo.com>
Patch by: <syrjala at sci dot fi> Patch by: <syrjala at sci dot fi>

16
libs/gst/base/gstbasesrc.c
View file

@ -1400,21 +1400,33 @@ gst_base_src_get_range (GstBaseSrc * src, guint64 offset, guint length,
status = gst_base_src_do_sync (src, *buf); status = gst_base_src_do_sync (src, *buf);
switch (status) { switch (status) {
case GST_CLOCK_EARLY: case GST_CLOCK_EARLY:
/* the buffer is too late. We currently don't drop the buffer. */
GST_DEBUG_OBJECT (src, "buffer too late!, returning anyway"); GST_DEBUG_OBJECT (src, "buffer too late!, returning anyway");
break; break;
case GST_CLOCK_OK: case GST_CLOCK_OK:
/* buffer synchronised properly */
GST_DEBUG_OBJECT (src, "buffer ok"); GST_DEBUG_OBJECT (src, "buffer ok");
break; break;
default: case GST_CLOCK_UNSCHEDULED:
/* this case is triggered when we were waiting for the clock and /* this case is triggered when we were waiting for the clock and
* it got unlocked because we did a state change. We return * it got unlocked because we did a state change. We return
* WRONG_STATE in this case to stop the dataflow also get rid of the * WRONG_STATE in this case to stop the dataflow also get rid of the
* produced buffer. */ * produced buffer. */
GST_DEBUG_OBJECT (src, "clock returned %d, not returning", status); GST_DEBUG_OBJECT (src,
"clock was unscheduled (%d), returning WRONG_STATE", status);
gst_buffer_unref (*buf); gst_buffer_unref (*buf);
*buf = NULL; *buf = NULL;
ret = GST_FLOW_WRONG_STATE; ret = GST_FLOW_WRONG_STATE;
break; break;
default:
/* all other result values are unexpected and errors */
GST_ELEMENT_ERROR (src, CORE, CLOCK,
(_("Internal clock error.")),
("clock returned unexpected return value %d", status));
gst_buffer_unref (*buf);
*buf = NULL;
ret = GST_FLOW_ERROR;
break;
} }
done: done:
return ret; return ret;