Moved twolame from Bad to Ugly

This commit is contained in:
Jan Schmidt 2009-03-10 00:10:20 +00:00
parent 9704439f33
commit b2d11de70a
25 changed files with 316 additions and 40 deletions

View file

@ -352,6 +352,18 @@ AG_GST_CHECK_FEATURE(SIDPLAY, [libsidplay], sid, [
GST_PATH_SIDPLAY()
])
dnl *** twolame ***
translit(dnm, m, l) AM_CONDITIONAL(USE_TWOLAME, true)
AG_GST_CHECK_FEATURE(TWOLAME, [twolame], twolame, [
PKG_CHECK_MODULES(TWOLAME, twolame >= 0.3.0, [
HAVE_TWOLAME="yes"], [
HAVE_TWOLAME="no"
AC_MSG_RESULT(no)
])
AC_SUBST(TWOLAME_CFLAGS)
AC_SUBST(TWOLAME_LIBS)
])
else
dnl not building plugins with external dependencies,
@ -367,6 +379,7 @@ AM_CONDITIONAL(USE_ID3TAG, false)
AM_CONDITIONAL(USE_MAD, false)
AM_CONDITIONAL(USE_MPEG2DEC, false)
AM_CONDITIONAL(USE_SIDPLAY, false)
AM_CONDITIONAL(USE_TWOLAME, false)
fi dnl of EXT plugins
@ -452,6 +465,7 @@ ext/lame/Makefile
ext/mad/Makefile
ext/mpeg2dec/Makefile
ext/sidplay/Makefile
ext/twolame/Makefile
docs/Makefile
docs/plugins/Makefile
docs/version.entities

View file

@ -91,6 +91,7 @@ EXTRA_HFILES = \
$(top_srcdir)/ext/lame/gstlame.h \
$(top_srcdir)/ext/mad/gstmad.h \
$(top_srcdir)/ext/sidplay/gstsiddec.h \
$(top_srcdir)/ext/twolame/gsttwolame.h \
$(top_srcdir)/gst/asfdemux/gstrtspwms.h \
$(top_srcdir)/gst/mpegaudioparse/gstxingmux.h \
$(top_srcdir)/gst/realmedia/rademux.h \

View file

@ -29,6 +29,7 @@
<xi:include href="xml/element-rtspreal.xml" />
<xi:include href="xml/element-rtspwms.xml" />
<xi:include href="xml/element-siddec.xml" />
<xi:include href="xml/element-twolame.xml" />
<xi:include href="xml/element-synaesthesia.xml" />
<xi:include href="xml/element-xingmux.xml" />
</chapter>
@ -53,5 +54,6 @@
<xi:include href="xml/plugin-rmdemux.xml" />
<xi:include href="xml/plugin-siddec.xml" />
<xi:include href="xml/plugin-synaesthesia.xml" />
<xi:include href="xml/plugin-twolame.xml" />
</chapter>
</book>

View file

@ -191,6 +191,20 @@ SYNAES_SAMPLES
SYNAES_WIDTH
</SECTION>
<SECTION>
<FILE>element-twolame</FILE>
<TITLE>twolame</TITLE>
GstTwoLame
<SUBSECTION Standard>
GstTwoLameClass
GST_TWO_LAME
GST_TWO_LAME_CLASS
GST_IS_TWO_LAME
GST_IS_TWO_LAME_CLASS
GST_TYPE_TWO_LAME
gst_two_lame_get_type
</SECTION>
<SECTION>
<FILE>element-xingmux</FILE>
<TITLE>xingmux</TITLE>

View file

@ -688,3 +688,163 @@
<DEFAULT>-1</DEFAULT>
</ARG>
<ARG>
<NAME>GstPNMSrc::location</NAME>
<TYPE>gchar*</TYPE>
<RANGE></RANGE>
<FLAGS>rw</FLAGS>
<NICK>PNM Location</NICK>
<BLURB>Location of the PNM url to read.</BLURB>
<DEFAULT>NULL</DEFAULT>
</ARG>
<ARG>
<NAME>GstTwoLame::ath-level</NAME>
<TYPE>gfloat</TYPE>
<RANGE></RANGE>
<FLAGS>rw</FLAGS>
<NICK>ATH Level</NICK>
<BLURB>ATH Level in dB.</BLURB>
<DEFAULT>0</DEFAULT>
</ARG>
<ARG>
<NAME>GstTwoLame::bitrate</NAME>
<TYPE>gint</TYPE>
<RANGE>[8,384]</RANGE>
<FLAGS>rw</FLAGS>
<NICK>Bitrate (kb/s)</NICK>
<BLURB>Bitrate in kbit/sec (8, 16, 24, 32, 40, 48, 56, 64, 80, 96, 112, 128, 144, 160, 192, 224, 256, 320, 384).</BLURB>
<DEFAULT>192</DEFAULT>
</ARG>
<ARG>
<NAME>GstTwoLame::copyright</NAME>
<TYPE>gboolean</TYPE>
<RANGE></RANGE>
<FLAGS>rw</FLAGS>
<NICK>Copyright</NICK>
<BLURB>Mark as copyright.</BLURB>
<DEFAULT>FALSE</DEFAULT>
</ARG>
<ARG>
<NAME>GstTwoLame::emphasis</NAME>
<TYPE>GstTwoLameEmphasis</TYPE>
<RANGE></RANGE>
<FLAGS>rw</FLAGS>
<NICK>Emphasis</NICK>
<BLURB>Pre-emphasis to apply to the decoded audio.</BLURB>
<DEFAULT>No emphasis</DEFAULT>
</ARG>
<ARG>
<NAME>GstTwoLame::energy-level-extension</NAME>
<TYPE>gboolean</TYPE>
<RANGE></RANGE>
<FLAGS>rw</FLAGS>
<NICK>Energy Level Extension</NICK>
<BLURB>Write peak PCM level to each frame.</BLURB>
<DEFAULT>FALSE</DEFAULT>
</ARG>
<ARG>
<NAME>GstTwoLame::error-protection</NAME>
<TYPE>gboolean</TYPE>
<RANGE></RANGE>
<FLAGS>rw</FLAGS>
<NICK>Error protection</NICK>
<BLURB>Adds checksum to every frame.</BLURB>
<DEFAULT>FALSE</DEFAULT>
</ARG>
<ARG>
<NAME>GstTwoLame::mode</NAME>
<TYPE>GstTwoLameMode</TYPE>
<RANGE></RANGE>
<FLAGS>rw</FLAGS>
<NICK>Mode</NICK>
<BLURB>Encoding mode.</BLURB>
<DEFAULT>Joint Stereo</DEFAULT>
</ARG>
<ARG>
<NAME>GstTwoLame::original</NAME>
<TYPE>gboolean</TYPE>
<RANGE></RANGE>
<FLAGS>rw</FLAGS>
<NICK>Original</NICK>
<BLURB>Mark as original.</BLURB>
<DEFAULT>TRUE</DEFAULT>
</ARG>
<ARG>
<NAME>GstTwoLame::padding</NAME>
<TYPE>GstTwoLamePadding</TYPE>
<RANGE></RANGE>
<FLAGS>rw</FLAGS>
<NICK>Padding</NICK>
<BLURB>Padding type.</BLURB>
<DEFAULT>No Padding</DEFAULT>
</ARG>
<ARG>
<NAME>GstTwoLame::psymodel</NAME>
<TYPE>gint</TYPE>
<RANGE>[-1,4]</RANGE>
<FLAGS>rw</FLAGS>
<NICK>Psychoacoustic Model</NICK>
<BLURB>Psychoacoustic model used to encode the audio.</BLURB>
<DEFAULT>3</DEFAULT>
</ARG>
<ARG>
<NAME>GstTwoLame::quick-mode</NAME>
<TYPE>gboolean</TYPE>
<RANGE></RANGE>
<FLAGS>rw</FLAGS>
<NICK>Quick mode</NICK>
<BLURB>Calculate Psymodel every frames.</BLURB>
<DEFAULT>FALSE</DEFAULT>
</ARG>
<ARG>
<NAME>GstTwoLame::quick-mode-count</NAME>
<TYPE>gint</TYPE>
<RANGE>>= 0</RANGE>
<FLAGS>rw</FLAGS>
<NICK>Quick mode count</NICK>
<BLURB>Calculate Psymodel every n frames.</BLURB>
<DEFAULT>10</DEFAULT>
</ARG>
<ARG>
<NAME>GstTwoLame::vbr</NAME>
<TYPE>gboolean</TYPE>
<RANGE></RANGE>
<FLAGS>rw</FLAGS>
<NICK>VBR</NICK>
<BLURB>Enable variable bitrate mode.</BLURB>
<DEFAULT>FALSE</DEFAULT>
</ARG>
<ARG>
<NAME>GstTwoLame::vbr-level</NAME>
<TYPE>gfloat</TYPE>
<RANGE>[-10,10]</RANGE>
<FLAGS>rw</FLAGS>
<NICK>VBR Level</NICK>
<BLURB>VBR Level.</BLURB>
<DEFAULT>5</DEFAULT>
</ARG>
<ARG>
<NAME>GstTwoLame::vbr-max-bitrate</NAME>
<TYPE>gint</TYPE>
<RANGE>[0,384]</RANGE>
<FLAGS>rw</FLAGS>
<NICK>VBR max bitrate</NICK>
<BLURB>Specify maximum VBR bitrate (0=off, 8, 16, 24, 32, 40, 48, 56, 64, 80, 96, 112, 128, 144, 160, 192, 224, 256, 320, 384).</BLURB>
<DEFAULT>0</DEFAULT>
</ARG>

View file

@ -19,7 +19,9 @@ GObject
GstCddaBaseSrc
GstCdioCddaSrc
GstDvdReadSrc
GstPNMSrc
GstSidDec
GstTwoLame
GstLame
GstRMDemux
GstRealAudioDemux
@ -37,6 +39,9 @@ GObject
GstMPEGAudioParse
GstASFDemux
GstRTSPWMS
GstBaseRTPDepayload
GstRtpAsfDepay
GstSynaesthesia
GstBus
GstTask
GstClock

View file

@ -4,6 +4,7 @@ GstID3Tag GstTagSetter
GstCddaBaseSrc GstURIHandler
GstCdioCddaSrc GstURIHandler
GstDvdReadSrc GstURIHandler
GstPNMSrc GstURIHandler
GstLame GstTagSetter
GstRTSPReal GstRTSPExtension
GstRTSPWMS GstRTSPExtension

View file

@ -3,10 +3,10 @@
<description>Decodes ATSC A/52 encoded audio streams</description>
<filename>../../ext/a52dec/.libs/libgsta52dec.so</filename>
<basename>libgsta52dec.so</basename>
<version>0.10.10</version>
<version>0.10.10.1</version>
<license>GPL</license>
<source>gst-plugins-ugly</source>
<package>GStreamer Ugly Plug-ins source release</package>
<package>GStreamer Ugly Plug-ins CVS/prerelease</package>
<origin>Unknown package origin</origin>
<elements>
<element>

View file

@ -3,10 +3,10 @@
<description>Demuxes and muxes audio and video in Microsofts ASF format</description>
<filename>../../gst/asfdemux/.libs/libgstasf.so</filename>
<basename>libgstasf.so</basename>
<version>0.10.10</version>
<version>0.10.10.1</version>
<license>LGPL</license>
<source>gst-plugins-ugly</source>
<package>GStreamer Ugly Plug-ins source release</package>
<package>GStreamer Ugly Plug-ins CVS/prerelease</package>
<origin>Unknown package origin</origin>
<elements>
<element>
@ -36,6 +36,27 @@
</caps>
</pads>
</element>
<element>
<name>rtpasfdepay</name>
<longname>RTP ASF packet depayloader</longname>
<class>Codec/Depayloader/Network</class>
<description>Extracts ASF streams from RTP</description>
<author>Tim-Philipp Müller &lt;tim centricular net&gt;, Wim Taymans &lt;wim.taymans@gmail.com&gt;</author>
<pads>
<caps>
<name>sink</name>
<direction>sink</direction>
<presence>always</presence>
<details>application/x-rtp, media=(string){ application, video, audio }, clock-rate=(int)[ 1, 2147483647 ], encoding-name=(string)X-ASF-PF</details>
</caps>
<caps>
<name>src</name>
<direction>source</direction>
<presence>always</presence>
<details>video/x-ms-asf</details>
</caps>
</pads>
</element>
<element>
<name>rtspwms</name>
<longname>WMS RTSP Extension</longname>

View file

@ -3,10 +3,10 @@
<description>Read audio from audio CDs</description>
<filename>../../ext/cdio/.libs/libgstcdio.so</filename>
<basename>libgstcdio.so</basename>
<version>0.10.10</version>
<version>0.10.10.1</version>
<license>GPL</license>
<source>gst-plugins-ugly</source>
<package>GStreamer Ugly Plug-ins source release</package>
<package>GStreamer Ugly Plug-ins CVS/prerelease</package>
<origin>Unknown package origin</origin>
<elements>
<element>

View file

@ -3,10 +3,10 @@
<description>Decode DVD LPCM frames into standard PCM</description>
<filename>../../gst/dvdlpcmdec/.libs/libgstdvdlpcmdec.so</filename>
<basename>libgstdvdlpcmdec.so</basename>
<version>0.10.10</version>
<version>0.10.10.1</version>
<license>LGPL</license>
<source>gst-plugins-ugly</source>
<package>GStreamer Ugly Plug-ins source release</package>
<package>GStreamer Ugly Plug-ins CVS/prerelease</package>
<origin>Unknown package origin</origin>
<elements>
<element>

View file

@ -3,10 +3,10 @@
<description>Access a DVD with dvdread</description>
<filename>../../ext/dvdread/.libs/libgstdvdread.so</filename>
<basename>libgstdvdread.so</basename>
<version>0.10.10</version>
<version>0.10.10.1</version>
<license>GPL</license>
<source>gst-plugins-ugly</source>
<package>GStreamer Ugly Plug-ins source release</package>
<package>GStreamer Ugly Plug-ins CVS/prerelease</package>
<origin>Unknown package origin</origin>
<elements>
<element>

View file

@ -3,10 +3,10 @@
<description>DVD subtitle parser and decoder</description>
<filename>../../gst/dvdsub/.libs/libgstdvdsub.so</filename>
<basename>libgstdvdsub.so</basename>
<version>0.10.10</version>
<version>0.10.10.1</version>
<license>LGPL</license>
<source>gst-plugins-ugly</source>
<package>GStreamer Ugly Plug-ins source release</package>
<package>GStreamer Ugly Plug-ins CVS/prerelease</package>
<origin>Unknown package origin</origin>
<elements>
<element>

View file

@ -3,10 +3,10 @@
<description>Convert raw AC3 into IEC958 (S/PDIF) frames</description>
<filename>../../gst/iec958/.libs/libgstiec958.so</filename>
<basename>libgstiec958.so</basename>
<version>0.10.10</version>
<version>0.10.10.1</version>
<license>LGPL</license>
<source>gst-plugins-ugly</source>
<package>GStreamer Ugly Plug-ins source release</package>
<package>GStreamer Ugly Plug-ins CVS/prerelease</package>
<origin>Unknown package origin</origin>
<elements>
<element>

View file

@ -3,10 +3,10 @@
<description>Encode MP3s with LAME</description>
<filename>../../ext/lame/.libs/libgstlame.so</filename>
<basename>libgstlame.so</basename>
<version>0.10.10</version>
<version>0.10.10.1</version>
<license>LGPL</license>
<source>gst-plugins-ugly</source>
<package>GStreamer Ugly Plug-ins source release</package>
<package>GStreamer Ugly Plug-ins CVS/prerelease</package>
<origin>Unknown package origin</origin>
<elements>
<element>

View file

@ -3,10 +3,10 @@
<description>id3 tag manipulation and mp3 decoding based on the mad library</description>
<filename>../../ext/mad/.libs/libgstmad.so</filename>
<basename>libgstmad.so</basename>
<version>0.10.10</version>
<version>0.10.10.1</version>
<license>GPL</license>
<source>gst-plugins-ugly</source>
<package>GStreamer Ugly Plug-ins source release</package>
<package>GStreamer Ugly Plug-ins CVS/prerelease</package>
<origin>Unknown package origin</origin>
<elements>
<element>

View file

@ -3,10 +3,10 @@
<description>LibMpeg2 decoder</description>
<filename>../../ext/mpeg2dec/.libs/libgstmpeg2dec.so</filename>
<basename>libgstmpeg2dec.so</basename>
<version>0.10.10</version>
<version>0.10.10.1</version>
<license>GPL</license>
<source>gst-plugins-ugly</source>
<package>GStreamer Ugly Plug-ins source release</package>
<package>GStreamer Ugly Plug-ins CVS/prerelease</package>
<origin>Unknown package origin</origin>
<elements>
<element>
@ -26,7 +26,7 @@
<name>src</name>
<direction>source</direction>
<presence>always</presence>
<details>video/x-raw-yuv, format=(fourcc){ YV12, I420, Y42B }, width=(int)[ 16, 4096 ], height=(int)[ 16, 4096 ], framerate=(fraction)[ 0/1, 2147483647/1 ]</details>
<details>video/x-raw-yuv, format=(fourcc){ YV12, I420, Y42B, Y444 }, width=(int)[ 16, 4096 ], height=(int)[ 16, 4096 ], framerate=(fraction)[ 0/1, 2147483647/1 ]</details>
</caps>
</pads>
</element>

View file

@ -3,10 +3,10 @@
<description>MPEG-1 layer 1/2/3 audio stream elements</description>
<filename>../../gst/mpegaudioparse/.libs/libgstmpegaudioparse.so</filename>
<basename>libgstmpegaudioparse.so</basename>
<version>0.10.10</version>
<version>0.10.10.1</version>
<license>LGPL</license>
<source>gst-plugins-ugly</source>
<package>GStreamer Ugly Plug-ins source release</package>
<package>GStreamer Ugly Plug-ins CVS/prerelease</package>
<origin>Unknown package origin</origin>
<elements>
<element>

View file

@ -3,10 +3,10 @@
<description>MPEG system stream parser</description>
<filename>../../gst/mpegstream/.libs/libgstmpegstream.so</filename>
<basename>libgstmpegstream.so</basename>
<version>0.10.10</version>
<version>0.10.10.1</version>
<license>LGPL</license>
<source>gst-plugins-ugly</source>
<package>GStreamer Ugly Plug-ins source release</package>
<package>GStreamer Ugly Plug-ins CVS/prerelease</package>
<origin>Unknown package origin</origin>
<elements>
<element>

View file

@ -1,14 +1,29 @@
<plugin>
<name>realmedia</name>
<description>RealMedia demuxer and depayloader</description>
<description>RealMedia support plugins</description>
<filename>../../gst/realmedia/.libs/libgstrmdemux.so</filename>
<basename>libgstrmdemux.so</basename>
<version>0.10.10</version>
<version>0.10.10.1</version>
<license>LGPL</license>
<source>gst-plugins-ugly</source>
<package>GStreamer Ugly Plug-ins source release</package>
<package>GStreamer Ugly Plug-ins CVS/prerelease</package>
<origin>Unknown package origin</origin>
<elements>
<element>
<name>pnmsrc</name>
<longname>PNM packet receiver</longname>
<class>Source/Network</class>
<description>Receive data over the network via PNM</description>
<author>Wim Taymans &lt;wim.taymans@gmail.com&gt;</author>
<pads>
<caps>
<name>src</name>
<direction>source</direction>
<presence>always</presence>
<details>application/vnd.rn-realmedia</details>
</caps>
</pads>
</element>
<element>
<name>rademux</name>
<longname>RealAudio Demuxer</longname>

View file

@ -3,10 +3,10 @@
<description>Uses libsidplay to decode .sid files</description>
<filename>../../ext/sidplay/.libs/libgstsid.so</filename>
<basename>libgstsid.so</basename>
<version>0.10.10</version>
<version>0.10.10.1</version>
<license>GPL</license>
<source>gst-plugins-ugly</source>
<package>GStreamer Ugly Plug-ins source release</package>
<package>GStreamer Ugly Plug-ins CVS/prerelease</package>
<origin>Unknown package origin</origin>
<elements>
<element>

View file

@ -3,11 +3,11 @@
<description>Creates video visualizations of audio input, using stereo and pitch information</description>
<filename>../../gst/synaesthesia/.libs/libgstsynaesthesia.so</filename>
<basename>libgstsynaesthesia.so</basename>
<version>0.10.8.1</version>
<version>0.10.10.1</version>
<license>GPL</license>
<source>gst-plugins-ugly</source>
<package>GStreamer Ugly Plug-ins CVS/prerelease</package>
<origin>http://gstreamer.freedesktop.org</origin>
<origin>Unknown package origin</origin>
<elements>
<element>
<name>synaesthesia</name>
@ -16,18 +16,18 @@
<description>Creates video visualizations of audio input, using stereo and pitch information</description>
<author>Richard Boulton &lt;richard@tartarus.org&gt;</author>
<pads>
<caps>
<name>src</name>
<direction>source</direction>
<presence>always</presence>
<details>video/x-raw-rgb, bpp=(int)32, depth=(int)24, endianness=(int)4321, red_mask=(int)65280, green_mask=(int)16711680, blue_mask=(int)-16777216, width=(int)[ 1, 2147483647 ], height=(int)[ 1, 2147483647 ], framerate=(fraction)[ 0/1, 2147483647/1 ]</details>
</caps>
<caps>
<name>sink</name>
<direction>sink</direction>
<presence>always</presence>
<details>audio/x-raw-int, rate=(int)[ 1, 2147483647 ], channels=(int)2, endianness=(int)1234, width=(int)16, depth=(int)16, signed=(boolean)true</details>
</caps>
<caps>
<name>src</name>
<direction>source</direction>
<presence>always</presence>
<details>video/x-raw-rgb, bpp=(int)32, depth=(int)24, endianness=(int)4321, red_mask=(int)65280, green_mask=(int)16711680, blue_mask=(int)-16777216, width=(int)[ 1, 2147483647 ], height=(int)[ 1, 2147483647 ], framerate=(fraction)[ 0/1, 2147483647/1 ]</details>
</caps>
</pads>
</element>
</elements>

View file

@ -0,0 +1,34 @@
<plugin>
<name>twolame</name>
<description>Encode MP2s with TwoLAME</description>
<filename>../../ext/twolame/.libs/libgsttwolame.so</filename>
<basename>libgsttwolame.so</basename>
<version>0.10.10.1</version>
<license>LGPL</license>
<source>gst-plugins-ugly</source>
<package>GStreamer Ugly Plug-ins CVS/prerelease</package>
<origin>Unknown package origin</origin>
<elements>
<element>
<name>twolame</name>
<longname>TwoLAME mp2 encoder</longname>
<class>Codec/Encoder/Audio</class>
<description>High-quality free MP2 encoder</description>
<author>Sebastian Dröge &lt;sebastian.droege@collabora.co.uk&gt;</author>
<pads>
<caps>
<name>sink</name>
<direction>sink</direction>
<presence>always</presence>
<details>audio/x-raw-float, endianness=(int)1234, width=(int)32, rate=(int){ 16000, 22050, 24000, 32000, 44100, 48000 }, channels=(int)[ 1, 2 ]; audio/x-raw-int, endianness=(int)1234, signed=(boolean)true, width=(int)16, depth=(int)16, rate=(int){ 16000, 22050, 24000, 32000, 44100, 48000 }, channels=(int)[ 1, 2 ]</details>
</caps>
<caps>
<name>src</name>
<direction>source</direction>
<presence>always</presence>
<details>audio/mpeg, mpegversion=(int)1, layer=(int)2, rate=(int){ 16000, 22050, 24000, 32000, 44100, 48000 }, channels=(int)[ 1, 2 ]</details>
</caps>
</pads>
</element>
</elements>
</plugin>

View file

@ -52,6 +52,12 @@ else
SIDPLAY_DIR =
endif
if USE_TWOLAME
TWOLAME_DIR = twolame
else
TWOLAME_DIR =
endif
SUBDIRS = \
$(A52DEC_DIR) \
$(AMRNB_DIR) \
@ -61,7 +67,8 @@ SUBDIRS = \
$(LAME_DIR) \
$(MAD_DIR) \
$(MPEG2DEC_DIR) \
$(SIDPLAY_DIR)
$(SIDPLAY_DIR) \
$(TWOLAME_DIR)
DIST_SUBDIRS = \
a52dec \
@ -72,4 +79,5 @@ DIST_SUBDIRS = \
lame \
mad \
mpeg2dec \
sidplay
sidplay \
twolame

View file

@ -2,4 +2,5 @@ ext/cdio/gstcdiocddasrc.c
ext/dvdnav/dvdnavsrc.c
ext/dvdread/dvdreadsrc.c
ext/lame/gstlame.c
ext/twolame/gsttwolame.c
gst/asfdemux/gstasfdemux.c