mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-24 09:10:36 +00:00
Code Issues 1 Projects Releases Wiki Activity

Move xingmux from -bad.

Browse source 
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.
This commit is contained in:
Jan Schmidt 2008-02-08 00:36:51 +00:00
parent c29660156f
commit 18df8e3250
10 changed files with 71 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
ChangeLog
View file

@ -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):

1
docs/plugins/Makefile.am
View file

@ -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 \

1
docs/plugins/gst-plugins-ugly-plugins-docs.sgml
View file

@ -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>

14
docs/plugins/gst-plugins-ugly-plugins-sections.txt
View file

@ -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>

36
docs/plugins/inspect/plugin-mpegaudioparse.xml
View file

@ -14,20 +14,42 @@
<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>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>
<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, layer=(int)[ 1, 3 ]</details>
</caps>
</pads>
</element>
</elements>

4
gst/mpegaudioparse/Makefile.am
View file

@ -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

18
gst/mpegaudioparse/gstmpegaudioparse.c
View file

@ -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);

22
gst/mpegaudioparse/gstxingmux.c
View file

@ -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)

5
tests/check/Makefile.am
View file

@ -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)

1
tests/check/elements/.gitignore vendored
View file

@ -1,3 +1,4 @@
amrnbenc
mpeg2dec
xingmux
.dirstamp