[gstreamermm] Added appsrc and appsink plug-ins.
- From: José Alburquerque <jaalburqu src gnome org>
- To: svn-commits-list gnome org
- Subject: [gstreamermm] Added appsrc and appsink plug-ins.
- Date: Thu, 18 Jun 2009 01:53:13 -0400 (EDT)
commit 82bc4f8c6c0c7555c4dbeb673b095cf9b3dac669
Author: José Alburquerque <jaalburqu svn gnome org>
Date: Thu Jun 18 01:47:24 2009 -0400
Added appsrc and appsink plug-ins.
ChangeLog | 33 +
configure.ac | 9 +-
gstreamer/src/Makefile_list_of_hg.am_fragment | 3 +-
gstreamer/src/generate-docs.sh | 4 +-
gstreamer/src/generate-enums.sh | 4 +-
gstreamer/src/generate-extra-defs.sh | 2 +-
gstreamer/src/generate-methods.sh | 6 +-
gstreamer/src/gst_enums.defs | 81 ++-
gstreamer/src/gst_enums.defs.patch | 106 ++--
gstreamer/src/gst_signals.defs | 637 ++++++++++++++------
gstreamer/src/gst_signals.defs.patch | 76 +---
tools/extra_defs_gen/generate_defs_gst.cc | 279 +++++-----
.../extra_defs_gen/generate_plugin_gmmproc_file.cc | 2 +-
tools/extra_defs_gen/get_plugin_defs.cc | 5 +-
tools/extra_defs_gen/get_plugin_defs.h | 3 +-
tools/m4/ctocpp_gstreamermm.m4 | 1 +
16 files changed, 751 insertions(+), 500 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index d49242a..b0b38ca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,36 @@
+2009-06-18 José Alburquerque <jaalburqu svn gnome org>
+
+ * configure.ac:
+ * gstreamer/src/Makefile_list_of_hg.am_fragment: Added appsrc and
+ appsink plug-ins.
+ * tools/m4/ctocpp_gstreamermm.m4: Added a translation needed for the
+ plug-in generation.
+
+ * tools/extra_defs_gen/get_plugin_defs.cc:
+ * tools/extra_defs_gen/get_plugin_defs.h:
+ * tools/extra_defs_gen/generate_defs_gst.cc: Modified defs generation
+ utilities to supply a custom is_a_pointer() function to glibmm's defs
+ generation utility so GstMiniObject derived types are identified
+ correctly as pointer types.
+
+ * tools/extra_defs_gen/generate_plugin_gmmproc_file.cc: Corrected
+ alphabetical order of wrapped enums.
+
+ * gstreamer/src/generate-docs.sh:
+ * gstreamer/src/generate-enums.sh:
+ * gstreamer/src/generate-extra-defs.sh:
+ * gstreamer/src/generate-methods.sh: Updated generation scripts to
+ include directories for appsrc and appsink plug-ins. Also modified
+ them to use /bin/bash instead of /bin/sh because expanding
+ arguments with '{..}' is recently not working right with /bin/sh.
+
+ * gstreamer/src/gst_enums.defs:
+ * gstreamer/src/gst_enums.defs.patch:
+ * gstreamer/src/gst_signals.defs:
+ * gstreamer/src/gst_signals.defs.patch: Regenerated enums and signals
+ and corrected their patch files now that GstMiniObject types are
+ correctly identified as pointer types.
+
2009-06-09 José Alburquerque <jaalburqu svn gnome org>
* gstreamer/src/structure.ccg: Use reinterpret_cast<> to cast a GValue
diff --git a/configure.ac b/configure.ac
index 1c105c3..42dfcf9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -187,10 +187,11 @@ AC_SUBST(GST_INSPECT)
GSTREAMERMM_ALL_PLUGIN_DEFS="capsfilter=CapsFilter fakesrc=FakeSrc \
fakesink=FakeSink fdsink=FdSink fdsrc=FdSrc filesrc=FileSrc filesink=FileSink \
identity=Identity multiqueue=MultiQueue queue=Queue tee=Tee \
-typefind=TypeFindElement adder=Adder alsamixer=AlsaMixer alsasink=AlsaSink \
-alsasrc=AlsaSrc audioconvert=AudioConvert audioresample=AudioResample \
-audiotestsrc=AudioTestSrc cdparanoiasrc=CdParanoiaSrc \
-clockoverlay=ClockOverlay decodebin=DecodeBin \
+typefind=TypeFindElement \
+adder=Adder alsamixer=AlsaMixer alsasink=AlsaSink alsasrc=AlsaSrc \
+appsrc=AppSrc appsink=AppSink audioconvert=AudioConvert \
+audioresample=AudioResample audiotestsrc=AudioTestSrc \
+cdparanoiasrc=CdParanoiaSrc clockoverlay=ClockOverlay decodebin=DecodeBin \
ffmpegcolorspace=FfmpegColorSpace gdpdepay=GDPDepay gdppay=GDPPay \
giosink=GioSink giosrc=GioSrc giostreamsink=GioStreamSink \
giostreamsrc=GioStreamSrc oggdemux=OggDemux oggmux=OggMux \
diff --git a/gstreamer/src/Makefile_list_of_hg.am_fragment b/gstreamer/src/Makefile_list_of_hg.am_fragment
index e6005d1..390ca72 100644
--- a/gstreamer/src/Makefile_list_of_hg.am_fragment
+++ b/gstreamer/src/Makefile_list_of_hg.am_fragment
@@ -35,7 +35,8 @@ files_general_deprecated_hg =
files_all_plugin_hg = capsfilter.hg fakesrc.hg fakesink.hg fdsink.hg fdsrc.hg \
filesrc.hg filesink.hg identity.hg multiqueue.hg queue.hg \
tee.hg typefindelement.hg \
- adder.hg alsamixer.hg alsasink.hg alsasrc.hg \
+ adder.hg alsamixer.hg alsasink.hg alsasrc.hg appsrc.hg \
+ appsink.hg \
audioconvert.hg audioresample.hg audiotestsrc.hg \
cdparanoiasrc.hg clockoverlay.hg decodebin.hg \
ffmpegcolorspace.hg gdpdepay.hg gdppay.hg giosink.hg \
diff --git a/gstreamer/src/generate-docs.sh b/gstreamer/src/generate-docs.sh
index 92da684..bc52fe1 100755
--- a/gstreamer/src/generate-docs.sh
+++ b/gstreamer/src/generate-docs.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
# Note that docextract_to_xml.py should be in PATH for this script to work and
# JHBUILD_SOURCES should be defined to contain the path to the root of the
@@ -17,7 +17,7 @@ DIR=`dirname "$0"`
PARAMS="-s $PREFIX/gstreamer/gst/ -s $PREFIX/gst-plugins-base/docs/libs/tmpl"
for dir in "$PREFIX"/gstreamer/libs/gst/{base,controller,dataprotocol,net,\
-check} "$PREFIX"/gst-plugins-base/gst-libs/gst/{audio,cdda,fft,floatcast,\
+check} "$PREFIX"/gst-plugins-base/gst-libs/gst/{app,audio,cdda,fft,floatcast,\
interfaces,netbuffer,riff,rtp,rtsp,sdp,tag,pbutils,video}; do
PARAMS="$PARAMS -s $dir"
done
diff --git a/gstreamer/src/generate-enums.sh b/gstreamer/src/generate-enums.sh
index 60abfcb..63bb9d2 100755
--- a/gstreamer/src/generate-enums.sh
+++ b/gstreamer/src/generate-enums.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
# Note that enum.pl should be in PATH for this script to work and
# JHBUILD_SOURCES should be defined to contain the path to the root of the
@@ -18,7 +18,7 @@ enum.pl "$PREFIX"/gst/*.h "$PREFIX"/libs/gst/{base,controller,dataprotocol,\
net,check}/*.h "$PREFIX"/plugins/elements/*.h > "$DIR/gst_enums.defs"
PREFIX="$JHBUILD_SOURCES/gst-plugins-base"
-enum.pl "$PREFIX"/gst-libs/gst/{audio,cdda,fft,floatcast,interfaces,netbuffer,\
+enum.pl "$PREFIX"/gst-libs/gst/{app,audio,cdda,fft,floatcast,interfaces,netbuffer,\
riff,rtp,rtsp,sdp,tag,pbutils,video}/*.h "$PREFIX"/gst/*/*.h \
"$PREFIX"/ext/*/*.h >> "$DIR/gst_enums.defs"
diff --git a/gstreamer/src/generate-extra-defs.sh b/gstreamer/src/generate-extra-defs.sh
index 3399442..ac774cc 100755
--- a/gstreamer/src/generate-extra-defs.sh
+++ b/gstreamer/src/generate-extra-defs.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
# Note that script assumes it resides in the gstreamermm/gstreamer/src
# directory.
diff --git a/gstreamer/src/generate-methods.sh b/gstreamer/src/generate-methods.sh
index ffdc43f..94b3654 100755
--- a/gstreamer/src/generate-methods.sh
+++ b/gstreamer/src/generate-methods.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
# Note that h2def.py should be in PATH for this script to work and
# JHBUILD_SOURCES should be defined to contain the path to the root of the
@@ -18,8 +18,8 @@ h2def.py "$PREFIX"/gst/*.h "$PREFIX"/libs/gst/{base,controller,dataprotocol,\
net,check}/*.h > "$DIR/gst_methods.defs"
PREFIX="$JHBUILD_SOURCES/gst-plugins-base"
-h2def.py "$PREFIX"/gst-libs/gst/{audio,cdda,fft,floatcast,interfaces,netbuffer,\
-riff,rtp,rtsp,sdp,tag,pbutils,video}/*.h >> "$DIR/gst_methods.defs"
+h2def.py "$PREFIX"/gst-libs/gst/{app,audio,cdda,fft,floatcast,interfaces,\
+netbuffer,riff,rtp,rtsp,sdp,tag,pbutils,video}/*.h >> "$DIR/gst_methods.defs"
#Patch generated file.
patch $DIR/gst_methods.defs $DIR/gst_methods.defs.patch
diff --git a/gstreamer/src/gst_enums.defs b/gstreamer/src/gst_enums.defs
index afaa8f0..77204cc 100644
--- a/gstreamer/src/gst_enums.defs
+++ b/gstreamer/src/gst_enums.defs
@@ -461,6 +461,7 @@
'("async-start" "GST_MESSAGE_ASYNC_START" "1 << 20")
'("async-done" "GST_MESSAGE_ASYNC_DONE" "1 << 21")
'("request-state" "GST_MESSAGE_REQUEST_STATE" "1 << 22")
+ '("step-start" "GST_MESSAGE_STEP_START" "1 << 23")
'("any" "GST_MESSAGE_ANY" "~0")
)
)
@@ -735,7 +736,45 @@
'("latency" "GST_QUARK_LATENCY" "50")
'("uri" "GST_QUARK_URI" "51")
'("object" "GST_QUARK_OBJECT" "52")
- '("max" "GST_QUARK_MAX" "53")
+ '("taglist" "GST_QUARK_TAGLIST" "53")
+ '("event-newsegment" "GST_QUARK_EVENT_NEWSEGMENT" "54")
+ '("event-buffer-size" "GST_QUARK_EVENT_BUFFER_SIZE" "55")
+ '("event-qos" "GST_QUARK_EVENT_QOS" "56")
+ '("event-seek" "GST_QUARK_EVENT_SEEK" "57")
+ '("event-latency" "GST_QUARK_EVENT_LATENCY" "58")
+ '("message-error" "GST_QUARK_MESSAGE_ERROR" "59")
+ '("message-warning" "GST_QUARK_MESSAGE_WARNING" "60")
+ '("message-info" "GST_QUARK_MESSAGE_INFO" "61")
+ '("message-buffering" "GST_QUARK_MESSAGE_BUFFERING" "62")
+ '("message-state" "GST_QUARK_MESSAGE_STATE" "63")
+ '("message-clock-provide" "GST_QUARK_MESSAGE_CLOCK_PROVIDE" "64")
+ '("message-clock-lost" "GST_QUARK_MESSAGE_CLOCK_LOST" "65")
+ '("message-new-clock" "GST_QUARK_MESSAGE_NEW_CLOCK" "66")
+ '("message-structure-change" "GST_QUARK_MESSAGE_STRUCTURE_CHANGE" "67")
+ '("message-segment-start" "GST_QUARK_MESSAGE_SEGMENT_START" "68")
+ '("message-segment-done" "GST_QUARK_MESSAGE_SEGMENT_DONE" "69")
+ '("message-duration" "GST_QUARK_MESSAGE_DURATION" "70")
+ '("message-async-start" "GST_QUARK_MESSAGE_ASYNC_START" "71")
+ '("message-request-state" "GST_QUARK_MESSAGE_REQUEST_STATE" "72")
+ '("message-stream-status" "GST_QUARK_MESSAGE_STREAM_STATUS" "73")
+ '("query-position" "GST_QUARK_QUERY_POSITION" "74")
+ '("query-duration" "GST_QUARK_QUERY_DURATION" "75")
+ '("query-latency" "GST_QUARK_QUERY_LATENCY" "76")
+ '("query-convert" "GST_QUARK_QUERY_CONVERT" "77")
+ '("query-segment" "GST_QUARK_QUERY_SEGMENT" "78")
+ '("query-seeking" "GST_QUARK_QUERY_SEEKING" "79")
+ '("query-formats" "GST_QUARK_QUERY_FORMATS" "80")
+ '("query-buffering" "GST_QUARK_QUERY_BUFFERING" "81")
+ '("query-uri" "GST_QUARK_QUERY_URI" "82")
+ '("event-step" "GST_QUARK_EVENT_STEP" "83")
+ '("message-step-done" "GST_QUARK_MESSAGE_STEP_DONE" "84")
+ '("amount" "GST_QUARK_AMOUNT" "85")
+ '("flush" "GST_QUARK_FLUSH" "86")
+ '("intermediate" "GST_QUARK_INTERMEDIATE" "87")
+ '("message-step-start" "GST_QUARK_MESSAGE_STEP_START" "88")
+ '("active" "GST_QUARK_ACTIVE" "89")
+ '("eos" "GST_QUARK_EOS" "90")
+ '("max" "GST_QUARK_MAX" "91")
)
)
@@ -1007,6 +1046,18 @@
)
)
+;; Handwritten for the filesink plug-in (Gst::FileSink).
+(define-enum-extended FileSinkBufferMode
+ (in-module "Gst")
+ (c-name "GstFileSinkBufferMode")
+ (values
+ '("default" "GST_FILE_SINK_BUFFER_MODE_DEFAULT" "-1")
+ '("full" "GST_FILE_SINK_BUFFER_MODE_FULL" "0")
+ '("line" "GST_FILE_SINK_BUFFER_MODE_LINE" "1")
+ '("unbuffered" "GST_FILE_SINK_BUFFER_MODE_UNBUFFERED" "2")
+ )
+)
+
;; From /usr/src/jhbuild-sources/gstreamer/plugins/elements/gsttee.h
(define-enum-extended TeePullMode
@@ -1018,17 +1069,19 @@
)
)
-(define-enum-extended FileSinkBufferMode
+;; From /usr/src/jhbuild-sources/gst-plugins-base/gst-libs/gst/app/gstappsrc.h
+
+(define-enum-extended AppStreamType
(in-module "Gst")
- (c-name "GstFileSinkBufferMode")
+ (c-name "GstAppStreamType")
(values
- '("default" "GST_FILE_SINK_BUFFER_MODE_DEFAULT" "-1")
- '("full" "GST_FILE_SINK_BUFFER_MODE_FULL" "0")
- '("line" "GST_FILE_SINK_BUFFER_MODE_LINE" "1")
- '("unbuffered" "GST_FILE_SINK_BUFFER_MODE_UNBUFFERED" "2")
+ '("stream" "GST_APP_STREAM_TYPE_STREAM" "0")
+ '("seekable" "GST_APP_STREAM_TYPE_SEEKABLE" "1")
+ '("random-access" "GST_APP_STREAM_TYPE_RANDOM_ACCESS" "2")
)
)
+;; Handwritten for the queue plug-in (Gst::Queue).
(define-enum-extended QueueLeaky
(in-module "Gst")
(c-name "GstQueueLeaky")
@@ -1830,6 +1883,9 @@
'("y41b" "GST_VIDEO_FORMAT_Y41B" "16")
'("y42b" "GST_VIDEO_FORMAT_Y42B" "17")
'("yvyu" "GST_VIDEO_FORMAT_YVYU" "18")
+ '("y444" "GST_VIDEO_FORMAT_Y444" "19")
+ '("v210" "GST_VIDEO_FORMAT_v210" "20")
+ '("v216" "GST_VIDEO_FORMAT_v216" "21")
)
)
@@ -1913,17 +1969,6 @@
'("event" "GST_GDP_DEPAY_STATE_EVENT" "4")
)
)
-;; Handwritten for GstGDPPay plugin (values taken from output of
-;; `gst-inspect gdppay' -- "version" property information)
-
-(define-enum-extended DPVersion
- (in-module "Gst")
- (c-name "GstDPVersion")
- (values
- '("0.2" "GST_GDP_VERSION_0_2" "1")
- '("1.0" "GST_GDP_VERSION_1_0" "2")
- )
-)
;; From /usr/src/jhbuild-sources/gst-plugins-base/gst/playback/gstfactorylists.h
diff --git a/gstreamer/src/gst_enums.defs.patch b/gstreamer/src/gst_enums.defs.patch
index 2e8fd35..24d2989 100644
--- a/gstreamer/src/gst_enums.defs.patch
+++ b/gstreamer/src/gst_enums.defs.patch
@@ -1,5 +1,5 @@
---- gst_enums.defs 2009-05-15 17:56:23.000000000 -0400
-+++ gst_enums.defs.new 2009-05-15 17:55:31.000000000 -0400
+--- gst_enums.defs.orig 2009-06-18 01:02:24.000000000 -0400
++++ gst_enums.defs 2009-06-18 01:16:27.000000000 -0400
@@ -1,3 +1,5 @@
+;; Apply gst_enums.defs.patch after regenerating.
+
@@ -74,7 +74,7 @@
)
)
-@@ -233,38 +262,6 @@
+@@ -233,40 +262,6 @@
)
)
@@ -99,21 +99,23 @@
- '("flag(upstream))" "FLAG(UPSTREAM))" "19")
- '("gst-event-latency" "GST_EVENT_LATENCY" "20")
- '("flag(upstream))" "FLAG(UPSTREAM))" "21")
-- '("gst-event-custom-upstream" "GST_EVENT_CUSTOM_UPSTREAM" "22")
+- '("gst-event-step" "GST_EVENT_STEP" "22")
- '("flag(upstream))" "FLAG(UPSTREAM))" "23")
-- '("gst-event-custom-downstream" "GST_EVENT_CUSTOM_DOWNSTREAM" "24")
-- '("gst-event-custom-downstream-oob" "GST_EVENT_CUSTOM_DOWNSTREAM_OOB" "26")
-- '("flag(downstream))" "FLAG(DOWNSTREAM))" "27")
-- '("gst-event-custom-both" "GST_EVENT_CUSTOM_BOTH" "28")
-- '("gst-event-custom-both-oob" "GST_EVENT_CUSTOM_BOTH_OOB" "30")
-- '("flag(both))" "FLAG(BOTH))" "31")
+- '("gst-event-custom-upstream" "GST_EVENT_CUSTOM_UPSTREAM" "24")
+- '("flag(upstream))" "FLAG(UPSTREAM))" "25")
+- '("gst-event-custom-downstream" "GST_EVENT_CUSTOM_DOWNSTREAM" "26")
+- '("gst-event-custom-downstream-oob" "GST_EVENT_CUSTOM_DOWNSTREAM_OOB" "28")
+- '("flag(downstream))" "FLAG(DOWNSTREAM))" "29")
+- '("gst-event-custom-both" "GST_EVENT_CUSTOM_BOTH" "30")
+- '("gst-event-custom-both-oob" "GST_EVENT_CUSTOM_BOTH_OOB" "32")
+- '("flag(both))" "FLAG(BOTH))" "33")
- )
-)
-
(define-enum-extended SeekType
(in-module "Gst")
(c-name "GstSeekType")
-@@ -362,6 +359,9 @@
+@@ -364,6 +359,9 @@
(in-module "Gst")
(c-name "GstIndexFlags")
(values
@@ -123,16 +125,16 @@
)
)
-@@ -461,7 +461,7 @@
- '("async-start" "GST_MESSAGE_ASYNC_START" "1 << 20")
+@@ -464,7 +462,7 @@
'("async-done" "GST_MESSAGE_ASYNC_DONE" "1 << 21")
'("request-state" "GST_MESSAGE_REQUEST_STATE" "1 << 22")
+ '("step-start" "GST_MESSAGE_STEP_START" "1 << 23")
- '("any" "GST_MESSAGE_ANY" "0xFFFFFFFFFFFFFFFF")
+ '("any" "GST_MESSAGE_ANY" "~0")
)
)
-@@ -568,6 +568,12 @@
+@@ -571,6 +569,12 @@
(in-module "Gst")
(c-name "GstPadFlags")
(values
@@ -145,7 +147,7 @@
)
)
-@@ -587,6 +593,8 @@
+@@ -590,6 +594,8 @@
(in-module "Gst")
(c-name "GstPadTemplateFlags")
(values
@@ -154,7 +156,7 @@
)
)
-@@ -941,13 +949,13 @@
+@@ -982,13 +988,13 @@
(in-module "Gst")
(c-name "GstFakeSinkStateError")
(values
@@ -175,7 +177,7 @@
)
)
-@@ -957,14 +965,14 @@
+@@ -998,14 +1004,14 @@
(in-module "Gst")
(c-name "GstFakeSrcOutputType")
(values
@@ -198,7 +200,7 @@
)
)
-@@ -972,8 +980,8 @@
+@@ -1013,8 +1019,8 @@
(in-module "Gst")
(c-name "GstFakeSrcDataType")
(values
@@ -209,7 +211,7 @@
)
)
-@@ -981,9 +989,9 @@
+@@ -1022,9 +1028,9 @@
(in-module "Gst")
(c-name "GstFakeSrcSizeType")
(values
@@ -222,7 +224,7 @@
)
)
-@@ -991,11 +999,11 @@
+@@ -1032,11 +1038,23 @@
(in-module "Gst")
(c-name "GstFakeSrcFillType")
(values
@@ -236,13 +238,10 @@
+ '("random" "GST_FAKE_SRC_FILLTYPE_RANDOM" "3")
+ '("pattern" "GST_FAKE_SRC_FILLTYPE_PATTERN" "4")
+ '("pattern-cont" "GST_FAKE_SRC_FILLTYPE_PATTERN_CONT" "5")
- )
- )
-
-@@ -1010,6 +1018,26 @@
- )
- )
-
++ )
++)
++
++;; Handwritten for the filesink plug-in (Gst::FileSink).
+(define-enum-extended FileSinkBufferMode
+ (in-module "Gst")
+ (c-name "GstFileSinkBufferMode")
@@ -251,9 +250,14 @@
+ '("full" "GST_FILE_SINK_BUFFER_MODE_FULL" "0")
+ '("line" "GST_FILE_SINK_BUFFER_MODE_LINE" "1")
+ '("unbuffered" "GST_FILE_SINK_BUFFER_MODE_UNBUFFERED" "2")
-+ )
-+)
-+
+ )
+ )
+
+@@ -1051,6 +1069,16 @@
+ )
+ )
+
++;; Handwritten for the queue plug-in (Gst::Queue).
+(define-enum-extended QueueLeaky
+ (in-module "Gst")
+ (c-name "GstQueueLeaky")
@@ -266,7 +270,7 @@
;; From /usr/src/jhbuild-sources/gst-plugins-base/gst-libs/gst/audio/gstbaseaudiosink.h
(define-enum-extended BaseAudioSinkSlaveMethod
-@@ -1823,10 +1851,10 @@
+@@ -1867,10 +1895,10 @@
(in-module "Gst")
(c-name "GstAudioConvertDithering")
(values
@@ -281,7 +285,7 @@
)
)
-@@ -1834,11 +1862,11 @@
+@@ -1878,11 +1906,11 @@
(in-module "Gst")
(c-name "GstAudioConvertNoiseShaping")
(values
@@ -298,32 +302,14 @@
)
)
-@@ -1885,6 +1913,17 @@
- '("event" "GST_GDP_DEPAY_STATE_EVENT" "4")
- )
- )
-+;; Handwritten for GstGDPPay plugin (values taken from output of
-+;; `gst-inspect gdppay' -- "version" property information)
-+
-+(define-enum-extended DPVersion
-+ (in-module "Gst")
-+ (c-name "GstDPVersion")
-+ (values
-+ '("0.2" "GST_GDP_VERSION_0_2" "1")
-+ '("1.0" "GST_GDP_VERSION_1_0" "2")
-+ )
-+)
-
- ;; From /usr/src/jhbuild-sources/gst-plugins-base/gst/playback/gstfactorylists.h
-
-@@ -2159,17 +2198,6 @@
+@@ -2203,17 +2231,6 @@
)
)
-;; From /usr/src/jhbuild-sources/gst-plugins-base/ext/ogg/gstoggmux.h
-
-(define-enum-extended
-- (in-module "")
+- (in-module "Gst")
- (c-name "")
- (values
- '("control" "GST_OGG_PAD_STATE_CONTROL" "0")
@@ -334,7 +320,7 @@
;; From /usr/src/jhbuild-sources/gst-plugins-base/ext/pango/gsttextoverlay.h
(define-enum-extended TextOverlayVAlign
-@@ -2197,9 +2225,9 @@
+@@ -2241,9 +2258,9 @@
(c-name "GstTextOverlayWrapMode")
(values
'("none" "GST_TEXT_OVERLAY_WRAP_MODE_NONE" "-1")
@@ -347,7 +333,7 @@
)
)
-@@ -2207,9 +2235,9 @@
+@@ -2251,9 +2268,9 @@
(in-module "Gst")
(c-name "GstTextOverlayLineAlign")
(values
@@ -360,7 +346,7 @@
)
)
-@@ -2239,21 +2267,35 @@
+@@ -2283,21 +2300,35 @@
(in-module "Gst")
(c-name "GstTextRenderLineAlign")
(values
@@ -376,16 +362,14 @@
;; From /usr/src/jhbuild-sources/gst-plugins-base/ext/theora/gsttheoraenc.h
-(define-enum-extended
-- (in-module "")
++(define-enum-extended TheoraEncBorderMode
+ (in-module "Gst")
- (c-name "")
-- (values
++ (c-name "GstTheoraEncBorderMode")
+ (values
- '("none" "BORDER_NONE" "0")
- '("black" "BORDER_BLACK" "1")
- '("mirror" "BORDER_MIRROR" "2")
-+(define-enum-extended TheoraEncBorderMode
-+ (in-module "Gst")
-+ (c-name "GstTheoraEncBorderMode")
-+ (values
+ '("none" "GST_THEORA_ENC_BORDER_NONE" "0")
+ '("black" "GST_THEORA_ENC_BORDER_BLACK" "1")
+ '("mirror" "GST_THEORA_ENC_BORDER_MIRROR" "2")
diff --git a/gstreamer/src/gst_signals.defs b/gstreamer/src/gst_signals.defs
index ed61886..0683662 100644
--- a/gstreamer/src/gst_signals.defs
+++ b/gstreamer/src/gst_signals.defs
@@ -2648,6 +2648,15 @@
(construct-only #f)
)
+(define-property can-activate-pull
+ (of-object "GstBaseAudioSink")
+ (prop-type "GParamBoolean")
+ (docs "Allow pull-based scheduling")
+ (readable #t)
+ (writable #t)
+ (construct-only #f)
+)
+
;; From GstBaseAudioSrc
(define-property name
@@ -2877,6 +2886,15 @@
(construct-only #f)
)
+(define-property can-activate-pull
+ (of-object "GstAudioSink")
+ (prop-type "GParamBoolean")
+ (docs "Allow pull-based scheduling")
+ (readable #t)
+ (writable #t)
+ (construct-only #f)
+)
+
;; From GstAudioSrc
(define-property name
@@ -3626,170 +3644,6 @@
;; From GstXOverlay
-;; From GstPlayBaseBin
-
-(define-property name
- (of-object "GstPlayBaseBin")
- (prop-type "GParamString")
- (docs "The name of the object")
- (readable #t)
- (writable #t)
- (construct-only #f)
-)
-
-(define-property async-handling
- (of-object "GstPlayBaseBin")
- (prop-type "GParamBoolean")
- (docs "The bin will handle Asynchronous state changes")
- (readable #t)
- (writable #t)
- (construct-only #f)
-)
-
-(define-property delay
- (of-object "GstPlayBaseBin")
- (prop-type "GParamUInt64")
- (docs "Expected delay needed for elements to spin up to PLAYING in nanoseconds")
- (readable #t)
- (writable #t)
- (construct-only #f)
-)
-
-(define-property auto-flush-bus
- (of-object "GstPlayBaseBin")
- (prop-type "GParamBoolean")
- (docs "Whether to automatically flush the pipeline's bus when going from READY into NULL state")
- (readable #t)
- (writable #t)
- (construct-only #f)
-)
-
-(define-property uri
- (of-object "GstPlayBaseBin")
- (prop-type "GParamString")
- (docs "URI of the media to play")
- (readable #t)
- (writable #t)
- (construct-only #f)
-)
-
-(define-property suburi
- (of-object "GstPlayBaseBin")
- (prop-type "GParamString")
- (docs "Optional URI of a subtitle")
- (readable #t)
- (writable #t)
- (construct-only #f)
-)
-
-(define-property queue-size
- (of-object "GstPlayBaseBin")
- (prop-type "GParamUInt64")
- (docs "Size of internal queues in nanoseconds")
- (readable #t)
- (writable #t)
- (construct-only #f)
-)
-
-(define-property queue-threshold
- (of-object "GstPlayBaseBin")
- (prop-type "GParamUInt64")
- (docs "Buffering threshold of internal queues in nanoseconds")
- (readable #t)
- (writable #t)
- (construct-only #f)
-)
-
-(define-property queue-min-threshold
- (of-object "GstPlayBaseBin")
- (prop-type "GParamUInt64")
- (docs "Buffering low threshold of internal queues in nanoseconds")
- (readable #t)
- (writable #t)
- (construct-only #f)
-)
-
-(define-property nstreams
- (of-object "GstPlayBaseBin")
- (prop-type "GParamInt")
- (docs "number of streams")
- (readable #t)
- (writable #f)
- (construct-only #f)
-)
-
-(define-property stream-info
- (of-object "GstPlayBaseBin")
- (prop-type "GParamPointer")
- (docs "List of streaminfo")
- (readable #t)
- (writable #f)
- (construct-only #f)
-)
-
-(define-property stream-info-value-array
- (of-object "GstPlayBaseBin")
- (prop-type "GParamValueArray")
- (docs "value array of streaminfo")
- (readable #t)
- (writable #f)
- (construct-only #f)
-)
-
-(define-property source
- (of-object "GstPlayBaseBin")
- (prop-type "GParamObject")
- (docs "Source element")
- (readable #t)
- (writable #f)
- (construct-only #f)
-)
-
-(define-property current-video
- (of-object "GstPlayBaseBin")
- (prop-type "GParamInt")
- (docs "Currently playing video stream (-1 = none)")
- (readable #t)
- (writable #t)
- (construct-only #f)
-)
-
-(define-property current-audio
- (of-object "GstPlayBaseBin")
- (prop-type "GParamInt")
- (docs "Currently playing audio stream (-1 = none)")
- (readable #t)
- (writable #t)
- (construct-only #f)
-)
-
-(define-property current-text
- (of-object "GstPlayBaseBin")
- (prop-type "GParamInt")
- (docs "Currently playing text stream (-1 = none)")
- (readable #t)
- (writable #t)
- (construct-only #f)
-)
-
-(define-property subtitle-encoding
- (of-object "GstPlayBaseBin")
- (prop-type "GParamString")
- (docs "Encoding to assume if input subtitles are not in UTF-8 encoding. If not set, the GST_SUBTITLE_ENCODING environment variable will be checked for an encoding to use. If that is not set either, ISO-8859-15 will be assumed.")
- (readable #t)
- (writable #t)
- (construct-only #f)
-)
-
-(define-property connection-speed
- (of-object "GstPlayBaseBin")
- (prop-type "GParamUInt")
- (docs "Network connection speed in kbps (0 = unknown)")
- (readable #t)
- (writable #t)
- (construct-only #f)
-)
-
;; From GstAdder
(define-property name
@@ -3958,6 +3812,15 @@
(construct-only #f)
)
+(define-property can-activate-pull
+ (of-object "GstAlsaSink")
+ (prop-type "GParamBoolean")
+ (docs "Allow pull-based scheduling")
+ (readable #t)
+ (writable #t)
+ (construct-only #f)
+)
+
(define-property device
(of-object "GstAlsaSink")
(prop-type "GParamString")
@@ -4095,6 +3958,349 @@
(construct-only #f)
)
+;; From GstAppSrc
+
+(define-signal need-data
+ (of-object "GstAppSrc")
+ (return-type "void")
+ (when "last")
+ (parameters
+ '("guint" "p0")
+ )
+)
+
+(define-signal enough-data
+ (of-object "GstAppSrc")
+ (return-type "void")
+ (when "last")
+)
+
+(define-signal seek-data
+ (of-object "GstAppSrc")
+ (return-type "gboolean")
+ (when "last")
+ (parameters
+ '("guint64" "p0")
+ )
+)
+
+(define-signal push-buffer
+ (of-object "GstAppSrc")
+ (return-type "GstFlowReturn")
+ (when "last")
+ (parameters
+ '("GstBuffer*" "p0")
+ )
+)
+
+(define-signal end-of-stream
+ (of-object "GstAppSrc")
+ (return-type "GstFlowReturn")
+ (when "last")
+)
+
+(define-property name
+ (of-object "GstAppSrc")
+ (prop-type "GParamString")
+ (docs "The name of the object")
+ (readable #t)
+ (writable #t)
+ (construct-only #f)
+)
+
+(define-property blocksize
+ (of-object "GstAppSrc")
+ (prop-type "GParamULong")
+ (docs "Size in bytes to read per buffer (-1 = default)")
+ (readable #t)
+ (writable #t)
+ (construct-only #f)
+)
+
+(define-property num-buffers
+ (of-object "GstAppSrc")
+ (prop-type "GParamInt")
+ (docs "Number of buffers to output before sending EOS (-1 = unlimited)")
+ (readable #t)
+ (writable #t)
+ (construct-only #f)
+)
+
+(define-property typefind
+ (of-object "GstAppSrc")
+ (prop-type "GParamBoolean")
+ (docs "Run typefind before negotiating")
+ (readable #t)
+ (writable #t)
+ (construct-only #f)
+)
+
+(define-property do-timestamp
+ (of-object "GstAppSrc")
+ (prop-type "GParamBoolean")
+ (docs "Apply current stream time to buffers")
+ (readable #t)
+ (writable #t)
+ (construct-only #f)
+)
+
+(define-property caps
+ (of-object "GstAppSrc")
+ (prop-type "GParamBoxed")
+ (docs "The allowed caps for the src pad")
+ (readable #t)
+ (writable #t)
+ (construct-only #f)
+)
+
+(define-property size
+ (of-object "GstAppSrc")
+ (prop-type "GParamInt64")
+ (docs "The size of the data stream in bytes (-1 if unknown)")
+ (readable #t)
+ (writable #t)
+ (construct-only #f)
+)
+
+(define-property stream-type
+ (of-object "GstAppSrc")
+ (prop-type "GParamEnum")
+ (docs "the type of the stream")
+ (readable #t)
+ (writable #t)
+ (construct-only #f)
+)
+
+(define-property max-bytes
+ (of-object "GstAppSrc")
+ (prop-type "GParamUInt64")
+ (docs "The maximum number of bytes to queue internally (0 = unlimited)")
+ (readable #t)
+ (writable #t)
+ (construct-only #f)
+)
+
+(define-property format
+ (of-object "GstAppSrc")
+ (prop-type "GParamEnum")
+ (docs "The format of the segment events and seek")
+ (readable #t)
+ (writable #t)
+ (construct-only #f)
+)
+
+(define-property block
+ (of-object "GstAppSrc")
+ (prop-type "GParamBoolean")
+ (docs "Block push-buffer when max-bytes are queued")
+ (readable #t)
+ (writable #t)
+ (construct-only #f)
+)
+
+(define-property is-live
+ (of-object "GstAppSrc")
+ (prop-type "GParamBoolean")
+ (docs "Whether to act as a live source")
+ (readable #t)
+ (writable #t)
+ (construct-only #f)
+)
+
+(define-property min-latency
+ (of-object "GstAppSrc")
+ (prop-type "GParamInt64")
+ (docs "The minimum latency (-1 = default)")
+ (readable #t)
+ (writable #t)
+ (construct-only #f)
+)
+
+(define-property max-latency
+ (of-object "GstAppSrc")
+ (prop-type "GParamInt64")
+ (docs "The maximum latency (-1 = unlimited)")
+ (readable #t)
+ (writable #t)
+ (construct-only #f)
+)
+
+(define-property emit-signals
+ (of-object "GstAppSrc")
+ (prop-type "GParamBoolean")
+ (docs "Emit new-preroll and new-buffer signals")
+ (readable #t)
+ (writable #t)
+ (construct-only #f)
+)
+
+;; From GstAppSink
+
+(define-signal eos
+ (of-object "GstAppSink")
+ (return-type "void")
+ (when "last")
+)
+
+(define-signal new-preroll
+ (of-object "GstAppSink")
+ (return-type "void")
+ (when "last")
+)
+
+(define-signal new-buffer
+ (of-object "GstAppSink")
+ (return-type "void")
+ (when "last")
+)
+
+(define-signal pull-preroll
+ (of-object "GstAppSink")
+ (return-type "GstBuffer*")
+ (when "last")
+)
+
+(define-signal pull-buffer
+ (of-object "GstAppSink")
+ (return-type "GstBuffer*")
+ (when "last")
+)
+
+(define-property name
+ (of-object "GstAppSink")
+ (prop-type "GParamString")
+ (docs "The name of the object")
+ (readable #t)
+ (writable #t)
+ (construct-only #f)
+)
+
+(define-property preroll-queue-len
+ (of-object "GstAppSink")
+ (prop-type "GParamUInt")
+ (docs "Number of buffers to queue during preroll")
+ (readable #t)
+ (writable #t)
+ (construct-only #f)
+)
+
+(define-property sync
+ (of-object "GstAppSink")
+ (prop-type "GParamBoolean")
+ (docs "Sync on the clock")
+ (readable #t)
+ (writable #t)
+ (construct-only #f)
+)
+
+(define-property max-lateness
+ (of-object "GstAppSink")
+ (prop-type "GParamInt64")
+ (docs "Maximum number of nanoseconds that a buffer can be late before it is dropped (-1 unlimited)")
+ (readable #t)
+ (writable #t)
+ (construct-only #f)
+)
+
+(define-property qos
+ (of-object "GstAppSink")
+ (prop-type "GParamBoolean")
+ (docs "Generate Quality-of-Service events upstream")
+ (readable #t)
+ (writable #t)
+ (construct-only #f)
+)
+
+(define-property async
+ (of-object "GstAppSink")
+ (prop-type "GParamBoolean")
+ (docs "Go asynchronously to PAUSED")
+ (readable #t)
+ (writable #t)
+ (construct-only #f)
+)
+
+(define-property ts-offset
+ (of-object "GstAppSink")
+ (prop-type "GParamInt64")
+ (docs "Timestamp offset in nanoseconds")
+ (readable #t)
+ (writable #t)
+ (construct-only #f)
+)
+
+(define-property last-buffer
+ (of-object "GstAppSink")
+ (prop-type "GParamSpecMiniObject")
+ (docs "The last buffer received in the sink")
+ (readable #t)
+ (writable #f)
+ (construct-only #f)
+)
+
+(define-property blocksize
+ (of-object "GstAppSink")
+ (prop-type "GParamUInt")
+ (docs "Size in bytes to pull per buffer (0 = default)")
+ (readable #t)
+ (writable #t)
+ (construct-only #f)
+)
+
+(define-property render-delay
+ (of-object "GstAppSink")
+ (prop-type "GParamUInt64")
+ (docs "Additional render delay of the sink in nanoseconds")
+ (readable #t)
+ (writable #t)
+ (construct-only #f)
+)
+
+(define-property caps
+ (of-object "GstAppSink")
+ (prop-type "GParamBoxed")
+ (docs "The allowed caps for the sink pad")
+ (readable #t)
+ (writable #t)
+ (construct-only #f)
+)
+
+(define-property eos
+ (of-object "GstAppSink")
+ (prop-type "GParamBoolean")
+ (docs "Check if the sink is EOS or not started")
+ (readable #t)
+ (writable #f)
+ (construct-only #f)
+)
+
+(define-property emit-signals
+ (of-object "GstAppSink")
+ (prop-type "GParamBoolean")
+ (docs "Emit new-preroll and new-buffer signals")
+ (readable #t)
+ (writable #t)
+ (construct-only #f)
+)
+
+(define-property max-buffers
+ (of-object "GstAppSink")
+ (prop-type "GParamUInt")
+ (docs "The maximum number of buffers to queue internally (0 = unlimited)")
+ (readable #t)
+ (writable #t)
+ (construct-only #f)
+)
+
+(define-property drop
+ (of-object "GstAppSink")
+ (prop-type "GParamBoolean")
+ (docs "Drop old buffers when the buffer queue is filled")
+ (readable #t)
+ (writable #t)
+ (construct-only #f)
+)
+
;; From GstAudioConvert
(define-property name
@@ -4575,32 +4781,32 @@
;; From GstDecodeBin
-(define-signal new-decoded-pad
+(define-signal unknown-type
(of-object "GstDecodeBin")
(return-type "void")
(when "last")
(parameters
'("GstPad*" "p0")
- '("gboolean" "p1")
+ '("GstCaps*" "p1")
)
)
-(define-signal removed-decoded-pad
+(define-signal new-decoded-pad
(of-object "GstDecodeBin")
(return-type "void")
(when "last")
(parameters
'("GstPad*" "p0")
+ '("gboolean" "p1")
)
)
-(define-signal unknown-type
+(define-signal removed-decoded-pad
(of-object "GstDecodeBin")
(return-type "void")
(when "last")
(parameters
'("GstPad*" "p0")
- '("GstCaps*" "p1")
)
)
@@ -4633,28 +4839,29 @@
;; From GstDecodeBin2
-(define-signal new-decoded-pad
+(define-signal unknown-type
(of-object "GstDecodeBin2")
(return-type "void")
(when "last")
(parameters
'("GstPad*" "p0")
- '("gboolean" "p1")
+ '("GstCaps*" "p1")
)
)
-(define-signal removed-decoded-pad
+(define-signal autoplug-continue
(of-object "GstDecodeBin2")
- (return-type "void")
+ (return-type "gboolean")
(when "last")
(parameters
'("GstPad*" "p0")
+ '("GstCaps*" "p1")
)
)
-(define-signal unknown-type
+(define-signal autoplug-factories
(of-object "GstDecodeBin2")
- (return-type "void")
+ (return-type "GValueArray*")
(when "last")
(parameters
'("GstPad*" "p0")
@@ -4662,52 +4869,51 @@
)
)
-(define-signal autoplug-continue
+(define-signal autoplug-select
(of-object "GstDecodeBin2")
- (return-type "gboolean")
+ (return-type "GstAutoplugSelectResult")
(when "last")
(parameters
'("GstPad*" "p0")
'("GstCaps*" "p1")
+ '("GstElementFactory*" "p2")
)
)
-(define-signal autoplug-factories
+(define-signal drained
(of-object "GstDecodeBin2")
- (return-type "GValueArray*")
+ (return-type "void")
(when "last")
- (parameters
- '("GstPad*" "p0")
- '("GstCaps*" "p1")
- )
)
-(define-signal autoplug-sort
+(define-signal new-decoded-pad
(of-object "GstDecodeBin2")
- (return-type "GValueArray*")
+ (return-type "void")
(when "last")
(parameters
'("GstPad*" "p0")
- '("GstCaps*" "p1")
- '("GValueArray*" "p2")
+ '("gboolean" "p1")
)
)
-(define-signal autoplug-select
+(define-signal removed-decoded-pad
(of-object "GstDecodeBin2")
- (return-type "GstAutoplugSelectResult")
+ (return-type "void")
(when "last")
(parameters
'("GstPad*" "p0")
- '("GstCaps*" "p1")
- '("GstElementFactory*" "p2")
)
)
-(define-signal drained
+(define-signal autoplug-sort
(of-object "GstDecodeBin2")
- (return-type "void")
+ (return-type "GValueArray*")
(when "last")
+ (parameters
+ '("GstPad*" "p0")
+ '("GstCaps*" "p1")
+ '("GValueArray*" "p2")
+ )
)
(define-property name
@@ -5759,6 +5965,15 @@
(construct-only #f)
)
+(define-property num-fds
+ (of-object "GstMultiFdSink")
+ (prop-type "GParamUInt")
+ (docs "The current number of client file descriptors.")
+ (readable #t)
+ (writable #f)
+ (construct-only #f)
+)
+
;; From GstOggDemux
(define-property name
@@ -6043,6 +6258,33 @@
(when "last")
)
+(define-signal video-tags-changed
+ (of-object "GstPlayBin2")
+ (return-type "void")
+ (when "last")
+ (parameters
+ '("gint" "p0")
+ )
+)
+
+(define-signal audio-tags-changed
+ (of-object "GstPlayBin2")
+ (return-type "void")
+ (when "last")
+ (parameters
+ '("gint" "p0")
+ )
+)
+
+(define-signal text-tags-changed
+ (of-object "GstPlayBin2")
+ (return-type "void")
+ (when "last")
+ (parameters
+ '("gint" "p0")
+ )
+)
+
(define-signal get-video-tags
(of-object "GstPlayBin2")
(return-type "GstTagList*")
@@ -6897,6 +7139,15 @@
(construct-only #f)
)
+(define-property num-fds
+ (of-object "GstTCPServerSink")
+ (prop-type "GParamUInt")
+ (docs "The current number of client file descriptors.")
+ (readable #t)
+ (writable #f)
+ (construct-only #f)
+)
+
(define-property host
(of-object "GstTCPServerSink")
(prop-type "GParamString")
diff --git a/gstreamer/src/gst_signals.defs.patch b/gstreamer/src/gst_signals.defs.patch
index dff61b2..a49f597 100644
--- a/gstreamer/src/gst_signals.defs.patch
+++ b/gstreamer/src/gst_signals.defs.patch
@@ -1,29 +1,11 @@
---- gst_signals.defs 2009-05-05 17:05:00.000000000 -0400
-+++ gst_signals.defs.new 2009-05-05 17:06:01.000000000 -0400
+--- gst_signals.defs 2009-06-17 00:37:57.000000000 -0400
++++ gst_signals.defs.new 2009-06-17 00:37:27.000000000 -0400
@@ -1,3 +1,5 @@
+;; Apply gst_signals.defs.patch after regenerating.
+
;; From GstBus
(define-signal sync-message
-@@ -5,7 +7,7 @@
- (return-type "void")
- (when "last")
- (parameters
-- '("GstMessage" "p0")
-+ '("GstMessage*" "p0")
- )
- )
-
-@@ -14,7 +16,7 @@
- (return-type "void")
- (when "last")
- (parameters
-- '("GstMessage" "p0")
-+ '("GstMessage*" "p0")
- )
- )
-
@@ -82,7 +84,7 @@
(return-type "void")
(when "first")
@@ -60,15 +42,6 @@
)
)
-@@ -357,7 +359,7 @@
- (return-type "gboolean")
- (when "last")
- (parameters
-- '("GstMiniObject" "p0")
-+ '("GstMiniObject*" "p0")
- )
- )
-
@@ -522,7 +524,7 @@
(return-type "void")
(when "last")
@@ -96,48 +69,3 @@
)
)
-@@ -1190,7 +1192,7 @@
- (return-type "void")
- (when "last")
- (parameters
-- '("GstBuffer" "p0")
-+ '("GstBuffer*" "p0")
- '("GstPad*" "p1")
- )
- )
-@@ -1400,7 +1402,7 @@
- (return-type "void")
- (when "last")
- (parameters
-- '("GstBuffer" "p0")
-+ '("GstBuffer*" "p0")
- '("GstPad*" "p1")
- )
- )
-@@ -1410,7 +1412,7 @@
- (return-type "void")
- (when "last")
- (parameters
-- '("GstBuffer" "p0")
-+ '("GstBuffer*" "p0")
- '("GstPad*" "p1")
- )
- )
-@@ -1970,7 +1972,7 @@
- (return-type "void")
- (when "last")
- (parameters
-- '("GstBuffer" "p0")
-+ '("GstBuffer*" "p0")
- )
- )
-
-@@ -6110,7 +6112,7 @@
-
- (define-signal convert-frame
- (of-object "GstPlayBin2")
-- (return-type "GstBuffer")
-+ (return-type "GstBuffer*")
- (when "last")
- (parameters
- '("GstCaps*" "p0")
diff --git a/tools/extra_defs_gen/generate_defs_gst.cc b/tools/extra_defs_gen/generate_defs_gst.cc
index 386c130..64b9795 100644
--- a/tools/extra_defs_gen/generate_defs_gst.cc
+++ b/tools/extra_defs_gen/generate_defs_gst.cc
@@ -64,158 +64,163 @@
#include <gst/interfaces/videoorientation.h>
#include <gst/interfaces/xoverlay.h>
+bool gst_type_is_a_pointer(GType gtype)
+{
+ return (gtype_is_a_pointer(gtype) || g_type_is_a(gtype,
+GST_TYPE_MINI_OBJECT));
+}
+
int main (int argc, char *argv[])
{
gst_init (&argc, &argv);
// GStreamer core types:
- std::cout << get_defs(GST_TYPE_BUS)
- << get_defs(GST_TYPE_BIN)
- << get_defs(GST_TYPE_BUFFER)
- << get_defs(GST_TYPE_CAPS)
- << get_defs(GST_TYPE_CHILD_PROXY)
- << get_defs(GST_TYPE_CLOCK)
- << get_defs(GST_TYPE_ELEMENT)
- << get_defs(GST_TYPE_ELEMENT_FACTORY)
- << get_defs(GST_TYPE_EVENT)
- << get_defs(GST_TYPE_FORMAT)
- << get_defs(GST_TYPE_G_ERROR)
- << get_defs(GST_TYPE_GHOST_PAD)
- << get_defs(GST_TYPE_IMPLEMENTS_INTERFACE)
- << get_defs(GST_TYPE_INDEX)
- << get_defs(GST_TYPE_INDEX_FACTORY)
- << get_defs(GST_TYPE_MESSAGE)
- << get_defs(GST_TYPE_MINI_OBJECT)
- << get_defs(GST_TYPE_OBJECT)
- << get_defs(GST_TYPE_PAD)
- << get_defs(GST_TYPE_PAD_TEMPLATE)
- << get_defs(GST_TYPE_PIPELINE)
- << get_defs(GST_TYPE_PLUGIN)
- << get_defs(GST_TYPE_PLUGIN_FEATURE)
- << get_defs(GST_TYPE_QUERY)
- << get_defs(GST_TYPE_REGISTRY)
- << get_defs(GST_TYPE_SEGMENT)
- << get_defs(GST_TYPE_STRUCTURE)
- << get_defs(GST_TYPE_SYSTEM_CLOCK)
- << get_defs(GST_TYPE_TAG_LIST)
- << get_defs(GST_TYPE_TAG_SETTER)
- << get_defs(GST_TYPE_TASK)
- << get_defs(GST_TYPE_TYPE_FIND)
- << get_defs(GST_TYPE_TYPE_FIND_FACTORY)
- << get_defs(GST_TYPE_URI_HANDLER)
- << get_defs(GST_TYPE_XML)
+ std::cout << get_defs(GST_TYPE_BUS, gst_type_is_a_pointer)
+ << get_defs(GST_TYPE_BIN, gst_type_is_a_pointer)
+ << get_defs(GST_TYPE_BUFFER, gst_type_is_a_pointer)
+ << get_defs(GST_TYPE_CAPS, gst_type_is_a_pointer)
+ << get_defs(GST_TYPE_CHILD_PROXY, gst_type_is_a_pointer)
+ << get_defs(GST_TYPE_CLOCK, gst_type_is_a_pointer)
+ << get_defs(GST_TYPE_ELEMENT, gst_type_is_a_pointer)
+ << get_defs(GST_TYPE_ELEMENT_FACTORY, gst_type_is_a_pointer)
+ << get_defs(GST_TYPE_EVENT, gst_type_is_a_pointer)
+ << get_defs(GST_TYPE_FORMAT, gst_type_is_a_pointer)
+ << get_defs(GST_TYPE_G_ERROR, gst_type_is_a_pointer)
+ << get_defs(GST_TYPE_GHOST_PAD, gst_type_is_a_pointer)
+ << get_defs(GST_TYPE_IMPLEMENTS_INTERFACE, gst_type_is_a_pointer)
+ << get_defs(GST_TYPE_INDEX, gst_type_is_a_pointer)
+ << get_defs(GST_TYPE_INDEX_FACTORY, gst_type_is_a_pointer)
+ << get_defs(GST_TYPE_MESSAGE, gst_type_is_a_pointer)
+ << get_defs(GST_TYPE_MINI_OBJECT, gst_type_is_a_pointer)
+ << get_defs(GST_TYPE_OBJECT, gst_type_is_a_pointer)
+ << get_defs(GST_TYPE_PAD, gst_type_is_a_pointer)
+ << get_defs(GST_TYPE_PAD_TEMPLATE, gst_type_is_a_pointer)
+ << get_defs(GST_TYPE_PIPELINE, gst_type_is_a_pointer)
+ << get_defs(GST_TYPE_PLUGIN, gst_type_is_a_pointer)
+ << get_defs(GST_TYPE_PLUGIN_FEATURE, gst_type_is_a_pointer)
+ << get_defs(GST_TYPE_QUERY, gst_type_is_a_pointer)
+ << get_defs(GST_TYPE_REGISTRY, gst_type_is_a_pointer)
+ << get_defs(GST_TYPE_SEGMENT, gst_type_is_a_pointer)
+ << get_defs(GST_TYPE_STRUCTURE, gst_type_is_a_pointer)
+ << get_defs(GST_TYPE_SYSTEM_CLOCK, gst_type_is_a_pointer)
+ << get_defs(GST_TYPE_TAG_LIST, gst_type_is_a_pointer)
+ << get_defs(GST_TYPE_TAG_SETTER, gst_type_is_a_pointer)
+ << get_defs(GST_TYPE_TASK, gst_type_is_a_pointer)
+ << get_defs(GST_TYPE_TYPE_FIND, gst_type_is_a_pointer)
+ << get_defs(GST_TYPE_TYPE_FIND_FACTORY, gst_type_is_a_pointer)
+ << get_defs(GST_TYPE_URI_HANDLER, gst_type_is_a_pointer)
+ << get_defs(GST_TYPE_XML, gst_type_is_a_pointer)
// GStreamer core library types:
- << get_defs(GST_TYPE_BASE_SRC)
- << get_defs(GST_TYPE_BASE_SINK)
- << get_defs(GST_TYPE_BASE_TRANSFORM)
- << get_defs(GST_TYPE_PUSH_SRC)
- << get_defs(GST_TYPE_ADAPTER)
- << get_defs(GST_TYPE_COLLECT_PADS)
- << get_defs(GST_TYPE_DATA_QUEUE)
- << get_defs(GST_TYPE_CONTROLLER)
- << get_defs(GST_TYPE_CONTROL_SOURCE)
- << get_defs(GST_TYPE_INTERPOLATION_CONTROL_SOURCE)
- << get_defs(GST_TYPE_LFO_CONTROL_SOURCE)
- << get_defs(GST_TYPE_NET_CLIENT_CLOCK)
- << get_defs(GST_TYPE_NET_TIME_PROVIDER)
- << get_defs(GST_TYPE_NET_TIME_PROVIDER)
+ << get_defs(GST_TYPE_BASE_SRC, gst_type_is_a_pointer)
+ << get_defs(GST_TYPE_BASE_SINK, gst_type_is_a_pointer)
+ << get_defs(GST_TYPE_BASE_TRANSFORM, gst_type_is_a_pointer)
+ << get_defs(GST_TYPE_PUSH_SRC, gst_type_is_a_pointer)
+ << get_defs(GST_TYPE_ADAPTER, gst_type_is_a_pointer)
+ << get_defs(GST_TYPE_COLLECT_PADS, gst_type_is_a_pointer)
+ << get_defs(GST_TYPE_DATA_QUEUE, gst_type_is_a_pointer)
+ << get_defs(GST_TYPE_CONTROLLER, gst_type_is_a_pointer)
+ << get_defs(GST_TYPE_CONTROL_SOURCE, gst_type_is_a_pointer)
+ << get_defs(GST_TYPE_INTERPOLATION_CONTROL_SOURCE, gst_type_is_a_pointer)
+ << get_defs(GST_TYPE_LFO_CONTROL_SOURCE, gst_type_is_a_pointer)
+ << get_defs(GST_TYPE_NET_CLIENT_CLOCK, gst_type_is_a_pointer)
+ << get_defs(GST_TYPE_NET_TIME_PROVIDER, gst_type_is_a_pointer)
+ << get_defs(GST_TYPE_NET_TIME_PROVIDER, gst_type_is_a_pointer)
// GStreamer core plugin types:
- << get_plugin_defs("capsfilter")
- << get_plugin_defs("fakesrc")
- << get_plugin_defs("fakesink")
- << get_plugin_defs("fdsink")
- << get_plugin_defs("fdsrc")
- << get_plugin_defs("filesrc")
- << get_plugin_defs("filesink")
- << get_plugin_defs("identity")
- << get_plugin_defs("multiqueue")
- << get_plugin_defs("queue")
- << get_plugin_defs("tee")
- << get_plugin_defs("typefind")
+ << get_plugin_defs("capsfilter", gst_type_is_a_pointer)
+ << get_plugin_defs("fakesrc", gst_type_is_a_pointer)
+ << get_plugin_defs("fakesink", gst_type_is_a_pointer)
+ << get_plugin_defs("fdsink", gst_type_is_a_pointer)
+ << get_plugin_defs("fdsrc", gst_type_is_a_pointer)
+ << get_plugin_defs("filesrc", gst_type_is_a_pointer)
+ << get_plugin_defs("filesink", gst_type_is_a_pointer)
+ << get_plugin_defs("identity", gst_type_is_a_pointer)
+ << get_plugin_defs("multiqueue", gst_type_is_a_pointer)
+ << get_plugin_defs("queue", gst_type_is_a_pointer)
+ << get_plugin_defs("tee", gst_type_is_a_pointer)
+ << get_plugin_defs("typefind", gst_type_is_a_pointer)
// gst-plugins-base (GStreamer base) types:
- << get_defs(GST_TYPE_AUDIO_CLOCK)
- << get_defs(GST_TYPE_AUDIO_FILTER)
- << get_defs(GST_TYPE_BASE_AUDIO_SINK)
- << get_defs(GST_TYPE_BASE_AUDIO_SRC)
- << get_defs(GST_TYPE_AUDIO_SINK)
- << get_defs(GST_TYPE_AUDIO_SRC)
- << get_defs(GST_TYPE_RING_BUFFER)
- << get_defs(GST_TYPE_CDDA_BASE_SRC)
- << get_defs(GST_TYPE_NETBUFFER)
- << get_defs(GST_TYPE_BASE_RTP_AUDIO_PAYLOAD)
- << get_defs(GST_TYPE_BASE_RTP_DEPAYLOAD)
- << get_defs(GST_TYPE_BASE_RTP_PAYLOAD)
- << get_defs(GST_TYPE_TAG_DEMUX)
- << get_defs(GST_TYPE_VIDEO_SINK)
- << get_defs(GST_TYPE_VIDEO_FILTER)
+ << get_defs(GST_TYPE_AUDIO_CLOCK, gst_type_is_a_pointer)
+ << get_defs(GST_TYPE_AUDIO_FILTER, gst_type_is_a_pointer)
+ << get_defs(GST_TYPE_BASE_AUDIO_SINK, gst_type_is_a_pointer)
+ << get_defs(GST_TYPE_BASE_AUDIO_SRC, gst_type_is_a_pointer)
+ << get_defs(GST_TYPE_AUDIO_SINK, gst_type_is_a_pointer)
+ << get_defs(GST_TYPE_AUDIO_SRC, gst_type_is_a_pointer)
+ << get_defs(GST_TYPE_RING_BUFFER, gst_type_is_a_pointer)
+ << get_defs(GST_TYPE_CDDA_BASE_SRC, gst_type_is_a_pointer)
+ << get_defs(GST_TYPE_NETBUFFER, gst_type_is_a_pointer)
+ << get_defs(GST_TYPE_BASE_RTP_AUDIO_PAYLOAD, gst_type_is_a_pointer)
+ << get_defs(GST_TYPE_BASE_RTP_DEPAYLOAD, gst_type_is_a_pointer)
+ << get_defs(GST_TYPE_BASE_RTP_PAYLOAD, gst_type_is_a_pointer)
+ << get_defs(GST_TYPE_TAG_DEMUX, gst_type_is_a_pointer)
+ << get_defs(GST_TYPE_VIDEO_SINK, gst_type_is_a_pointer)
+ << get_defs(GST_TYPE_VIDEO_FILTER, gst_type_is_a_pointer)
// gst-plugins-base (GStreamer base) interfaces:
- << get_defs(GST_TYPE_COLOR_BALANCE)
- << get_defs(GST_TYPE_COLOR_BALANCE_CHANNEL)
- << get_defs(GST_TYPE_MIXER)
- << get_defs(GST_TYPE_MIXER_TRACK)
- << get_defs(GST_TYPE_MIXER_OPTIONS)
- << get_defs(GST_TYPE_NAVIGATION)
- << get_defs(GST_TYPE_PROPERTY_PROBE)
- << get_defs(GST_TYPE_TUNER)
- << get_defs(GST_TYPE_TUNER_CHANNEL)
- << get_defs(GST_TYPE_TUNER_NORM)
- << get_defs(GST_TYPE_VIDEO_ORIENTATION)
- << get_defs(GST_TYPE_X_OVERLAY)
-
- // Base class of playbin plugin:
- << get_defs(g_type_from_name("GstPlayBaseBin"))
+ << get_defs(GST_TYPE_COLOR_BALANCE, gst_type_is_a_pointer)
+ << get_defs(GST_TYPE_COLOR_BALANCE_CHANNEL, gst_type_is_a_pointer)
+ << get_defs(GST_TYPE_MIXER, gst_type_is_a_pointer)
+ << get_defs(GST_TYPE_MIXER_TRACK, gst_type_is_a_pointer)
+ << get_defs(GST_TYPE_MIXER_OPTIONS, gst_type_is_a_pointer)
+ << get_defs(GST_TYPE_NAVIGATION, gst_type_is_a_pointer)
+ << get_defs(GST_TYPE_PROPERTY_PROBE, gst_type_is_a_pointer)
+ << get_defs(GST_TYPE_TUNER, gst_type_is_a_pointer)
+ << get_defs(GST_TYPE_TUNER_CHANNEL, gst_type_is_a_pointer)
+ << get_defs(GST_TYPE_TUNER_NORM, gst_type_is_a_pointer)
+ << get_defs(GST_TYPE_VIDEO_ORIENTATION, gst_type_is_a_pointer)
+ << get_defs(GST_TYPE_X_OVERLAY, gst_type_is_a_pointer)
// gst-plugins-base (GStreamer base) plugin types:
- << get_plugin_defs("adder")
- << get_plugin_defs("alsamixer")
- << get_plugin_defs("alsasink")
- << get_plugin_defs("alsasrc")
- << get_plugin_defs("audioconvert")
- << get_plugin_defs("audioresample")
- << get_plugin_defs("audiotestsrc")
- << get_plugin_defs("cdparanoiasrc")
- << get_plugin_defs("clockoverlay")
- << get_plugin_defs("decodebin")
- << get_plugin_defs("decodebin2")
- << get_plugin_defs("ffmpegcolorspace")
- << get_plugin_defs("gdpdepay")
- << get_plugin_defs("gdppay")
- << get_plugin_defs("giosink")
- << get_plugin_defs("giosrc")
- << get_plugin_defs("giostreamsink")
- << get_plugin_defs("giostreamsrc")
- << get_plugin_defs("gnomevfssink")
- << get_plugin_defs("gnomevfssrc")
- << get_plugin_defs("multifdsink")
- << get_plugin_defs("oggdemux")
- << get_plugin_defs("oggmux")
- << get_plugin_defs("playbin")
- << get_plugin_defs("playbin2")
- << get_plugin_defs("tcpclientsrc")
- << get_plugin_defs("tcpclientsink")
- << get_plugin_defs("tcpserversrc")
- << get_plugin_defs("tcpserversink")
- << get_plugin_defs("textoverlay")
- << get_plugin_defs("textrender")
- << get_plugin_defs("theoradec")
- << get_plugin_defs("theoraenc")
- << get_plugin_defs("theoraparse")
- << get_plugin_defs("timeoverlay")
- << get_plugin_defs("uridecodebin")
- << get_plugin_defs("videorate")
- << get_plugin_defs("videoscale")
- << get_plugin_defs("videotestsrc")
- << get_plugin_defs("volume")
- << get_plugin_defs("vorbisdec")
- << get_plugin_defs("vorbisenc")
- << get_plugin_defs("vorbisparse")
- << get_plugin_defs("vorbistag")
- << get_plugin_defs("ximagesink")
- << get_plugin_defs("xvimagesink")
+ << get_plugin_defs("adder", gst_type_is_a_pointer)
+ << get_plugin_defs("alsamixer", gst_type_is_a_pointer)
+ << get_plugin_defs("alsasink", gst_type_is_a_pointer)
+ << get_plugin_defs("alsasrc", gst_type_is_a_pointer)
+ << get_plugin_defs("appsrc", gst_type_is_a_pointer)
+ << get_plugin_defs("appsink", gst_type_is_a_pointer)
+ << get_plugin_defs("audioconvert", gst_type_is_a_pointer)
+ << get_plugin_defs("audioresample", gst_type_is_a_pointer)
+ << get_plugin_defs("audiotestsrc", gst_type_is_a_pointer)
+ << get_plugin_defs("cdparanoiasrc", gst_type_is_a_pointer)
+ << get_plugin_defs("clockoverlay", gst_type_is_a_pointer)
+ << get_plugin_defs("decodebin", gst_type_is_a_pointer)
+ << get_plugin_defs("decodebin2", gst_type_is_a_pointer)
+ << get_plugin_defs("ffmpegcolorspace", gst_type_is_a_pointer)
+ << get_plugin_defs("gdpdepay", gst_type_is_a_pointer)
+ << get_plugin_defs("gdppay", gst_type_is_a_pointer)
+ << get_plugin_defs("giosink", gst_type_is_a_pointer)
+ << get_plugin_defs("giosrc", gst_type_is_a_pointer)
+ << get_plugin_defs("giostreamsink", gst_type_is_a_pointer)
+ << get_plugin_defs("giostreamsrc", gst_type_is_a_pointer)
+ << get_plugin_defs("gnomevfssink", gst_type_is_a_pointer)
+ << get_plugin_defs("gnomevfssrc", gst_type_is_a_pointer)
+ << get_plugin_defs("multifdsink", gst_type_is_a_pointer)
+ << get_plugin_defs("oggdemux", gst_type_is_a_pointer)
+ << get_plugin_defs("oggmux", gst_type_is_a_pointer)
+ << get_plugin_defs("playbin", gst_type_is_a_pointer)
+ << get_plugin_defs("playbin2", gst_type_is_a_pointer)
+ << get_plugin_defs("tcpclientsrc", gst_type_is_a_pointer)
+ << get_plugin_defs("tcpclientsink", gst_type_is_a_pointer)
+ << get_plugin_defs("tcpserversrc", gst_type_is_a_pointer)
+ << get_plugin_defs("tcpserversink", gst_type_is_a_pointer)
+ << get_plugin_defs("textoverlay", gst_type_is_a_pointer)
+ << get_plugin_defs("textrender", gst_type_is_a_pointer)
+ << get_plugin_defs("theoradec", gst_type_is_a_pointer)
+ << get_plugin_defs("theoraenc", gst_type_is_a_pointer)
+ << get_plugin_defs("theoraparse", gst_type_is_a_pointer)
+ << get_plugin_defs("timeoverlay", gst_type_is_a_pointer)
+ << get_plugin_defs("uridecodebin", gst_type_is_a_pointer)
+ << get_plugin_defs("videorate", gst_type_is_a_pointer)
+ << get_plugin_defs("videoscale", gst_type_is_a_pointer)
+ << get_plugin_defs("videotestsrc", gst_type_is_a_pointer)
+ << get_plugin_defs("volume", gst_type_is_a_pointer)
+ << get_plugin_defs("vorbisdec", gst_type_is_a_pointer)
+ << get_plugin_defs("vorbisenc", gst_type_is_a_pointer)
+ << get_plugin_defs("vorbisparse", gst_type_is_a_pointer)
+ << get_plugin_defs("vorbistag", gst_type_is_a_pointer)
+ << get_plugin_defs("ximagesink", gst_type_is_a_pointer)
+ << get_plugin_defs("xvimagesink", gst_type_is_a_pointer)
;
return 0;
}
diff --git a/tools/extra_defs_gen/generate_plugin_gmmproc_file.cc b/tools/extra_defs_gen/generate_plugin_gmmproc_file.cc
index 3b10fe2..6f22b7b 100644
--- a/tools/extra_defs_gen/generate_plugin_gmmproc_file.cc
+++ b/tools/extra_defs_gen/generate_plugin_gmmproc_file.cc
@@ -80,10 +80,10 @@ static const char* wrappedEnums[WRAPPED_ENUMS_SIZE] =
"GstState",
"GstStateChange",
"GstStateChangeReturn",
- "GstTCPProtocol",
"GstTagFlag",
"GstTagMergeMode",
"GstTaskState",
+ "GstTCPProtocol",
"GstURIType"
};
diff --git a/tools/extra_defs_gen/get_plugin_defs.cc b/tools/extra_defs_gen/get_plugin_defs.cc
index 040f4f5..ae6022a 100644
--- a/tools/extra_defs_gen/get_plugin_defs.cc
+++ b/tools/extra_defs_gen/get_plugin_defs.cc
@@ -22,7 +22,8 @@
#include <gst/gst.h>
-std::string get_plugin_defs(const std::string& pluginName)
+std::string get_plugin_defs(const std::string& pluginName,
+ GTypeIsAPointerFunc is_a_pointer_func)
{
GType type = 0;
GstElementFactory* factory = 0;
@@ -39,7 +40,7 @@ std::string get_plugin_defs(const std::string& pluginName)
g_object_unref(factory);
factory = GST_ELEMENT_FACTORY(loaded_feature);
type = gst_element_factory_get_element_type(factory);
- result = get_defs(type);
+ result = get_defs(type, is_a_pointer_func);
g_object_unref(factory);
}
return result;
diff --git a/tools/extra_defs_gen/get_plugin_defs.h b/tools/extra_defs_gen/get_plugin_defs.h
index 22bf71f..90b05e0 100644
--- a/tools/extra_defs_gen/get_plugin_defs.h
+++ b/tools/extra_defs_gen/get_plugin_defs.h
@@ -19,4 +19,5 @@
#include <string>
-std::string get_plugin_defs(const std::string& pluginName);
+std::string get_plugin_defs(const std::string& pluginName,
+ GTypeIsAPointerFunc is_a_pointer_func = gtype_is_a_pointer);
diff --git a/tools/m4/ctocpp_gstreamermm.m4 b/tools/m4/ctocpp_gstreamermm.m4
index 43dcdfd..fbef4c4 100644
--- a/tools/m4/ctocpp_gstreamermm.m4
+++ b/tools/m4/ctocpp_gstreamermm.m4
@@ -2,6 +2,7 @@
# ctocpp_base.m4 file for documentation.
#Enums
+_TRANSLATION(`GstFlowReturn',`Gst::FlowReturn',`Gst::FlowReturn',,`<gstreamermm/pad.h>')
_TRANSLATION(`GstFormat',`Gst::Format',`Gst::Format',,`<gstreamermm/format.h>')
_TRANSLATION(`GstTCPProtocol',`Gst::TCPProtocol',`Gst::TCPProtocol',,`<gstreamermm/enums.h>')
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
