mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-10-02 08:42:32 +00:00
Moved twolame from Bad to Ugly
This commit is contained in:
Jan Schmidt
parent
3c87d0ceea
commit
ba53f2ff3b
10 changed files with 0 additions and 1220 deletions
14
configure.ac
14
configure.ac
|
|
@ -1181,18 +1181,6 @@ AG_GST_CHECK_FEATURE(WILDMIDI, [wildmidi midi soft synth plugin], wildmidi, [
|
|||
AC_SUBST(WILDMIDI_LIBS)
|
||||
])
|
||||
|
||||
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)
|
||||
])
|
||||
|
||||
dnl *** SDL ***
|
||||
translit(dnm, m, l) AM_CONDITIONAL(USE_SDL, true)
|
||||
AG_GST_CHECK_FEATURE(SDL, [SDL plug-in], sdlvideosink sdlaudiosink, [
|
||||
|
|
@ -1389,7 +1377,6 @@ AM_CONDITIONAL(USE_NAS, false)
|
|||
AM_CONDITIONAL(USE_NEON, false)
|
||||
AM_CONDITIONAL(USE_OFA, false)
|
||||
AM_CONDITIONAL(USE_OSS4, false)
|
||||
AM_CONDITIONAL(USE_TWOLAME, false)
|
||||
AM_CONDITIONAL(USE_SDL, false)
|
||||
AM_CONDITIONAL(USE_SNDFILE, false)
|
||||
AM_CONDITIONAL(USE_SOUNDTOUCH, false)
|
||||
|
|
@ -1572,7 +1559,6 @@ ext/mythtv/Makefile
|
|||
ext/neon/Makefile
|
||||
ext/ofa/Makefile
|
||||
ext/resindvd/Makefile
|
||||
ext/twolame/Makefile
|
||||
ext/sdl/Makefile
|
||||
ext/sndfile/Makefile
|
||||
ext/soundtouch/Makefile
|
||||
|
|
|
|||
|
|
@ -115,7 +115,6 @@ EXTRA_HFILES = \
|
|||
$(top_srcdir)/ext/theora/theoradec.h \
|
||||
$(top_srcdir)/ext/timidity/gsttimidity.h \
|
||||
$(top_srcdir)/ext/timidity/gstwildmidi.h \
|
||||
$(top_srcdir)/ext/twolame/gsttwolame.h \
|
||||
$(top_srcdir)/ext/x264/gstx264enc.h \
|
||||
$(top_srcdir)/gst/aacparse/gstaacparse.h \
|
||||
$(top_srcdir)/gst/amrparse/gstamrparse.h \
|
||||
|
|
|
|||
|
|
@ -74,7 +74,6 @@
|
|||
<xi:include href="xml/element-stereo.xml" />
|
||||
<!--xi:include href="xml/element-theoradecexp.xml" /-->
|
||||
<xi:include href="xml/element-timidity.xml" />
|
||||
<xi:include href="xml/element-twolame.xml" />
|
||||
<xi:include href="xml/element-trm.xml" />
|
||||
<xi:include href="xml/element-valve.xml" />
|
||||
<xi:include href="xml/element-videoanalyse.xml" />
|
||||
|
|
@ -154,7 +153,6 @@
|
|||
<xi:include href="xml/plugin-stereo.xml" />
|
||||
<xi:include href="xml/plugin-swfdec.xml" />
|
||||
<xi:include href="xml/plugin-timidity.xml" />
|
||||
<xi:include href="xml/plugin-twolame.xml" />
|
||||
<xi:include href="xml/plugin-tremor.xml" />
|
||||
<xi:include href="xml/plugin-tta.xml" />
|
||||
<xi:include href="xml/plugin-valve.xml" />
|
||||
|
|
|
|||
|
|
@ -879,20 +879,6 @@ GST_TYPE_TIMIDITY
|
|||
gst_timidity_get_type
|
||||
</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-trm</FILE>
|
||||
<TITLE>trm</TITLE>
|
||||
|
|
|
|||
|
|
@ -1,34 +0,0 @@
|
|||
<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-bad</source>
|
||||
<package>GStreamer Bad Plug-ins CVS/prerelease</package>
|
||||
<origin>http://gstreamer.freedesktop.org</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 <sebastian.droege@collabora.co.uk></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>
|
||||
|
|
@ -252,12 +252,6 @@ TIMIDITY_DIR=
|
|||
endif
|
||||
endif
|
||||
|
||||
if USE_TWOLAME
|
||||
TWOLAME_DIR=twolame
|
||||
else
|
||||
TWOLAME_DIR=
|
||||
endif
|
||||
|
||||
# if USE_POLYP
|
||||
# POLYP_DIR=polyp
|
||||
# else
|
||||
|
|
@ -388,7 +382,6 @@ SUBDIRS=\
|
|||
$(TARKIN_DIR) \
|
||||
$(THEORA_DIR) \
|
||||
$(TIMIDITY_DIR) \
|
||||
$(TWOLAME_DIR) \
|
||||
$(X264_DIR) \
|
||||
$(XINE_DIR) \
|
||||
$(XVID_DIR)
|
||||
|
|
@ -433,6 +426,5 @@ DIST_SUBDIRS = \
|
|||
swfdec \
|
||||
theora \
|
||||
timidity \
|
||||
twolame \
|
||||
x264 \
|
||||
xvid
|
||||
|
|
|
|||
|
|
@ -1,9 +0,0 @@
|
|||
plugin_LTLIBRARIES = libgsttwolame.la
|
||||
|
||||
libgsttwolame_la_SOURCES = gsttwolame.c
|
||||
libgsttwolame_la_CFLAGS = $(GST_CFLAGS) $(TWOLAME_CFLAGS)
|
||||
libgsttwolame_la_LIBADD = $(TWOLAME_LIBS) $(GST_LIBS)
|
||||
libgsttwolame_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
|
||||
libgsttwolame_la_LIBTOOLFLAGS = --tag=disable-static
|
||||
|
||||
noinst_HEADERS = gsttwolame.h
|
||||
File diff suppressed because it is too large
Load diff
|
|
@ -1,96 +0,0 @@
|
|||
/* GStreamer
|
||||
* Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu>
|
||||
* Copyright (C) <2008> Sebastian Dröge <sebastian.droege@collabora.co.uk>
|
||||
*
|
||||
* This library is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU Library General Public
|
||||
* License as published by the Free Software Foundation; either
|
||||
* version 2 of the License, or (at your option) any later version.
|
||||
*
|
||||
* This library is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
* Library General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Library General Public
|
||||
* License along with this library; if not, write to the
|
||||
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
||||
* Boston, MA 02111-1307, USA.
|
||||
*/
|
||||
|
||||
|
||||
#ifndef __GST_TWO_LAME_H__
|
||||
#define __GST_TWO_LAME_H__
|
||||
|
||||
|
||||
#include <gst/gst.h>
|
||||
|
||||
G_BEGIN_DECLS
|
||||
|
||||
#include <twolame.h>
|
||||
|
||||
#define GST_TYPE_TWO_LAME \
|
||||
(gst_two_lame_get_type())
|
||||
#define GST_TWO_LAME(obj) \
|
||||
(G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_TWO_LAME,GstTwoLame))
|
||||
#define GST_TWO_LAME_CLASS(klass) \
|
||||
(G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_TWO_LAME,GstTwoLameClass))
|
||||
#define GST_IS_TWO_LAME(obj) \
|
||||
(G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_TWO_LAME))
|
||||
#define GST_IS_TWO_LAME_CLASS(klass) \
|
||||
(G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_TWO_LAME))
|
||||
|
||||
typedef struct _GstTwoLame GstTwoLame;
|
||||
typedef struct _GstTwoLameClass GstTwoLameClass;
|
||||
|
||||
/**
|
||||
* GstTwoLame:
|
||||
*
|
||||
* Opaque data structure.
|
||||
*/
|
||||
struct _GstTwoLame {
|
||||
GstElement element;
|
||||
|
||||
/*< private >*/
|
||||
GstPad *srcpad, *sinkpad;
|
||||
|
||||
gint samplerate;
|
||||
gint num_channels;
|
||||
gboolean float_input;
|
||||
gboolean setup;
|
||||
|
||||
gint mode;
|
||||
gint psymodel;
|
||||
gint bitrate;
|
||||
gint padding;
|
||||
gboolean energy_level_extension;
|
||||
gint emphasis;
|
||||
gboolean error_protection;
|
||||
gboolean copyright;
|
||||
gboolean original;
|
||||
gboolean vbr;
|
||||
gfloat vbr_level;
|
||||
gfloat ath_level;
|
||||
gint vbr_max_bitrate;
|
||||
gboolean quick_mode;
|
||||
gint quick_mode_count;
|
||||
|
||||
/* track this so we don't send a last buffer in eos handler after error */
|
||||
GstFlowReturn last_flow;
|
||||
|
||||
twolame_options *glopts;
|
||||
|
||||
/* time tracker */
|
||||
guint64 last_ts, last_offs, last_duration, eos_ts;
|
||||
};
|
||||
|
||||
struct _GstTwoLameClass {
|
||||
GstElementClass parent_class;
|
||||
};
|
||||
|
||||
GType gst_two_lame_get_type(void);
|
||||
|
||||
G_END_DECLS
|
||||
|
||||
|
||||
#endif /* __GST_TWO_LAME_H__ */
|
||||
|
|
@ -2,7 +2,6 @@ ext/resindvd/resindvdsrc.c
|
|||
ext/resindvd/rsnbasesrc.c
|
||||
ext/sndfile/gstsfsink.c
|
||||
ext/sndfile/gstsfsrc.c
|
||||
ext/twolame/gsttwolame.c
|
||||
gst/aiffparse/aiffparse.c
|
||||
gst/nuvdemux/gstnuvdemux.c
|
||||
sys/dvb/gstdvbsrc.c
|
||||
|
|
|
|||
Loading…
Reference in a new issue