mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-06-16 04:50:38 +00:00
Code Issues 1 Projects Releases Wiki Activity

Provide intrastructure to not have to pass NULL buffers on errors and interrupts, this should fix some issues with th...

Browse source 
Original commit message from CVS:
Provide intrastructure to not have to pass NULL buffers on errors and
interrupts, this should fix some issues with the optimal scheduler.
This commit is contained in:
Wim Taymans 2003-01-08 21:33:20 +00:00
parent b005b541c8
commit e8b63df877
7 changed files with 59 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
gst/elements/gstidentity.c
View file

@ -265,10 +265,18 @@ gst_identity_loop (GstElement *element)
buf = gst_pad_pull (identity->sinkpad);
if (GST_IS_EVENT (buf)) {
gst_pad_event_default (identity->sinkpad, GST_EVENT (buf));
}
GstEvent *event = GST_EVENT (buf);
gst_identity_chain (identity->sinkpad, buf);
if (GST_EVENT_IS_INTERRUPT (event)) {
gst_event_unref (event);
}
else {
gst_pad_event_default (identity->sinkpad, event);
}
}
else {
gst_identity_chain (identity->sinkpad, buf);
}
}
static void

5
gst/gstevent.h
View file

@ -45,7 +45,8 @@ typedef enum {
GST_EVENT_SIZE,
GST_EVENT_RATE,
GST_EVENT_FILLER,
GST_EVENT_TS_OFFSET
GST_EVENT_TS_OFFSET,
GST_EVENT_INTERRUPT
} GstEventType;
extern GType _gst_event_type;
@ -58,6 +59,8 @@ extern GType _gst_event_type;
#define GST_EVENT_TIMESTAMP(event) (GST_EVENT(event)->timestamp)
#define GST_EVENT_SRC(event) (GST_EVENT(event)->src)
#define GST_EVENT_IS_INTERRUPT(event) (GST_EVENT_TYPE (event) == GST_EVENT_INTERRUPT)
#define GST_SEEK_FORMAT_SHIFT 0
#define GST_SEEK_METHOD_SHIFT 16
#define GST_SEEK_FLAGS_SHIFT 20

10
gst/gstpad.c
View file

@ -2193,7 +2193,8 @@ gst_pad_pull (GstPad *pad)
GST_DEBUG_ENTER("(%s:%s)",GST_DEBUG_PAD_NAME(pad));
g_return_val_if_fail (GST_PAD_DIRECTION (pad) == GST_PAD_SINK, NULL);
g_return_val_if_fail (GST_PAD_DIRECTION (pad) == GST_PAD_SINK,
GST_BUFFER (gst_event_new (GST_EVENT_INTERRUPT)));
peer = GST_RPAD_PEER (pad);
@ -2204,6 +2205,7 @@ gst_pad_pull (GstPad *pad)
GST_PAD_NAME (pad), NULL);
}
else {
restart:
if (peer->gethandler) {
GstBuffer *buf;
gboolean active = GST_PAD_IS_ACTIVE (peer);
@ -2216,12 +2218,12 @@ gst_pad_pull (GstPad *pad)
if (buf) {
if (!gst_probe_dispatcher_dispatch (&peer->probedisp, GST_DATA (buf)))
return NULL;
goto restart;
if (!GST_IS_EVENT (buf) && !active) {
g_warning ("pull on pad %s:%s but it is not active",
GST_DEBUG_PAD_NAME (peer));
return NULL;
return GST_BUFFER (gst_event_new (GST_EVENT_INTERRUPT));
}
return buf;
}
@ -2239,7 +2241,7 @@ gst_pad_pull (GstPad *pad)
NULL);
}
}
return NULL;
return GST_BUFFER (gst_event_new (GST_EVENT_INTERRUPT));
}
/**

2
gst/gstqueue.c
View file

@ -485,7 +485,7 @@ restart:
GST_DEBUG_ELEMENT (GST_CAT_DATAFLOW, queue, "interrupted!!");
g_mutex_unlock (queue->qlock);
if (gst_scheduler_interrupt (gst_pad_get_scheduler (queue->srcpad), GST_ELEMENT (queue)))
return NULL;
return GST_BUFFER (gst_event_new (GST_EVENT_INTERRUPT));
goto restart;
}
if (GST_STATE (queue) != GST_STATE_PLAYING) {

27
gst/schedulers/gstoptimalscheduler.c
View file

@ -60,6 +60,7 @@ typedef enum {
GST_OPT_SCHEDULER_STATE_STOPPED,
GST_OPT_SCHEDULER_STATE_ERROR,
GST_OPT_SCHEDULER_STATE_RUNNING,
GST_OPT_SCHEDULER_STATE_INTERRUPTED
} GstOptSchedulerState;
struct _GstOptScheduler {
@ -768,8 +769,13 @@ get_group_schedule_function (int argc, char *argv[])
GST_DEBUG_PAD_NAME (pad), group);
buffer = GST_RPAD_GETFUNC (pad) (pad);
if (buffer)
if (buffer) {
if (GST_EVENT_IS_INTERRUPT (buffer)) {
gst_event_unref (GST_EVENT (buffer));
break;
}
gst_pad_push (pad, buffer);
}
}
group->flags &= ~GST_OPT_SCHEDULER_GROUP_RUNNING;
@ -879,9 +885,14 @@ gst_opt_scheduler_get_wrapper (GstPad *srcpad)
else {
g_warning ("deadlock detected, disabling group %p", group);
group_error_handler (group);
return NULL;
return GST_BUFFER (gst_event_new (GST_EVENT_INTERRUPT));
}
#endif
/* if the scheduler interrupted, make sure we send an INTERRUPTED event to the
* > * loop based element */
if (osched->state == GST_OPT_SCHEDULER_STATE_INTERRUPTED) {
return GST_BUFFER (gst_event_new (GST_EVENT_INTERRUPT));
}
if (GST_PAD_BUFLIST (srcpad)) {
buffer = (GstBuffer *) GST_PAD_BUFLIST (srcpad)->data;
@ -1219,10 +1230,18 @@ gst_opt_scheduler_yield (GstScheduler *sched, GstElement *element)
static gboolean
gst_opt_scheduler_interrupt (GstScheduler *sched, GstElement *element)
{
GST_INFO (GST_CAT_SCHEDULING, "interrupt from \"%s\"",
GST_ELEMENT_NAME (element));
#ifdef USE_COTHREADS
do_cothread_switch (do_cothread_get_main (((GstOptScheduler*)sched)->context));
return FALSE;
#else
{
GstOptScheduler *osched = GST_OPT_SCHEDULER_CAST (sched);
osched->state = GST_OPT_SCHEDULER_STATE_INTERRUPTED;
}
return TRUE;
#endif
}
@ -1564,6 +1583,10 @@ gst_opt_scheduler_iterate (GstScheduler *sched)
schedule_chain (chain);
scheduled = TRUE;
}
/* don't schedule any more chains when interrupted or in error */
if (osched->state != GST_OPT_SCHEDULER_STATE_RUNNING)
break;
}
/* at this point it's possible that the scheduler state is

14
plugins/elements/gstidentity.c
View file

@ -265,10 +265,18 @@ gst_identity_loop (GstElement *element)
buf = gst_pad_pull (identity->sinkpad);
if (GST_IS_EVENT (buf)) {
gst_pad_event_default (identity->sinkpad, GST_EVENT (buf));
}
GstEvent *event = GST_EVENT (buf);
gst_identity_chain (identity->sinkpad, buf);
if (GST_EVENT_IS_INTERRUPT (event)) {
gst_event_unref (event);
}
else {
gst_pad_event_default (identity->sinkpad, event);
}
}
else {
gst_identity_chain (identity->sinkpad, buf);
}
}
static void

2
plugins/elements/gstqueue.c
View file

@ -485,7 +485,7 @@ restart:
GST_DEBUG_ELEMENT (GST_CAT_DATAFLOW, queue, "interrupted!!");
g_mutex_unlock (queue->qlock);
if (gst_scheduler_interrupt (gst_pad_get_scheduler (queue->srcpad), GST_ELEMENT (queue)))
return NULL;
return GST_BUFFER (gst_event_new (GST_EVENT_INTERRUPT));
goto restart;
}
if (GST_STATE (queue) != GST_STATE_PLAYING) {