mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-23 10:11:08 +00:00
Code Issues 1 Projects Releases Wiki Activity

tracer: add a GFlag for the tracer scope

Browse source 
Port all tracers. Add the GST_USE_UNSTABLE_API flag to the internal CFLAGS so
that we don't have to specify this for gir, docs, mkenum, ...
This commit is contained in:
Stefan Sauer 2016-01-16 13:24:16 +01:00
parent 485b15d8a9
commit 89ee5d948d
13 changed files with 55 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
configure.ac
View file

@ -922,8 +922,8 @@ dnl - src and build dirs need to be added because every piece that gets built
dnl will need the GStreamer source and generated headers dnl will need the GStreamer source and generated headers
dnl LIBS: XML doesn't need to be added because we don't explicitly use symbols dnl LIBS: XML doesn't need to be added because we don't explicitly use symbols
dnl from LibXML except for in the core library dnl from LibXML except for in the core library
GST_ALL_CXXFLAGS="-I\$(top_srcdir)/libs -I\$(top_srcdir) -I\$(top_builddir)/libs -I\$(top_builddir) $GLIB_CFLAGS \$(GLIB_EXTRA_CFLAGS) $XML_CFLAGS \$(GST_OPTION_CXXFLAGS) \$(ERROR_CXXFLAGS)" GST_ALL_CXXFLAGS="-I\$(top_srcdir)/libs -I\$(top_srcdir) -I\$(top_builddir)/libs -I\$(top_builddir) $GLIB_CFLAGS \$(GLIB_EXTRA_CFLAGS) $XML_CFLAGS \$(GST_OPTION_CXXFLAGS) \$(ERROR_CXXFLAGS) -DGST_USE_UNSTABLE_API"
GST_ALL_CFLAGS="-I\$(top_srcdir)/libs -I\$(top_srcdir) -I\$(top_builddir)/libs -I\$(top_builddir) $GLIB_CFLAGS \$(GLIB_EXTRA_CFLAGS) $XML_CFLAGS \$(GST_OPTION_CFLAGS) \$(ERROR_CFLAGS)" GST_ALL_CFLAGS="-I\$(top_srcdir)/libs -I\$(top_srcdir) -I\$(top_builddir)/libs -I\$(top_builddir) $GLIB_CFLAGS \$(GLIB_EXTRA_CFLAGS) $XML_CFLAGS \$(GST_OPTION_CFLAGS) \$(ERROR_CFLAGS) -DGST_USE_UNSTABLE_API"
dnl FIXME: check if LTLIBINTL is needed everywhere dnl FIXME: check if LTLIBINTL is needed everywhere
dnl I presume it is given that it contains the symbols that _() stuff maps to dnl I presume it is given that it contains the symbols that _() stuff maps to

2
docs/gst/Makefile.am
View file

@ -75,7 +75,7 @@ extra_files = gst-universe.dot
# CFLAGS and LDFLAGS for compiling scan program. Only needed if your app/lib # CFLAGS and LDFLAGS for compiling scan program. Only needed if your app/lib
# contains GtkObjects/GObjects and you want to document signals and properties. # contains GtkObjects/GObjects and you want to document signals and properties.
GTKDOC_CFLAGS = $(GST_OBJ_CFLAGS) -DGST_USE_UNSTABLE_API GTKDOC_CFLAGS = $(GST_OBJ_CFLAGS)
GTKDOC_LIBS = $(GST_OBJ_LIBS) \ GTKDOC_LIBS = $(GST_OBJ_LIBS) \
$(top_builddir)/gst/libgstreamer-@GST_API_VERSION@.la \ $(top_builddir)/gst/libgstreamer-@GST_API_VERSION@.la \
$(top_builddir)/libs/gst/base/libgstbase-@GST_API_VERSION@.la \ $(top_builddir)/libs/gst/base/libgstbase-@GST_API_VERSION@.la \

1
gst/gst.h
View file

@ -78,6 +78,7 @@
#include <gst/gsttoc.h> #include <gst/gsttoc.h>
#include <gst/gsttocsetter.h> #include <gst/gsttocsetter.h>
#include <gst/gsttracerfactory.h> #include <gst/gsttracerfactory.h>
#include <gst/gsttracerrecord.h>
#include <gst/gsttypefind.h> #include <gst/gsttypefind.h>
#include <gst/gsttypefindfactory.h> #include <gst/gsttypefindfactory.h>
#include <gst/gsturi.h> #include <gst/gsturi.h>

2
gst/gsttracer.c
View file

@ -31,8 +31,6 @@
* Since: 1.8 * Since: 1.8
*/ */
#define GST_USE_UNSTABLE_API
#include "gst_private.h" #include "gst_private.h"
#include "gstenumtypes.h" #include "gstenumtypes.h"
#include "gsttracer.h" #include "gsttracer.h"

2
gst/gsttracerrecord.c
View file

@ -29,8 +29,6 @@
* Since: 1.8 * Since: 1.8
*/ */
#define GST_USE_UNSTABLE_API
#include "gst_private.h" #include "gst_private.h"
#include "gstinfo.h" #include "gstinfo.h"
#include "gststructure.h" #include "gststructure.h"

21
gst/gsttracerrecord.h
View file

@ -52,6 +52,27 @@ void gst_tracer_record_log (GstTracerRecord *self, ...);
G_DEFINE_AUTOPTR_CLEANUP_FUNC(GstTracerRecord, gst_object_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC(GstTracerRecord, gst_object_unref)
#endif #endif
/**
* GstTracerValueScope:
* @GST_TRACER_VALUE_SCOPE_PROCESS: the value is related to the process
* @GST_TRACER_VALUE_SCOPE_THREAD: the value is related to a thread
* @GST_TRACER_VALUE_SCOPE_ELEMENT: the value is related to an #GstElement
* @GST_TRACER_VALUE_SCOPE_PAD: the value is related to a #GstPad
*
* Tracing record will contain fields that contain a meassured value or extra
* meta-data. One such meta data are values that tell where a measurement was
* taken. This enumerating declares to which scope such a meta data field
* relates to. If it is e.g. %GST_TRACER_VALUE_SCOPE_PAD, then each of the log
* events may contain values for different #GstPads.
*/
typedef enum
{
GST_TRACER_VALUE_SCOPE_PROCESS,
GST_TRACER_VALUE_SCOPE_THREAD,
GST_TRACER_VALUE_SCOPE_ELEMENT,
GST_TRACER_VALUE_SCOPE_PAD
} GstTracerValueScope;
G_END_DECLS G_END_DECLS
#endif /* __GST_TRACER_RECORD_H__ */ #endif /* __GST_TRACER_RECORD_H__ */

2
gst/gsttracerutils.c
View file

@ -30,8 +30,6 @@
* to a ';' separated list of tracers. * to a ';' separated list of tracers.
*/ */
#define GST_USE_UNSTABLE_API
#include "gst_private.h" #include "gst_private.h"
#include "gsttracer.h" #include "gsttracer.h"
#include "gsttracerfactory.h" #include "gsttracerfactory.h"

3
plugins/tracers/Makefile.am
View file

@ -23,8 +23,7 @@ libgstcoretracers_la_SOURCES = \
gststats.c \ gststats.c \
gsttracers.c gsttracers.c
libgstcoretracers_la_CFLAGS = $(GST_OBJ_CFLAGS) \ libgstcoretracers_la_CFLAGS = $(GST_OBJ_CFLAGS)
-DGST_USE_UNSTABLE_API
libgstcoretracers_la_LIBADD = \ libgstcoretracers_la_LIBADD = \
$(GST_PRINTF_LA) \ $(GST_PRINTF_LA) \
$(GST_OBJ_LIBS) $(GST_OBJ_LIBS)

5
plugins/tracers/gstlatency.c
View file

@ -38,7 +38,6 @@
#endif #endif
#include "gstlatency.h" #include "gstlatency.h"
#include <gst/gsttracerrecord.h>
GST_DEBUG_CATEGORY_STATIC (gst_latency_debug); GST_DEBUG_CATEGORY_STATIC (gst_latency_debug);
#define GST_CAT_DEFAULT gst_latency_debug #define GST_CAT_DEFAULT gst_latency_debug
@ -207,11 +206,11 @@ gst_latency_tracer_class_init (GstLatencyTracerClass * klass)
tr_latency = gst_tracer_record_new (gst_structure_new ("latency.class", tr_latency = gst_tracer_record_new (gst_structure_new ("latency.class",
"src", GST_TYPE_STRUCTURE, gst_structure_new ("scope", "src", GST_TYPE_STRUCTURE, gst_structure_new ("scope",
"type", G_TYPE_GTYPE, G_TYPE_STRING, "type", G_TYPE_GTYPE, G_TYPE_STRING,
"related-to", G_TYPE_STRING, "pad", /* TODO: use genum */ "related-to", GST_TYPE_TRACER_VALUE_SCOPE, GST_TRACER_VALUE_SCOPE_PAD,
NULL), NULL),
"sink", GST_TYPE_STRUCTURE, gst_structure_new ("scope", "sink", GST_TYPE_STRUCTURE, gst_structure_new ("scope",
"type", G_TYPE_GTYPE, G_TYPE_STRING, "type", G_TYPE_GTYPE, G_TYPE_STRING,
"related-to", G_TYPE_STRING, "pad", /* TODO: use genum */ "related-to", GST_TYPE_TRACER_VALUE_SCOPE, GST_TRACER_VALUE_SCOPE_PAD,
NULL), NULL),
"time", GST_TYPE_STRUCTURE, gst_structure_new ("value", "time", GST_TYPE_STRUCTURE, gst_structure_new ("value",
"type", G_TYPE_GTYPE, G_TYPE_UINT64, "type", G_TYPE_GTYPE, G_TYPE_UINT64,

5
plugins/tracers/gstrusage.c
View file

@ -31,7 +31,6 @@
#include <unistd.h> #include <unistd.h>
#include "gstrusage.h" #include "gstrusage.h"
#include <gst/gsttracerrecord.h>
#ifdef HAVE_SYS_RESOURCE_H #ifdef HAVE_SYS_RESOURCE_H
#ifndef __USE_GNU #ifndef __USE_GNU
@ -288,7 +287,7 @@ gst_rusage_tracer_class_init (GstRUsageTracerClass * klass)
tr_thread = gst_tracer_record_new (gst_structure_new ("thread-rusage.class", tr_thread = gst_tracer_record_new (gst_structure_new ("thread-rusage.class",
"thread-id", GST_TYPE_STRUCTURE, gst_structure_new ("scope", "thread-id", GST_TYPE_STRUCTURE, gst_structure_new ("scope",
"type", G_TYPE_GTYPE, G_TYPE_UINT64, "type", G_TYPE_GTYPE, G_TYPE_UINT64,
"related-to", G_TYPE_STRING, "thread", /* TODO: use genum */ "related-to", GST_TYPE_TRACER_VALUE_SCOPE, GST_TRACER_VALUE_SCOPE_THREAD,
NULL), NULL),
"ts", GST_TYPE_STRUCTURE, gst_structure_new ("value", "ts", GST_TYPE_STRUCTURE, gst_structure_new ("value",
"type", G_TYPE_GTYPE, G_TYPE_UINT64, "type", G_TYPE_GTYPE, G_TYPE_UINT64,
@ -319,7 +318,7 @@ gst_rusage_tracer_class_init (GstRUsageTracerClass * klass)
tr_proc = gst_tracer_record_new (gst_structure_new ("proc-rusage.class", tr_proc = gst_tracer_record_new (gst_structure_new ("proc-rusage.class",
"thread-id", GST_TYPE_STRUCTURE, gst_structure_new ("scope", "thread-id", GST_TYPE_STRUCTURE, gst_structure_new ("scope",
"type", G_TYPE_GTYPE, G_TYPE_UINT64, "type", G_TYPE_GTYPE, G_TYPE_UINT64,
"related-to", G_TYPE_STRING, "process", /* TODO: use genum */ "related-to", GST_TYPE_TRACER_VALUE_SCOPE, GST_TRACER_VALUE_SCOPE_PROCESS,
NULL), NULL),
"ts", GST_TYPE_STRUCTURE, gst_structure_new ("value", "ts", GST_TYPE_STRUCTURE, gst_structure_new ("value",
"type", G_TYPE_GTYPE, G_TYPE_UINT64, "type", G_TYPE_GTYPE, G_TYPE_UINT64,

54
plugins/tracers/gststats.c
View file

@ -30,7 +30,6 @@
#endif #endif
#include "gststats.h" #include "gststats.h"
#include <gst/gsttracerrecord.h>
#include <stdio.h> #include <stdio.h>
@ -520,7 +519,7 @@ gst_stats_tracer_class_init (GstStatsTracerClass * klass)
tr_buffer = gst_tracer_record_new (gst_structure_new ("buffer.class", tr_buffer = gst_tracer_record_new (gst_structure_new ("buffer.class",
"thread-id", GST_TYPE_STRUCTURE, gst_structure_new ("scope", "thread-id", GST_TYPE_STRUCTURE, gst_structure_new ("scope",
"type", G_TYPE_GTYPE, G_TYPE_UINT64, "type", G_TYPE_GTYPE, G_TYPE_UINT64,
"related-to", G_TYPE_STRING, "thread", /* TODO use genum */ "related-to", GST_TYPE_TRACER_VALUE_SCOPE, GST_TRACER_VALUE_SCOPE_THREAD,
NULL), NULL),
"ts", GST_TYPE_STRUCTURE, gst_structure_new ("value", "ts", GST_TYPE_STRUCTURE, gst_structure_new ("value",
"type", G_TYPE_GTYPE, G_TYPE_UINT64, "type", G_TYPE_GTYPE, G_TYPE_UINT64,
@ -528,19 +527,19 @@ gst_stats_tracer_class_init (GstStatsTracerClass * klass)
NULL), NULL),
"pad-ix", GST_TYPE_STRUCTURE, gst_structure_new ("scope", "pad-ix", GST_TYPE_STRUCTURE, gst_structure_new ("scope",
"type", G_TYPE_GTYPE, G_TYPE_UINT, "type", G_TYPE_GTYPE, G_TYPE_UINT,
"related-to", G_TYPE_STRING, "pad", /* TODO: use genum */ "related-to", GST_TYPE_TRACER_VALUE_SCOPE, GST_TRACER_VALUE_SCOPE_PAD,
NULL), NULL),
"element-ix", GST_TYPE_STRUCTURE, gst_structure_new ("scope", "element-ix", GST_TYPE_STRUCTURE, gst_structure_new ("scope",
"type", G_TYPE_GTYPE, G_TYPE_UINT, "type", G_TYPE_GTYPE, G_TYPE_UINT,
"related-to", G_TYPE_STRING, "element", /* TODO: use genum */ "related-to", GST_TYPE_TRACER_VALUE_SCOPE, GST_TRACER_VALUE_SCOPE_ELEMENT,
NULL), NULL),
"peer-pad-ix", GST_TYPE_STRUCTURE, gst_structure_new ("scope", "peer-pad-ix", GST_TYPE_STRUCTURE, gst_structure_new ("scope",
"type", G_TYPE_GTYPE, G_TYPE_UINT, "type", G_TYPE_GTYPE, G_TYPE_UINT,
"related-to", G_TYPE_STRING, "pad", /* TODO: use genum */ "related-to", GST_TYPE_TRACER_VALUE_SCOPE, GST_TRACER_VALUE_SCOPE_PAD,
NULL), NULL),
"peer-element-ix", GST_TYPE_STRUCTURE, gst_structure_new ("scope", "peer-element-ix", GST_TYPE_STRUCTURE, gst_structure_new ("scope",
"type", G_TYPE_GTYPE, G_TYPE_UINT, "type", G_TYPE_GTYPE, G_TYPE_UINT,
"related-to", G_TYPE_STRING, "element", /* TODO: use genum */ "related-to", GST_TYPE_TRACER_VALUE_SCOPE, GST_TRACER_VALUE_SCOPE_ELEMENT,
NULL), NULL),
"buffer-size", GST_TYPE_STRUCTURE, gst_structure_new ("value", "buffer-size", GST_TYPE_STRUCTURE, gst_structure_new ("value",
"type", G_TYPE_GTYPE, G_TYPE_UINT, "type", G_TYPE_GTYPE, G_TYPE_UINT,
@ -568,7 +567,7 @@ gst_stats_tracer_class_init (GstStatsTracerClass * klass)
tr_event = gst_tracer_record_new (gst_structure_new ("event.class", tr_event = gst_tracer_record_new (gst_structure_new ("event.class",
"thread-id", GST_TYPE_STRUCTURE, gst_structure_new ("scope", "thread-id", GST_TYPE_STRUCTURE, gst_structure_new ("scope",
"type", G_TYPE_GTYPE, G_TYPE_UINT64, "type", G_TYPE_GTYPE, G_TYPE_UINT64,
"related-to", G_TYPE_STRING, "thread", /* TODO use genum */ "related-to", GST_TYPE_TRACER_VALUE_SCOPE, GST_TRACER_VALUE_SCOPE_THREAD,
NULL), NULL),
"ts", GST_TYPE_STRUCTURE, gst_structure_new ("value", "ts", GST_TYPE_STRUCTURE, gst_structure_new ("value",
"type", G_TYPE_GTYPE, G_TYPE_UINT64, "type", G_TYPE_GTYPE, G_TYPE_UINT64,
@ -576,11 +575,11 @@ gst_stats_tracer_class_init (GstStatsTracerClass * klass)
NULL), NULL),
"pad-ix", GST_TYPE_STRUCTURE, gst_structure_new ("scope", "pad-ix", GST_TYPE_STRUCTURE, gst_structure_new ("scope",
"type", G_TYPE_GTYPE, G_TYPE_UINT, "type", G_TYPE_GTYPE, G_TYPE_UINT,
"related-to", G_TYPE_STRING, "pad", /* TODO: use genum */ "related-to", GST_TYPE_TRACER_VALUE_SCOPE, GST_TRACER_VALUE_SCOPE_PAD,
NULL), NULL),
"element-ix", GST_TYPE_STRUCTURE, gst_structure_new ("scope", "element-ix", GST_TYPE_STRUCTURE, gst_structure_new ("scope",
"type", G_TYPE_GTYPE, G_TYPE_UINT, "type", G_TYPE_GTYPE, G_TYPE_UINT,
"related-to", G_TYPE_STRING, "element", /* TODO: use genum */ "related-to", GST_TYPE_TRACER_VALUE_SCOPE, GST_TRACER_VALUE_SCOPE_ELEMENT,
NULL), NULL),
"name", GST_TYPE_STRUCTURE, gst_structure_new ("value", "name", GST_TYPE_STRUCTURE, gst_structure_new ("value",
"type", G_TYPE_GTYPE, G_TYPE_STRING, "type", G_TYPE_GTYPE, G_TYPE_STRING,
@ -591,7 +590,7 @@ gst_stats_tracer_class_init (GstStatsTracerClass * klass)
tr_message = gst_tracer_record_new (gst_structure_new ("message.class", tr_message = gst_tracer_record_new (gst_structure_new ("message.class",
"thread-id", GST_TYPE_STRUCTURE, gst_structure_new ("scope", "thread-id", GST_TYPE_STRUCTURE, gst_structure_new ("scope",
"type", G_TYPE_GTYPE, G_TYPE_UINT64, "type", G_TYPE_GTYPE, G_TYPE_UINT64,
"related-to", G_TYPE_STRING, "thread", /* TODO use genum */ "related-to", GST_TYPE_TRACER_VALUE_SCOPE, GST_TRACER_VALUE_SCOPE_THREAD,
NULL), NULL),
"ts", GST_TYPE_STRUCTURE, gst_structure_new ("value", "ts", GST_TYPE_STRUCTURE, gst_structure_new ("value",
"type", G_TYPE_GTYPE, G_TYPE_UINT64, "type", G_TYPE_GTYPE, G_TYPE_UINT64,
@ -599,7 +598,7 @@ gst_stats_tracer_class_init (GstStatsTracerClass * klass)
NULL), NULL),
"element-ix", GST_TYPE_STRUCTURE, gst_structure_new ("scope", "element-ix", GST_TYPE_STRUCTURE, gst_structure_new ("scope",
"type", G_TYPE_GTYPE, G_TYPE_UINT, "type", G_TYPE_GTYPE, G_TYPE_UINT,
"related-to", G_TYPE_STRING, "element", /* TODO: use genum */ "related-to", GST_TYPE_TRACER_VALUE_SCOPE, GST_TRACER_VALUE_SCOPE_ELEMENT,
NULL), NULL),
"name", GST_TYPE_STRUCTURE, gst_structure_new ("value", "name", GST_TYPE_STRUCTURE, gst_structure_new ("value",
"type", G_TYPE_GTYPE, G_TYPE_STRING, "type", G_TYPE_GTYPE, G_TYPE_STRING,
@ -615,7 +614,7 @@ gst_stats_tracer_class_init (GstStatsTracerClass * klass)
"element-query.class", "element-query.class",
"thread-id", GST_TYPE_STRUCTURE, gst_structure_new ("scope", "thread-id", GST_TYPE_STRUCTURE, gst_structure_new ("scope",
"type", G_TYPE_GTYPE, G_TYPE_UINT64, "type", G_TYPE_GTYPE, G_TYPE_UINT64,
"related-to", G_TYPE_STRING, "thread", /* TODO use genum */ "related-to", GST_TYPE_TRACER_VALUE_SCOPE, GST_TRACER_VALUE_SCOPE_THREAD,
NULL), NULL),
"ts", GST_TYPE_STRUCTURE, gst_structure_new ("value", "ts", GST_TYPE_STRUCTURE, gst_structure_new ("value",
"type", G_TYPE_GTYPE, G_TYPE_UINT64, "type", G_TYPE_GTYPE, G_TYPE_UINT64,
@ -623,18 +622,17 @@ gst_stats_tracer_class_init (GstStatsTracerClass * klass)
NULL), NULL),
"element-ix", GST_TYPE_STRUCTURE, gst_structure_new ("scope", "element-ix", GST_TYPE_STRUCTURE, gst_structure_new ("scope",
"type", G_TYPE_GTYPE, G_TYPE_UINT, "type", G_TYPE_GTYPE, G_TYPE_UINT,
"related-to", G_TYPE_STRING, "element", /* TODO: use genum */ "related-to", GST_TYPE_TRACER_VALUE_SCOPE, GST_TRACER_VALUE_SCOPE_ELEMENT,
NULL), NULL),
"name", GST_TYPE_STRUCTURE, gst_structure_new ("value", "name", GST_TYPE_STRUCTURE, gst_structure_new ("value",
"type", G_TYPE_GTYPE, G_TYPE_STRING, "type", G_TYPE_GTYPE, G_TYPE_STRING,
"description", G_TYPE_STRING, "name of the query", "description", G_TYPE_STRING, "name of the query",
"flags", G_TYPE_STRING, "", /* TODO: use gflags */
NULL), NULL),
NULL)); NULL));
tr_query = gst_tracer_record_new (gst_structure_new ("query.class", tr_query = gst_tracer_record_new (gst_structure_new ("query.class",
"thread-id", GST_TYPE_STRUCTURE, gst_structure_new ("scope", "thread-id", GST_TYPE_STRUCTURE, gst_structure_new ("scope",
"type", G_TYPE_GTYPE, G_TYPE_UINT64, "type", G_TYPE_GTYPE, G_TYPE_UINT64,
"related-to", G_TYPE_STRING, "thread", /* TODO use genum */ "related-to", GST_TYPE_TRACER_VALUE_SCOPE, GST_TRACER_VALUE_SCOPE_THREAD,
NULL), NULL),
"ts", GST_TYPE_STRUCTURE, gst_structure_new ("value", "ts", GST_TYPE_STRUCTURE, gst_structure_new ("value",
"type", G_TYPE_GTYPE, G_TYPE_UINT64, "type", G_TYPE_GTYPE, G_TYPE_UINT64,
@ -642,29 +640,27 @@ gst_stats_tracer_class_init (GstStatsTracerClass * klass)
NULL), NULL),
"pad-ix", GST_TYPE_STRUCTURE, gst_structure_new ("scope", "pad-ix", GST_TYPE_STRUCTURE, gst_structure_new ("scope",
"type", G_TYPE_GTYPE, G_TYPE_UINT, "type", G_TYPE_GTYPE, G_TYPE_UINT,
"related-to", G_TYPE_STRING, "pad", /* TODO: use genum */ "related-to", GST_TYPE_TRACER_VALUE_SCOPE, GST_TRACER_VALUE_SCOPE_PAD,
NULL), NULL),
"element-ix", GST_TYPE_STRUCTURE, gst_structure_new ("scope", "element-ix", GST_TYPE_STRUCTURE, gst_structure_new ("scope",
"type", G_TYPE_GTYPE, G_TYPE_UINT, "type", G_TYPE_GTYPE, G_TYPE_UINT,
"related-to", G_TYPE_STRING, "element", /* TODO: use genum */ "related-to", GST_TYPE_TRACER_VALUE_SCOPE, GST_TRACER_VALUE_SCOPE_ELEMENT,
NULL), NULL),
"peer-pad-ix", GST_TYPE_STRUCTURE, gst_structure_new ("scope", "peer-pad-ix", GST_TYPE_STRUCTURE, gst_structure_new ("scope",
"type", G_TYPE_GTYPE, G_TYPE_UINT, "type", G_TYPE_GTYPE, G_TYPE_UINT,
"related-to", G_TYPE_STRING, "pad", /* TODO: use genum */ "related-to", GST_TYPE_TRACER_VALUE_SCOPE, GST_TRACER_VALUE_SCOPE_PAD,
NULL), NULL),
"peer-element-ix", GST_TYPE_STRUCTURE, gst_structure_new ("scope", "peer-element-ix", GST_TYPE_STRUCTURE, gst_structure_new ("scope",
"type", G_TYPE_GTYPE, G_TYPE_UINT, "type", G_TYPE_GTYPE, G_TYPE_UINT,
"related-to", G_TYPE_STRING, "element", /* TODO: use genum */ "related-to", GST_TYPE_TRACER_VALUE_SCOPE, GST_TRACER_VALUE_SCOPE_ELEMENT,
NULL), NULL),
"name", GST_TYPE_STRUCTURE, gst_structure_new ("value", "name", GST_TYPE_STRUCTURE, gst_structure_new ("value",
"type", G_TYPE_GTYPE, G_TYPE_STRING, "type", G_TYPE_GTYPE, G_TYPE_STRING,
"description", G_TYPE_STRING, "name of the query", "description", G_TYPE_STRING, "name of the query",
"flags", G_TYPE_STRING, "", /* TODO: use gflags */
NULL), NULL),
"structure", GST_TYPE_STRUCTURE, gst_structure_new ("value", "structure", GST_TYPE_STRUCTURE, gst_structure_new ("value",
"type", G_TYPE_GTYPE, GST_TYPE_STRUCTURE, "type", G_TYPE_GTYPE, GST_TYPE_STRUCTURE,
"description", G_TYPE_STRING, "query structure", "description", G_TYPE_STRING, "query structure",
"flags", G_TYPE_STRING, "", /* TODO: use gflags */
NULL), NULL),
"have-res", GST_TYPE_STRUCTURE, gst_structure_new ("value", "have-res", GST_TYPE_STRUCTURE, gst_structure_new ("value",
"type", G_TYPE_GTYPE, G_TYPE_BOOLEAN, "type", G_TYPE_GTYPE, G_TYPE_BOOLEAN,
@ -680,7 +676,7 @@ gst_stats_tracer_class_init (GstStatsTracerClass * klass)
"new-element.class", "new-element.class",
"thread-id", GST_TYPE_STRUCTURE, gst_structure_new ("scope", "thread-id", GST_TYPE_STRUCTURE, gst_structure_new ("scope",
"type", G_TYPE_GTYPE, G_TYPE_UINT64, "type", G_TYPE_GTYPE, G_TYPE_UINT64,
"related-to", G_TYPE_STRING, "thread", /* TODO use genum */ "related-to", GST_TYPE_TRACER_VALUE_SCOPE, GST_TRACER_VALUE_SCOPE_THREAD,
NULL), NULL),
"ts", GST_TYPE_STRUCTURE, gst_structure_new ("value", "ts", GST_TYPE_STRUCTURE, gst_structure_new ("value",
"type", G_TYPE_GTYPE, G_TYPE_UINT64, "type", G_TYPE_GTYPE, G_TYPE_UINT64,
@ -688,21 +684,19 @@ gst_stats_tracer_class_init (GstStatsTracerClass * klass)
NULL), NULL),
"ix", GST_TYPE_STRUCTURE, gst_structure_new ("scope", "ix", GST_TYPE_STRUCTURE, gst_structure_new ("scope",
"type", G_TYPE_GTYPE, G_TYPE_UINT, "type", G_TYPE_GTYPE, G_TYPE_UINT,
"related-to", G_TYPE_STRING, "element", /* TODO: use genum */ "related-to", GST_TYPE_TRACER_VALUE_SCOPE, GST_TRACER_VALUE_SCOPE_ELEMENT,
NULL), NULL),
"parent-ix", GST_TYPE_STRUCTURE, gst_structure_new ("scope", "parent-ix", GST_TYPE_STRUCTURE, gst_structure_new ("scope",
"type", G_TYPE_GTYPE, G_TYPE_UINT, "type", G_TYPE_GTYPE, G_TYPE_UINT,
"related-to", G_TYPE_STRING, "element", /* TODO: use genum */ "related-to", GST_TYPE_TRACER_VALUE_SCOPE, GST_TRACER_VALUE_SCOPE_ELEMENT,
NULL), NULL),
"name", GST_TYPE_STRUCTURE, gst_structure_new ("value", "name", GST_TYPE_STRUCTURE, gst_structure_new ("value",
"type", G_TYPE_GTYPE, G_TYPE_STRING, "type", G_TYPE_GTYPE, G_TYPE_STRING,
"description", G_TYPE_STRING, "name of the element", "description", G_TYPE_STRING, "name of the element",
"flags", G_TYPE_STRING, "", /* TODO: use gflags */
NULL), NULL),
"type", GST_TYPE_STRUCTURE, gst_structure_new ("value", "type", GST_TYPE_STRUCTURE, gst_structure_new ("value",
"type", G_TYPE_GTYPE, G_TYPE_STRING, "type", G_TYPE_GTYPE, G_TYPE_STRING,
"description", G_TYPE_STRING, "type name of the element", "description", G_TYPE_STRING, "type name of the element",
"flags", G_TYPE_STRING, "", /* TODO: use gflags */
NULL), NULL),
"is-bin", GST_TYPE_STRUCTURE, gst_structure_new ("value", "is-bin", GST_TYPE_STRUCTURE, gst_structure_new ("value",
"type", G_TYPE_GTYPE, G_TYPE_BOOLEAN, "type", G_TYPE_GTYPE, G_TYPE_BOOLEAN,
@ -712,25 +706,23 @@ gst_stats_tracer_class_init (GstStatsTracerClass * klass)
tr_new_pad = gst_tracer_record_new (gst_structure_new ("new-pad.class", tr_new_pad = gst_tracer_record_new (gst_structure_new ("new-pad.class",
"thread-id", GST_TYPE_STRUCTURE, gst_structure_new ("scope", "thread-id", GST_TYPE_STRUCTURE, gst_structure_new ("scope",
"type", G_TYPE_GTYPE, G_TYPE_UINT64, "type", G_TYPE_GTYPE, G_TYPE_UINT64,
"related-to", G_TYPE_STRING, "thread", /* TODO use genum */ "related-to", GST_TYPE_TRACER_VALUE_SCOPE, GST_TRACER_VALUE_SCOPE_THREAD,
NULL), NULL),
"ix", GST_TYPE_STRUCTURE, gst_structure_new ("scope", "ix", GST_TYPE_STRUCTURE, gst_structure_new ("scope",
"type", G_TYPE_GTYPE, G_TYPE_UINT, "type", G_TYPE_GTYPE, G_TYPE_UINT,
"related-to", G_TYPE_STRING, "pad", /* TODO: use genum */ "related-to", GST_TYPE_TRACER_VALUE_SCOPE, GST_TRACER_VALUE_SCOPE_PAD,
NULL), NULL),
"parent-ix", GST_TYPE_STRUCTURE, gst_structure_new ("scope", "parent-ix", GST_TYPE_STRUCTURE, gst_structure_new ("scope",
"type", G_TYPE_GTYPE, G_TYPE_UINT, "type", G_TYPE_GTYPE, G_TYPE_UINT,
"related-to", G_TYPE_STRING, "element", /* TODO: use genum */ "related-to", GST_TYPE_TRACER_VALUE_SCOPE, GST_TRACER_VALUE_SCOPE_ELEMENT,
NULL), NULL),
"name", GST_TYPE_STRUCTURE, gst_structure_new ("value", "name", GST_TYPE_STRUCTURE, gst_structure_new ("value",
"type", G_TYPE_GTYPE, G_TYPE_STRING, "type", G_TYPE_GTYPE, G_TYPE_STRING,
"description", G_TYPE_STRING, "name of the pad", "description", G_TYPE_STRING, "name of the pad",
"flags", G_TYPE_STRING, "", /* TODO: use gflags */
NULL), NULL),
"type", GST_TYPE_STRUCTURE, gst_structure_new ("value", "type", GST_TYPE_STRUCTURE, gst_structure_new ("value",
"type", G_TYPE_GTYPE, G_TYPE_STRING, "type", G_TYPE_GTYPE, G_TYPE_STRING,
"description", G_TYPE_STRING, "type name of the pad", "description", G_TYPE_STRING, "type name of the pad",
"flags", G_TYPE_STRING, "", /* TODO: use gflags */
NULL), NULL),
"is-ghostpad", GST_TYPE_STRUCTURE, gst_structure_new ("value", "is-ghostpad", GST_TYPE_STRUCTURE, gst_structure_new ("value",
"type", G_TYPE_GTYPE, G_TYPE_BOOLEAN, "type", G_TYPE_GTYPE, G_TYPE_BOOLEAN,

2
tests/check/Makefile.am
View file

@ -207,7 +207,7 @@ gst_gstcpp_SOURCES = gst/gstcpp.cc
libs_gstlibscpp_SOURCES = libs/gstlibscpp.cc libs_gstlibscpp_SOURCES = libs/gstlibscpp.cc
gst_gsttracerrecord_CFLAGS = $(GST_OBJ_CFLAGS) $(AM_CFLAGS) -DGST_USE_UNSTABLE_API gst_gsttracerrecord_CFLAGS = $(GST_OBJ_CFLAGS) $(AM_CFLAGS)
gst_gstutils_LDADD = $(LDADD) $(GSL_LIBS) $(GMP_LIBS) gst_gstutils_LDADD = $(LDADD) $(GSL_LIBS) $(GMP_LIBS)

1
win32/common/libgstreamer.def
View file

@ -1395,6 +1395,7 @@ EXPORTS
gst_tracer_record_log gst_tracer_record_log
gst_tracer_record_new gst_tracer_record_new
gst_tracer_register gst_tracer_register
gst_tracer_value_scope_get_type
gst_tracing_register_hook gst_tracing_register_hook
gst_type_find_factory_call_function gst_type_find_factory_call_function
gst_type_find_factory_get_caps gst_type_find_factory_get_caps