+2004-02-20 Andy Wingo <wingo@pobox.com>
+
+ * gst/gstbin.c:
+ * gst/gstbuffer.c:
+ * gst/gstplugin.c:
+ * gst/registries/gstxmlregistry.c:
+ * gst/schedulers/gstoptimalscheduler.c: Debugging tweaks.
+
+ * gst/gstelement.c (gst_element_set_scheduler): Debugging fixes.
+ (gst_element_add_pad): DEBUG->INFO, some fixes.
+ (gst_element_get_compatible_pad_template): Just see if the
+ templates' caps intersect, not if one is a strict subset of the
+ other. This conforms more to what gst_pad_link_intersect() does.
+ (gst_element_class_add_pad_template): Don't memcpy the pad
+ template, just ref it.
+ (gst_element_get_compatible_pad_filtered): Clean up debug messages
+
+ * gst/gstpad.c (gst_pad_can_link_filtered): Debug a true result.
+ (gst_pad_link_filtered): Debug changes.
+ (gst_pad_link_prepare): New function, consolidated from
+ can_link_filtered and link_filtered.
+
+ * gst/parse/grammar.y (gst_parse_perform_link): Made INFO output
+ look more like that of the functions in gstelement.c
+
+ * gst/gstinfo.c (gst_debug_print_object): Put a space before the
+ object, and return the empty string if object is NULL.
+
+ * gst/parse/parse.l: Remove trailing newlines when calling PRINT.
+ * gst/parse/grammar.y (YYFPRINTF): Log bison debugging info via
+ LOG, not DEBUG. We still get flex info on debug.
+
+ * gst/registries/gstxmlregistry.c (gst_xml_registry_load): Make
+ debug string more verbose.
+ (plugin_times_older_than): DEBUG->LOG.
+
2004-02-20 Julien MOUTTE <julien@moutte.net>
* gst/gsttag.h: Adding video-codec and audio-codec for demuxers which
require gettext 0.11.5 so ulonglong.m4 gets checked out and copied
by autopoint (fixes #132996)
+>>>>>>> 1.260
2004-02-10 Andy Wingo <wingo@pobox.com>
* gst/gstpad.c (gst_pad_custom_new): Add a FIXME, this is a hacky
* gst/gstelement.c: (gst_element_default_error):
suffix error messages with period
->>>>>>> 1.206
2004-01-31 Thomas Vander Stichele <thomas at apestaart dot org>
* gst/elements/gstfilesrc.c: (gst_filesrc_open_file):
static void
gst_bin_set_element_sched (GstElement *element, GstScheduler *sched)
{
- GST_CAT_INFO (GST_CAT_SCHEDULING, "setting element \"%s\" sched to %p", GST_ELEMENT_NAME (element),
- sched);
+ GST_CAT_LOG (GST_CAT_SCHEDULING, "setting element \"%s\" sched to %p",
+ GST_ELEMENT_NAME (element), sched);
/* if it's actually a Bin */
if (GST_IS_BIN (element)) {
if (GST_FLAG_IS_SET (element, GST_BIN_FLAG_MANAGER)) {
- GST_CAT_INFO (GST_CAT_PARENTAGE, "[%s]: child is already a manager, not resetting", GST_ELEMENT_NAME (element));
+ GST_CAT_DEBUG_OBJECT (GST_CAT_PARENTAGE, element,
+ "child is already a manager, not resetting sched");
if (GST_ELEMENT_SCHED (element))
gst_scheduler_add_scheduler (sched, GST_ELEMENT_SCHED (element));
return;
}
- GST_CAT_INFO (GST_CAT_PARENTAGE, "[%s]: setting children's schedule to parent's", GST_ELEMENT_NAME (element));
+ GST_CAT_DEBUG_OBJECT (GST_CAT_PARENTAGE, element,
+ "setting child bin's scheduler to be the same as the parent's");
gst_scheduler_add_element (sched, element);
/* set the children's schedule */
/* if the peer element exists and is a candidate */
if (GST_PAD_PEER (pad)) {
if (gst_pad_get_scheduler (GST_PAD_PEER (pad)) == sched) {
- GST_CAT_INFO (GST_CAT_SCHEDULING,
- "peer is in same scheduler, telling scheduler");
+ GST_CAT_LOG (GST_CAT_SCHEDULING,
+ "peer is in same scheduler, telling scheduler");
if (GST_PAD_IS_SRC (pad))
gst_scheduler_pad_link (sched, pad, GST_PAD_PEER (pad));
gst_bin_unset_element_sched (GstElement *element, GstScheduler *sched)
{
if (GST_ELEMENT_SCHED (element) == NULL) {
- GST_CAT_INFO (GST_CAT_SCHEDULING, "element \"%s\" has no scheduler",
+ GST_CAT_DEBUG (GST_CAT_SCHEDULING, "element \"%s\" has no scheduler",
GST_ELEMENT_NAME (element));
return;
}
- GST_CAT_INFO (GST_CAT_SCHEDULING, "removing element \"%s\" from its sched %p",
- GST_ELEMENT_NAME (element), GST_ELEMENT_SCHED (element));
+ GST_CAT_DEBUG (GST_CAT_SCHEDULING, "removing element \"%s\" from its sched %p",
+ GST_ELEMENT_NAME (element), GST_ELEMENT_SCHED (element));
/* if it's actually a Bin */
if (GST_IS_BIN (element)) {
if (GST_FLAG_IS_SET (element, GST_BIN_FLAG_MANAGER)) {
- GST_CAT_INFO (GST_CAT_PARENTAGE, "[%s]: child is already a manager, not unsetting sched",
- GST_ELEMENT_NAME (element));
+ GST_CAT_DEBUG_OBJECT (GST_CAT_PARENTAGE, element,
+ "child is already a manager, not unsetting sched");
if (sched) {
gst_scheduler_remove_scheduler (sched, GST_ELEMENT_SCHED (element));
}
/* if the peer element exists and is a candidate */
if (GST_PAD_PEER (pad)) {
if (gst_pad_get_scheduler (GST_PAD_PEER (pad)) == sched) {
- GST_CAT_INFO (GST_CAT_SCHEDULING, "peer is in same scheduler, telling scheduler");
+ GST_CAT_LOG (GST_CAT_SCHEDULING, "peer is in same scheduler, telling scheduler");
if (GST_PAD_IS_SRC (pad))
gst_scheduler_pad_unlink (sched, pad, GST_PAD_PEER (pad));
gst_bin_set_element_sched (element, sched);
}
- GST_CAT_INFO (GST_CAT_PARENTAGE, "[%s]: added child \"%s\"",
- GST_ELEMENT_NAME (bin), GST_ELEMENT_NAME (element));
+ GST_CAT_DEBUG_OBJECT (GST_CAT_PARENTAGE, bin, "added element \"%s\"",
+ GST_OBJECT_NAME (element));
g_signal_emit (G_OBJECT (bin), gst_bin_signals[ELEMENT_ADDED], 0, element);
}
g_return_if_fail (GST_IS_BIN (bin));
g_return_if_fail (GST_IS_ELEMENT (element));
- GST_CAT_DEBUG (GST_CAT_PARENTAGE, "adding element \"%s\" to bin \"%s\"",
- GST_ELEMENT_NAME (element), GST_ELEMENT_NAME (bin));
+ GST_CAT_INFO_OBJECT (GST_CAT_PARENTAGE, bin, "adding element \"%s\"",
+ GST_OBJECT_NAME (element));
bclass = GST_BIN_GET_CLASS (bin);
while (state >>= 1) state_idx++;
bin->child_states[state_idx]--;
- GST_CAT_INFO (GST_CAT_PARENTAGE, "[%s]: removed child %s",
- GST_ELEMENT_NAME (bin), GST_ELEMENT_NAME (element));
+ GST_CAT_INFO_OBJECT (GST_CAT_PARENTAGE, bin, "removed child \"%s\"",
+ GST_OBJECT_NAME (element));
/* ref as we're going to emit a signal */
gst_object_ref (GST_OBJECT (element));
g_return_if_fail (GST_IS_BIN (bin));
g_return_if_fail (GST_IS_ELEMENT (child));
- GST_CAT_INFO (GST_CAT_STATES, "child %s changed state in bin %s from %s to %s",
- GST_ELEMENT_NAME (child), GST_ELEMENT_NAME (bin),
- gst_element_state_get_name (oldstate), gst_element_state_get_name (newstate));
+ GST_CAT_LOG (GST_CAT_STATES, "child %s changed state in bin %s from %s to %s",
+ GST_ELEMENT_NAME (child), GST_ELEMENT_NAME (bin),
+ gst_element_state_get_name (oldstate),
+ gst_element_state_get_name (newstate));
bclass = GST_BIN_GET_CLASS (bin);
if (bin->child_states[i] != 0) {
gint state = (1 << i);
if (GST_STATE (bin) != state) {
- GST_CAT_INFO (GST_CAT_STATES, "bin %s need state change to %s",
- GST_ELEMENT_NAME (bin), gst_element_state_get_name (state));
+ GST_CAT_DEBUG_OBJECT (GST_CAT_STATES, bin,
+ "highest child state is %s, changing bin state accordingly",
+ gst_element_state_get_name (state));
GST_STATE_PENDING (bin) = state;
GST_UNLOCK (bin);
gst_bin_change_state_norecurse (bin);
if (state != GST_STATE (bin)) {
- g_warning ("%s: state change in cllback %d %d",
- GST_ELEMENT_NAME (bin),
- state, GST_STATE (bin));
+ g_warning ("%s: state change in callback %d %d",
+ GST_ELEMENT_NAME (bin),
+ state, GST_STATE (bin));
}
return;
}
pending = GST_STATE_PENDING (element);
transition = GST_STATE_TRANSITION (element);
- GST_CAT_INFO (GST_CAT_STATES, "[%s]: changing childrens' state from %s to %s",
- GST_ELEMENT_NAME (element),
- gst_element_state_get_name (old_state), gst_element_state_get_name (pending));
+ GST_CAT_DEBUG_OBJECT (GST_CAT_STATES, element, "changing childrens' state from %s to %s",
+ gst_element_state_get_name (old_state),
+ gst_element_state_get_name (pending));
if (pending == GST_STATE_VOID_PENDING)
return GST_STATE_SUCCESS;
if (old_state == pending)
{
- GST_CAT_INFO (GST_CAT_STATES, "[%s]: old and pending state are both %s, returning",
- GST_ELEMENT_NAME (element), gst_element_state_get_name (pending));
+ GST_CAT_LOG_OBJECT (GST_CAT_STATES, element,
+ "old and pending state are both %s, returning",
+ gst_element_state_get_name (pending));
return GST_STATE_SUCCESS;
}
switch (gst_element_set_state (child, pending)) {
case GST_STATE_FAILURE:
- GST_CAT_DEBUG (GST_CAT_STATES, "child '%s' failed to go to state %d(%s)",
- GST_ELEMENT_NAME (child), pending, gst_element_state_get_name (pending));
+ GST_CAT_INFO_OBJECT (GST_CAT_STATES, element,
+ "child '%s' failed to go to state %d(%s)",
+ GST_ELEMENT_NAME (child),
+ pending, gst_element_state_get_name (pending));
gst_element_set_state (child, old_child_state);
/* There was a check for elements being in the same scheduling group
return GST_STATE_FAILURE;
break;
case GST_STATE_ASYNC:
- GST_CAT_DEBUG (GST_CAT_STATES, "child '%s' is changing state asynchronously",
- GST_ELEMENT_NAME (child));
+ GST_CAT_INFO_OBJECT (GST_CAT_STATES, element,
+ "child '%s' is changing state asynchronously",
+ GST_ELEMENT_NAME (child));
have_async = TRUE;
break;
case GST_STATE_SUCCESS:
}
}
- GST_CAT_INFO (GST_CAT_STATES, "[%s]: done changing bin's state from %s to %s, now in %s",
- GST_ELEMENT_NAME (element),
- gst_element_state_get_name (old_state),
- gst_element_state_get_name (pending),
- gst_element_state_get_name (GST_STATE (element)));
+ GST_CAT_DEBUG_OBJECT (GST_CAT_STATES, element,
+ "done changing bin's state from %s to %s, now in %s",
+ gst_element_state_get_name (old_state),
+ gst_element_state_get_name (pending),
+ gst_element_state_get_name (GST_STATE (element)));
if (have_async)
ret = GST_STATE_ASYNC;
GstElementStateReturn ret;
if (parent_class->change_state) {
- GST_CAT_DEBUG (GST_CAT_STATES, "[%s]: setting bin's own state", GST_ELEMENT_NAME (bin));
+ GST_CAT_LOG_OBJECT (GST_CAT_STATES, bin, "setting bin's own state");
ret = parent_class->change_state (GST_ELEMENT (bin));
return ret;
chunk = gst_mem_chunk_new ("GstBufferChunk", sizeof (GstBuffer),
sizeof (GstBuffer) * 200, 0);
- GST_CAT_INFO (GST_CAT_BUFFER, "Buffers are initialized now");
+ GST_CAT_LOG (GST_CAT_BUFFER, "Buffers are initialized now");
}
GType
gst_alloc_trace_new (_gst_buffer_trace, buffer);
#endif
- GST_CAT_LOG (GST_CAT_BUFFER, "new subbuffer %p", buffer);
+ GST_CAT_LOG (GST_CAT_BUFFER, "new subbuffer %p (parent %p)", buffer, parent);
/* make sure nobody overwrites data in the new buffer
* by setting the READONLY flag */
#endif
#include <string.h>
-#include <gobject/gvaluecollector.h>
#include <gst/gst.h>
#define CAPS_POISON(caps) G_STMT_START{ \
g_return_val_if_fail (data != NULL, NULL);
g_return_val_if_fail (GST_DATA_REFCOUNT_VALUE(data) > 0, NULL);
- GST_CAT_LOG (GST_CAT_BUFFER, "ref data %p, count before ref is %d",
- data, GST_DATA_REFCOUNT_VALUE (data));
+ GST_CAT_LOG (GST_CAT_BUFFER, "%p %d->%d", data,
+ GST_DATA_REFCOUNT_VALUE (data), GST_DATA_REFCOUNT_VALUE (data) + 1);
gst_atomic_int_inc (&data->refcount);
g_return_val_if_fail (count >= 0, NULL);
g_return_val_if_fail (GST_DATA_REFCOUNT_VALUE(data) > 0, NULL);
+ GST_CAT_LOG (GST_CAT_BUFFER, "%p %d->%d", data,
+ GST_DATA_REFCOUNT_VALUE (data), GST_DATA_REFCOUNT_VALUE (data) + count);
+
gst_atomic_int_add (&data->refcount, count);
return data;
g_return_if_fail (data != NULL);
- GST_CAT_LOG (GST_CAT_BUFFER, "unref data %p, count before unref is %d",
- data, GST_DATA_REFCOUNT_VALUE (data));
+ GST_CAT_LOG (GST_CAT_BUFFER, "%p %d->%d", data,
+ GST_DATA_REFCOUNT_VALUE (data), GST_DATA_REFCOUNT_VALUE (data) - 1);
g_return_if_fail (GST_DATA_REFCOUNT_VALUE (data) > 0);
zero = gst_atomic_int_dec_and_test (&data->refcount);
/* then check to see if there's already a pad by that name here */
g_return_if_fail (gst_object_check_uniqueness (element->pads, GST_PAD_NAME(pad)) == TRUE);
+ GST_CAT_INFO_OBJECT (GST_CAT_ELEMENT_PADS, element, "adding pad '%s'",
+ GST_STR_NULL (GST_OBJECT_NAME (pad)));
+
/* set the pad's parent */
- GST_CAT_DEBUG (GST_CAT_ELEMENT_PADS,"setting parent of pad '%s' to '%s'",
- GST_PAD_NAME (pad), GST_STR_NULL (GST_ELEMENT_NAME (element)));
gst_object_set_parent (GST_OBJECT (pad), GST_OBJECT (element));
/* add it to the list */
gst_element_class_add_pad_template (GstElementClass *klass,
GstPadTemplate *templ)
{
- GstPadTemplate *templ_copy;
-
- g_return_if_fail (klass != NULL);
g_return_if_fail (GST_IS_ELEMENT_CLASS (klass));
- g_return_if_fail (templ != NULL);
g_return_if_fail (GST_IS_PAD_TEMPLATE (templ));
+
/* avoid registering pad templates with the same name */
g_return_if_fail (gst_element_class_get_pad_template (klass, templ->name_template) == NULL);
- templ_copy = g_memdup(templ, sizeof(GstPadTemplate));
-
- klass->padtemplates = g_list_append (klass->padtemplates, templ_copy);
+ klass->padtemplates = g_list_append (klass->padtemplates,
+ gst_object_ref (GST_OBJECT (templ)));
klass->numpadtemplates++;
}
GstPadTemplate *newtempl = NULL;
GList *padlist;
- GST_CAT_DEBUG (GST_CAT_ELEMENT_PADS, "gst_element_get_compatible_pad_template()");
-
g_return_val_if_fail (element != NULL, NULL);
g_return_val_if_fail (GST_IS_ELEMENT (element), NULL);
g_return_val_if_fail (compattempl != NULL, NULL);
padlist = gst_element_get_pad_template_list (element);
+ GST_CAT_DEBUG (GST_CAT_ELEMENT_PADS, "Looking for a suitable pad template...");
+
while (padlist) {
GstPadTemplate *padtempl = (GstPadTemplate*) padlist->data;
- gboolean comp = FALSE;
+ GstCaps *intersection;
/* Ignore name
* Ignore presence
* Check direction (must be opposite)
* Check caps
*/
- GST_CAT_DEBUG (GST_CAT_CAPS, "checking direction and caps");
if (padtempl->direction != compattempl->direction) {
- GST_CAT_DEBUG (GST_CAT_CAPS, "compatible direction: found %s pad template",
- padtempl->direction == GST_PAD_SRC ? "src" : "sink");
+ GST_CAT_DEBUG (GST_CAT_CAPS, "compatible direction: found %s pad template \"%s\"",
+ padtempl->direction == GST_PAD_SRC ? "src" : "sink",
+ padtempl->name_template);
- comp = gst_caps_is_always_compatible (GST_PAD_TEMPLATE_CAPS (compattempl),
- GST_PAD_TEMPLATE_CAPS (padtempl));
+ intersection = gst_caps_intersect (GST_PAD_TEMPLATE_CAPS (compattempl),
+ GST_PAD_TEMPLATE_CAPS (padtempl));
- GST_CAT_DEBUG (GST_CAT_CAPS, "caps are %scompatible", (comp ? "" : "not "));
+ GST_CAT_DEBUG (GST_CAT_CAPS, "caps are %scompatible", (intersection ? "" : "not "));
- if (comp) {
+ if (intersection)
newtempl = padtempl;
- break;
- }
+ gst_caps_free (intersection);
+ if (newtempl) break;
}
padlist = g_list_next (padlist);
g_return_val_if_fail (GST_IS_ELEMENT (element), NULL);
g_return_val_if_fail (GST_IS_PAD (pad), NULL);
- GST_DEBUG ("finding pad in %s compatible with %s:%s",
- GST_ELEMENT_NAME (element), GST_DEBUG_PAD_NAME (pad));
+ GST_CAT_DEBUG (GST_CAT_ELEMENT_PADS, "finding pad in %s compatible with %s:%s",
+ GST_ELEMENT_NAME (element), GST_DEBUG_PAD_NAME (pad));
/* let's use the real pad */
pad = (GstPad *) GST_PAD_REALIZE (pad);
if (foundpad) return foundpad;
//}
- GST_DEBUG_OBJECT (element, "Could not find a compatible pad to link to %s:%s",
- GST_DEBUG_PAD_NAME (pad));
+ GST_CAT_INFO_OBJECT (GST_CAT_ELEMENT_PADS, element,
+ "Could not find a compatible pad to link to %s:%s",
+ GST_DEBUG_PAD_NAME (pad));
return NULL;
}
return (GST_STATE_SUCCESS);
}
- GST_CAT_DEBUG_OBJECT (GST_CAT_STATES, element, "setting state from %s to %s",
- gst_element_state_get_name (curpending),
- gst_element_state_get_name (state));
+ GST_CAT_INFO_OBJECT (GST_CAT_STATES, element, "setting state from %s to %s",
+ gst_element_state_get_name (curpending),
+ gst_element_state_get_name (state));
/* loop until the final requested state is set */
while (GST_STATE (element) != state
if (curpending != state) {
GST_CAT_DEBUG_OBJECT (GST_CAT_STATES, element,
- "intermediate: setting state from %s to %s",
- gst_element_state_get_name (GST_STATE (element)),
- gst_element_state_get_name (curpending));
+ "intermediate: setting state from %s to %s",
+ gst_element_state_get_name (GST_STATE (element)),
+ gst_element_state_get_name (curpending));
}
/* call the state change function so it can set the state */
switch (return_val) {
case GST_STATE_FAILURE:
- GST_CAT_DEBUG_OBJECT (GST_CAT_STATES, element,
- "have failed change_state return");
+ GST_CAT_INFO_OBJECT (GST_CAT_STATES, element,
+ "have failed change_state return");
goto exit;
case GST_STATE_ASYNC:
- GST_CAT_DEBUG_OBJECT (GST_CAT_STATES, element,
- "element will change state async");
+ GST_CAT_INFO_OBJECT (GST_CAT_STATES, element,
+ "element will change state async");
goto exit;
case GST_STATE_SUCCESS:
/* Last thing we do is verify that a successful state change really
if (old_pending == GST_STATE_VOID_PENDING ||
old_state == GST_STATE_PENDING (element)) {
- GST_CAT_INFO (GST_CAT_STATES,
- "no state change needed for element %s (VOID_PENDING)",
- GST_ELEMENT_NAME (element));
+ GST_CAT_DEBUG_OBJECT (GST_CAT_STATES, element,
+ "element is already in the %s state",
+ gst_element_state_get_name (old_state));
return GST_STATE_SUCCESS;
}
- GST_CAT_INFO (GST_CAT_STATES, "%s default handler sets state from %s to %s %04x",
- GST_ELEMENT_NAME (element),
- gst_element_state_get_name (old_state),
- gst_element_state_get_name (old_pending),
- old_transition);
+ GST_CAT_LOG_OBJECT (GST_CAT_STATES, element,
+ "default handler sets state from %s to %s %04x",
+ gst_element_state_get_name (old_state),
+ gst_element_state_get_name (old_pending),
+ old_transition);
/* we set the state change early for the negotiation functions */
GST_STATE (element) = old_pending;
parent = GST_ELEMENT_PARENT (element);
- GST_CAT_DEBUG_OBJECT (GST_CAT_STATES, element,
- "signaling state change from %s to %s",
- gst_element_state_get_name (old_state),
- gst_element_state_get_name (GST_STATE (element)));
+ GST_CAT_LOG_OBJECT (GST_CAT_STATES, element,
+ "signaling state change from %s to %s",
+ gst_element_state_get_name (old_state),
+ gst_element_state_get_name (GST_STATE (element)));
/* tell the scheduler if we have one */
if (element->sched) {
if (gst_scheduler_state_transition (element->sched, element,
old_transition) != GST_STATE_SUCCESS) {
- GST_CAT_DEBUG_OBJECT (GST_CAT_STATES, element,
- "scheduler could not change state");
+ GST_CAT_INFO_OBJECT (GST_CAT_STATES, element,
+ "scheduler could not change state");
goto failure;
}
}
{
g_return_if_fail (GST_IS_ELEMENT (element));
- GST_CAT_INFO_OBJECT (GST_CAT_PARENTAGE, element, "setting scheduler to %p", sched);
+ GST_CAT_DEBUG_OBJECT (GST_CAT_PARENTAGE, element, "setting scheduler to %p", sched);
gst_object_replace ((GstObject **)&GST_ELEMENT_SCHED (element), GST_OBJECT (sched));
}
if (feature)
return GST_ELEMENT_FACTORY (feature);
- /* this should be an ERROR */
- GST_DEBUG ("no such elementfactory \"%s\"", name);
+ /* this isn't an error, for instance when you query if an element factory is
+ * present */
+ GST_LOG ("no such element factory \"%s\"", name);
return NULL;
}
return NULL;
}
- GST_LOG_OBJECT (factory, "creating element (name \"%s\", type %d)",
- GST_STR_NULL (name), (gint) factory->type);
+ if (name)
+ GST_INFO ("creating \"%s\" named \"%s\"", GST_PLUGIN_FEATURE_NAME (factory),
+ GST_STR_NULL (name));
+ else
+ GST_INFO ("creating \"%s\"", GST_PLUGIN_FEATURE_NAME (factory));
if (factory->type == 0) {
g_critical ("Factory for `%s' has no type",
}
oclass = GST_ELEMENT_CLASS (g_type_class_ref (factory->type));
- if (oclass->elementfactory == NULL) {
- GST_DEBUG ("class %s", GST_PLUGIN_FEATURE_NAME (factory));
+ if (oclass->elementfactory == NULL)
oclass->elementfactory = factory;
- }
/* create an instance of the element */
element = GST_ELEMENT (g_object_new (factory->type, NULL));
/* nicely printed object */
if (object == NULL) {
- return g_strdup ("NULL");
+ return g_strdup ("(NULL)");
}
if (*(GType *)ptr == GST_TYPE_CAPS) {
return gst_caps_to_string ((GstCaps *)ptr);
pidcolor = g_strdup ("");
}
- obj = gst_debug_print_object (object);
+ obj = object ? gst_debug_print_object (object) : g_strdup ("");
- g_printerr ("%s %s%15s%s(%s%5d%s) %s%s(%d):%s: %s%s %s\n",
+ g_printerr ("%s %s%15s%s(%s%5d%s) %s%s(%d):%s:%s%s %s\n",
gst_debug_level_get_name (level),
color, gst_debug_category_get_name (category), clear,
pidcolor, pid, clear,
gst_marshal_BOXED__BOXED, GST_TYPE_CAPS, 1,
GST_TYPE_CAPS | G_SIGNAL_TYPE_STATIC_SCOPE);
-/* gtk_object_add_arg_type ("GstRealPad::active", G_TYPE_BOOLEAN, */
-/* GTK_ARG_READWRITE, REAL_ARG_ACTIVE); */
g_object_class_install_property (G_OBJECT_CLASS (klass), REAL_ARG_ACTIVE,
g_param_spec_boolean ("active", "Active", "Whether the pad is active.",
TRUE, G_PARAM_READWRITE));
GST_RPAD_EVENTMASKFUNC (pad) = mask_func;
- GST_CAT_DEBUG (GST_CAT_PADS, "eventmaskfunc for %s:%s set to %s",
+ GST_CAT_LOG (GST_CAT_PADS, "eventmaskfunc for %s:%s set to %s",
GST_DEBUG_PAD_NAME (pad), GST_DEBUG_FUNCPTR_NAME (mask_func));
}
GST_RPAD_CONVERTFUNC (pad) = convert;
- GST_CAT_DEBUG (GST_CAT_PADS, "convertfunc for %s:%s set to %s",
+ GST_CAT_LOG (GST_CAT_PADS, "convertfunc for %s:%s set to %s",
GST_DEBUG_PAD_NAME (pad), GST_DEBUG_FUNCPTR_NAME (convert));
}
GST_RPAD_QUERYFUNC (pad) = query;
- GST_CAT_DEBUG (GST_CAT_PADS, "queryfunc for %s:%s set to %s",
+ GST_CAT_LOG (GST_CAT_PADS, "queryfunc for %s:%s set to %s",
GST_DEBUG_PAD_NAME (pad), GST_DEBUG_FUNCPTR_NAME (query));
}
GST_RPAD_QUERYTYPEFUNC (pad) = type_func;
- GST_CAT_DEBUG (GST_CAT_PADS, "querytypefunc for %s:%s set to %s",
+ GST_CAT_LOG (GST_CAT_PADS, "querytypefunc for %s:%s set to %s",
GST_DEBUG_PAD_NAME (pad), GST_DEBUG_FUNCPTR_NAME (type_func));
}
g_return_if_fail (GST_IS_REAL_PAD (pad));
GST_RPAD_INTLINKFUNC (pad) = intlink;
- GST_CAT_DEBUG (GST_CAT_PADS, "internal link for %s:%s set to %s",
+ GST_CAT_LOG (GST_CAT_PADS, "internal link for %s:%s set to %s",
GST_DEBUG_PAD_NAME (pad), GST_DEBUG_FUNCPTR_NAME (intlink));
}
g_return_if_fail (GST_IS_REAL_PAD (pad));
GST_RPAD_FORMATSFUNC (pad) = formats;
- GST_CAT_DEBUG (GST_CAT_PADS, "formats function for %s:%s set to %s",
+ GST_CAT_LOG (GST_CAT_PADS, "formats function for %s:%s set to %s",
GST_DEBUG_PAD_NAME (pad), GST_DEBUG_FUNCPTR_NAME (formats));
}
g_return_if_fail (GST_IS_REAL_PAD (pad));
GST_RPAD_LINKFUNC (pad) = link;
- GST_CAT_DEBUG (GST_CAT_PADS, "linkfunc for %s:%s set to %s",
+ GST_CAT_LOG (GST_CAT_PADS, "linkfunc for %s:%s set to %s",
GST_DEBUG_PAD_NAME (pad), GST_DEBUG_FUNCPTR_NAME (link));
}
g_return_if_fail (GST_IS_REAL_PAD (pad));
GST_RPAD_UNLINKFUNC (pad) = unlink;
- GST_CAT_DEBUG (GST_CAT_PADS, "unlinkfunc for %s:%s set to %s",
+ GST_CAT_LOG (GST_CAT_PADS, "unlinkfunc for %s:%s set to %s",
GST_DEBUG_PAD_NAME (pad), GST_DEBUG_FUNCPTR_NAME (unlink));
}
g_return_if_fail (GST_IS_REAL_PAD (pad));
GST_RPAD_FIXATEFUNC (pad) = fixate;
- GST_CAT_DEBUG (GST_CAT_PADS, "fixatefunc for %s:%s set to %s",
+ GST_CAT_LOG (GST_CAT_PADS, "fixatefunc for %s:%s set to %s",
GST_DEBUG_PAD_NAME (pad), GST_DEBUG_FUNCPTR_NAME (fixate));
}
g_return_if_fail (GST_IS_REAL_PAD (pad));
GST_RPAD_GETCAPSFUNC (pad) = getcaps;
- GST_CAT_DEBUG (GST_CAT_PADS, "getcapsfunc for %s:%s set to %s",
+ GST_CAT_LOG (GST_CAT_PADS, "getcapsfunc for %s:%s set to %s",
GST_DEBUG_PAD_NAME (pad), GST_DEBUG_FUNCPTR_NAME (getcaps));
}
g_return_if_fail (GST_PAD_IS_SINK (pad));
GST_RPAD_BUFFERALLOCFUNC (pad) = bufalloc;
- GST_CAT_DEBUG (GST_CAT_PADS, "bufferallocfunc for %s:%s set to %s",
+ GST_CAT_LOG (GST_CAT_PADS, "bufferallocfunc for %s:%s set to %s",
GST_DEBUG_PAD_NAME (pad), GST_DEBUG_FUNCPTR_NAME (bufalloc));
}
g_signal_emit (G_OBJECT (realsink), gst_real_pad_signals[REAL_UNLINKED],
0, realsrc);
- GST_CAT_INFO (GST_CAT_ELEMENT_PADS, "unlinked %s:%s and %s:%s",
- GST_DEBUG_PAD_NAME (srcpad), GST_DEBUG_PAD_NAME (sinkpad));
+ GST_CAT_LOG (GST_CAT_ELEMENT_PADS, "unlinked %s:%s and %s:%s",
+ GST_DEBUG_PAD_NAME (srcpad), GST_DEBUG_PAD_NAME (sinkpad));
gst_object_unref (GST_OBJECT (realsrc));
gst_object_unref (GST_OBJECT (realsink));
return ret;
}
-/**
- * gst_pad_can_link_filtered:
- * @srcpad: the source #GstPad to link.
- * @sinkpad: the sink #GstPad to link.
- * @filtercaps: the filter #GstCaps.
- *
- * Checks if the source pad and the sink pad can be linked when constrained
- * by the given filter caps. Both @srcpad and @sinkpad must be unlinked.
- *
- * Returns: TRUE if the pads can be linked, FALSE otherwise.
- */
-gboolean
-gst_pad_can_link_filtered (GstPad *srcpad, GstPad *sinkpad,
- const GstCaps *filtercaps)
+/* returning NULL indicates that the arguments are invalid */
+static GstPadLink*
+gst_pad_link_prepare (GstPad *srcpad, GstPad *sinkpad,
+ const GstCaps *filtercaps)
{
GstRealPad *realsrc, *realsink;
GstPadLink *link;
- /* FIXME This function is gross. It's almost a direct copy of
- * gst_pad_link_filtered(). Any decent programmer would attempt
- * to merge the two functions, which I will do some day. --ds
- */
+ g_return_val_if_fail (GST_IS_PAD (srcpad), NULL);
+ g_return_val_if_fail (GST_IS_PAD (sinkpad), NULL);
- /* generic checks */
- g_return_val_if_fail (srcpad != NULL, FALSE);
- g_return_val_if_fail (GST_IS_PAD (srcpad), FALSE);
- g_return_val_if_fail (sinkpad != NULL, FALSE);
- g_return_val_if_fail (GST_IS_PAD (sinkpad), FALSE);
-
- GST_CAT_INFO (GST_CAT_PADS, "trying to link %s:%s and %s:%s",
- GST_DEBUG_PAD_NAME (srcpad), GST_DEBUG_PAD_NAME (sinkpad));
-
- /* now we need to deal with the real/ghost stuff */
realsrc = GST_PAD_REALIZE (srcpad);
realsink = GST_PAD_REALIZE (sinkpad);
if ((GST_PAD (realsrc) != srcpad) || (GST_PAD (realsink) != sinkpad)) {
- GST_CAT_INFO (GST_CAT_PADS, "*actually* linking %s:%s and %s:%s",
- GST_DEBUG_PAD_NAME (realsrc), GST_DEBUG_PAD_NAME (realsink));
- }
- /* FIXME: shouldn't we convert this to g_return_val_if_fail? */
- if (GST_RPAD_PEER (realsrc) != NULL) {
- GST_CAT_INFO (GST_CAT_PADS, "Real source pad %s:%s has a peer, failed",
- GST_DEBUG_PAD_NAME (realsrc));
- return FALSE;
- }
- if (GST_RPAD_PEER (realsink) != NULL) {
- GST_CAT_INFO (GST_CAT_PADS, "Real sink pad %s:%s has a peer, failed",
- GST_DEBUG_PAD_NAME (realsink));
- return FALSE;
- }
- if (GST_PAD_PARENT (realsrc) == NULL) {
- GST_CAT_INFO (GST_CAT_PADS, "Real src pad %s:%s has no parent, failed",
- GST_DEBUG_PAD_NAME (realsrc));
- return FALSE;
- }
- if (GST_PAD_PARENT (realsink) == NULL) {
- GST_CAT_INFO (GST_CAT_PADS, "Real sink pad %s:%s has no parent, failed",
- GST_DEBUG_PAD_NAME (realsrc));
- return FALSE;
+ GST_CAT_DEBUG (GST_CAT_PADS, "*actually* linking %s:%s and %s:%s",
+ GST_DEBUG_PAD_NAME (realsrc), GST_DEBUG_PAD_NAME (realsink));
}
+ g_return_val_if_fail (GST_RPAD_PEER (realsrc) == NULL, NULL);
+ g_return_val_if_fail (GST_RPAD_PEER (realsink) == NULL, NULL);
+ g_return_val_if_fail (GST_PAD_PARENT (realsrc) != NULL, NULL);
+ g_return_val_if_fail (GST_PAD_PARENT (realsink) != NULL, NULL);
+
if (!gst_pad_check_schedulers (realsrc, realsink)) {
g_warning ("linking pads with different scheds requires "
"exactly one decoupled element (such as queue)");
- return FALSE;
+ return NULL;
}
- g_return_val_if_fail (realsrc != NULL, GST_PAD_LINK_REFUSED);
- g_return_val_if_fail (realsink != NULL, GST_PAD_LINK_REFUSED);
+ if (GST_RPAD_DIRECTION (realsrc) == GST_RPAD_DIRECTION (realsink)) {
+ g_warning ("%s:%s and %s:%s are both %s pads, failed",
+ GST_DEBUG_PAD_NAME (realsrc), GST_DEBUG_PAD_NAME (realsink),
+ GST_RPAD_DIRECTION (realsrc) == GST_PAD_SRC ? "src" : "sink");
+ return NULL;
+ }
link = gst_pad_link_new ();
link->sinkpad = GST_PAD (realsrc);
}
- if (GST_RPAD_DIRECTION (link->srcpad) != GST_PAD_SRC) {
- GST_CAT_INFO (GST_CAT_PADS, "Real src pad %s:%s is not a source pad, failed",
- GST_DEBUG_PAD_NAME (link->srcpad));
- gst_pad_link_free (link);
- return FALSE;
- }
- if (GST_RPAD_DIRECTION (link->sinkpad) != GST_PAD_SINK) {
- GST_CAT_INFO (GST_CAT_PADS, "Real sink pad %s:%s is not a sink pad, failed",
- GST_DEBUG_PAD_NAME (link->sinkpad));
- gst_pad_link_free (link);
- return FALSE;
- }
-
link->srccaps = gst_pad_get_caps (link->srcpad);
link->sinkcaps = gst_pad_get_caps (link->sinkpad);
if (filtercaps) link->filtercaps = gst_caps_copy (filtercaps);
+ return link;
+}
+
+/**
+ * gst_pad_can_link_filtered:
+ * @srcpad: the source #GstPad to link.
+ * @sinkpad: the sink #GstPad to link.
+ * @filtercaps: the filter #GstCaps.
+ *
+ * Checks if the source pad and the sink pad can be linked when constrained
+ * by the given filter caps. Both @srcpad and @sinkpad must be unlinked.
+ *
+ * Returns: TRUE if the pads can be linked, FALSE otherwise.
+ */
+gboolean
+gst_pad_can_link_filtered (GstPad *srcpad, GstPad *sinkpad,
+ const GstCaps *filtercaps)
+{
+ GstPadLink *link;
+
+ GST_CAT_INFO (GST_CAT_PADS, "checking if %s:%s and %s:%s can link",
+ GST_DEBUG_PAD_NAME (srcpad), GST_DEBUG_PAD_NAME (sinkpad));
+
+ link = gst_pad_link_prepare (srcpad, sinkpad, filtercaps);
+
+ if (!link) return FALSE;
+
gst_pad_link_intersect (link);
if (gst_caps_is_empty (link->caps)) {
+ GST_CAT_INFO (GST_CAT_PADS, "%s:%s and %s:%s %sdo not have compatible capabilities, failed",
+ GST_DEBUG_PAD_NAME (link->sinkpad), GST_DEBUG_PAD_NAME (link->srcpad),
+ link->filtercaps ? "and the filtercaps " : "");
gst_pad_link_free (link);
return FALSE;
}
+ GST_CAT_DEBUG (GST_CAT_PADS, "yes, pads %s:%s and %s:%s can link",
+ GST_DEBUG_PAD_NAME (srcpad), GST_DEBUG_PAD_NAME (sinkpad));
gst_pad_link_free (link);
return TRUE;
}
gst_pad_link_filtered (GstPad *srcpad, GstPad *sinkpad,
const GstCaps *filtercaps)
{
- GstRealPad *realsrc, *realsink;
- GstScheduler *src_sched, *sink_sched;
GstPadLink *link;
-
- /* generic checks */
- g_return_val_if_fail (srcpad != NULL, FALSE);
- g_return_val_if_fail (GST_IS_PAD (srcpad), FALSE);
- g_return_val_if_fail (sinkpad != NULL, FALSE);
- g_return_val_if_fail (GST_IS_PAD (sinkpad), FALSE);
+ GstScheduler *src_sched, *sink_sched;
GST_CAT_INFO (GST_CAT_PADS, "trying to link %s:%s and %s:%s",
- GST_DEBUG_PAD_NAME (srcpad), GST_DEBUG_PAD_NAME (sinkpad));
-
- /* now we need to deal with the real/ghost stuff */
- realsrc = GST_PAD_REALIZE (srcpad);
- realsink = GST_PAD_REALIZE (sinkpad);
+ GST_DEBUG_PAD_NAME (srcpad), GST_DEBUG_PAD_NAME (sinkpad));
- if ((GST_PAD (realsrc) != srcpad) || (GST_PAD (realsink) != sinkpad)) {
- GST_CAT_INFO (GST_CAT_PADS, "*actually* linking %s:%s and %s:%s",
- GST_DEBUG_PAD_NAME (realsrc), GST_DEBUG_PAD_NAME (realsink));
- }
- /* FIXME: shouldn't we convert this to g_return_val_if_fail? */
- if (GST_RPAD_PEER (realsrc) != NULL) {
- GST_CAT_INFO (GST_CAT_PADS, "Real source pad %s:%s has a peer, failed",
- GST_DEBUG_PAD_NAME (realsrc));
- return FALSE;
- }
- if (GST_RPAD_PEER (realsink) != NULL) {
- GST_CAT_INFO (GST_CAT_PADS, "Real sink pad %s:%s has a peer, failed",
- GST_DEBUG_PAD_NAME (realsink));
- return FALSE;
- }
- if (GST_PAD_PARENT (realsrc) == NULL) {
- GST_CAT_INFO (GST_CAT_PADS, "Real src pad %s:%s has no parent, failed",
- GST_DEBUG_PAD_NAME (realsrc));
- return FALSE;
- }
- if (GST_PAD_PARENT (realsink) == NULL) {
- GST_CAT_INFO (GST_CAT_PADS, "Real sink pad %s:%s has no parent, failed",
- GST_DEBUG_PAD_NAME (realsrc));
- return FALSE;
- }
-
- if (!gst_pad_check_schedulers (realsrc, realsink)) {
- g_warning ("linking pads with different scheds requires "
- "exactly one decoupled element (such as queue)");
- return FALSE;
- }
+ link = gst_pad_link_prepare (srcpad, sinkpad, filtercaps);
- g_return_val_if_fail (realsrc != NULL, GST_PAD_LINK_REFUSED);
- g_return_val_if_fail (realsink != NULL, GST_PAD_LINK_REFUSED);
-
- link = gst_pad_link_new ();
-
- if (GST_RPAD_DIRECTION (realsrc) == GST_PAD_SRC) {
- link->srcpad = GST_PAD (realsrc);
- link->sinkpad = GST_PAD (realsink);
- } else {
- link->srcpad = GST_PAD (realsink);
- link->sinkpad = GST_PAD (realsrc);
- }
+ if (!link) return FALSE;
- if (GST_RPAD_DIRECTION (link->srcpad) != GST_PAD_SRC) {
- GST_CAT_INFO (GST_CAT_PADS, "Real src pad %s:%s is not a source pad, failed",
- GST_DEBUG_PAD_NAME (link->srcpad));
- gst_pad_link_free (link);
- return FALSE;
- }
- if (GST_RPAD_DIRECTION (link->sinkpad) != GST_PAD_SINK) {
- GST_CAT_INFO (GST_CAT_PADS, "Real sink pad %s:%s is not a sink pad, failed",
- GST_DEBUG_PAD_NAME (link->sinkpad));
- gst_pad_link_free (link);
+ if (gst_pad_link_try (link) == GST_PAD_LINK_REFUSED) {
+ GST_CAT_INFO (GST_CAT_PADS, "could not link %s:%s to %s:%s",
+ GST_DEBUG_PAD_NAME (srcpad), GST_DEBUG_PAD_NAME (sinkpad));
return FALSE;
}
- link->srccaps = gst_pad_get_caps (link->srcpad);
- link->sinkcaps = gst_pad_get_caps (link->sinkpad);
- if (filtercaps) link->filtercaps = gst_caps_copy (filtercaps);
- if (gst_pad_link_try (link) == GST_PAD_LINK_REFUSED)
- return FALSE;
-
/* fire off a signal to each of the pads telling them
* that they've been linked */
g_signal_emit (G_OBJECT (link->srcpad), gst_real_pad_signals[REAL_LINKED],
GST_PAD (link->srcpad), GST_PAD (link->sinkpad));
}
else {
- GST_CAT_INFO (GST_CAT_PADS, "not telling link to scheduler %s:%s and %s:%s, %p %p",
- GST_DEBUG_PAD_NAME (link->srcpad),
- GST_DEBUG_PAD_NAME (link->sinkpad),
- src_sched, sink_sched);
+ GST_CAT_LOG (GST_CAT_PADS, "not telling link to scheduler %s:%s and %s:%s, %p %p",
+ GST_DEBUG_PAD_NAME (link->srcpad), GST_DEBUG_PAD_NAME (link->sinkpad),
+ src_sched, sink_sched);
}
- GST_CAT_INFO (GST_CAT_PADS, "linked %s:%s and %s:%s, successful",
- GST_DEBUG_PAD_NAME (link->srcpad),
- GST_DEBUG_PAD_NAME (link->sinkpad));
+ GST_CAT_INFO (GST_CAT_PADS, "sucessfully linked %s:%s and %s:%s",
+ GST_DEBUG_PAD_NAME (link->srcpad),
+ GST_DEBUG_PAD_NAME (link->sinkpad));
return TRUE;
}
return FALSE;
}
- if (GST_CAT_DEFAULT) GST_DEBUG ("plugin \"%s\" initialised", GST_STR_NULL (plugin->filename));
+ if (GST_CAT_DEFAULT) GST_LOG ("plugin \"%s\" initialised", GST_STR_NULL (plugin->filename));
return plugin;
}
*/
# define YYFPRINTF(a, ...) G_STMT_START{ \
gchar *temp = g_strdup_printf (__VA_ARGS__); \
- GST_CAT_DEBUG (GST_CAT_PIPELINE, temp); \
+ GST_CAT_LOG (GST_CAT_PIPELINE, temp); \
g_free (temp); \
}G_STMT_END
#endif
*/
# define YYFPRINTF(a, args...) G_STMT_START{ \
gchar *temp = g_strdup_printf ( args ); \
- GST_CAT_DEBUG (GST_CAT_PIPELINE, temp); \
+ GST_CAT_LOG (GST_CAT_PIPELINE, temp); \
g_free (temp); \
}G_STMT_END
#endif
g_assert (GST_IS_ELEMENT (src));
g_assert (GST_IS_ELEMENT (sink));
- GST_CAT_INFO (GST_CAT_PIPELINE, "linking %s(%s):%u to %s(%s):%u with caps \"%" GST_PTR_FORMAT "\"",
- GST_ELEMENT_NAME (src), link->src_name ? link->src_name : "---", g_slist_length (srcs),
- GST_ELEMENT_NAME (sink), link->sink_name ? link->sink_name : "---", g_slist_length (sinks),
+ GST_CAT_INFO (GST_CAT_PIPELINE, "linking %s:%s to %s:%s (%u/%u) with caps \"%" GST_PTR_FORMAT "\"",
+ GST_ELEMENT_NAME (src), link->src_name ? link->src_name : "(any)",
+ GST_ELEMENT_NAME (sink), link->sink_name ? link->sink_name : "(any)",
+ g_slist_length (srcs), g_slist_length (sinks),
link->caps);
if (!srcs || !sinks) {
yyerror (const char *s)
{
/* FIXME: This should go into the GError somehow, but how? */
- g_warning ("error: %s\n", s);
+ g_warning ("error: %s", s);
return -1;
}
}
g_free (dstr);
- GST_CAT_INFO (GST_CAT_PIPELINE, "got %u elements and %u links", g.chain ? g_slist_length (g.chain->elements) : 0, g_slist_length (g.links));
+ GST_CAT_DEBUG (GST_CAT_PIPELINE, "got %u elements and %u links", g.chain ? g_slist_length (g.chain->elements) : 0, g_slist_length (g.links));
if (!g.chain) {
ret = NULL;
{_assignment} {
/* "=" */
- PRINT ("ASSIGNMENT: %s\n", yytext);
+ PRINT ("ASSIGNMENT: %s", yytext);
lvalp->s = gst_parse_strdup (yytext);
BEGIN (INITIAL);
return ASSIGNMENT;
{_padref} {
yytext++;
- PRINT ("PADREF: %s\n", yytext);
+ PRINT ("PADREF: %s", yytext);
lvalp->s = gst_parse_strdup (yytext);
BEGIN (INITIAL);
return PADREF;
}
{_ref} {
- PRINT ("REF: %s\n", yytext);
+ PRINT ("REF: %s", yytext);
lvalp->s = gst_parse_strdup (yytext);
BEGIN (INITIAL);
return REF;
gchar *pos = yytext;
while (!g_ascii_isspace (*pos) && (*pos != '.')) pos++;
*pos = '\0';
- PRINT ("BINREF: %s\n", yytext);
+ PRINT ("BINREF: %s", yytext);
lvalp->s = gst_parse_strdup (yytext);
BEGIN (INITIAL);
return BINREF;
}
{_identifier} {
- PRINT ("IDENTIFIER: %s\n", yytext);
+ PRINT ("IDENTIFIER: %s", yytext);
lvalp->s = gst_parse_strdup (yytext);
BEGIN (INITIAL);
return IDENTIFIER;
{_link} {
gchar *c = yytext;
- PRINT ("LINK: %s\n", yytext);
+ PRINT ("LINK: %s", yytext);
c++;
if (*c) {
while (g_ascii_isspace (*c)) c++;
return LINK;
}
{_url} {
- PRINT ("URL: %s\n", yytext);
+ PRINT ("URL: %s", yytext);
if (gst_uri_is_valid (yytext)) {
lvalp->s = g_strdup (yytext);
} else {
return PARSE_URL;
}
-{_operator} { PRINT ("OPERATOR: [%s]\n", yytext); return *yytext; }
+{_operator} { PRINT ("OPERATOR: [%s]", yytext); return *yytext; }
-[[:space:]]+ { PRINT ("SPACE: [%s]\n", yytext); }
+[[:space:]]+ { PRINT ("SPACE: [%s]", yytext); }
. {
printf ("???: %s\n", yytext);
*/
while (paths) {
- GST_CAT_DEBUG (GST_CAT_PLUGIN_LOADING,
- "comparing plugin times from %s with %ld\n",
- (gchar *)paths->data, (long) regtime);
+ GST_CAT_LOG (GST_CAT_PLUGIN_LOADING,
+ "comparing plugin times from %s with %ld",
+ (gchar *)paths->data, (long) regtime);
if(!plugin_times_older_than_recurse(paths->data, regtime))
return FALSE;
paths = g_list_next(paths);
seconds = g_timer_elapsed (timer, NULL);
g_timer_destroy (timer);
- GST_INFO ( "registry: loaded %s in %f seconds\n (%s)",
- registry->name, seconds, xmlregistry->location);
+ GST_INFO ("loaded %s in %f seconds (%s)",
+ registry->name, seconds, xmlregistry->location);
CLASS (xmlregistry)->close_func (xmlregistry);
{
GstOptScheduler *osched;
- GST_INFO ( "destroy chain %p", chain);
+ GST_LOG ( "destroy chain %p", chain);
g_assert (chain->num_groups == 0);
g_assert (chain->groups == NULL);
gst_object_ref (GST_OBJECT (osched));
osched->chains = g_slist_prepend (osched->chains, chain);
- GST_INFO ( "new chain %p", chain);
+ GST_LOG ( "new chain %p", chain);
return chain;
}
static GstOptSchedulerChain*
add_to_chain (GstOptSchedulerChain *chain, GstOptSchedulerGroup *group)
{
- GST_INFO ( "adding group %p to chain %p", group, chain);
+ GST_LOG ( "adding group %p to chain %p", group, chain);
g_assert (group->chain == NULL);
static GstOptSchedulerChain*
remove_from_chain (GstOptSchedulerChain *chain, GstOptSchedulerGroup *group)
{
- GST_INFO ( "removing group %p from chain %p", group, chain);
+ GST_LOG ( "removing group %p from chain %p", group, chain);
if (!chain)
return NULL;
g_assert (chain1 != NULL);
- GST_INFO ( "merging chain %p and %p", chain1, chain2);
+ GST_LOG ("merging chain %p and %p", chain1, chain2);
if (chain1 == chain2 || chain2 == NULL)
return chain1;
GstOptSchedulerGroup *group = (GstOptSchedulerGroup *) walk->data;
walk = g_slist_next (walk);
- GST_INFO ( "reparenting group %p from chain %p to %p",
- group, chain2, chain1);
+ GST_LOG ("reparenting group %p from chain %p to %p",
+ group, chain2, chain1);
group->chain = NULL;
chain2->num_groups--;
g_assert (chain != NULL);
g_assert (group != NULL);
- GST_INFO ( "request to %d group %p in chain %p, have %d groups enabled out of %d",
- enabled, group, chain, chain->num_enabled, chain->num_groups);
+ GST_LOG ("request to %d group %p in chain %p, have %d groups enabled out of %d",
+ enabled, group, chain, chain->num_enabled, chain->num_groups);
if (enabled)
GST_OPT_SCHEDULER_GROUP_ENABLE (group);
if (chain->num_enabled < chain->num_groups)
chain->num_enabled++;
- GST_INFO ( "enable group %p in chain %p, now %d groups enabled out of %d", group, chain,
- chain->num_enabled, chain->num_groups);
+ GST_DEBUG ("enable group %p in chain %p, now %d groups enabled out of %d", group, chain,
+ chain->num_enabled, chain->num_groups);
if (chain->num_enabled == chain->num_groups) {
- GST_INFO ( "enable chain %p", chain);
+ GST_DEBUG ("enable chain %p", chain);
GST_OPT_SCHEDULER_CHAIN_ENABLE (chain);
}
}
if (chain->num_enabled > 0)
chain->num_enabled--;
- GST_INFO ( "disable group %p in chain %p, now %d groups enabled out of %d", group, chain,
- chain->num_enabled, chain->num_groups);
+ GST_DEBUG ("disable group %p in chain %p, now %d groups enabled out of %d", group, chain,
+ chain->num_enabled, chain->num_groups);
if (chain->num_enabled == 0) {
- GST_INFO ( "disable chain %p", chain);
+ GST_DEBUG ("disable chain %p", chain);
GST_OPT_SCHEDULER_CHAIN_DISABLE (chain);
}
}
g_assert (group != NULL);
g_assert (element != NULL);
- GST_INFO ( "adding element \"%s\" to group %p", GST_ELEMENT_NAME (element), group);
+ GST_DEBUG ("adding element \"%s\" to group %p", GST_ELEMENT_NAME (element), group);
if (GST_ELEMENT_IS_DECOUPLED (element)) {
- GST_INFO ( "element \"%s\" is decoupled, not adding to group %p",
- GST_ELEMENT_NAME (element), group);
+ GST_DEBUG ("element \"%s\" is decoupled, not adding to group %p",
+ GST_ELEMENT_NAME (element), group);
return group;
}
GstOptSchedulerGroup *group;
group = g_new0 (GstOptSchedulerGroup, 1);
- GST_INFO ( "new group %p", group);
+ GST_LOG ("new group %p", group);
group->refcount = 1;
group->flags = GST_OPT_SCHEDULER_GROUP_DISABLED;
static void
destroy_group (GstOptSchedulerGroup *group)
{
- GST_INFO ( "destroy group %p", group);
+ GST_LOG ("destroy group %p", group);
g_assert (group != NULL);
g_assert (group->elements == NULL);
static GstOptSchedulerGroup*
remove_from_group (GstOptSchedulerGroup *group, GstElement *element)
{
- GST_INFO ( "removing element \"%s\" from group %p", GST_ELEMENT_NAME (element), group);
+ GST_DEBUG ("removing element \"%s\" from group %p", GST_ELEMENT_NAME (element), group);
g_assert (group != NULL);
g_assert (element != NULL);
{
g_assert (group1 != NULL);
- GST_INFO ( "merging groups %p and %p", group1, group2);
+ GST_DEBUG ("merging groups %p and %p", group1, group2);
if (group1 == group2 || group2 == NULL)
return group1;
static void
group_error_handler (GstOptSchedulerGroup *group)
{
- GST_INFO ( "group %p has errored", group);
+ GST_DEBUG ("group %p has errored", group);
chain_group_set_enabled (group->chain, group, FALSE);
group->chain->sched->state = GST_OPT_SCHEDULER_STATE_ERROR;
g_assert (group != NULL);
g_assert (element != NULL);
- GST_INFO ( "request to %d element %s in group %p, have %d elements enabled out of %d",
- enabled, GST_ELEMENT_NAME (element), group, group->num_enabled, group->num_elements);
+ GST_LOG ("request to %d element %s in group %p, have %d elements enabled out of %d",
+ enabled, GST_ELEMENT_NAME (element), group, group->num_enabled, group->num_elements);
if (enabled) {
if (group->num_enabled < group->num_elements)
group->num_enabled++;
- GST_INFO ( "enable element %s in group %p, now %d elements enabled out of %d",
- GST_ELEMENT_NAME (element), group, group->num_enabled, group->num_elements);
+ GST_DEBUG ("enable element %s in group %p, now %d elements enabled out of %d",
+ GST_ELEMENT_NAME (element), group, group->num_enabled, group->num_elements);
if (group->num_enabled == group->num_elements) {
- GST_INFO ( "enable group %p", group);
+ GST_LOG ("enable group %p", group);
chain_group_set_enabled (group->chain, group, TRUE);
}
}
if (group->num_enabled > 0)
group->num_enabled--;
- GST_INFO ( "disable element %s in group %p, now %d elements enabled out of %d",
- GST_ELEMENT_NAME (element), group, group->num_enabled, group->num_elements);
+ GST_DEBUG ("disable element %s in group %p, now %d elements enabled out of %d",
+ GST_ELEMENT_NAME (element), group, group->num_enabled, group->num_elements);
if (group->num_enabled == 0) {
- GST_INFO ( "disable group %p", group);
+ GST_LOG ("disable group %p", group);
chain_group_set_enabled (group->chain, group, FALSE);
}
}
schedule_group (GstOptSchedulerGroup *group)
{
if (!group->entry) {
- GST_INFO ( "not scheduling group %p without entry", group);
+ GST_INFO ("not scheduling group %p without entry", group);
return FALSE;
}
/* cothreads automatically call the pre- and post-run functions for us;
* without cothreads we need to call them manually */
if (group->schedulefunc == NULL) {
- GST_INFO ( "not scheduling group %p without schedulefunc",
- group);
+ GST_INFO ("not scheduling group %p without schedulefunc", group);
return FALSE;
} else {
GSList *l;
if (!GST_PAD_IS_SRC (pad) || !GST_IS_REAL_PAD (pad))
continue;
- GST_LOG ("doing get and push on pad \"%s:%s\" in group %p",
- GST_DEBUG_PAD_NAME (pad), group);
+ GST_DEBUG ("doing get and push on pad \"%s:%s\" in group %p",
+ GST_DEBUG_PAD_NAME (pad), group);
data = GST_RPAD_GETFUNC (pad) (pad);
if (data) {
group->flags |= GST_OPT_SCHEDULER_GROUP_RUNNING;
- GST_LOG ("calling loopfunc of element %s in group %p",
- GST_ELEMENT_NAME (entry), group);
+ GST_DEBUG ("calling loopfunc of element %s in group %p",
+ GST_ELEMENT_NAME (entry), group);
entry->loopfunc (entry);
/* if the scheduler interrupted, make sure we send an INTERRUPTED event to the
* loop based element */
if (osched->state == GST_OPT_SCHEDULER_STATE_INTERRUPTED) {
- GST_INFO ( "scheduler interrupted, return interrupt event");
+ GST_INFO ("scheduler interrupted, return interrupt event");
data = GST_DATA (gst_event_new (GST_EVENT_INTERRUPT));
}
else {
GList *buflist = GST_PAD_BUFLIST (srcpad);
if (buflist) {
- GST_INFO ( "need to clear some buffers");
+ GST_LOG ("need to clear some buffers");
g_list_foreach (buflist, (GFunc) clear_queued, NULL);
g_list_free (buflist);
GST_PAD_BUFLIST (srcpad) = NULL;
{
gboolean flush;
- GST_LOG ("intercepting event %d on pad %s:%s",
- GST_EVENT_TYPE (event), GST_DEBUG_PAD_NAME (srcpad));
+ GST_DEBUG ("intercepting event %d on pad %s:%s",
+ GST_EVENT_TYPE (event), GST_DEBUG_PAD_NAME (srcpad));
/* figure out if this is a flush event */
switch (GST_EVENT_TYPE (event)) {
GstOptSchedulerGroup *group;
GstElementStateReturn res = GST_STATE_SUCCESS;
- GST_INFO ( "element \"%s\" state change %d", GST_ELEMENT_NAME (element), transition);
+ GST_DEBUG ("element \"%s\" state change %d", GST_ELEMENT_NAME (element), transition);
/* we check the state of the managing pipeline here */
if (GST_IS_BIN (element)) {
if (GST_SCHEDULER_PARENT (sched) == element) {
- GST_INFO ( "parent \"%s\" changed state", GST_ELEMENT_NAME (element));
+ GST_LOG ("parent \"%s\" changed state", GST_ELEMENT_NAME (element));
switch (transition) {
case GST_STATE_PLAYING_TO_PAUSED:
- GST_INFO ( "setting scheduler state to stopped");
+ GST_INFO ("setting scheduler state to stopped");
GST_SCHEDULER_STATE (sched) = GST_SCHEDULER_STATE_STOPPED;
break;
case GST_STATE_PAUSED_TO_PLAYING:
- GST_INFO ( "setting scheduler state to running");
+ GST_INFO ("setting scheduler state to running");
GST_SCHEDULER_STATE (sched) = GST_SCHEDULER_STATE_RUNNING;
break;
default:
- GST_INFO ( "no interesting state change, doing nothing");
+ GST_LOG ("no interesting state change, doing nothing");
}
}
return res;
/* an element withut a group has to be an unlinked src, sink
* filter element */
if (!group) {
- GST_INFO ( "element \"%s\" has no group", GST_ELEMENT_NAME (element));
+ GST_INFO ("element \"%s\" has no group", GST_ELEMENT_NAME (element));
res = GST_STATE_FAILURE;
}
/* else construct the scheduling context of this group and enable it */
if (!group1 && !group2) {
GstOptSchedulerChain *chain;
- GST_INFO ( "creating new group to hold \"%s\" and \"%s\"",
- GST_ELEMENT_NAME (element1), GST_ELEMENT_NAME (element2));
+ GST_DEBUG ("creating new group to hold \"%s\" and \"%s\"",
+ GST_ELEMENT_NAME (element1), GST_ELEMENT_NAME (element2));
chain = create_chain (osched);
group = create_group (chain, element1);
}
/* the first element has a group */
else if (group1) {
- GST_INFO ( "adding \"%s\" to \"%s\"'s group",
- GST_ELEMENT_NAME (element2), GST_ELEMENT_NAME (element1));
+ GST_DEBUG ("adding \"%s\" to \"%s\"'s group",
+ GST_ELEMENT_NAME (element2), GST_ELEMENT_NAME (element1));
/* the second element also has a group, merge */
if (group2)
/* element1 has no group, element2 does. Add element1 to the
* group of element2 */
else {
- GST_INFO ( "adding \"%s\" to \"%s\"'s group",
- GST_ELEMENT_NAME (element1), GST_ELEMENT_NAME (element2));
+ GST_DEBUG ("adding \"%s\" to \"%s\"'s group",
+ GST_ELEMENT_NAME (element1), GST_ELEMENT_NAME (element2));
add_to_group (group2, element1);
group = group2;
}
if (IS_GROUP_LINK (link, group1, group2)) {
/* we found a link to this group, increment the link count */
link->count++;
- GST_INFO ( "incremented group link count between %p and %p to %d",
- group1, group2, link->count);
+ GST_LOG ("incremented group link count between %p and %p to %d",
+ group1, group2, link->count);
done = TRUE;
}
}
group1->group_links = g_slist_prepend (group1->group_links, link);
group2->group_links = g_slist_prepend (group2->group_links, link);
- GST_INFO ( "added group link count between %p and %p",
- group1, group2);
+ GST_DEBUG ("added group link between %p and %p",
+ group1, group2);
}
}
if (IS_GROUP_LINK (link, group1, group2)) {
link->count--;
- GST_INFO ( "link count between %p and %p is now %d",
- group1, group2, link->count);
+ GST_LOG ("link count between %p and %p is now %d",
+ group1, group2, link->count);
if (link->count == 0) {
group1->group_links = g_slist_remove (group1->group_links, link);
group2->group_links = g_slist_remove (group2->group_links, link);
g_free (link);
- GST_INFO ( "removed group link between %p and %p",
- group1, group2);
+ GST_DEBUG ("removed group link between %p and %p",
+ group1, group2);
res = TRUE;
}
break;
/* first create thread context */
if (osched->context == NULL) {
- GST_DEBUG ( "initializing cothread context");
+ GST_DEBUG ("initializing cothread context");
osched->context = do_cothread_context_init ();
}
#endif
GstOptSchedulerCtx *ctx;
const GList *pads;
- GST_INFO ( "adding element \"%s\" to scheduler", GST_ELEMENT_NAME (element));
+ GST_DEBUG_OBJECT (sched, "adding element \"%s\"", GST_OBJECT_NAME (element));
/* decoupled elements are not added to the scheduler lists */
if (GST_ELEMENT_IS_DECOUPLED (element))
group->entry = element;
group->type = GST_OPT_SCHEDULER_GROUP_LOOP;
- GST_INFO ( "added element \"%s\" as loop based entry", GST_ELEMENT_NAME (element));
+ GST_LOG ("added element \"%s\" as loop based entry", GST_ELEMENT_NAME (element));
}
}
{
GstOptSchedulerGroup *group;
- GST_INFO ( "removing element \"%s\" from scheduler", GST_ELEMENT_NAME (element));
+ GST_DEBUG_OBJECT (sched, "removing element \"%s\"", GST_OBJECT_NAME (element));
/* decoupled elements are not added to the scheduler lists and should therefore
* no be removed */
static gboolean
gst_opt_scheduler_interrupt (GstScheduler *sched, GstElement *element)
{
- GST_INFO ( "interrupt from \"%s\"",
- GST_ELEMENT_NAME (element));
+ GST_INFO ("interrupt from \"%s\"",
+ GST_OBJECT_NAME (element));
#ifdef USE_COTHREADS
do_cothread_switch (do_cothread_get_main (((GstOptScheduler*)sched)->context));
{
GstOptScheduler *osched = GST_OPT_SCHEDULER (sched);
- GST_INFO ( "scheduler set interrupted state");
+ GST_INFO ("scheduler set interrupted state");
osched->state = GST_OPT_SCHEDULER_STATE_INTERRUPTED;
}
return TRUE;
LinkType type = GST_OPT_INVALID;
GstElement *element1, *element2;
- GST_INFO ( "pad link between \"%s:%s\" and \"%s:%s\"",
- GST_DEBUG_PAD_NAME (srcpad), GST_DEBUG_PAD_NAME (sinkpad));
+ GST_INFO ("scheduling link between %s:%s and %s:%s",
+ GST_DEBUG_PAD_NAME (srcpad), GST_DEBUG_PAD_NAME (sinkpad));
element1 = GST_PAD_PARENT (srcpad);
element2 = GST_PAD_PARENT (sinkpad);
{
GstOptSchedulerGroup *group = NULL;
- GST_INFO ( "get to chain based link");
+ GST_LOG ("get to chain based link");
/* setup get/chain handlers */
GST_RPAD_GETHANDLER (srcpad) = GST_RPAD_GETFUNC (srcpad);
group->entry = element1;
group->type = GST_OPT_SCHEDULER_GROUP_GET;
- GST_INFO ( "setting \"%s\" as entry point of _get-based group %p",
- GST_ELEMENT_NAME (element1), group);
+ GST_DEBUG ("setting \"%s\" as entry point of _get-based group %p",
+ GST_ELEMENT_NAME (element1), group);
}
break;
}
case GST_OPT_LOOP_TO_CHAIN:
case GST_OPT_CHAIN_TO_CHAIN:
- GST_INFO ( "loop/chain to chain based link");
+ GST_LOG ("loop/chain to chain based link");
if (GST_ELEMENT_IS_EVENT_AWARE (element2))
GST_RPAD_CHAINHANDLER (sinkpad) = GST_RPAD_CHAINFUNC (sinkpad);
group_elements (osched, element1, element2);
break;
case GST_OPT_GET_TO_LOOP:
- GST_INFO ( "get to loop based link");
+ GST_LOG ("get to loop based link");
GST_RPAD_GETHANDLER (srcpad) = GST_RPAD_GETFUNC (srcpad);
{
GstOptSchedulerGroup *group1, *group2;
- GST_INFO ( "chain/loop to loop based link");
+ GST_LOG ("chain/loop to loop based link");
GST_RPAD_CHAINHANDLER (sinkpad) = gst_opt_scheduler_loop_wrapper;
GST_RPAD_GETHANDLER (srcpad) = gst_opt_scheduler_get_wrapper;
if (!group1) {
/* create a new group for element1 as it cannot be merged into another group
* here. we create the group in the same chain as the loop-based element. */
- GST_INFO ( "creating new group for element %s", GST_ELEMENT_NAME (element1));
+ GST_DEBUG ("creating new group for element %s", GST_ELEMENT_NAME (element1));
group1 = create_group (group2->chain, element1);
}
else {
gboolean reachable = FALSE;
const GSList *links = group->group_links;
- GST_INFO ( "checking if group %p can reach %p",
- group, target);
+ GST_LOG ("checking if group %p can reach %p",
+ group, target);
/* seems like we found the target element */
if (group == target) {
- GST_INFO ( "found way to reach %p", target);
+ GST_LOG ("found way to reach %p", target);
return TRUE;
}
/* if the group is marked as visited, we don't need to check here */
if (GST_OPT_SCHEDULER_GROUP_IS_FLAG_SET (group, GST_OPT_SCHEDULER_GROUP_VISITED)) {
- GST_INFO ( "already visited %p", group);
+ GST_LOG ("already visited %p", group);
return FALSE;
}
/* find other group in this link */
other = OTHER_GROUP_LINK (link, group);
- GST_INFO ( "found link from %p to %p, count %d",
- group, other, link->count);
+ GST_LOG ("found link from %p to %p, count %d",
+ group, other, link->count);
/* check if we can reach the target recursiveley */
reachable = group_can_reach_group (other, target);
* all groups are checked. */
GST_OPT_SCHEDULER_GROUP_UNSET_FLAG (group, GST_OPT_SCHEDULER_GROUP_VISITED);
- GST_INFO ( "leaving group %p with %s", group, (reachable ? "TRUE":"FALSE"));
+ GST_LOG ("leaving group %p with %s", group, (reachable ? "TRUE":"FALSE"));
return reachable;
}
GstElement *element1, *element2;
GstOptSchedulerGroup *group1, *group2;
- GST_INFO ( "pad unlink between \"%s:%s\" and \"%s:%s\"",
- GST_DEBUG_PAD_NAME (srcpad), GST_DEBUG_PAD_NAME (sinkpad));
+ GST_INFO ("unscheduling link between %s:%s and %s:%s",
+ GST_DEBUG_PAD_NAME (srcpad), GST_DEBUG_PAD_NAME (sinkpad));
element1 = GST_PAD_PARENT (srcpad);
element2 = GST_PAD_PARENT (sinkpad);
/* if one the elements has no group (anymore) we don't really care
* about the link */
if (!group1 || !group2) {
- GST_INFO ( "one (or both) of the elements is not in a group, not interesting");
+ GST_LOG ("one (or both) of the elements is not in a group, not interesting");
return;
}
if (group1 != group2) {
gboolean zero;
- GST_INFO ( "elements are in different groups");
+ GST_LOG ("elements are in different groups");
/* we can remove the links between the groups now */
zero = group_dec_link (group1, group2);
/* see if group1 and group2 are still connected in any indirect way */
still_link = group_can_reach_group (group1, group2);
- GST_INFO ( "group %p %s reach group %p", group1, (still_link ? "can":"can't"), group2);
+ GST_DEBUG ("group %p %s reach group %p", group1, (still_link ? "can":"can't"), group2);
if (!still_link) {
/* groups are really disconnected, migrate one group to a new chain */
chain = create_chain (osched);
chain_recursively_migrate_group (chain, group1);
- GST_INFO ( "migrated group %p to new chain %p", group1, chain);
+ GST_DEBUG ("migrated group %p to new chain %p", group1, chain);
}
}
else {
- GST_INFO ( "group %p still has direct link with group %p", group1, group2);
+ GST_DEBUG ("group %p still has direct link with group %p", group1, group2);
}
}
/* hard part, groups are equal */
/* since group1 == group2, it doesn't matter which group we take */
group = group1;
- GST_INFO ( "elements are in the same group %p", group);
+ GST_LOG ("elements are in the same group %p", group);
/* check if the element is still linked to some other element in the group,
* we pass the pad that is broken up as an arg because a link on that pad
/* if there is still a link, we don't need to break this group */
if (still_link1 && still_link2) {
- GST_INFO ( "elements still have links with other elements in the group");
+ GST_LOG ( "elements still have links with other elements in the group");
/* FIXME it's possible that we have to break the group/chain. This heppens when
* the src element recursiveley has links with other elements in the group but not
* with all elements. */
group->type == GST_OPT_SCHEDULER_GROUP_LOOP) &&
!GST_ELEMENT_IS_DECOUPLED (element1))
{
- GST_INFO ( "element1 is separated from the group");
+ GST_LOG ("element1 is separated from the group");
remove_from_group (group, element1);
}
else {
- GST_INFO ( "element1 is decoupled or entry in loop based group");
+ GST_LOG ("element1 is decoupled or entry in loop based group");
}
}
if (!still_link2) {
group->type == GST_OPT_SCHEDULER_GROUP_LOOP) &&
!GST_ELEMENT_IS_DECOUPLED (element2))
{
- GST_INFO ( "element2 is separated from the group");
+ GST_LOG ("element2 is separated from the group");
remove_from_group (group, element2);
}
else {
- GST_INFO ( "element2 is decoupled or entry in loop based group");
+ GST_LOG ("element2 is decoupled or entry in loop based group");
}
}
}
osched->state = GST_OPT_SCHEDULER_STATE_RUNNING;
+ GST_DEBUG ("iterating scheduler %p", sched);
+
while (iterations) {
gboolean scheduled = FALSE;
GSList *chains;
projects / platform / upstream / gstreamer.git / commitdiff