tracer/gststats: fix mismatch between '.class' and tracer args
authorStefan Sauer <ensonic@users.sf.net>
Mon, 18 Jan 2016 20:09:49 +0000 (21:09 +0100)
committerStefan Sauer <ensonic@users.sf.net>
Wed, 20 Jan 2016 08:14:12 +0000 (09:14 +0100)
Clean up from the recent changes. The logging descriptiors did not match what we logged.

plugins/tracers/gststats.c
tools/gst-stats.c

index 52ee091..52aa456 100644 (file)
@@ -549,9 +549,15 @@ gst_stats_tracer_class_init (GstStatsTracerClass * klass)
           "min", G_TYPE_UINT, 0,
           "max", G_TYPE_UINT, G_MAXUINT,
           NULL),
-      "buffer-ts", GST_TYPE_STRUCTURE, gst_structure_new ("value",
+      "buffer-pts", GST_TYPE_STRUCTURE, gst_structure_new ("value",
           "type", G_TYPE_GTYPE, G_TYPE_UINT64,
-          "description", G_TYPE_STRING, "timestamp of the buffer in ns",
+          "description", G_TYPE_STRING, "presentation timestamp of the buffer in ns",
+          "min", G_TYPE_UINT64, G_GUINT64_CONSTANT (0),
+          "max", G_TYPE_UINT64, G_MAXUINT64,
+          NULL),
+      "buffer-dts", GST_TYPE_STRUCTURE, gst_structure_new ("value",
+          "type", G_TYPE_GTYPE, G_TYPE_UINT64,
+          "description", G_TYPE_STRING, "decoding timestamp of the buffer in ns",
           "min", G_TYPE_UINT64, G_GUINT64_CONSTANT (0),
           "max", G_TYPE_UINT64, G_MAXUINT64,
           NULL),
@@ -561,7 +567,10 @@ gst_stats_tracer_class_init (GstStatsTracerClass * klass)
           "min", G_TYPE_UINT64, G_GUINT64_CONSTANT (0),
           "max", G_TYPE_UINT64, G_MAXUINT64,
           NULL),
-      /* TODO(ensonic): "buffer-flags" */
+      "buffer-flags", GST_TYPE_STRUCTURE, gst_structure_new ("value",
+          "type", G_TYPE_GTYPE, GST_TYPE_BUFFER_FLAGS,
+          "description", G_TYPE_STRING, "flags of the buffer",
+          NULL),
       NULL));
   tr_event = gst_tracer_record_new (gst_structure_new ("event.class",
       "thread-id", GST_TYPE_STRUCTURE, gst_structure_new ("scope",
index f663a65..a9b1918 100644 (file)
@@ -291,7 +291,7 @@ do_buffer_stats (GstStructure * s)
   gst_structure_get (s, "ts", G_TYPE_UINT64, &ts,
       "pad-ix", G_TYPE_UINT, &pad_ix,
       "element-ix", G_TYPE_UINT, &elem_ix,
-      "peer-elem-ix", G_TYPE_UINT, &peer_elem_ix,
+      "peer-element-ix", G_TYPE_UINT, &peer_elem_ix,
       "buffer-size", G_TYPE_UINT, &size,
       "buffer-pts", G_TYPE_UINT64, &buffer_pts,
       "buffer-duration", G_TYPE_UINT64, &buffer_dur,