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

queue: add silent property to suppress signal emission

Browse source 
Allow to turn off signal emission and therefore extra locking if this is not needed.
Fixes #621299
This commit is contained in:
Stefan Kost 2010-08-27 15:35:49 +03:00
parent 4e861cefbd
commit e406f7c572
2 changed files with 59 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

74
plugins/elements/gstqueue.c
View file

@ -118,7 +118,7 @@ enum
PROP_MIN_THRESHOLD_BYTES, PROP_MIN_THRESHOLD_BYTES,
PROP_MIN_THRESHOLD_TIME, PROP_MIN_THRESHOLD_TIME,
PROP_LEAKY, PROP_LEAKY,
/* FILL ME */ PROP_SILENT
}; };
/* default property values */ /* default property values */
@ -351,6 +351,19 @@ gst_queue_class_init (GstQueueClass * klass)
GST_TYPE_QUEUE_LEAKY, GST_QUEUE_NO_LEAK, GST_TYPE_QUEUE_LEAKY, GST_QUEUE_NO_LEAK,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
* GstQueue:silent
*
* Don't emit queue signals. Makes queues more lightweight if no signals are
* needed.
*
* Since: 0.10.31
*/
g_object_class_install_property (gobject_class, PROP_SILENT,
g_param_spec_boolean ("silent", "Silent",
"Don't emit queue signals", FALSE,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
gobject_class->finalize = gst_queue_finalize; gobject_class->finalize = gst_queue_finalize;
/* Registering debug symbols for function pointers */ /* Registering debug symbols for function pointers */
@ -934,9 +947,14 @@ gst_queue_chain (GstPad * pad, GstBuffer * buffer)
* the user defined as "full". Note that this only applies to buffers. * the user defined as "full". Note that this only applies to buffers.
* We always handle events and they don't count in our statistics. */ * We always handle events and they don't count in our statistics. */
while (gst_queue_is_filled (queue)) { while (gst_queue_is_filled (queue)) {
GST_QUEUE_MUTEX_UNLOCK (queue); if (!queue->silent) {
g_signal_emit (queue, gst_queue_signals[SIGNAL_OVERRUN], 0); GST_QUEUE_MUTEX_UNLOCK (queue);
GST_QUEUE_MUTEX_LOCK_CHECK (queue, out_flushing); g_signal_emit (queue, gst_queue_signals[SIGNAL_OVERRUN], 0);
GST_QUEUE_MUTEX_LOCK_CHECK (queue, out_flushing);
} else {
if (queue->srcresult != GST_FLOW_OK)
goto out_flushing;
}
/* we recheck, the signal could have changed the thresholds */ /* we recheck, the signal could have changed the thresholds */
if (!gst_queue_is_filled (queue)) if (!gst_queue_is_filled (queue))
@ -971,9 +989,14 @@ gst_queue_chain (GstPad * pad, GstBuffer * buffer)
GST_CAT_DEBUG_OBJECT (queue_dataflow, queue, "queue is not full"); GST_CAT_DEBUG_OBJECT (queue_dataflow, queue, "queue is not full");
GST_QUEUE_MUTEX_UNLOCK (queue); if (!queue->silent) {
g_signal_emit (queue, gst_queue_signals[SIGNAL_RUNNING], 0); GST_QUEUE_MUTEX_UNLOCK (queue);
GST_QUEUE_MUTEX_LOCK_CHECK (queue, out_flushing); g_signal_emit (queue, gst_queue_signals[SIGNAL_RUNNING], 0);
GST_QUEUE_MUTEX_LOCK_CHECK (queue, out_flushing);
} else {
if (queue->srcresult != GST_FLOW_OK)
goto out_flushing;
}
break; break;
} }
} }
@ -1193,22 +1216,33 @@ gst_queue_loop (GstPad * pad)
GST_QUEUE_MUTEX_LOCK_CHECK (queue, out_flushing); GST_QUEUE_MUTEX_LOCK_CHECK (queue, out_flushing);
while (gst_queue_is_empty (queue)) { while (gst_queue_is_empty (queue)) {
GST_QUEUE_MUTEX_UNLOCK (queue); if (!queue->silent) {
g_signal_emit (queue, gst_queue_signals[SIGNAL_UNDERRUN], 0); GST_QUEUE_MUTEX_UNLOCK (queue);
GST_CAT_DEBUG_OBJECT (queue_dataflow, queue, "queue is empty"); g_signal_emit (queue, gst_queue_signals[SIGNAL_UNDERRUN], 0);
GST_QUEUE_MUTEX_LOCK_CHECK (queue, out_flushing); GST_CAT_DEBUG_OBJECT (queue_dataflow, queue, "queue is empty");
GST_QUEUE_MUTEX_LOCK_CHECK (queue, out_flushing);
} else {
GST_CAT_DEBUG_OBJECT (queue_dataflow, queue, "queue is empty");
if (queue->srcresult != GST_FLOW_OK)
goto out_flushing;
}
/* we recheck, the signal could have changed the thresholds */ /* we recheck, the signal could have changed the thresholds */
while (gst_queue_is_empty (queue)) { while (gst_queue_is_empty (queue)) {
GST_QUEUE_WAIT_ADD_CHECK (queue, out_flushing); GST_QUEUE_WAIT_ADD_CHECK (queue, out_flushing);
} }
GST_QUEUE_MUTEX_UNLOCK (queue);
g_signal_emit (queue, gst_queue_signals[SIGNAL_RUNNING], 0); if (!queue->silent) {
g_signal_emit (queue, gst_queue_signals[SIGNAL_PUSHING], 0); GST_QUEUE_MUTEX_UNLOCK (queue);
GST_CAT_DEBUG_OBJECT (queue_dataflow, queue, "queue is not empty"); g_signal_emit (queue, gst_queue_signals[SIGNAL_RUNNING], 0);
g_signal_emit (queue, gst_queue_signals[SIGNAL_PUSHING], 0);
GST_QUEUE_MUTEX_LOCK_CHECK (queue, out_flushing); GST_CAT_DEBUG_OBJECT (queue_dataflow, queue, "queue is not empty");
GST_QUEUE_MUTEX_LOCK_CHECK (queue, out_flushing);
} else {
GST_CAT_DEBUG_OBJECT (queue_dataflow, queue, "queue is not empty");
if (queue->srcresult != GST_FLOW_OK)
goto out_flushing;
}
} }
ret = gst_queue_push_one (queue); ret = gst_queue_push_one (queue);
@ -1459,6 +1493,9 @@ gst_queue_set_property (GObject * object,
case PROP_LEAKY: case PROP_LEAKY:
queue->leaky = g_value_get_enum (value); queue->leaky = g_value_get_enum (value);
break; break;
case PROP_SILENT:
queue->silent = g_value_get_boolean (value);
break;
default: default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break; break;
@ -1506,6 +1543,9 @@ gst_queue_get_property (GObject * object,
case PROP_LEAKY: case PROP_LEAKY:
g_value_set_enum (value, queue->leaky); g_value_set_enum (value, queue->leaky);
break; break;
case PROP_SILENT:
g_value_set_boolean (value, queue->silent);
break;
default: default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break; break;

2
plugins/elements/gstqueue.h
View file

@ -113,6 +113,8 @@ struct _GstQueue {
gboolean head_needs_discont, tail_needs_discont; gboolean head_needs_discont, tail_needs_discont;
gboolean push_newsegment; gboolean push_newsegment;
gboolean silent; /* don't emit signals */
}; };
struct _GstQueueClass { struct _GstQueueClass {