From 09c550a172a2c8a76f0b48f2f8ce11070598f66c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim.muller@collabora.co.uk>
Date: Thu, 23 Jul 2009 17:57:14 +0100
Subject: docs: fix docs build again
There is no element called 'ladspa', so there won't be a -details
file for it.
---
docs/plugins/gst-plugins-bad-plugins-docs.sgml | 1 -
docs/plugins/gst-plugins-bad-plugins-sections.txt | 8 --------
2 files changed, 9 deletions(-)
(limited to 'docs')
diff --git a/docs/plugins/gst-plugins-bad-plugins-docs.sgml b/docs/plugins/gst-plugins-bad-plugins-docs.sgml
index f1a36d70..5d2300e0 100644
--- a/docs/plugins/gst-plugins-bad-plugins-docs.sgml
+++ b/docs/plugins/gst-plugins-bad-plugins-docs.sgml
@@ -54,7 +54,6 @@
<xi:include href="xml/element-katedec.xml" />
<xi:include href="xml/element-kateparse.xml" />
<xi:include href="xml/element-katetag.xml" />
- <xi:include href="xml/element-ladspa.xml" />
<xi:include href="xml/element-legacyresample.xml" />
<xi:include href="xml/element-liveadder.xml" />
<xi:include href="xml/element-metadatademux.xml" />
diff --git a/docs/plugins/gst-plugins-bad-plugins-sections.txt b/docs/plugins/gst-plugins-bad-plugins-sections.txt
index 09e0e3fc..ec0c0b7b 100644
--- a/docs/plugins/gst-plugins-bad-plugins-sections.txt
+++ b/docs/plugins/gst-plugins-bad-plugins-sections.txt
@@ -541,14 +541,6 @@ GST_TYPE_KATE_TIGER
gst_kate_tiger_get_type
</SECTION>
-<SECTION>
-<FILE>element-ladspa</FILE>
-<TITLE>ladspa</TITLE>
-GstLADSPA
-<SUBSECTION Standard>
-GstLADSPAClass
-</SECTION>
-
<SECTION>
<FILE>gstbasemetadata</FILE>
<TITLE>GstBaseMetadata</TITLE>
--
cgit v1.2.1
From ab6538561faa9defb1224a688b3107241389726b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim.muller@collabora.co.uk>
Date: Fri, 24 Jul 2009 01:00:34 +0100
Subject: Revert "docs: fix docs build again"
It's not needed any longer after Stefan's updates in the common module.
This reverts commit 09c550a172a2c8a76f0b48f2f8ce11070598f66c.
---
docs/plugins/gst-plugins-bad-plugins-docs.sgml | 1 +
docs/plugins/gst-plugins-bad-plugins-sections.txt | 8 ++++++++
2 files changed, 9 insertions(+)
(limited to 'docs')
diff --git a/docs/plugins/gst-plugins-bad-plugins-docs.sgml b/docs/plugins/gst-plugins-bad-plugins-docs.sgml
index 5d2300e0..f1a36d70 100644
--- a/docs/plugins/gst-plugins-bad-plugins-docs.sgml
+++ b/docs/plugins/gst-plugins-bad-plugins-docs.sgml
@@ -54,6 +54,7 @@
<xi:include href="xml/element-katedec.xml" />
<xi:include href="xml/element-kateparse.xml" />
<xi:include href="xml/element-katetag.xml" />
+ <xi:include href="xml/element-ladspa.xml" />
<xi:include href="xml/element-legacyresample.xml" />
<xi:include href="xml/element-liveadder.xml" />
<xi:include href="xml/element-metadatademux.xml" />
diff --git a/docs/plugins/gst-plugins-bad-plugins-sections.txt b/docs/plugins/gst-plugins-bad-plugins-sections.txt
index ec0c0b7b..09e0e3fc 100644
--- a/docs/plugins/gst-plugins-bad-plugins-sections.txt
+++ b/docs/plugins/gst-plugins-bad-plugins-sections.txt
@@ -541,6 +541,14 @@ GST_TYPE_KATE_TIGER
gst_kate_tiger_get_type
</SECTION>
+<SECTION>
+<FILE>element-ladspa</FILE>
+<TITLE>ladspa</TITLE>
+GstLADSPA
+<SUBSECTION Standard>
+GstLADSPAClass
+</SECTION>
+
<SECTION>
<FILE>gstbasemetadata</FILE>
<TITLE>GstBaseMetadata</TITLE>
--
cgit v1.2.1
From 29e39080324a4a5a3b4d5bbc3fc79213090c6b0a Mon Sep 17 00:00:00 2001
From: Iago Toral <itoral@igalia.com>
Date: Mon, 27 Jul 2009 19:55:27 +0200
Subject: amrwb: Remove AMR-WB parser and decoder and rename encoder plugin
from amrwb to amrwbenc
Partially fixes bug #584890.
---
docs/plugins/Makefile.am | 4 +-
docs/plugins/gst-plugins-bad-plugins-docs.sgml | 5 +-
docs/plugins/gst-plugins-bad-plugins-sections.txt | 28 ---------
docs/plugins/inspect/plugin-amrwb.xml | 76 -----------------------
docs/plugins/inspect/plugin-amrwbenc.xml | 34 ++++++++++
5 files changed, 36 insertions(+), 111 deletions(-)
delete mode 100644 docs/plugins/inspect/plugin-amrwb.xml
create mode 100644 docs/plugins/inspect/plugin-amrwbenc.xml
(limited to 'docs')
diff --git a/docs/plugins/Makefile.am b/docs/plugins/Makefile.am
index 0a43f4ca..7ac083ae 100644
--- a/docs/plugins/Makefile.am
+++ b/docs/plugins/Makefile.am
@@ -89,9 +89,7 @@ EXAMPLE_CFILES = \
$(top_srcdir)/ext/directfb/dfb-example.c
EXTRA_HFILES = \
- $(top_srcdir)/ext/amrwb/gstamrwbdec.h \
- $(top_srcdir)/ext/amrwb/gstamrwbenc.h \
- $(top_srcdir)/ext/amrwb/gstamrwbparse.h \
+ $(top_srcdir)/ext/amrwbenc/gstamrwbenc.h \
$(top_srcdir)/ext/celt/gstceltdec.h \
$(top_srcdir)/ext/celt/gstceltenc.h \
$(top_srcdir)/ext/dc1394/gstdc1394.h \
diff --git a/docs/plugins/gst-plugins-bad-plugins-docs.sgml b/docs/plugins/gst-plugins-bad-plugins-docs.sgml
index f1a36d70..ef8eb36b 100644
--- a/docs/plugins/gst-plugins-bad-plugins-docs.sgml
+++ b/docs/plugins/gst-plugins-bad-plugins-docs.sgml
@@ -19,10 +19,7 @@
<title>gst-plugins-bad Elements</title>
<xi:include href="xml/element-aacparse.xml" />
<xi:include href="xml/element-amrparse.xml" />
- <xi:include href="xml/element-amrwbdec.xml" />
<xi:include href="xml/element-amrwbenc.xml" />
- <xi:include href="xml/element-amrwbparse.xml" />
- <xi:include href="xml/element-amrwbparse.xml" />
<xi:include href="xml/element-autoconvert.xml" />
<xi:include href="xml/element-camerabin.xml" />
<xi:include href="xml/element-capssetter.xml" />
@@ -100,7 +97,7 @@
<xi:include href="xml/plugin-autoconvert.xml" />
<xi:include href="xml/plugin-legacyresample.xml" />
<xi:include href="xml/plugin-alsaspdif.xml" />
- <xi:include href="xml/plugin-amrwb.xml" />
+ <xi:include href="xml/plugin-amrwbenc.xml" />
<xi:include href="xml/plugin-bayer.xml" />
<xi:include href="xml/plugin-bz2.xml" />
<xi:include href="xml/plugin-camerabin.xml" />
diff --git a/docs/plugins/gst-plugins-bad-plugins-sections.txt b/docs/plugins/gst-plugins-bad-plugins-sections.txt
index 09e0e3fc..c60e127c 100644
--- a/docs/plugins/gst-plugins-bad-plugins-sections.txt
+++ b/docs/plugins/gst-plugins-bad-plugins-sections.txt
@@ -26,20 +26,6 @@ GST_TYPE_AMRPARSE
gst_amrparse_get_type
</SECTION>
-<SECTION>
-<FILE>element-amrwbdec</FILE>
-<TITLE>amrwbdec</TITLE>
-GstAmrwbDec
-<SUBSECTION Standard>
-GstAmrwbDecClass
-GST_AMRWBDEC
-GST_AMRWBDEC_CLASS
-GST_IS_AMRWBDEC
-GST_IS_AMRWBDEC_CLASS
-GST_TYPE_AMRWBDEC
-gst_amrwbdec_get_type
-</SECTION>
-
<SECTION>
<FILE>element-amrwbenc</FILE>
<TITLE>amrwbenc</TITLE>
@@ -54,20 +40,6 @@ GST_TYPE_AMRWBENC
gst_amrwbenc_get_type
</SECTION>
-<SECTION>
-<FILE>element-amrwbparse</FILE>
-<TITLE>amrwbparse</TITLE>
-GstAmrwbParse
-<SUBSECTION Standard>
-GstAmrwbParseClass
-GST_AMRWBPARSE
-GST_AMRWBPARSE_CLASS
-GST_IS_AMRWBPARSE
-GST_IS_AMRWBPARSE_CLASS
-GST_TYPE_AMRWBPARSE
-gst_amrwbparse_get_type
-</SECTION>
-
<SECTION>
<FILE>element-audioparse</FILE>
<TITLE>audioparse</TITLE>
diff --git a/docs/plugins/inspect/plugin-amrwb.xml b/docs/plugins/inspect/plugin-amrwb.xml
deleted file mode 100644
index bd617351..00000000
--- a/docs/plugins/inspect/plugin-amrwb.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<plugin>
- <name>amrwb</name>
- <description>Adaptive Multi-Rate Wide-Band</description>
- <filename>../../ext/amrwb/.libs/libgstamrwb.so</filename>
- <basename>libgstamrwb.so</basename>
- <version>0.10.13.1</version>
- <license>unknown</license>
- <source>gst-plugins-bad</source>
- <package>GStreamer Bad Plug-ins git/prerelease</package>
- <origin>http://gstreamer.freedesktop.org</origin>
- <elements>
- <element>
- <name>amrwbdec</name>
- <longname>AMR-WB audio decoder</longname>
- <class>Codec/Decoder/Audio</class>
- <description>Adaptive Multi-Rate Wideband audio decoder</description>
- <author>Renato Araujo <renato.filho@indt.org.br></author>
- <pads>
- <caps>
- <name>src</name>
- <direction>source</direction>
- <presence>always</presence>
- <details>audio/x-raw-int, width=(int)16, depth=(int)16, signed=(boolean)true, endianness=(int)1234, rate=(int)16000, channels=(int)1</details>
- </caps>
- <caps>
- <name>sink</name>
- <direction>sink</direction>
- <presence>always</presence>
- <details>audio/AMR-WB, rate=(int)16000, channels=(int)1</details>
- </caps>
- </pads>
- </element>
- <element>
- <name>amrwbenc</name>
- <longname>AMR-WB audio encoder</longname>
- <class>Codec/Encoder/Audio</class>
- <description>Adaptive Multi-Rate Wideband audio encoder</description>
- <author>Renato Araujo <renato.filho@indt.org.br></author>
- <pads>
- <caps>
- <name>src</name>
- <direction>source</direction>
- <presence>always</presence>
- <details>audio/AMR-WB, rate=(int)16000, channels=(int)1</details>
- </caps>
- <caps>
- <name>sink</name>
- <direction>sink</direction>
- <presence>always</presence>
- <details>audio/x-raw-int, width=(int)16, depth=(int)16, signed=(boolean)true, endianness=(int)1234, rate=(int)16000, channels=(int)1</details>
- </caps>
- </pads>
- </element>
- <element>
- <name>amrwbparse</name>
- <longname>AMR-WB audio stream parser</longname>
- <class>Codec/Parser/Audio</class>
- <description>Adaptive Multi-Rate WideBand audio parser</description>
- <author>Renato Filho <renato.filho@indt.org.br></author>
- <pads>
- <caps>
- <name>src</name>
- <direction>source</direction>
- <presence>always</presence>
- <details>audio/AMR-WB, rate=(int)16000, channels=(int)1</details>
- </caps>
- <caps>
- <name>sink</name>
- <direction>sink</direction>
- <presence>always</presence>
- <details>audio/x-amr-wb-sh</details>
- </caps>
- </pads>
- </element>
- </elements>
-</plugin>
\ No newline at end of file
diff --git a/docs/plugins/inspect/plugin-amrwbenc.xml b/docs/plugins/inspect/plugin-amrwbenc.xml
new file mode 100644
index 00000000..9a7ada08
--- /dev/null
+++ b/docs/plugins/inspect/plugin-amrwbenc.xml
@@ -0,0 +1,34 @@
+<plugin>
+ <name>amrwbenc</name>
+ <description>Adaptive Multi-Rate Wide-Band Encoder</description>
+ <filename>../../ext/amrwb/.libs/libgstamrwbenc.so</filename>
+ <basename>libgstamrwbenc.so</basename>
+ <version>0.10.12.1</version>
+ <license>unknown</license>
+ <source>gst-plugins-bad</source>
+ <package>GStreamer Bad Plug-ins git/prerelease</package>
+ <origin>Unknown package origin</origin>
+ <elements>
+ <element>
+ <name>amrwbenc</name>
+ <longname>AMR-WB audio encoder</longname>
+ <class>Codec/Encoder/Audio</class>
+ <description>Adaptive Multi-Rate Wideband audio encoder</description>
+ <author>Renato Araujo <renato.filho@indt.org.br></author>
+ <pads>
+ <caps>
+ <name>src</name>
+ <direction>source</direction>
+ <presence>always</presence>
+ <details>audio/AMR-WB, rate=(int)16000, channels=(int)1</details>
+ </caps>
+ <caps>
+ <name>sink</name>
+ <direction>sink</direction>
+ <presence>always</presence>
+ <details>audio/x-raw-int, width=(int)16, depth=(int)16, signed=(boolean)true, endianness=(int)1234, rate=(int)16000, channels=(int)1</details>
+ </caps>
+ </pads>
+ </element>
+ </elements>
+</plugin>
--
cgit v1.2.1