mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-02 20:42:30 +00:00
Code Issues 1 Projects Releases Wiki Activity

gstdataqueue: new constructor which takes callbacks.

Browse source 
This allows us to avoid going through glib's signalling system
This commit is contained in:
Edward Hervey 2009-09-28 15:18:37 +02:00
parent 8c67b6390e
commit ea9b0cedcd
2 changed files with 53 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
libs/gst/base/gstdataqueue.c
View file

@ -184,6 +184,39 @@ gst_data_queue_init (GstDataQueue * queue)
GST_DEBUG ("initialized queue's not_empty & not_full conditions"); GST_DEBUG ("initialized queue's not_empty & not_full conditions");
} }
/**
* gst_data_queue_new_full:
* @checkfull: the callback used to tell if the element considers the queue full
* or not.
* @fullcallback: the callback which will be called when the queue is considered full.
* @emptycallback: the callback which will be called when the queue is considered empty.
* @checkdata: a #gpointer that will be given in the @checkfull callback.
*
* Creates a new #GstDataQueue. The difference with @gst_data_queue_new is that it will
* not emit the 'full' and 'empty' signals, but instead calling directly @fullcallback
* or @emptycallback.
*
* Returns: a new #GstDataQueue.
*/
GstDataQueue *
gst_data_queue_new_full (GstDataQueueCheckFullFunction checkfull,
GstDataQueueFullCallback fullcallback,
GstDataQueueEmptyCallback emptycallback, gpointer checkdata)
{
GstDataQueue *ret;
g_return_val_if_fail (checkfull != NULL, NULL);
ret = g_object_new (GST_TYPE_DATA_QUEUE, NULL);
ret->checkfull = checkfull;
ret->checkdata = checkdata;
ret->fullcallback = fullcallback;
ret->emptycallback = emptycallback;
return ret;
}
/** /**
* gst_data_queue_new: * gst_data_queue_new:
* @checkfull: the callback used to tell if the element considers the queue full * @checkfull: the callback used to tell if the element considers the queue full
@ -196,15 +229,7 @@ gst_data_queue_init (GstDataQueue * queue)
GstDataQueue * GstDataQueue *
gst_data_queue_new (GstDataQueueCheckFullFunction checkfull, gpointer checkdata) gst_data_queue_new (GstDataQueueCheckFullFunction checkfull, gpointer checkdata)
{ {
GstDataQueue *ret; return gst_data_queue_new_full (checkfull, NULL, NULL, checkdata);
g_return_val_if_fail (checkfull != NULL, NULL);
ret = g_object_new (GST_TYPE_DATA_QUEUE, NULL);
ret->checkfull = checkfull;
ret->checkdata = checkdata;
return ret;
} }
static void static void
@ -383,7 +408,10 @@ gst_data_queue_push (GstDataQueue * queue, GstDataQueueItem * item)
/* We ALWAYS need to check for queue fillness */ /* We ALWAYS need to check for queue fillness */
if (gst_data_queue_locked_is_full (queue)) { if (gst_data_queue_locked_is_full (queue)) {
GST_DATA_QUEUE_MUTEX_UNLOCK (queue); GST_DATA_QUEUE_MUTEX_UNLOCK (queue);
g_signal_emit (queue, gst_data_queue_signals[SIGNAL_FULL], 0); if (G_LIKELY (queue->fullcallback))
queue->fullcallback (queue, queue->checkdata);
else
g_signal_emit (queue, gst_data_queue_signals[SIGNAL_FULL], 0);
GST_DATA_QUEUE_MUTEX_LOCK_CHECK (queue, flushing); GST_DATA_QUEUE_MUTEX_LOCK_CHECK (queue, flushing);
/* signal might have removed some items */ /* signal might have removed some items */
@ -441,7 +469,10 @@ gst_data_queue_pop (GstDataQueue * queue, GstDataQueueItem ** item)
if (gst_data_queue_locked_is_empty (queue)) { if (gst_data_queue_locked_is_empty (queue)) {
GST_DATA_QUEUE_MUTEX_UNLOCK (queue); GST_DATA_QUEUE_MUTEX_UNLOCK (queue);
g_signal_emit (queue, gst_data_queue_signals[SIGNAL_EMPTY], 0); if (G_LIKELY (queue->emptycallback))
queue->emptycallback (queue, queue->checkdata);
else
g_signal_emit (queue, gst_data_queue_signals[SIGNAL_EMPTY], 0);
GST_DATA_QUEUE_MUTEX_LOCK_CHECK (queue, flushing); GST_DATA_QUEUE_MUTEX_LOCK_CHECK (queue, flushing);
while (gst_data_queue_locked_is_empty (queue)) { while (gst_data_queue_locked_is_empty (queue)) {

13
libs/gst/base/gstdataqueue.h
View file

@ -98,6 +98,9 @@ struct _GstDataQueueSize
typedef gboolean (*GstDataQueueCheckFullFunction) (GstDataQueue * queue, typedef gboolean (*GstDataQueueCheckFullFunction) (GstDataQueue * queue,
guint visible, guint bytes, guint64 time, gpointer checkdata); guint visible, guint bytes, guint64 time, gpointer checkdata);
typedef void (*GstDataQueueFullCallback) (GstDataQueue * queue, gpointer checkdata);
typedef void (*GstDataQueueEmptyCallback) (GstDataQueue * queue, gpointer checkdata);
/** /**
* GstDataQueue: * GstDataQueue:
* *
@ -120,8 +123,9 @@ struct _GstDataQueue
GCond *item_del; /* signals space now available for writing */ GCond *item_del; /* signals space now available for writing */
gboolean flushing; /* indicates whether conditions where signalled because gboolean flushing; /* indicates whether conditions where signalled because
* of external flushing */ * of external flushing */
GstDataQueueFullCallback fullcallback;
gpointer _gst_reserved[GST_PADDING]; GstDataQueueEmptyCallback emptycallback;
gpointer _gst_reserved[GST_PADDING - 2];
}; };
struct _GstDataQueueClass struct _GstDataQueueClass
@ -140,6 +144,11 @@ GType gst_data_queue_get_type (void);
GstDataQueue * gst_data_queue_new (GstDataQueueCheckFullFunction checkfull, GstDataQueue * gst_data_queue_new (GstDataQueueCheckFullFunction checkfull,
gpointer checkdata); gpointer checkdata);
GstDataQueue * gst_data_queue_new_full (GstDataQueueCheckFullFunction checkfull,
GstDataQueueFullCallback fullcallback,
GstDataQueueEmptyCallback emptycallback,
gpointer checkdata);
gboolean gst_data_queue_push (GstDataQueue * queue, GstDataQueueItem * item); gboolean gst_data_queue_push (GstDataQueue * queue, GstDataQueueItem * item);
gboolean gst_data_queue_pop (GstDataQueue * queue, GstDataQueueItem ** item); gboolean gst_data_queue_pop (GstDataQueue * queue, GstDataQueueItem ** item);