tee: Check for the removed pad flag also in the slow pushing path

[platform/upstream/gstreamer.git] / gst / gsttracer.c

diff --git a/gst/gsttracer.c b/gst/gsttracer.c
index df973f3..eaeddbd 100644 (file)
--- a/gst/gsttracer.c
+++ b/gst/gsttracer.c
@@ -21,12 +21,15 @@
 
 /**
  * SECTION:gsttracer
+ * @title: GstTracer
  * @short_description: Tracing base class
  *
  * Tracing modules will subclass #GstTracer and register through
  * gst_tracer_register(). Modules can attach to various hook-types - see
- * #GstTracerHook. When invoked they receive hook specific contextual data, 
- * which they must not modify.
+ * gst_tracing_register_hook(). When invoked they receive hook specific
+ * contextual data, which they must not modify.
+ *
+ * Since: 1.8
  */
 
 #define GST_USE_UNSTABLE_API
@@ -35,6 +38,7 @@
 #include "gstenumtypes.h"
 #include "gsttracer.h"
 #include "gsttracerfactory.h"
+#include "gsttracerutils.h"
 
 GST_DEBUG_CATEGORY_EXTERN (tracer_debug);
 #define GST_CAT_DEFAULT tracer_debug
@@ -45,7 +49,6 @@ enum
 {
   PROP_0,
   PROP_PARAMS,
-  PROP_MASK,
   PROP_LAST
 };
 
@@ -58,12 +61,18 @@ static void gst_tracer_get_property (GObject * object, guint prop_id,
 
 struct _GstTracerPrivate
 {
-  const gchar *params;
-  GstTracerHook mask;
+  gchar *params;
 };
 
 #define gst_tracer_parent_class parent_class
-G_DEFINE_ABSTRACT_TYPE (GstTracer, gst_tracer, GST_TYPE_OBJECT);
+G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE (GstTracer, gst_tracer, GST_TYPE_OBJECT);
+
+static void
+gst_tracer_dispose (GObject * object)
+{
+  GstTracer *tracer = GST_TRACER (object);
+  g_free (tracer->priv->params);
+}
 
 static void
 gst_tracer_class_init (GstTracerClass * klass)
@@ -72,24 +81,19 @@ gst_tracer_class_init (GstTracerClass * klass)
 
   gobject_class->set_property = gst_tracer_set_property;
   gobject_class->get_property = gst_tracer_get_property;
+  gobject_class->dispose = gst_tracer_dispose;
 
   properties[PROP_PARAMS] =
       g_param_spec_string ("params", "Params", "Extra configuration parameters",
       NULL, G_PARAM_READWRITE | G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS);
 
-  properties[PROP_MASK] =
-      g_param_spec_flags ("mask", "Mask", "Event mask", GST_TYPE_TRACER_HOOK,
-      GST_TRACER_HOOK_NONE, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
-
   g_object_class_install_properties (gobject_class, PROP_LAST, properties);
-  g_type_class_add_private (klass, sizeof (GstTracerPrivate));
 }
 
 static void
 gst_tracer_init (GstTracer * tracer)
 {
-  tracer->priv = G_TYPE_INSTANCE_GET_PRIVATE (tracer, GST_TYPE_TRACER,
-      GstTracerPrivate);
+  tracer->priv = gst_tracer_get_instance_private (tracer);
 }
 
 static void
@@ -100,10 +104,7 @@ gst_tracer_set_property (GObject * object, guint prop_id,
 
   switch (prop_id) {
     case PROP_PARAMS:
-      self->priv->params = g_value_get_string (value);
-      break;
-    case PROP_MASK:
-      self->priv->mask = g_value_get_flags (value);
+      self->priv->params = g_value_dup_string (value);
       break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -121,28 +122,25 @@ gst_tracer_get_property (GObject * object, guint prop_id,
     case PROP_PARAMS:
       g_value_set_string (value, self->priv->params);
       break;
-    case PROP_MASK:
-      g_value_set_flags (value, self->priv->mask);
-      break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
   }
 }
 
-void
-gst_tracer_invoke (GstTracer * self, GstTracerHookId hid,
-    GstTracerMessageId mid, va_list var_args)
-{
-  GstTracerClass *klass = GST_TRACER_GET_CLASS (self);
-
-  g_return_if_fail (klass->invoke);
-
-  klass->invoke (self, hid, mid, var_args);
-}
-
 /* tracing modules */
 
+/**
+ * gst_tracer_register:
+ * @plugin: (allow-none): A #GstPlugin, or %NULL for a static typefind function
+ * @name: The name for registering
+ * @type: GType of tracer to register
+ *
+ * Create a new tracer-factory  capable of instantiating objects of the
+ * @type and add the factory to @plugin.
+ *
+ * Returns: %TRUE, if the registering succeeded, %FALSE on error
+ */
 gboolean
 gst_tracer_register (GstPlugin * plugin, const gchar * name, GType type)
 {
@@ -165,12 +163,11 @@ gst_tracer_register (GstPlugin * plugin, const gchar * name, GType type)
     factory = GST_TRACER_FACTORY_CAST (existing_feature);
     factory->type = type;
     existing_feature->loaded = TRUE;
-    //g_type_set_qdata (type, __gst_elementclass_factory, factory);
     gst_object_unref (existing_feature);
     return TRUE;
   }
 
-  factory = g_object_newv (GST_TYPE_TRACER_FACTORY, 0, NULL);
+  factory = g_object_new (GST_TYPE_TRACER_FACTORY, NULL);
   GST_DEBUG_OBJECT (factory, "new tracer factory for %s", name);
 
   gst_plugin_feature_set_name (GST_PLUGIN_FEATURE_CAST (factory), name);
@@ -197,27 +194,3 @@ gst_tracer_register (GstPlugin * plugin, const gchar * name, GType type)
 
   return TRUE;
 }
-
-/* tracing module helpers */
-
-void
-gst_tracer_log_trace (GstStructure * s)
-{
-  GST_TRACE ("%" GST_PTR_FORMAT, s);
-  /* expands to:
-     gst_debug_log_valist (
-     GST_CAT_DEFAULT, GST_LEVEL_TRACE,
-     file, func, line, object
-     "%" GST_PTR_FORMAT, s);
-     // does it make sense to use the {file, line, func} from the tracer hook?
-     // a)
-     // - we'd need to pass them in the macros to gst_tracer_dispatch()
-     // - and each tracer needs to grab them from the va_list and pass them here
-     // b)
-     // - we create a content in dispatch, pass that to the tracer
-     // - and the tracer will pass that here
-     // ideally we also use *our* ts instead of the one that
-     // gst_debug_log_default() will pick
-   */
-  gst_structure_free (s);
-}