gst/gstbin.*: Add do-latency signal with the old default fallback implementation. This allows for custom latency calc...

Original commit message from CVS:
* gst/gstbin.c: (_gst_boolean_accumulator), (gst_bin_class_init),
(gst_bin_recalculate_latency), (gst_bin_do_latency_func),
(gst_bin_change_state_func):
* gst/gstbin.h:
Add do-latency signal with the old default fallback implementation. This
allows for custom latency calculations for when the default is not
sufficient.
API: GstBin::do-latency signal.
This commit is contained in:
Wim Taymans 2008-11-19 12:06:41 +00:00
parent e538502f02
commit 9184d9ee3c
3 changed files with 74 additions and 1 deletions

View file

@ -1,3 +1,14 @@
2008-11-19 Wim Taymans <wim.taymans@collabora.co.uk>
* gst/gstbin.c: (_gst_boolean_accumulator), (gst_bin_class_init),
(gst_bin_recalculate_latency), (gst_bin_do_latency_func),
(gst_bin_change_state_func):
* gst/gstbin.h:
Add do-latency signal with the old default fallback implementation. This
allows for custom latency calculations for when the default is not
sufficient.
API: GstBin::do-latency signal.
2008-11-18 Wim Taymans <wim.taymans@collabora.co.uk> 2008-11-18 Wim Taymans <wim.taymans@collabora.co.uk>
* win32/common/libgstreamer.def: * win32/common/libgstreamer.def:

View file

@ -241,6 +241,8 @@ static GstBusSyncReply bin_bus_handler (GstBus * bus,
GstMessage * message, GstBin * bin); GstMessage * message, GstBin * bin);
static gboolean gst_bin_query (GstElement * element, GstQuery * query); static gboolean gst_bin_query (GstElement * element, GstQuery * query);
static gboolean gst_bin_do_latency_func (GstBin * bin);
#ifndef GST_DISABLE_LOADSAVE #ifndef GST_DISABLE_LOADSAVE
static xmlNodePtr gst_bin_save_thyself (GstObject * object, xmlNodePtr parent); static xmlNodePtr gst_bin_save_thyself (GstObject * object, xmlNodePtr parent);
static void gst_bin_restore_thyself (GstObject * object, xmlNodePtr self); static void gst_bin_restore_thyself (GstObject * object, xmlNodePtr self);
@ -259,6 +261,7 @@ enum
{ {
ELEMENT_ADDED, ELEMENT_ADDED,
ELEMENT_REMOVED, ELEMENT_REMOVED,
DO_LATENCY,
LAST_SIGNAL LAST_SIGNAL
}; };
@ -378,6 +381,22 @@ gst_bin_child_proxy_init (gpointer g_iface, gpointer iface_data)
iface->get_child_by_index = gst_bin_child_proxy_get_child_by_index; iface->get_child_by_index = gst_bin_child_proxy_get_child_by_index;
} }
static gboolean
_gst_boolean_accumulator (GSignalInvocationHint * ihint,
GValue * return_accu, const GValue * handler_return, gpointer dummy)
{
gboolean myboolean;
myboolean = g_value_get_boolean (handler_return);
if (!(ihint->run_type & G_SIGNAL_RUN_CLEANUP))
g_value_set_boolean (return_accu, myboolean);
GST_DEBUG ("invocation %d, %d", ihint->run_type, myboolean);
/* stop emission */
return FALSE;
}
static void static void
gst_bin_class_init (GstBinClass * klass) gst_bin_class_init (GstBinClass * klass)
{ {
@ -433,6 +452,29 @@ gst_bin_class_init (GstBinClass * klass)
g_signal_new ("element-removed", G_TYPE_FROM_CLASS (klass), g_signal_new ("element-removed", G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GstBinClass, element_removed), NULL, G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GstBinClass, element_removed), NULL,
NULL, gst_marshal_VOID__OBJECT, G_TYPE_NONE, 1, GST_TYPE_ELEMENT); NULL, gst_marshal_VOID__OBJECT, G_TYPE_NONE, 1, GST_TYPE_ELEMENT);
/**
* GstBin::do-latency:
* @bin: the #GstBin
*
* Will be emitted when the bin needs to perform latency calculations. This
* signal is only emited for toplevel bins or when async-handling is
* enabled.
*
* Only one signal handler is invoked. If no signals are connected, the
* default handler is invoked, which will query and distribute the lowest
* possible latency to all sinks.
*
* Connect to this signal if the default latency calculations are not
* sufficient, like when you need different latencies for different sinks in
* the same pipeline.
*
* Since: 0.10.22
*/
gst_bin_signals[DO_LATENCY] =
g_signal_new ("do-latency", G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstBinClass, do_latency),
_gst_boolean_accumulator, NULL, gst_marshal_BOOLEAN__VOID,
G_TYPE_BOOLEAN, 0, G_TYPE_NONE);
gobject_class->dispose = GST_DEBUG_FUNCPTR (gst_bin_dispose); gobject_class->dispose = GST_DEBUG_FUNCPTR (gst_bin_dispose);
@ -457,6 +499,8 @@ gst_bin_class_init (GstBinClass * klass)
klass->remove_element = GST_DEBUG_FUNCPTR (gst_bin_remove_func); klass->remove_element = GST_DEBUG_FUNCPTR (gst_bin_remove_func);
klass->handle_message = GST_DEBUG_FUNCPTR (gst_bin_handle_message_func); klass->handle_message = GST_DEBUG_FUNCPTR (gst_bin_handle_message_func);
klass->do_latency = GST_DEBUG_FUNCPTR (gst_bin_do_latency_func);
GST_DEBUG ("creating bin thread pool"); GST_DEBUG ("creating bin thread pool");
err = NULL; err = NULL;
klass->pool = klass->pool =
@ -2086,12 +2130,26 @@ failed:
* This method is typically called on the pipeline when a #GST_MESSAGE_LATENCY * This method is typically called on the pipeline when a #GST_MESSAGE_LATENCY
* is posted on the bus. * is posted on the bus.
* *
* This function simply emits the 'do-latency' signal so any custom latency
* calculations will be performed.
*
* Returns: %TRUE if the latency could be queried and reconfigured. * Returns: %TRUE if the latency could be queried and reconfigured.
* *
* Since: 0.10.22. * Since: 0.10.22.
*/ */
gboolean gboolean
gst_bin_recalculate_latency (GstBin * bin) gst_bin_recalculate_latency (GstBin * bin)
{
gboolean res;
g_signal_emit (G_OBJECT (bin), gst_bin_signals[DO_LATENCY], 0, &res);
GST_DEBUG_OBJECT (bin, "latency returned %d", res);
return res;
}
static gboolean
gst_bin_do_latency_func (GstBin * bin)
{ {
GstQuery *query; GstQuery *query;
GstElement *element; GstElement *element;

View file

@ -151,7 +151,11 @@ struct _GstBinClass {
void (*handle_message) (GstBin *bin, GstMessage *message); void (*handle_message) (GstBin *bin, GstMessage *message);
/*< private >*/ /*< private >*/
gpointer _gst_reserved[GST_PADDING]; /* signal added 0.10.22 */
gboolean (*do_latency) (GstBin *bin);
/*< private >*/
gpointer _gst_reserved[GST_PADDING-1];
}; };
GType gst_bin_get_type (void); GType gst_bin_get_type (void);