diff --git a/ChangeLog b/ChangeLog index 135c0627b2..d4acf77995 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +2008-02-08 Jan Schmidt + + * 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 * gst/mpegaudioparse/gstmpegaudioparse.c:(mp3parse_time_to_bytepos): diff --git a/docs/plugins/Makefile.am b/docs/plugins/Makefile.am index af6dff7806..55e1303aa8 100644 --- 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 5f10c6d36b..2d8937b658 100644 --- a/docs/plugins/gst-plugins-ugly-plugins-docs.sgml +++ b/docs/plugins/gst-plugins-ugly-plugins-docs.sgml @@ -19,6 +19,7 @@ + diff --git a/docs/plugins/gst-plugins-ugly-plugins-sections.txt b/docs/plugins/gst-plugins-ugly-plugins-sections.txt index 9bdf9ea2fb..73a73f055e 100644 --- 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 +
+element-xingmux +xingmux +GstXingMux + +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 +
+ diff --git a/docs/plugins/inspect/plugin-mpegaudioparse.xml b/docs/plugins/inspect/plugin-mpegaudioparse.xml index 4b4dc62317..d74d12aa6c 100644 --- a/docs/plugins/inspect/plugin-mpegaudioparse.xml +++ b/docs/plugins/inspect/plugin-mpegaudioparse.xml @@ -14,20 +14,42 @@ MPEG1 Audio Parser Codec/Parser/Audio Parses and frames mpeg1 audio streams (levels 1-3), provides seek - Jan Schmidt <thaytan@mad.scientist.com>012Erik Walthinsen <omega@cse.ogi.edu> + Jan Schmidt <thaytan@mad.scientist.com> + Erik Walthinsen <omega@cse.ogi.edu> - - src - source - always -
audio/mpeg, mpegversion=(int)1, layer=(int)[ 1, 3 ], rate=(int)[ 8000, 48000 ], channels=(int)[ 1, 2 ], parsed=(boolean)true
- sink sink always
audio/mpeg, mpegversion=(int)1, parsed=(boolean)false
 + + src + source + always +
audio/mpeg, mpegversion=(int)1, layer=(int)[ 1, 3 ], rate=(int)[ 8000, 48000 ], channels=(int)[ 1, 2 ], parsed=(boolean)true
+ + + + + xingmux + MP3 Xing muxer + Formatter/Metadata + Adds a Xing header to the beginning of a VBR MP3 file + Christophe Fergeau <teuf@gnome.org> + + + src + source + always +
audio/mpeg, mpegversion=(int)1, layer=(int)[ 1, 3 ]
+ + + sink + sink + always +
audio/mpeg, mpegversion=(int)1, layer=(int)[ 1, 3 ]
+ diff --git a/gst/mpegaudioparse/Makefile.am b/gst/mpegaudioparse/Makefile.am index 4011ff9a76..134de8b010 100644 --- 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 99ffb59d8e..a61c08f50a 100644 --- 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 49a4628b16..32d757ac64 100644 --- 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 18abf51c55..33a9547e46 100644 --- 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 d27ee9f1d8..ace39484c5 100644 --- a/tests/check/elements/.gitignore +++ b/tests/check/elements/.gitignore @@ -1,3 +1,4 @@ amrnbenc mpeg2dec +xingmux .dirstamp