Move xingmux from -bad.

Original commit message from CVS:
* docs/plugins/Makefile.am:
* docs/plugins/gst-plugins-ugly-plugins-docs.sgml:
* docs/plugins/gst-plugins-ugly-plugins-sections.txt:
* docs/plugins/inspect/plugin-mpegaudioparse.xml:
* gst/mpegaudioparse/Makefile.am:
* gst/mpegaudioparse/gstmpegaudioparse.c:
* gst/mpegaudioparse/gstxingmux.c:
* tests/check/Makefile.am:
* tests/check/elements/.cvsignore:
Move xingmux from -bad.

diff --git a/ChangeLog b/ChangeLog
index 135c0627b20d96c4ece919277c6aade26cdc5f9c..d4acf77995decd6850e0bb69e5dd0a8fd75ffb51 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2008-02-08  Jan Schmidt  <jan.schmidt@sun.com>
+
+       * docs/plugins/Makefile.am:
+       * docs/plugins/gst-plugins-ugly-plugins-docs.sgml:
+       * docs/plugins/gst-plugins-ugly-plugins-sections.txt:
+       * docs/plugins/inspect/plugin-mpegaudioparse.xml:
+       * gst/mpegaudioparse/Makefile.am:
+       * gst/mpegaudioparse/gstmpegaudioparse.c:
+       * gst/mpegaudioparse/gstxingmux.c:
+       * tests/check/Makefile.am:
+       * tests/check/elements/.cvsignore:
+       Move xingmux from -bad.
+
 2008-02-07  Sebastien Moutte  <sebastien@moutte.net>
 
        * gst/mpegaudioparse/gstmpegaudioparse.c:(mp3parse_time_to_bytepos):

diff --git a/docs/plugins/Makefile.am b/docs/plugins/Makefile.am
index af6dff78064bc3c6f981ff22c751cb16c44ceddb..55e1303aa8a4685da49591bd3fe13499717e87ff 100644 (file)
--- a/docs/plugins/Makefile.am
+++ b/docs/plugins/Makefile.am
@@ -90,6 +90,7 @@ EXTRA_HFILES = \
        $(top_srcdir)/ext/mad/gstmad.h \
        $(top_srcdir)/ext/sidplay/gstsiddec.h \
        $(top_srcdir)/gst/asfdemux/gstrtspwms.h \
+       $(top_srcdir)/gst/mpegaudioparse/gstxingmux.h \
        $(top_srcdir)/gst/realmedia/rademux.h \
        $(top_srcdir)/gst/realmedia/rdtmanager.h \
        $(top_srcdir)/gst/realmedia/rtspreal.h \

diff --git a/docs/plugins/gst-plugins-ugly-plugins-docs.sgml b/docs/plugins/gst-plugins-ugly-plugins-docs.sgml
index 5f10c6d36b7b662a44a1a2fea8ca4e2429e10120..2d8937b6588f47110f87db43d9e54ee9577d74f4 100644 (file)
--- a/docs/plugins/gst-plugins-ugly-plugins-docs.sgml
+++ b/docs/plugins/gst-plugins-ugly-plugins-docs.sgml
@@ -19,6 +19,7 @@
     <xi:include href="xml/element-mad.xml" />
     <xi:include href="xml/element-siddec.xml" />
     <xi:include href="xml/element-synaesthesia.xml" />
+    <xi:include href="xml/element-xingmux.xml" />
   </chapter>
 
   <chapter>

diff --git a/docs/plugins/gst-plugins-ugly-plugins-sections.txt b/docs/plugins/gst-plugins-ugly-plugins-sections.txt
index 9bdf9ea2fbe5b23eaa1600359ce94cc0b0bd7e67..73a73f055e28203c12ddce9c590fcb5869651551 100644 (file)
--- a/docs/plugins/gst-plugins-ugly-plugins-sections.txt
+++ b/docs/plugins/gst-plugins-ugly-plugins-sections.txt
@@ -163,3 +163,17 @@ SYNAES_SAMPLES
 SYNAES_WIDTH
 </SECTION>
 
+<SECTION>
+<FILE>element-xingmux</FILE>
+<TITLE>xingmux</TITLE>
+GstXingMux
+<SUBSECTION Standard>
+GstXingMuxClass
+GST_XING_MUX
+GST_XING_MUX_CLASS
+GST_IS_XING_MUX
+GST_IS_XING_MUX_CLASS
+GST_TYPE_XING_MUX
+gst_xing_mux_get_type
+</SECTION>
+

diff --git a/docs/plugins/inspect/plugin-mpegaudioparse.xml b/docs/plugins/inspect/plugin-mpegaudioparse.xml
index 4b4dc62317d61d45474f90bd69d57f1c4bd928ea..d74d12aa6c05cfe94e061c38e205beb398dda87e 100644 (file)
--- a/docs/plugins/inspect/plugin-mpegaudioparse.xml
+++ b/docs/plugins/inspect/plugin-mpegaudioparse.xml
@@ -14,19 +14,41 @@
       <longname>MPEG1 Audio Parser</longname>
       <class>Codec/Parser/Audio</class>
       <description>Parses and frames mpeg1 audio streams (levels 1-3), provides seek</description>
-      <author>Jan Schmidt &lt;thaytan@mad.scientist.com&gt;012Erik Walthinsen &lt;omega@cse.ogi.edu&gt;</author>
+      <author>Jan Schmidt &lt;thaytan@mad.scientist.com&gt;
+    Erik Walthinsen &lt;omega@cse.ogi.edu&gt;</author>
       <pads>
+        <caps>
+          <name>sink</name>
+          <direction>sink</direction>
+          <presence>always</presence>
+          <details>audio/mpeg, mpegversion=(int)1, parsed=(boolean)false</details>
+        </caps>
         <caps>
           <name>src</name>
           <direction>source</direction>
           <presence>always</presence>
           <details>audio/mpeg, mpegversion=(int)1, layer=(int)[ 1, 3 ], rate=(int)[ 8000, 48000 ], channels=(int)[ 1, 2 ], parsed=(boolean)true</details>
         </caps>
+      </pads>
+    </element>
+    <element>
+      <name>xingmux</name>
+      <longname>MP3 Xing muxer</longname>
+      <class>Formatter/Metadata</class>
+      <description>Adds a Xing header to the beginning of a VBR MP3 file</description>
+      <author>Christophe Fergeau &lt;teuf@gnome.org&gt;</author>
+      <pads>
+        <caps>
+          <name>src</name>
+          <direction>source</direction>
+          <presence>always</presence>
+          <details>audio/mpeg, mpegversion=(int)1, layer=(int)[ 1, 3 ]</details>
+        </caps>
         <caps>
           <name>sink</name>
           <direction>sink</direction>
           <presence>always</presence>
-          <details>audio/mpeg, mpegversion=(int)1, parsed=(boolean)false</details>
+          <details>audio/mpeg, mpegversion=(int)1, layer=(int)[ 1, 3 ]</details>
         </caps>
       </pads>
     </element>

diff --git a/gst/mpegaudioparse/Makefile.am b/gst/mpegaudioparse/Makefile.am
index 4011ff9a76455cb0abe02625e089bec9b894501c..134de8b010584e5c064757d463828c684eb6a1e7 100644 (file)
--- a/gst/mpegaudioparse/Makefile.am
+++ b/gst/mpegaudioparse/Makefile.am
@@ -1,8 +1,8 @@
 plugin_LTLIBRARIES = libgstmpegaudioparse.la
 
-libgstmpegaudioparse_la_SOURCES = gstmpegaudioparse.c
+libgstmpegaudioparse_la_SOURCES = plugin.c gstmpegaudioparse.c gstxingmux.c
 libgstmpegaudioparse_la_CFLAGS = $(GST_CFLAGS)
 libgstmpegaudioparse_la_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS)
 libgstmpegaudioparse_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 
-noinst_HEADERS = gstmpegaudioparse.h
+noinst_HEADERS = gstmpegaudioparse.h gstxingmux.h

diff --git a/gst/mpegaudioparse/gstmpegaudioparse.c b/gst/mpegaudioparse/gstmpegaudioparse.c
index 99ffb59d8e0092fb81078716e791804a4c6b2f2f..a61c08f50a11ed883d6d8a1211c7dc3228bd5db5 100644 (file)
--- a/gst/mpegaudioparse/gstmpegaudioparse.c
+++ b/gst/mpegaudioparse/gstmpegaudioparse.c
@@ -213,6 +213,9 @@ gst_mp3parse_base_init (gpointer klass)
       gst_static_pad_template_get (&mp3_sink_template));
   gst_element_class_add_pad_template (element_class,
       gst_static_pad_template_get (&mp3_src_template));
+
+  GST_DEBUG_CATEGORY_INIT (mp3parse_debug, "mp3parse", 0, "MPEG Audio Parser");
+
   gst_element_class_set_details (element_class, &mp3parse_details);
 }
 
@@ -1723,18 +1726,3 @@ mp3parse_get_query_types (GstPad * pad ATTR_UNUSED)
 
   return query_types;
 }
-
-static gboolean
-plugin_init (GstPlugin * plugin)
-{
-  GST_DEBUG_CATEGORY_INIT (mp3parse_debug, "mp3parse", 0, "MP3 Parser");
-
-  return gst_element_register (plugin, "mp3parse",
-      GST_RANK_PRIMARY + 1, GST_TYPE_MP3PARSE);
-}
-
-GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
-    GST_VERSION_MINOR,
-    "mpegaudioparse",
-    "MPEG-1 layer 1/2/3 audio parser",
-    plugin_init, VERSION, "LGPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN);

diff --git a/gst/mpegaudioparse/gstxingmux.c b/gst/mpegaudioparse/gstxingmux.c
index 49a4628b16511d3e3f45feeb1c5f62e4df872b20..32d757ac64bc261eeda1b9cf308c9be68152fe40 100644 (file)
--- a/gst/mpegaudioparse/gstxingmux.c
+++ b/gst/mpegaudioparse/gstxingmux.c
@@ -391,6 +391,9 @@ gst_xing_mux_base_init (gpointer g_class)
       gst_static_pad_template_get (&gst_xing_mux_src_template));
   gst_element_class_add_pad_template (element_class,
       gst_static_pad_template_get (&gst_xing_mux_sink_template));
+
+  GST_DEBUG_CATEGORY_INIT (xing_mux_debug, "xingmux", 0, "Xing Header Muxer");
+
   gst_element_class_set_details (element_class, &gst_xing_mux_details);
 }
 
@@ -668,22 +671,3 @@ gst_xing_mux_change_state (GstElement * element, GstStateChange transition)
 
   return result;
 }
-
-
-static gboolean
-plugin_init (GstPlugin * plugin)
-{
-  if (!gst_element_register (plugin, "xingmux", GST_RANK_NONE,
-          GST_TYPE_XING_MUX))
-    return FALSE;
-
-  GST_DEBUG_CATEGORY_INIT (xing_mux_debug, "xingmux", 0, "Xing Header Muxer");
-
-  return TRUE;
-}
-
-GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
-    GST_VERSION_MINOR,
-    "xingheader",
-    "Add a xing header to mp3 encoded data",
-    plugin_init, VERSION, "LGPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN)

diff --git a/tests/check/Makefile.am b/tests/check/Makefile.am
index 18abf51c55e403ac49d9f3657b6127254f56c6d3..33a9547e46c23a96309c67c718a977bd4cbd45a8 100644 (file)
--- a/tests/check/Makefile.am
+++ b/tests/check/Makefile.am
@@ -40,11 +40,14 @@ check_PROGRAMS = \
        generic/states \
        $(AMRNB) \
        $(LAME) \
-       $(MPEG2DEC)
+       $(MPEG2DEC) \
+       elements/xingmux
 
 # these tests don't even pass
 noinst_PROGRAMS =
 
+noinst_HEADERS = elements/xingmux_testdata.h
+
 AM_CFLAGS = $(GST_OBJ_CFLAGS) $(GST_CHECK_CFLAGS) $(CHECK_CFLAGS)
 LDADD = $(GST_OBJ_LIBS) $(GST_CHECK_LIBS) $(CHECK_LIBS)
 

diff --git a/tests/check/elements/.gitignore b/tests/check/elements/.gitignore
index d27ee9f1d80b6c5166b89c70c58c6a6595c4084e..ace39484c55f3828e800d56ca5b42a62904eeb54 100644 (file)
--- a/tests/check/elements/.gitignore
+++ b/tests/check/elements/.gitignore
@@ -1,3 +1,4 @@
 amrnbenc
 mpeg2dec
+xingmux
 .dirstamp