diff --git a/configure.ac b/configure.ac index 4bd441ece6..4b980d6036 100644 --- a/configure.ac +++ b/configure.ac @@ -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 diff --git a/docs/plugins/Makefile.am b/docs/plugins/Makefile.am index e190220a9a..8022df53c8 100644 --- a/docs/plugins/Makefile.am +++ b/docs/plugins/Makefile.am @@ -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 \ diff --git a/docs/plugins/gst-plugins-ugly-plugins-docs.sgml b/docs/plugins/gst-plugins-ugly-plugins-docs.sgml index e7ccb9b5f5..bdf4504490 100644 --- a/docs/plugins/gst-plugins-ugly-plugins-docs.sgml +++ b/docs/plugins/gst-plugins-ugly-plugins-docs.sgml @@ -29,6 +29,7 @@ + @@ -53,5 +54,6 @@ + diff --git a/docs/plugins/gst-plugins-ugly-plugins-sections.txt b/docs/plugins/gst-plugins-ugly-plugins-sections.txt index daaf3d23f2..cc5c5d81a1 100644 --- a/docs/plugins/gst-plugins-ugly-plugins-sections.txt +++ b/docs/plugins/gst-plugins-ugly-plugins-sections.txt @@ -191,6 +191,20 @@ SYNAES_SAMPLES SYNAES_WIDTH +
+element-twolame +twolame +GstTwoLame + +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 +
+
element-xingmux xingmux diff --git a/docs/plugins/gst-plugins-ugly-plugins.args b/docs/plugins/gst-plugins-ugly-plugins.args index 943f6ba28e..8e6dd1bd07 100644 --- a/docs/plugins/gst-plugins-ugly-plugins.args +++ b/docs/plugins/gst-plugins-ugly-plugins.args @@ -688,3 +688,163 @@ -1 + +GstPNMSrc::location +gchar* + +rw +PNM Location +Location of the PNM url to read. +NULL + + + +GstTwoLame::ath-level +gfloat + +rw +ATH Level +ATH Level in dB. +0 + + + +GstTwoLame::bitrate +gint +[8,384] +rw +Bitrate (kb/s) +Bitrate in kbit/sec (8, 16, 24, 32, 40, 48, 56, 64, 80, 96, 112, 128, 144, 160, 192, 224, 256, 320, 384). +192 + + + +GstTwoLame::copyright +gboolean + +rw +Copyright +Mark as copyright. +FALSE + + + +GstTwoLame::emphasis +GstTwoLameEmphasis + +rw +Emphasis +Pre-emphasis to apply to the decoded audio. +No emphasis + + + +GstTwoLame::energy-level-extension +gboolean + +rw +Energy Level Extension +Write peak PCM level to each frame. +FALSE + + + +GstTwoLame::error-protection +gboolean + +rw +Error protection +Adds checksum to every frame. +FALSE + + + +GstTwoLame::mode +GstTwoLameMode + +rw +Mode +Encoding mode. +Joint Stereo + + + +GstTwoLame::original +gboolean + +rw +Original +Mark as original. +TRUE + + + +GstTwoLame::padding +GstTwoLamePadding + +rw +Padding +Padding type. +No Padding + + + +GstTwoLame::psymodel +gint +[-1,4] +rw +Psychoacoustic Model +Psychoacoustic model used to encode the audio. +3 + + + +GstTwoLame::quick-mode +gboolean + +rw +Quick mode +Calculate Psymodel every frames. +FALSE + + + +GstTwoLame::quick-mode-count +gint +>= 0 +rw +Quick mode count +Calculate Psymodel every n frames. +10 + + + +GstTwoLame::vbr +gboolean + +rw +VBR +Enable variable bitrate mode. +FALSE + + + +GstTwoLame::vbr-level +gfloat +[-10,10] +rw +VBR Level +VBR Level. +5 + + + +GstTwoLame::vbr-max-bitrate +gint +[0,384] +rw +VBR max bitrate +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). +0 + + diff --git a/docs/plugins/gst-plugins-ugly-plugins.hierarchy b/docs/plugins/gst-plugins-ugly-plugins.hierarchy index 866a9f23ec..24b607708d 100644 --- a/docs/plugins/gst-plugins-ugly-plugins.hierarchy +++ b/docs/plugins/gst-plugins-ugly-plugins.hierarchy @@ -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 diff --git a/docs/plugins/gst-plugins-ugly-plugins.interfaces b/docs/plugins/gst-plugins-ugly-plugins.interfaces index 23e686b2b2..33ee1c86c0 100644 --- a/docs/plugins/gst-plugins-ugly-plugins.interfaces +++ b/docs/plugins/gst-plugins-ugly-plugins.interfaces @@ -4,6 +4,7 @@ GstID3Tag GstTagSetter GstCddaBaseSrc GstURIHandler GstCdioCddaSrc GstURIHandler GstDvdReadSrc GstURIHandler +GstPNMSrc GstURIHandler GstLame GstTagSetter GstRTSPReal GstRTSPExtension GstRTSPWMS GstRTSPExtension diff --git a/docs/plugins/inspect/plugin-a52dec.xml b/docs/plugins/inspect/plugin-a52dec.xml index b077893fb6..2eba78bd04 100644 --- a/docs/plugins/inspect/plugin-a52dec.xml +++ b/docs/plugins/inspect/plugin-a52dec.xml @@ -3,10 +3,10 @@ Decodes ATSC A/52 encoded audio streams ../../ext/a52dec/.libs/libgsta52dec.so libgsta52dec.so - 0.10.10 + 0.10.10.1 GPL gst-plugins-ugly - GStreamer Ugly Plug-ins source release + GStreamer Ugly Plug-ins CVS/prerelease Unknown package origin diff --git a/docs/plugins/inspect/plugin-asf.xml b/docs/plugins/inspect/plugin-asf.xml index 29ce9940c9..fd9432388a 100644 --- a/docs/plugins/inspect/plugin-asf.xml +++ b/docs/plugins/inspect/plugin-asf.xml @@ -3,10 +3,10 @@ Demuxes and muxes audio and video in Microsofts ASF format ../../gst/asfdemux/.libs/libgstasf.so libgstasf.so - 0.10.10 + 0.10.10.1 LGPL gst-plugins-ugly - GStreamer Ugly Plug-ins source release + GStreamer Ugly Plug-ins CVS/prerelease Unknown package origin @@ -36,6 +36,27 @@ + + rtpasfdepay + RTP ASF packet depayloader + Codec/Depayloader/Network + Extracts ASF streams from RTP + Tim-Philipp Müller <tim centricular net>, Wim Taymans <wim.taymans@gmail.com> + + + sink + sink + always +
application/x-rtp, media=(string){ application, video, audio }, clock-rate=(int)[ 1, 2147483647 ], encoding-name=(string)X-ASF-PF
+ + + src + source + always +
video/x-ms-asf
+ + + rtspwms WMS RTSP Extension diff --git a/docs/plugins/inspect/plugin-cdio.xml b/docs/plugins/inspect/plugin-cdio.xml index 15e11f2ea3..f5b6581d1e 100644 --- a/docs/plugins/inspect/plugin-cdio.xml +++ b/docs/plugins/inspect/plugin-cdio.xml @@ -3,10 +3,10 @@ Read audio from audio CDs ../../ext/cdio/.libs/libgstcdio.so libgstcdio.so - 0.10.10 + 0.10.10.1 GPL gst-plugins-ugly - GStreamer Ugly Plug-ins source release + GStreamer Ugly Plug-ins CVS/prerelease Unknown package origin diff --git a/docs/plugins/inspect/plugin-dvdlpcmdec.xml b/docs/plugins/inspect/plugin-dvdlpcmdec.xml index d28e5b709f..7da8e82125 100644 --- a/docs/plugins/inspect/plugin-dvdlpcmdec.xml +++ b/docs/plugins/inspect/plugin-dvdlpcmdec.xml @@ -3,10 +3,10 @@ Decode DVD LPCM frames into standard PCM ../../gst/dvdlpcmdec/.libs/libgstdvdlpcmdec.so libgstdvdlpcmdec.so - 0.10.10 + 0.10.10.1 LGPL gst-plugins-ugly - GStreamer Ugly Plug-ins source release + GStreamer Ugly Plug-ins CVS/prerelease Unknown package origin diff --git a/docs/plugins/inspect/plugin-dvdread.xml b/docs/plugins/inspect/plugin-dvdread.xml index c55e2e1ffd..b2ede4ad85 100644 --- a/docs/plugins/inspect/plugin-dvdread.xml +++ b/docs/plugins/inspect/plugin-dvdread.xml @@ -3,10 +3,10 @@ Access a DVD with dvdread ../../ext/dvdread/.libs/libgstdvdread.so libgstdvdread.so - 0.10.10 + 0.10.10.1 GPL gst-plugins-ugly - GStreamer Ugly Plug-ins source release + GStreamer Ugly Plug-ins CVS/prerelease Unknown package origin diff --git a/docs/plugins/inspect/plugin-dvdsub.xml b/docs/plugins/inspect/plugin-dvdsub.xml index 95bfc60e18..460880814e 100644 --- a/docs/plugins/inspect/plugin-dvdsub.xml +++ b/docs/plugins/inspect/plugin-dvdsub.xml @@ -3,10 +3,10 @@ DVD subtitle parser and decoder ../../gst/dvdsub/.libs/libgstdvdsub.so libgstdvdsub.so - 0.10.10 + 0.10.10.1 LGPL gst-plugins-ugly - GStreamer Ugly Plug-ins source release + GStreamer Ugly Plug-ins CVS/prerelease Unknown package origin diff --git a/docs/plugins/inspect/plugin-iec958.xml b/docs/plugins/inspect/plugin-iec958.xml index 890224c220..747e564911 100644 --- a/docs/plugins/inspect/plugin-iec958.xml +++ b/docs/plugins/inspect/plugin-iec958.xml @@ -3,10 +3,10 @@ Convert raw AC3 into IEC958 (S/PDIF) frames ../../gst/iec958/.libs/libgstiec958.so libgstiec958.so - 0.10.10 + 0.10.10.1 LGPL gst-plugins-ugly - GStreamer Ugly Plug-ins source release + GStreamer Ugly Plug-ins CVS/prerelease Unknown package origin diff --git a/docs/plugins/inspect/plugin-lame.xml b/docs/plugins/inspect/plugin-lame.xml index fd55f4dac0..e502652751 100644 --- a/docs/plugins/inspect/plugin-lame.xml +++ b/docs/plugins/inspect/plugin-lame.xml @@ -3,10 +3,10 @@ Encode MP3s with LAME ../../ext/lame/.libs/libgstlame.so libgstlame.so - 0.10.10 + 0.10.10.1 LGPL gst-plugins-ugly - GStreamer Ugly Plug-ins source release + GStreamer Ugly Plug-ins CVS/prerelease Unknown package origin diff --git a/docs/plugins/inspect/plugin-mad.xml b/docs/plugins/inspect/plugin-mad.xml index 56a26437d0..f57c85f366 100644 --- a/docs/plugins/inspect/plugin-mad.xml +++ b/docs/plugins/inspect/plugin-mad.xml @@ -3,10 +3,10 @@ id3 tag manipulation and mp3 decoding based on the mad library ../../ext/mad/.libs/libgstmad.so libgstmad.so - 0.10.10 + 0.10.10.1 GPL gst-plugins-ugly - GStreamer Ugly Plug-ins source release + GStreamer Ugly Plug-ins CVS/prerelease Unknown package origin diff --git a/docs/plugins/inspect/plugin-mpeg2dec.xml b/docs/plugins/inspect/plugin-mpeg2dec.xml index 1aee137ea5..c66aa7c34f 100644 --- a/docs/plugins/inspect/plugin-mpeg2dec.xml +++ b/docs/plugins/inspect/plugin-mpeg2dec.xml @@ -3,10 +3,10 @@ LibMpeg2 decoder ../../ext/mpeg2dec/.libs/libgstmpeg2dec.so libgstmpeg2dec.so - 0.10.10 + 0.10.10.1 GPL gst-plugins-ugly - GStreamer Ugly Plug-ins source release + GStreamer Ugly Plug-ins CVS/prerelease Unknown package origin @@ -26,7 +26,7 @@ src source always -
video/x-raw-yuv, format=(fourcc){ YV12, I420, Y42B }, width=(int)[ 16, 4096 ], height=(int)[ 16, 4096 ], framerate=(fraction)[ 0/1, 2147483647/1 ]
+
video/x-raw-yuv, format=(fourcc){ YV12, I420, Y42B, Y444 }, width=(int)[ 16, 4096 ], height=(int)[ 16, 4096 ], framerate=(fraction)[ 0/1, 2147483647/1 ]
 diff --git a/docs/plugins/inspect/plugin-mpegaudioparse.xml b/docs/plugins/inspect/plugin-mpegaudioparse.xml index 1a3cd6c359..75e8ad55fb 100644 --- a/docs/plugins/inspect/plugin-mpegaudioparse.xml +++ b/docs/plugins/inspect/plugin-mpegaudioparse.xml @@ -3,10 +3,10 @@ MPEG-1 layer 1/2/3 audio stream elements ../../gst/mpegaudioparse/.libs/libgstmpegaudioparse.so libgstmpegaudioparse.so - 0.10.10 + 0.10.10.1 LGPL gst-plugins-ugly - GStreamer Ugly Plug-ins source release + GStreamer Ugly Plug-ins CVS/prerelease Unknown package origin diff --git a/docs/plugins/inspect/plugin-mpegstream.xml b/docs/plugins/inspect/plugin-mpegstream.xml index 0ff186d32f..cd91df39ae 100644 --- a/docs/plugins/inspect/plugin-mpegstream.xml +++ b/docs/plugins/inspect/plugin-mpegstream.xml @@ -3,10 +3,10 @@ MPEG system stream parser ../../gst/mpegstream/.libs/libgstmpegstream.so libgstmpegstream.so - 0.10.10 + 0.10.10.1 LGPL gst-plugins-ugly - GStreamer Ugly Plug-ins source release + GStreamer Ugly Plug-ins CVS/prerelease Unknown package origin diff --git a/docs/plugins/inspect/plugin-realmedia.xml b/docs/plugins/inspect/plugin-realmedia.xml index 0d62317a73..b8abb052bf 100644 --- a/docs/plugins/inspect/plugin-realmedia.xml +++ b/docs/plugins/inspect/plugin-realmedia.xml @@ -1,14 +1,29 @@ realmedia - RealMedia demuxer and depayloader + RealMedia support plugins ../../gst/realmedia/.libs/libgstrmdemux.so libgstrmdemux.so - 0.10.10 + 0.10.10.1 LGPL gst-plugins-ugly - GStreamer Ugly Plug-ins source release + GStreamer Ugly Plug-ins CVS/prerelease Unknown package origin + + pnmsrc + PNM packet receiver + Source/Network + Receive data over the network via PNM + Wim Taymans <wim.taymans@gmail.com> + + + src + source + always +
application/vnd.rn-realmedia
+ + + rademux RealAudio Demuxer diff --git a/docs/plugins/inspect/plugin-siddec.xml b/docs/plugins/inspect/plugin-siddec.xml index c949ec50a5..91d56d22f2 100644 --- a/docs/plugins/inspect/plugin-siddec.xml +++ b/docs/plugins/inspect/plugin-siddec.xml @@ -3,10 +3,10 @@ Uses libsidplay to decode .sid files ../../ext/sidplay/.libs/libgstsid.so libgstsid.so - 0.10.10 + 0.10.10.1 GPL gst-plugins-ugly - GStreamer Ugly Plug-ins source release + GStreamer Ugly Plug-ins CVS/prerelease Unknown package origin diff --git a/docs/plugins/inspect/plugin-synaesthesia.xml b/docs/plugins/inspect/plugin-synaesthesia.xml index 23c1c74fba..c1f90399b2 100644 --- a/docs/plugins/inspect/plugin-synaesthesia.xml +++ b/docs/plugins/inspect/plugin-synaesthesia.xml @@ -3,11 +3,11 @@ Creates video visualizations of audio input, using stereo and pitch information ../../gst/synaesthesia/.libs/libgstsynaesthesia.so libgstsynaesthesia.so - 0.10.8.1 + 0.10.10.1 GPL gst-plugins-ugly GStreamer Ugly Plug-ins CVS/prerelease - http://gstreamer.freedesktop.org + Unknown package origin synaesthesia @@ -16,18 +16,18 @@ Creates video visualizations of audio input, using stereo and pitch information Richard Boulton <richard@tartarus.org> - - src - source - always -
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 ]
- sink sink always
audio/x-raw-int, rate=(int)[ 1, 2147483647 ], channels=(int)2, endianness=(int)1234, width=(int)16, depth=(int)16, signed=(boolean)true
 + + src + source + always +
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 ]
+ diff --git a/docs/plugins/inspect/plugin-twolame.xml b/docs/plugins/inspect/plugin-twolame.xml new file mode 100644 index 0000000000..7794d95e3b --- /dev/null +++ b/docs/plugins/inspect/plugin-twolame.xml @@ -0,0 +1,34 @@ + + twolame + Encode MP2s with TwoLAME + ../../ext/twolame/.libs/libgsttwolame.so + libgsttwolame.so + 0.10.10.1 + LGPL + gst-plugins-ugly + GStreamer Ugly Plug-ins CVS/prerelease + Unknown package origin + + + twolame + TwoLAME mp2 encoder + Codec/Encoder/Audio + High-quality free MP2 encoder + Sebastian Dröge <sebastian.droege@collabora.co.uk> + + + sink + sink + always +
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 ]
+ + + src + source + always +
audio/mpeg, mpegversion=(int)1, layer=(int)2, rate=(int){ 16000, 22050, 24000, 32000, 44100, 48000 }, channels=(int)[ 1, 2 ]
+ + + + + \ No newline at end of file diff --git a/ext/Makefile.am b/ext/Makefile.am index 30dc8eff90..6634c1b891 100644 --- a/ext/Makefile.am +++ b/ext/Makefile.am @@ -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 diff --git a/po/POTFILES.in b/po/POTFILES.in index fdd90b0e91..20e51d4ef2 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -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