Remove mp3parse plugin/element

It's been replaced by mpegaudioparse in -good. Don't want anyone
to spend time porting a deprecated element. Rename plugin to xingmux
for now until we move that somewhere else.
This commit is contained in:
Tim-Philipp Müller 2011-08-03 01:08:43 +01:00
parent 10b6489163
commit 2e6d295b8b
14 changed files with 32 additions and 2610 deletions

View file

@ -210,7 +210,7 @@ dnl *** plug-ins to include ***
dnl Non ported plugins (non-dependant, then dependant)
dnl Make sure you have a space before and after all plugins
GST_PLUGINS_NONPORTED=" dvdlpcmdec dvdsub iec958 mpegaudioparse mpegstream \
GST_PLUGINS_NONPORTED=" dvdlpcmdec dvdsub iec958 xingmux mpegstream \
realmedia \
a52dec amrnb amrwb cdio dvdread lame mpeg2dec twolame x264 "
AC_SUBST(GST_PLUGINS_NONPORTED)
@ -220,7 +220,7 @@ AG_GST_CHECK_PLUGIN(asfdemux)
AG_GST_CHECK_PLUGIN(dvdlpcmdec)
AG_GST_CHECK_PLUGIN(dvdsub)
AG_GST_CHECK_PLUGIN(iec958)
AG_GST_CHECK_PLUGIN(mpegaudioparse)
AG_GST_CHECK_PLUGIN(xingmux)
AG_GST_CHECK_PLUGIN(mpegstream)
AG_GST_CHECK_PLUGIN(realmedia)
AG_GST_CHECK_PLUGIN(synaesthesia)
@ -467,10 +467,10 @@ gst/asfdemux/Makefile
gst/dvdlpcmdec/Makefile
gst/dvdsub/Makefile
gst/iec958/Makefile
gst/mpegaudioparse/Makefile
gst/mpegstream/Makefile
gst/realmedia/Makefile
gst/synaesthesia/Makefile
gst/xingmux/Makefile
ext/Makefile
ext/a52dec/Makefile
ext/amrnb/Makefile

View file

@ -90,8 +90,7 @@ EXTRA_HFILES = \
$(top_srcdir)/ext/twolame/gsttwolame.h \
$(top_srcdir)/ext/x264/gstx264enc.h \
$(top_srcdir)/gst/asfdemux/gstrtspwms.h \
$(top_srcdir)/gst/mpegaudioparse/gstmpegaudioparse.h \
$(top_srcdir)/gst/mpegaudioparse/gstxingmux.h \
$(top_srcdir)/gst/xingmux/gstxingmux.h \
$(top_srcdir)/gst/realmedia/rademux.h \
$(top_srcdir)/gst/realmedia/rdtmanager.h \
$(top_srcdir)/gst/realmedia/rmdemux.h \

View file

@ -25,7 +25,6 @@
<xi:include href="xml/element-lame.xml" />
<xi:include href="xml/element-lamemp3enc.xml" />
<xi:include href="xml/element-mad.xml" />
<xi:include href="xml/element-mp3parse.xml" />
<xi:include href="xml/element-rademux.xml" />
<xi:include href="xml/element-rmdemux.xml" />
<xi:include href="xml/element-rdtmanager.xml" />
@ -52,7 +51,6 @@
<xi:include href="xml/plugin-lame.xml" />
<xi:include href="xml/plugin-mad.xml" />
<xi:include href="xml/plugin-mpeg2dec.xml" />
<xi:include href="xml/plugin-mpegaudioparse.xml" />
<xi:include href="xml/plugin-mpegstream.xml" />
<xi:include href="xml/plugin-realmedia.xml" />
<xi:include href="xml/plugin-siddec.xml" />

View file

@ -121,22 +121,6 @@ GST_TYPE_MAD
gst_mad_get_type
</SECTION>
<SECTION>
<FILE>element-mp3parse</FILE>
<TITLE>mp3parse</TITLE>
GstMPEGAudioParse
<SUBSECTION Standard>
GstMPEGAudioParseClass
MPEGAudioPendingAccurateSeek
MPEGAudioSeekEntry
GST_MP3PARSE
GST_MP3PARSE_CLASS
GST_IS_MP3PARSE
GST_IS_MP3PARSE_CLASS
GST_TYPE_MP3PARSE
gst_mp3parse_get_type
</SECTION>
<SECTION>
<FILE>element-rademux</FILE>
<TITLE>rademux</TITLE>

View file

@ -1,55 +0,0 @@
<plugin>
<name>mpegaudioparse</name>
<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.18.1</version>
<license>LGPL</license>
<source>gst-plugins-ugly</source>
<package>GStreamer Ugly Plug-ins git</package>
<origin>Unknown package origin</origin>
<elements>
<element>
<name>mp3parse</name>
<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;,Erik Walthinsen &lt;omega@cse.ogi.edu&gt;</author>
<pads>
<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>sink</name>
<direction>sink</direction>
<presence>always</presence>
<details>audio/mpeg, mpegversion=(int)1, layer=(int)[ 1, 3 ]</details>
</caps>
<caps>
<name>src</name>
<direction>source</direction>
<presence>always</presence>
<details>audio/mpeg, mpegversion=(int)1, layer=(int)[ 1, 3 ]</details>
</caps>
</pads>
</element>
</elements>
</plugin>

View file

@ -96,7 +96,7 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/gstreamer-%{majorminor}/libgstasf.so
%{_libdir}/gstreamer-%{majorminor}/libgstdvdlpcmdec.so
%{_libdir}/gstreamer-%{majorminor}/libgstiec958.so
%{_libdir}/gstreamer-%{majorminor}/libgstmpegaudioparse.so
%{_libdir}/gstreamer-%{majorminor}/libgstxingmux.so
%{_libdir}/gstreamer-%{majorminor}/libgstmpegstream.so
%{_libdir}/gstreamer-%{majorminor}/libgstrmdemux.so
%{_libdir}/gstreamer-%{majorminor}/libgstdvdsub.so

View file

@ -1,23 +0,0 @@
plugin_LTLIBRARIES = libgstmpegaudioparse.la
libgstmpegaudioparse_la_SOURCES = plugin.c gstmpegaudioparse.c gstxingmux.c
libgstmpegaudioparse_la_CFLAGS = $(GST_BASE_CFLAGS) $(GST_CFLAGS)
libgstmpegaudioparse_la_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS)
libgstmpegaudioparse_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
libgstmpegaudioparse_la_LIBTOOLFLAGS = --tag=disable-static
noinst_HEADERS = gstmpegaudioparse.h gstxingmux.h
Android.mk: Makefile.am $(BUILT_SOURCES)
androgenizer \
-:PROJECT libgstmpegaudioparse -:SHARED libgstmpegaudioparse \
-:TAGS eng debug \
-:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \
-:SOURCES $(libgstmpegaudioparse_la_SOURCES) \
-:CFLAGS $(DEFS) $(DEFAULT_INCLUDES) $(libgstmpegaudioparse_la_CFLAGS) \
-:LDFLAGS $(libgstmpegaudioparse_la_LDFLAGS) \
$(libgstmpegaudioparse_la_LIBADD) \
-ldl \
-:PASSTHROUGH LOCAL_ARM_MODE:=arm \
LOCAL_MODULE_PATH:='$$(TARGET_OUT)/lib/gstreamer-0.10' \
> $@

File diff suppressed because it is too large Load diff

View file

@ -1,151 +0,0 @@
/* GStreamer
* Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu>
*
* 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 __MP3PARSE_H__
#define __MP3PARSE_H__
#include <gst/gst.h>
#include <gst/base/gstadapter.h>
G_BEGIN_DECLS
#define GST_TYPE_MP3PARSE \
(gst_mp3parse_get_type())
#define GST_MP3PARSE(obj) \
(G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_MP3PARSE,GstMPEGAudioParse))
#define GST_MP3PARSE_CLASS(klass) \
(G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_MP3PARSE,GstMPEGAudioParseClass))
#define GST_IS_MP3PARSE(obj) \
(G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_MP3PARSE))
#define GST_IS_MP3PARSE_CLASS(klass) \
(G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_MP3PARSE))
typedef struct _GstMPEGAudioParse GstMPEGAudioParse;
typedef struct _GstMPEGAudioParseClass GstMPEGAudioParseClass;
typedef struct _MPEGAudioSeekEntry MPEGAudioSeekEntry;
typedef struct _MPEGAudioPendingAccurateSeek MPEGAudioPendingAccurateSeek;
struct _MPEGAudioSeekEntry {
gint64 byte;
GstClockTime timestamp;
};
struct _MPEGAudioPendingAccurateSeek {
GstSegment segment;
gint64 upstream_start;
GstClockTime timestamp_start;
};
struct _GstMPEGAudioParse {
GstElement element;
GstPad *sinkpad, *srcpad;
GstSegment segment;
GstClockTime next_ts;
gboolean discont;
/* Offset as supplied by incoming buffers */
gint64 cur_offset;
/* Upcoming timestamp given on an incoming buffer and
* the offset at which it becomes active */
GstClockTime pending_ts;
gint64 pending_offset;
/* Offset since the last newseg */
gint64 tracked_offset;
/* tracked_offset when resyncing started */
gint64 sync_offset;
GstAdapter *adapter;
guint skip; /* number of frames to skip */
guint bit_rate; /* in kbps */
gint channels, rate, layer, version;
GstClockTime max_bitreservoir;
gint spf; /* Samples per frame */
gboolean resyncing; /* True when attempting to resync (stricter checks are
performed) */
gboolean sent_codec_tag;
/* VBR tracking */
guint avg_bitrate;
guint64 bitrate_sum;
guint frame_count;
guint last_posted_bitrate;
gint last_posted_crc;
guint last_posted_channel_mode;
/* Xing info */
guint32 xing_flags;
guint32 xing_frames;
GstClockTime xing_total_time;
guint32 xing_bytes;
/* percent -> filepos mapping */
guchar xing_seek_table[100];
/* filepos -> percent mapping */
guint16 xing_seek_table_inverse[256];
guint32 xing_vbr_scale;
guint xing_bitrate;
/* VBRI info */
guint32 vbri_frames;
GstClockTime vbri_total_time;
guint32 vbri_bytes;
guint vbri_bitrate;
guint vbri_seek_points;
guint32 *vbri_seek_table;
gboolean vbri_valid;
/* Accurate seeking */
GList *seek_table;
GMutex *pending_seeks_lock;
GSList *pending_accurate_seeks;
gboolean exact_position;
GSList *pending_nonaccurate_seeks;
/* Track whether we're seekable (in BYTES format, if upstream operates in
* TIME format, we don't care about seekability and assume upstream handles
* it). The seek table for accurate seeking is not maintained if we're not
* seekable. */
gboolean seekable;
/* minimum distance between two index entries */
GstClockTimeDiff idx_interval;
/* pending segment */
GstEvent *pending_segment;
/* pending events */
GList *pending_events;
};
struct _GstMPEGAudioParseClass {
GstElementClass parent_class;
};
GType gst_mp3parse_get_type(void);
G_END_DECLS
#endif /* __MP3PARSE_H__ */

View file

@ -1,148 +0,0 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
Version="7.10"
Name="mpegaudioparse"
ProjectGUID="{979C216F-0ACF-4956-AE00-055A42D678BD}"
Keyword="Win32Proj">
<Platforms>
<Platform
Name="Win32"/>
</Platforms>
<Configurations>
<Configuration
Name="Debug|Win32"
OutputDirectory="../../win32/Debug"
IntermediateDirectory="../../win32/Debug"
ConfigurationType="2"
CharacterSet="2">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="../../../gstreamer/win32;../../../gstreamer;../../../gstreamer/libs;../../../glib;../../../glib/glib;../../../glib/gmodule;&quot;../../gst-libs&quot;;../../../popt/include;../../../libxml2/include/libxml2"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;mpegaudioparse_EXPORTS;HAVE_CONFIG_H;_USE_MATH_DEFINES"
MinimalRebuild="TRUE"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
UsePrecompiledHeader="0"
WarningLevel="3"
Detect64BitPortabilityProblems="TRUE"
DebugInformationFormat="4"/>
<Tool
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="glib-2.0.lib gmodule-2.0.lib gthread-2.0.lib gobject-2.0.lib libgstreamer.lib gstbytestream.lib gstgetbits.lib iconv.lib intl.lib"
OutputFile="$(OutDir)/gstmpegaudioparse.dll"
LinkIncremental="2"
AdditionalLibraryDirectories="../../../gstreamer/win32/Debug;../../../glib/glib;../../../glib/gmodule;../../../glib/gthread;../../../glib/gobject;../../../gettext/lib;../../../libiconv/lib"
ModuleDefinitionFile=""
GenerateDebugInformation="TRUE"
ProgramDatabaseFile="$(OutDir)/mpegaudioparse.pdb"
SubSystem="2"
OptimizeReferences="2"
ImportLibrary="$(OutDir)/gstmpegaudioparse.lib"
TargetMachine="1"/>
<Tool
Name="VCMIDLTool"/>
<Tool
Name="VCPostBuildEventTool"
CommandLine="copy /Y $(TargetPath) c:\gstreamer\plugins"/>
<Tool
Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
Name="VCResourceCompilerTool"/>
<Tool
Name="VCWebServiceProxyGeneratorTool"/>
<Tool
Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
Name="VCManagedWrapperGeneratorTool"/>
<Tool
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Release|Win32"
OutputDirectory="../../win32/Release"
IntermediateDirectory="../../win32/Release"
ConfigurationType="2"
CharacterSet="2">
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="../../../gstreamer/win32;../../../gstreamer;../../../gstreamer/libs;../../../glib;../../../glib/glib;../../../glib/gmodule;&quot;../../gst-libs&quot;;../../../popt/include;../../../libxml2/include/libxml2"
PreprocessorDefinitions="WIN32;NDEBUG;GST_DISABLE_GST_DEBUG;_WINDOWS;_USRDLL;mpegaudioparse_EXPORTS;HAVE_CONFIG_H;_USE_MATH_DEFINES"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
WarningLevel="3"
Detect64BitPortabilityProblems="TRUE"
DebugInformationFormat="3"/>
<Tool
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="glib-2.0.lib gmodule-2.0.lib gthread-2.0.lib gobject-2.0.lib libgstreamer.lib gstbytestream.lib gstgetbits.lib iconv.lib intl.lib"
OutputFile="$(OutDir)/gstmpegaudioparse.dll"
LinkIncremental="1"
AdditionalLibraryDirectories="../../../gstreamer/win32/Release;../../../glib/glib;../../../glib/gmodule;../../../glib/gthread;../../../glib/gobject;../../../gettext/lib;../../../libiconv/lib"
ModuleDefinitionFile=""
GenerateDebugInformation="TRUE"
SubSystem="2"
OptimizeReferences="2"
EnableCOMDATFolding="2"
ImportLibrary="$(OutDir)/gstmpegaudioparse.lib"
TargetMachine="1"/>
<Tool
Name="VCMIDLTool"/>
<Tool
Name="VCPostBuildEventTool"
CommandLine="copy /Y $(TargetPath) c:\gstreamer\plugins"/>
<Tool
Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
Name="VCResourceCompilerTool"/>
<Tool
Name="VCWebServiceProxyGeneratorTool"/>
<Tool
Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
Name="VCManagedWrapperGeneratorTool"/>
<Tool
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
</Configurations>
<References>
</References>
<Files>
<Filter
Name="Source Files"
Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
<File
RelativePath=".\gstmpegaudioparse.c">
</File>
</Filter>
<Filter
Name="Header Files"
Filter="h;hpp;hxx;hm;inl;inc;xsd"
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
<File
RelativePath=".\gstmpegaudioparse.h">
</File>
</Filter>
<Filter
Name="Resource Files"
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
</Filter>
</Files>
<Globals>
</Globals>
</VisualStudioProject>

25
gst/xingmux/Makefile.am Normal file
View file

@ -0,0 +1,25 @@
# FIXME 0.11: element should move somewhere else really, such as
# gst-plugins-good/gst/tags/ or so
plugin_LTLIBRARIES = libgstxingmux.la
libgstxingmux_la_SOURCES = plugin.c gstxingmux.c
libgstxingmux_la_CFLAGS = $(GST_BASE_CFLAGS) $(GST_CFLAGS)
libgstxingmux_la_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS)
libgstxingmux_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
libgstxingmux_la_LIBTOOLFLAGS = --tag=disable-static
noinst_HEADERS = gstxingmux.h
Android.mk: Makefile.am $(BUILT_SOURCES)
androgenizer \
-:PROJECT libgstxingmux -:SHARED libgstxingmux \
-:TAGS eng debug \
-:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \
-:SOURCES $(libgstxingmux_la_SOURCES) \
-:CFLAGS $(DEFS) $(DEFAULT_INCLUDES) $(libgstxingmux_la_CFLAGS) \
-:LDFLAGS $(libgstxingmux_la_LDFLAGS) \
$(libgstxingmux_la_LIBADD) \
-ldl \
-:PASSTHROUGH LOCAL_ARM_MODE:=arm \
LOCAL_MODULE_PATH:='$$(TARGET_OUT)/lib/gstreamer-0.10' \
> $@

View file

@ -22,7 +22,6 @@
#endif
#include <gst/gst.h>
#include "gstmpegaudioparse.h"
#include "gstxingmux.h"
static gboolean
@ -31,15 +30,12 @@ plugin_init (GstPlugin * plugin)
if (!gst_element_register (plugin, "xingmux", GST_RANK_NONE,
GST_TYPE_XING_MUX))
return FALSE;
if (!gst_element_register (plugin, "mp3parse", GST_RANK_PRIMARY + 1,
GST_TYPE_MP3PARSE))
return FALSE;
return TRUE;
}
GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
GST_VERSION_MINOR,
"mpegaudioparse",
"MPEG-1 layer 1/2/3 audio stream elements",
"xingmux",
"Add XING tags to mpeg audio files",
plugin_init, VERSION, "LGPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN);