summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier CrĂȘte <olivier.crete@collabora.co.uk>2009-02-20 17:41:37 -0500
committerEdward Hervey <bilboed@bilboed.com>2009-02-21 17:48:08 +0100
commit0df90ed395eacdc4e863213e59b75ddfb88780b9 (patch)
treef7b31f16d7a7ae1ff73b52fb9e2aa46ad4a2cbc6
parentbda90f1977761e277893a5116de92696d0bc619e (diff)
downloadgst-plugins-bad-0df90ed395eacdc4e863213e59b75ddfb88780b9.tar.gz
gst-plugins-bad-0df90ed395eacdc4e863213e59b75ddfb88780b9.tar.bz2
gst-plugins-bad-0df90ed395eacdc4e863213e59b75ddfb88780b9.zip
Moved dtmf elements from gst-plugins-farsight to -bad
-rw-r--r--configure.ac2
-rw-r--r--docs/plugins/Makefile.am4
-rw-r--r--docs/plugins/gst-plugins-bad-plugins-docs.sgml4
-rw-r--r--docs/plugins/gst-plugins-bad-plugins-sections.txt54
-rw-r--r--docs/plugins/inspect/plugin-dtmf.xml64
-rw-r--r--gst/dtmf/gstdtmf.c3
6 files changed, 130 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac
index 7366a38c..03c76e00 100644
--- a/configure.ac
+++ b/configure.ac
@@ -246,6 +246,7 @@ AG_GST_CHECK_PLUGIN(cdxaparse)
AG_GST_CHECK_PLUGIN(dccp)
AG_GST_CHECK_PLUGIN(deinterlace)
AG_GST_CHECK_PLUGIN(deinterlace2)
+AG_GST_CHECK_PLUGIN(dtmf)
AG_GST_CHECK_PLUGIN(dvdspu)
AG_GST_CHECK_PLUGIN(festival)
AG_GST_CHECK_PLUGIN(flv)
@@ -1422,6 +1423,7 @@ gst/cdxaparse/Makefile
gst/dccp/Makefile
gst/deinterlace/Makefile
gst/deinterlace2/Makefile
+gst/dtmf/Makefile
gst/dvdspu/Makefile
gst/festival/Makefile
gst/flv/Makefile
diff --git a/docs/plugins/Makefile.am b/docs/plugins/Makefile.am
index edce6a75..e29416a2 100644
--- a/docs/plugins/Makefile.am
+++ b/docs/plugins/Makefile.am
@@ -146,6 +146,10 @@ EXTRA_HFILES = \
$(top_srcdir)/gst/valve/gstvalve.h \
$(top_srcdir)/gst/y4m/gsty4mencode.h \
$(top_srcdir)/gst/liveadder/liveadder.h \
+ $(top_srcdir)/gst/dtmf/gstdtmfsrc.h \
+ $(top_srcdir)/gst/dtmf/gstrtpdtmfsrc.h \
+ $(top_srcdir)/gst/dtmf/gstrtpdtmfdepay.h \
+ $(top_srcdir)/gst/dtmf/gstrtpdtmfcommon.h \
$(top_srcdir)/sys/dvb/gstdvbsrc.h
# Images to copy into HTML directory.
diff --git a/docs/plugins/gst-plugins-bad-plugins-docs.sgml b/docs/plugins/gst-plugins-bad-plugins-docs.sgml
index 750e1961..1aba2c7a 100644
--- a/docs/plugins/gst-plugins-bad-plugins-docs.sgml
+++ b/docs/plugins/gst-plugins-bad-plugins-docs.sgml
@@ -32,6 +32,7 @@
<xi:include href="xml/element-dccpserversrc.xml" />
<xi:include href="xml/element-deinterlace.xml" />
<xi:include href="xml/element-dfbvideosink.xml" />
+ <xi:include href="xml/element-dtmfsrc.xml" />
<xi:include href="xml/element-dvbsrc.xml" />
<xi:include href="xml/element-dvdspu.xml" />
<xi:include href="xml/element-festival.xml" />
@@ -56,6 +57,8 @@
<xi:include href="xml/element-mxfdemux.xml" />
<xi:include href="xml/element-nuvdemux.xml" />
<xi:include href="xml/element-output-selector.xml" />
+ <xi:include href="xml/element-rtpdtmfdepay.xml" />
+ <xi:include href="xml/element-rtpdtmfsrc.xml" />
<xi:include href="xml/element-scaletempo.xml" />
<xi:include href="xml/element-sdlaudiosink.xml" />
<xi:include href="xml/element-sdlvideosink.xml" />
@@ -90,6 +93,7 @@
<xi:include href="xml/plugin-celt.xml" />
<xi:include href="xml/plugin-dccp.xml" />
<xi:include href="xml/plugin-dfbvideosink.xml" />
+ <xi:include href="xml/plugin-dtmf.xml" />
<xi:include href="xml/plugin-dtsdec.xml" />
<xi:include href="xml/plugin-dvbsrc.xml" />
<xi:include href="xml/plugin-dvb.xml" />
diff --git a/docs/plugins/gst-plugins-bad-plugins-sections.txt b/docs/plugins/gst-plugins-bad-plugins-sections.txt
index a0dc6c74..2bd89411 100644
--- a/docs/plugins/gst-plugins-bad-plugins-sections.txt
+++ b/docs/plugins/gst-plugins-bad-plugins-sections.txt
@@ -892,3 +892,57 @@ GST_TYPE_VALVE
GST_VALVE
GST_VALVE_CLASS
</SECTION>
+
+<SECTION>
+<FILE>element-dtmfsrc</FILE>
+<TITLE>dtmfsrc</TITLE>
+GstDTMFSrc
+<SUBSECTION Standard>
+GstDTMFEventType
+GstDTMFSrcEvent
+GstDTMFSrcClass
+GST_TYPE_DTMF_SRC
+GST_DTMF_SRC
+GST_DTMF_SRC_CAST
+GST_DTMF_SRC_CLASS
+GST_DTMF_SRC_GET_CLASS
+GST_IS_DTMF_SRC
+GST_IS_DTMF_SRC_CLASS
+gst_dtmf_src_get_type
+gst_dtmf_src_plugin_init
+</SECTION>
+
+<SECTION>
+<FILE>element-rtpdtmfsrc</FILE>
+<TITLE>rtpdtmfsrc</TITLE>
+GstRTPDTMFSrc
+<SUBSECTION Standard>
+GstRTPDTMFSrcClass
+GST_TYPE_RTP_DTMF_SRC
+GST_IS_RTP_DTMF_SRC
+GST_IS_RTP_DTMF_SRC_CLASS
+GST_RTP_DTMF_SRC
+GST_RTP_DTMF_SRC_CAST
+GST_RTP_DTMF_SRC_CLASS
+GST_RTP_DTMF_SRC_GET_CLASS
+gst_rtp_dtmf_src_get_type
+gst_rtp_dtmf_src_plugin_init
+GstRTPDTMFPayload
+GstRTPDTMFSrcEvent
+GstRTPDTMFEventType
+</SECTION>
+
+<SECTION>
+<FILE>element-rtpdtmfdepay</FILE>
+<TITLE>rtpdtmfdepay</TITLE>
+GstRtpDTMFDepay
+<SUBSECTION Standard>
+GstRtpDTMFDepayClass
+GST_TYPE_RTP_DTMF_DEPAY
+GST_IS_RTP_DTMF_DEPAY
+GST_IS_RTP_DTMF_DEPAY_CLASS
+GST_RTP_DTMF_DEPAY
+GST_RTP_DTMF_DEPAY_CLASS
+gst_rtp_dtmf_depay_plugin_init
+</SECTION>
+
diff --git a/docs/plugins/inspect/plugin-dtmf.xml b/docs/plugins/inspect/plugin-dtmf.xml
new file mode 100644
index 00000000..2c132c54
--- /dev/null
+++ b/docs/plugins/inspect/plugin-dtmf.xml
@@ -0,0 +1,64 @@
+<plugin>
+ <name>dtmf</name>
+ <description>DTMF plugins</description>
+ <filename>../../gst/dtmf/.libs/libgstdtmf.so</filename>
+ <basename>libgstdtmf.so</basename>
+ <version>0.1</version>
+ <license>LGPL</license>
+ <source>gst-plugins-bad</source>
+ <package>DTMF</package>
+ <origin></origin>
+ <elements>
+ <element>
+ <name>dtmfsrc</name>
+ <longname>DTMF tone generator</longname>
+ <class>Source/Audio</class>
+ <description>Generates DTMF tones</description>
+ <author>Youness Alaoui &lt;youness.alaoui@collabora.co.uk&gt;</author>
+ <pads>
+ <caps>
+ <name>src</name>
+ <direction>source</direction>
+ <presence>always</presence>
+ <details>audio/x-raw-int, width=(int)16, depth=(int)16, endianness=(int)1234, signed=(boolean)true, rate=(int)8000, channels=(int)1</details>
+ </caps>
+ </pads>
+ </element>
+ <element>
+ <name>rtpdtmfdepay</name>
+ <longname>RTP DTMF packet depayloader</longname>
+ <class>Codec/Depayloader/Network</class>
+ <description>Generates DTMF Sound from telephone-event RTP packets</description>
+ <author>Youness Alaoui &lt;youness.alaoui@collabora.co.uk&gt;</author>
+ <pads>
+ <caps>
+ <name>sink</name>
+ <direction>sink</direction>
+ <presence>always</presence>
+ <details>application/x-rtp, media=(string)audio, payload=(int)[ 96, 127 ], clock-rate=(int)[ 0, 2147483647 ], encoding-name=(string)TELEPHONE-EVENT</details>
+ </caps>
+ <caps>
+ <name>src</name>
+ <direction>source</direction>
+ <presence>always</presence>
+ <details>audio/x-raw-int, width=(int)16, depth=(int)16, endianness=(int)1234, signed=(boolean)true, rate=(int)[ 0, 2147483647 ], channels=(int)1</details>
+ </caps>
+ </pads>
+ </element>
+ <element>
+ <name>rtpdtmfsrc</name>
+ <longname>RTP DTMF packet generator</longname>
+ <class>Source/Network</class>
+ <description>Generates RTP DTMF packets</description>
+ <author>Zeeshan Ali &lt;zeeshan.ali@nokia.com&gt;</author>
+ <pads>
+ <caps>
+ <name>src</name>
+ <direction>source</direction>
+ <presence>always</presence>
+ <details>application/x-rtp, media=(string)audio, payload=(int)[ 96, 127 ], clock-rate=(int)[ 0, 2147483647 ], ssrc=(int)[ 0, 2147483647 ], encoding-name=(string)TELEPHONE-EVENT</details>
+ </caps>
+ </pads>
+ </element>
+ </elements>
+</plugin> \ No newline at end of file
diff --git a/gst/dtmf/gstdtmf.c b/gst/dtmf/gstdtmf.c
index 4d9d1a59..d50cf03f 100644
--- a/gst/dtmf/gstdtmf.c
+++ b/gst/dtmf/gstdtmf.c
@@ -26,4 +26,5 @@ plugin_init (GstPlugin * plugin)
GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
GST_VERSION_MINOR,
- "dtmf", "DTMF plugins", plugin_init, "0.1", "LGPL", "DTMF", "");
+ "dtmf", "DTMF plugins",
+ plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN)