mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-01 14:11:15 +00:00
Code Issues 1 Projects Releases Wiki Activity

app: use generic marshallers

Browse source
This commit is contained in:
Tim-Philipp Müller 2016-05-15 14:37:41 +01:00
parent 98c9eb9858
commit 75f3c7cb85
3 changed files with 10 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
gst-libs/gst/app/Makefile.am
View file

@ -6,14 +6,6 @@ glib_gen_basename = gstapp
include $(top_srcdir)/common/gst-glib-gen.mak include $(top_srcdir)/common/gst-glib-gen.mak
built_sources = gstapp-marshal.c
built_headers = gstapp-marshal.h
BUILT_SOURCES = $(built_sources) $(built_headers)
nodist_libgstapp_@GST_API_VERSION@_la_SOURCES = \
$(built_sources)
libgstapp_@GST_API_VERSION@_la_SOURCES = gstappsrc.c gstappsink.c libgstapp_@GST_API_VERSION@_la_SOURCES = gstappsrc.c gstappsink.c
libgstapp_@GST_API_VERSION@_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) \ libgstapp_@GST_API_VERSION@_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) \
$(GST_BASE_CFLAGS) $(GST_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS)
@ -26,10 +18,6 @@ libgstapp_@GST_API_VERSION@include_HEADERS = \
gstappsrc.h \ gstappsrc.h \
gstappsink.h gstappsink.h
CLEANFILES = $(BUILT_SOURCES)
EXTRA_DIST = gstapp-marshal.list
if HAVE_INTROSPECTION if HAVE_INTROSPECTION
BUILT_GIRSOURCES = GstApp-@GST_API_VERSION@.gir BUILT_GIRSOURCES = GstApp-@GST_API_VERSION@.gir
@ -80,5 +68,5 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
--includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \ --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
$(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA) CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA)
endif endif

13
gst-libs/gst/app/gstappsink.c
View file

@ -69,7 +69,6 @@
#include <string.h> #include <string.h>
#include "gstapp-marshal.h"
#include "gstappsink.h" #include "gstappsink.h"
struct _GstAppSinkPrivate struct _GstAppSinkPrivate
@ -259,8 +258,7 @@ gst_app_sink_class_init (GstAppSinkClass * klass)
gst_app_sink_signals[SIGNAL_NEW_PREROLL] = gst_app_sink_signals[SIGNAL_NEW_PREROLL] =
g_signal_new ("new-preroll", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, g_signal_new ("new-preroll", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GstAppSinkClass, new_preroll), G_STRUCT_OFFSET (GstAppSinkClass, new_preroll),
NULL, NULL, __gst_app_marshal_ENUM__VOID, GST_TYPE_FLOW_RETURN, 0, NULL, NULL, NULL, GST_TYPE_FLOW_RETURN, 0, G_TYPE_NONE);
G_TYPE_NONE);
/** /**
* GstAppSink::new-sample: * GstAppSink::new-sample:
* @appsink: the appsink element that emited the signal * @appsink: the appsink element that emited the signal
@ -280,8 +278,7 @@ gst_app_sink_class_init (GstAppSinkClass * klass)
gst_app_sink_signals[SIGNAL_NEW_SAMPLE] = gst_app_sink_signals[SIGNAL_NEW_SAMPLE] =
g_signal_new ("new-sample", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, g_signal_new ("new-sample", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GstAppSinkClass, new_sample), G_STRUCT_OFFSET (GstAppSinkClass, new_sample),
NULL, NULL, __gst_app_marshal_ENUM__VOID, GST_TYPE_FLOW_RETURN, 0, NULL, NULL, NULL, GST_TYPE_FLOW_RETURN, 0, G_TYPE_NONE);
G_TYPE_NONE);
/** /**
* GstAppSink::pull-preroll: * GstAppSink::pull-preroll:
@ -309,8 +306,7 @@ gst_app_sink_class_init (GstAppSinkClass * klass)
gst_app_sink_signals[SIGNAL_PULL_PREROLL] = gst_app_sink_signals[SIGNAL_PULL_PREROLL] =
g_signal_new ("pull-preroll", G_TYPE_FROM_CLASS (klass), g_signal_new ("pull-preroll", G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (GstAppSinkClass, G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (GstAppSinkClass,
pull_preroll), NULL, NULL, __gst_app_marshal_BOXED__VOID, pull_preroll), NULL, NULL, NULL, GST_TYPE_SAMPLE, 0, G_TYPE_NONE);
GST_TYPE_SAMPLE, 0, G_TYPE_NONE);
/** /**
* GstAppSink::pull-sample: * GstAppSink::pull-sample:
* @appsink: the appsink element to emit this signal on * @appsink: the appsink element to emit this signal on
@ -335,8 +331,7 @@ gst_app_sink_class_init (GstAppSinkClass * klass)
gst_app_sink_signals[SIGNAL_PULL_SAMPLE] = gst_app_sink_signals[SIGNAL_PULL_SAMPLE] =
g_signal_new ("pull-sample", G_TYPE_FROM_CLASS (klass), g_signal_new ("pull-sample", G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (GstAppSinkClass, G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (GstAppSinkClass,
pull_sample), NULL, NULL, __gst_app_marshal_BOXED__VOID, pull_sample), NULL, NULL, NULL, GST_TYPE_SAMPLE, 0, G_TYPE_NONE);
GST_TYPE_SAMPLE, 0, G_TYPE_NONE);
gst_element_class_set_static_metadata (element_class, "AppSink", gst_element_class_set_static_metadata (element_class, "AppSink",
"Generic/Sink", "Allow the application to get access to raw buffer", "Generic/Sink", "Allow the application to get access to raw buffer",

12
gst-libs/gst/app/gstappsrc.c
View file

@ -98,7 +98,6 @@
#include <string.h> #include <string.h>
#include "gstapp-marshal.h"
#include "gstappsrc.h" #include "gstappsrc.h"
struct _GstAppSrcPrivate struct _GstAppSrcPrivate
@ -436,7 +435,7 @@ gst_app_src_class_init (GstAppSrcClass * klass)
gst_app_src_signals[SIGNAL_NEED_DATA] = gst_app_src_signals[SIGNAL_NEED_DATA] =
g_signal_new ("need-data", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, g_signal_new ("need-data", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GstAppSrcClass, need_data), G_STRUCT_OFFSET (GstAppSrcClass, need_data),
NULL, NULL, __gst_app_marshal_VOID__UINT, G_TYPE_NONE, 1, G_TYPE_UINT); NULL, NULL, NULL, G_TYPE_NONE, 1, G_TYPE_UINT);
/** /**
* GstAppSrc::enough-data: * GstAppSrc::enough-data:
@ -465,8 +464,7 @@ gst_app_src_class_init (GstAppSrcClass * klass)
gst_app_src_signals[SIGNAL_SEEK_DATA] = gst_app_src_signals[SIGNAL_SEEK_DATA] =
g_signal_new ("seek-data", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, g_signal_new ("seek-data", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GstAppSrcClass, seek_data), G_STRUCT_OFFSET (GstAppSrcClass, seek_data),
NULL, NULL, __gst_app_marshal_BOOLEAN__UINT64, G_TYPE_BOOLEAN, 1, NULL, NULL, NULL, G_TYPE_BOOLEAN, 1, G_TYPE_UINT64);
G_TYPE_UINT64);
/** /**
* GstAppSrc::push-buffer: * GstAppSrc::push-buffer:
@ -483,7 +481,7 @@ gst_app_src_class_init (GstAppSrcClass * klass)
gst_app_src_signals[SIGNAL_PUSH_BUFFER] = gst_app_src_signals[SIGNAL_PUSH_BUFFER] =
g_signal_new ("push-buffer", G_TYPE_FROM_CLASS (klass), g_signal_new ("push-buffer", G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (GstAppSrcClass, G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (GstAppSrcClass,
push_buffer), NULL, NULL, __gst_app_marshal_ENUM__BOXED, push_buffer), NULL, NULL, NULL,
GST_TYPE_FLOW_RETURN, 1, GST_TYPE_BUFFER); GST_TYPE_FLOW_RETURN, 1, GST_TYPE_BUFFER);
/** /**
@ -509,7 +507,7 @@ gst_app_src_class_init (GstAppSrcClass * klass)
gst_app_src_signals[SIGNAL_PUSH_SAMPLE] = gst_app_src_signals[SIGNAL_PUSH_SAMPLE] =
g_signal_new ("push-sample", G_TYPE_FROM_CLASS (klass), g_signal_new ("push-sample", G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (GstAppSrcClass, G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (GstAppSrcClass,
push_sample), NULL, NULL, __gst_app_marshal_ENUM__BOXED, push_sample), NULL, NULL, NULL,
GST_TYPE_FLOW_RETURN, 1, GST_TYPE_SAMPLE); GST_TYPE_FLOW_RETURN, 1, GST_TYPE_SAMPLE);
@ -522,7 +520,7 @@ gst_app_src_class_init (GstAppSrcClass * klass)
gst_app_src_signals[SIGNAL_END_OF_STREAM] = gst_app_src_signals[SIGNAL_END_OF_STREAM] =
g_signal_new ("end-of-stream", G_TYPE_FROM_CLASS (klass), g_signal_new ("end-of-stream", G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (GstAppSrcClass, G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (GstAppSrcClass,
end_of_stream), NULL, NULL, __gst_app_marshal_ENUM__VOID, end_of_stream), NULL, NULL, NULL,
GST_TYPE_FLOW_RETURN, 0, G_TYPE_NONE); GST_TYPE_FLOW_RETURN, 0, G_TYPE_NONE);
gst_element_class_set_static_metadata (element_class, "AppSrc", gst_element_class_set_static_metadata (element_class, "AppSrc",