Remove the xingmux plugin, as the element has moved into mpegaudioparse in -ugly.

Original commit message from CVS:
* configure.ac:
* docs/plugins/gst-plugins-bad-plugins-docs.sgml:
* docs/plugins/gst-plugins-bad-plugins-sections.txt:
* docs/plugins/inspect/plugin-xingheader.xml:
* gst/xingheader/Makefile.am:
* gst/xingheader/gstxingmux.c:
* gst/xingheader/gstxingmux.h:
* tests/check/Makefile.am:
* tests/check/elements/.cvsignore:
* tests/check/elements/xingmux.c:
* tests/check/elements/xingmux_testdata.h:
Remove the xingmux plugin, as the element has moved into
mpegaudioparse in -ugly.
This commit is contained in:
Jan Schmidt 2008-02-08 00:40:34 +00:00
parent eca6caa0bf
commit 8a36e3b2aa
12 changed files with 18 additions and 5778 deletions

View file

@ -1,3 +1,19 @@
2008-02-08 Jan Schmidt <jan.schmidt@sun.com>
* configure.ac:
* docs/plugins/gst-plugins-bad-plugins-docs.sgml:
* docs/plugins/gst-plugins-bad-plugins-sections.txt:
* docs/plugins/inspect/plugin-xingheader.xml:
* gst/xingheader/Makefile.am:
* gst/xingheader/gstxingmux.c:
* gst/xingheader/gstxingmux.h:
* tests/check/Makefile.am:
* tests/check/elements/.cvsignore:
* tests/check/elements/xingmux.c:
* tests/check/elements/xingmux_testdata.h:
Remove the xingmux plugin, as the element has moved into
mpegaudioparse in -ugly.
2008-02-07 Jan Schmidt <jan.schmidt@sun.com>
* docs/plugins/Makefile.am:

View file

@ -113,7 +113,6 @@ GST_PLUGINS_ALL="\
tta \
videosignal \
vmnc \
xingheader \
y4m \
"
@ -1074,7 +1073,6 @@ gst/stereo/Makefile
gst/tta/Makefile
gst/videosignal/Makefile
gst/vmnc/Makefile
gst/xingheader/Makefile
gst/real/Makefile
gst/y4m/Makefile
gst-libs/Makefile

View file

@ -63,7 +63,6 @@
<xi:include href="xml/element-videomark.xml" />
<xi:include href="xml/element-videoparse.xml" />
<xi:include href="xml/element-wildmidi.xml" />
<xi:include href="xml/element-xingmux.xml" />
</chapter>
<chapter>
@ -138,7 +137,6 @@
<xi:include href="xml/plugin-vmnc.xml" />
<xi:include href="xml/plugin-wildmidi.xml" />
<xi:include href="xml/plugin-x264.xml" />
<xi:include href="xml/plugin-xingheader.xml" />
<xi:include href="xml/plugin-xvid.xml" />
<xi:include href="xml/plugin-y4menc.xml" />
</chapter>

View file

@ -803,17 +803,3 @@ GST_IS_WILDMIDI_CLASS
GST_TYPE_WILDMIDI
</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>

View file

@ -1,34 +0,0 @@
<plugin>
<name>xingheader</name>
<description>Add a xing header to mp3 encoded data</description>
<filename>../../gst/xingheader/.libs/libgstxingheader.so</filename>
<basename>libgstxingheader.so</basename>
<version>0.10.5.1</version>
<license>LGPL</license>
<source>gst-plugins-bad</source>
<package>GStreamer Bad Plug-ins CVS/prerelease</package>
<origin>Unknown package origin</origin>
<elements>
<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

@ -1,9 +0,0 @@
plugin_LTLIBRARIES = libgstxingheader.la
libgstxingheader_la_SOURCES = gstxingmux.c
libgstxingheader_la_CFLAGS = $(GST_BASE_CFLAGS) $(GST_CFLAGS)
libgstxingheader_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
libgstxingheader_la_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS)
noinst_HEADERS = gstxingmux.h

View file

@ -1,689 +0,0 @@
/*
* Copyright (c) 2006 Christophe Fergeau <teuf@gnome.org>
* Copyright (c) 2008 Sebastian Dröge <slomo@circular-chaos.org>
*
* 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.
*/
/* Xing SDK: http://www.mp3-tech.org/programmer/sources/vbrheadersdk.zip */
/**
* SECTION:element-xingmux
* @short_description: Adds a Xing header to MP3 files
*
* <refsect2>
* <para>
* xingmux adds a Xing header to MP3 files. This contains information about the duration and size
* of the file and a seek table and is very useful for getting an almost correct duration and better
* seeking on VBR MP3 files.
* </para>
* <para>
* This element will remove any existing Xing, LAME or VBRI headers from the beginning of the file.
* </para>
* <title>Example launch line</title>
* <para>
* <programlisting>
* gst-launch audiotestsrc num-buffers=1000 ! audioconvert ! lame ! xingmux ! filesink location=test.mp3
* gst-launch filesrc location=test.mp3 ! xingmux ! filesink location=test2.mp3
* gst-launch filesrc location=test.mp3 ! mp3parse ! xingmux ! filesink location=test2.mp3
* </programlisting>
* </para>
* </refsect2>
*/
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include <string.h>
#include "gstxingmux.h"
GST_DEBUG_CATEGORY_STATIC (xing_mux_debug);
#define GST_CAT_DEFAULT xing_mux_debug
GST_BOILERPLATE (GstXingMux, gst_xing_mux, GstElement, GST_TYPE_ELEMENT);
/* Xing Header stuff */
#define GST_XING_FRAME_FIELD (1 << 0)
#define GST_XING_BYTES_FIELD (1 << 1)
#define GST_XING_TOC_FIELD (1 << 2)
#define GST_XING_QUALITY_FIELD (1 << 3)
typedef struct _GstXingSeekEntry
{
gint64 timestamp;
gint byte;
} GstXingSeekEntry;
static void gst_xing_mux_finalize (GObject * obj);
static GstStateChangeReturn
gst_xing_mux_change_state (GstElement * element, GstStateChange transition);
static GstFlowReturn gst_xing_mux_chain (GstPad * pad, GstBuffer * buffer);
static gboolean gst_xing_mux_sink_event (GstPad * pad, GstEvent * event);
static GstStaticPadTemplate gst_xing_mux_sink_template =
GST_STATIC_PAD_TEMPLATE ("sink",
GST_PAD_SINK,
GST_PAD_ALWAYS,
GST_STATIC_CAPS ("audio/mpeg, "
"mpegversion = (int) 1, " "layer = (int) [ 1, 3 ]"));
static GstStaticPadTemplate gst_xing_mux_src_template =
GST_STATIC_PAD_TEMPLATE ("src",
GST_PAD_SRC,
GST_PAD_ALWAYS,
GST_STATIC_CAPS ("audio/mpeg, "
"mpegversion = (int) 1, " "layer = (int) [ 1, 3 ]"));
static const guint mp3types_bitrates[2][3][16] = {
{
{0, 32, 64, 96, 128, 160, 192, 224, 256, 288, 320, 352, 384, 416, 448,},
{0, 32, 48, 56, 64, 80, 96, 112, 128, 160, 192, 224, 256, 320, 384,},
{0, 32, 40, 48, 56, 64, 80, 96, 112, 128, 160, 192, 224, 256, 320,}
},
{
{0, 32, 48, 56, 64, 80, 96, 112, 128, 144, 160, 176, 192, 224, 256,},
{0, 8, 16, 24, 32, 40, 48, 56, 64, 80, 96, 112, 128, 144, 160,},
{0, 8, 16, 24, 32, 40, 48, 56, 64, 80, 96, 112, 128, 144, 160,}
},
};
static const guint mp3types_freqs[3][3] = { {44100, 48000, 32000},
{22050, 24000, 16000},
{11025, 12000, 8000}
};
static gboolean
parse_header (guint32 header, guint * ret_size, guint * ret_spf,
gulong * ret_rate)
{
guint length, spf;
gulong mode, samplerate, bitrate, layer, channels, padding;
gint lsf, mpg25;
if ((header & 0xffe00000) != 0xffe00000) {
g_warning ("invalid sync");
return FALSE;
}
if (((header >> 19) & 3) == 0x01) {
g_warning ("invalid MPEG version");
return FALSE;
}
if (((header >> 17) & 3) == 0x00) {
g_warning ("invalid MPEG layer");
return FALSE;
}
if (((header >> 12) & 0xf) == 0xf || ((header >> 12) & 0xf) == 0x0) {
g_warning ("invalid bitrate");
return FALSE;
}
if (((header >> 10) & 0x3) == 0x3) {
g_warning ("invalid sampling rate");
return FALSE;
}
if (header & 0x00000002) {
g_warning ("invalid emphasis");
return FALSE;
}
if (header & (1 << 20)) {
lsf = (header & (1 << 19)) ? 0 : 1;
mpg25 = 0;
} else {
lsf = 1;
mpg25 = 1;
}
if (header & (1 << 20)) {
lsf = (header & (1 << 19)) ? 0 : 1;
mpg25 = 0;
} else {
lsf = 1;
mpg25 = 1;
}
layer = 4 - ((header >> 17) & 0x3);
bitrate = (header >> 12) & 0xF;
bitrate = mp3types_bitrates[lsf][layer - 1][bitrate] * 1000;
if (bitrate == 0)
return 0;
samplerate = (header >> 10) & 0x3;
samplerate = mp3types_freqs[lsf + mpg25][samplerate];
padding = (header >> 9) & 0x1;
mode = (header >> 6) & 0x3;
channels = (mode == 3) ? 1 : 2;
switch (layer) {
case 1:
length = 4 * ((bitrate * 12) / samplerate + padding);
break;
case 2:
length = (bitrate * 144) / samplerate + padding;
break;
default:
case 3:
length = (bitrate * 144) / (samplerate << lsf) + padding;
break;
}
if (layer == 1)
spf = 384;
else if (layer == 2 || lsf == 0)
spf = 1152;
else
spf = 576;
if (ret_size)
*ret_size = length;
if (ret_spf)
*ret_spf = spf;
if (ret_rate)
*ret_rate = samplerate;
return TRUE;
}
static guint
get_xing_offset (guint32 header)
{
guint mpeg_version = (header >> 19) & 3;
guint channel_mode = (header >> 6) & 0x3;
if (mpeg_version == 0x11) {
if (channel_mode == 0x11) {
return 0x11;
} else {
return 0x20;
}
} else {
if (channel_mode == 0x11) {
return 0x09;
} else {
return 0x11;
}
}
}
static gboolean
has_xing_header (guint32 header, guchar * data, gsize size)
{
data += 4;
data += get_xing_offset (header);
if (memcmp (data, "Xing", 4) == 0 ||
memcmp (data, "Info", 4) == 0 || memcmp (data, "VBRI", 4) == 0)
return TRUE;
else
return FALSE;
}
static GstBuffer *
generate_xing_header (GstXingMux * xing)
{
guint32 *xing_flags;
GstBuffer *xing_header;
guchar *data;
guint32 header;
guint32 header_be;
guint size, spf, xing_offset;
gulong rate;
guint bitrate = 0x00;
gint64 duration;
gint64 byte_count;
header = xing->first_header;
/* Set bitrate and choose lowest possible size */
do {
bitrate++;
header &= 0xffff0fff;
header |= bitrate << 12;
parse_header (header, &size, &spf, &rate);
xing_offset = get_xing_offset (header);
} while (size < (4 + xing_offset + 4 + 4 + 4 + 4 + 100) && bitrate < 0xe);
if (bitrate == 0xe) {
GST_ERROR ("No usable bitrate found!");
return NULL;
}
if (gst_pad_alloc_buffer_and_set_caps (xing->srcpad, 0, size,
GST_PAD_CAPS (xing->srcpad), &xing_header) != GST_FLOW_OK) {
xing_header = gst_buffer_new_and_alloc (size);
gst_buffer_set_caps (xing_header, GST_PAD_CAPS (xing->srcpad));
}
data = GST_BUFFER_DATA (xing_header);
memset (data, 0, size);
header_be = GUINT32_TO_BE (header);
memcpy (data, &header_be, 4);
data += 4;
data += xing_offset;
memcpy (data, "Xing", 4);
data += 4;
xing_flags = (guint32 *) data;
data += 4;
if (xing->duration != GST_CLOCK_TIME_NONE) {
duration = xing->duration;
} else {
GstFormat fmt = GST_FORMAT_TIME;
if (!gst_pad_query_peer_duration (xing->sinkpad, &fmt, &duration))
duration = GST_CLOCK_TIME_NONE;
}
if (duration != GST_CLOCK_TIME_NONE) {
guint32 number_of_frames;
/* The Xing Header contains a NumberOfFrames field, which verifies to:
* Duration = NumberOfFrames *SamplesPerFrame/SamplingRate
* SamplesPerFrame and SamplingRate are values for the current frame.
*/
number_of_frames = gst_util_uint64_scale (duration, rate, GST_SECOND) / spf;
GST_DEBUG ("Setting number of frames to %u", number_of_frames);
number_of_frames = GUINT32_TO_BE (number_of_frames);
memcpy (data, &number_of_frames, 4);
*xing_flags |= GST_XING_FRAME_FIELD;
data += 4;
}
if (xing->byte_count != 0) {
byte_count = xing->byte_count;
} else {
GstFormat fmt = GST_FORMAT_BYTES;
if (!gst_pad_query_peer_duration (xing->sinkpad, &fmt, &byte_count))
byte_count = 0;
if (byte_count == -1)
byte_count = 0;
}
if (byte_count != 0) {
GST_DEBUG ("Setting number of bytes to %u", byte_count);
byte_count = GUINT32_TO_BE (byte_count);
memcpy (data, &byte_count, 4);
*xing_flags |= GST_XING_BYTES_FIELD;
data += 4;
byte_count = GUINT32_FROM_BE (byte_count);
}
if (xing->seek_table != NULL && byte_count != 0
&& duration != GST_CLOCK_TIME_NONE) {
GList *it;
gint percent = 0;
*xing_flags |= GST_XING_TOC_FIELD;
GST_DEBUG ("Writing seek table");
for (it = xing->seek_table; it != NULL && percent < 100; it = it->next) {
GstXingSeekEntry *entry = (GstXingSeekEntry *) it->data;
gint64 byte;
while ((entry->timestamp * 100) / duration >= percent) {
byte = (entry->byte * 256) / byte_count;
GST_DEBUG (" %d %% -- %d 1/256", percent, byte);
*data = byte;
data++;
percent++;
}
}
if (percent < 100) {
guchar b = *(data - 1);
gint i;
for (i = percent; i < 100; i++) {
GST_DEBUG (" %d %% -- %d 1/256", i, b);
*data = b;
data++;
}
}
}
GST_DEBUG ("Setting Xing flags to 0x%x\n", *xing_flags);
*xing_flags = GUINT32_TO_BE (*xing_flags);
return xing_header;
}
static void
gst_xing_mux_base_init (gpointer g_class)
{
GstElementClass *element_class = GST_ELEMENT_CLASS (g_class);
static const GstElementDetails gst_xing_mux_details =
GST_ELEMENT_DETAILS ("MP3 Xing muxer",
"Formatter/Metadata",
"Adds a Xing header to the beginning of a VBR MP3 file",
"Christophe Fergeau <teuf@gnome.org>");
gst_element_class_add_pad_template (element_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_element_class_set_details (element_class, &gst_xing_mux_details);
}
static void
gst_xing_mux_class_init (GstXingMuxClass * klass)
{
GObjectClass *gobject_class;
GstElementClass *gstelement_class;
gobject_class = (GObjectClass *) klass;
gstelement_class = (GstElementClass *) klass;
gobject_class->finalize = GST_DEBUG_FUNCPTR (gst_xing_mux_finalize);
gstelement_class->change_state =
GST_DEBUG_FUNCPTR (gst_xing_mux_change_state);
}
static void
gst_xing_mux_finalize (GObject * obj)
{
GstXingMux *xing = GST_XING_MUX (obj);
if (xing->adapter) {
g_object_unref (xing->adapter);
xing->adapter = NULL;
}
if (xing->seek_table) {
g_list_foreach (xing->seek_table, (GFunc) g_free, NULL);
g_list_free (xing->seek_table);
xing->seek_table = NULL;
}
G_OBJECT_CLASS (parent_class)->finalize (obj);
}
static void
xing_reset (GstXingMux * xing)
{
xing->duration = GST_CLOCK_TIME_NONE;
xing->byte_count = 0;
gst_adapter_clear (xing->adapter);
if (xing->seek_table) {
g_list_foreach (xing->seek_table, (GFunc) g_free, NULL);
g_list_free (xing->seek_table);
xing->seek_table = NULL;
}
xing->sent_xing = FALSE;
}
static void
gst_xing_mux_init (GstXingMux * xing, GstXingMuxClass * xingmux_class)
{
GstElementClass *klass = GST_ELEMENT_CLASS (xingmux_class);
/* pad through which data comes in to the element */
xing->sinkpad =
gst_pad_new_from_template (gst_element_class_get_pad_template (klass,
"sink"), "sink");
gst_pad_set_setcaps_function (xing->sinkpad,
GST_DEBUG_FUNCPTR (gst_pad_proxy_setcaps));
gst_pad_set_chain_function (xing->sinkpad,
GST_DEBUG_FUNCPTR (gst_xing_mux_chain));
gst_pad_set_event_function (xing->sinkpad,
GST_DEBUG_FUNCPTR (gst_xing_mux_sink_event));
gst_element_add_pad (GST_ELEMENT (xing), xing->sinkpad);
/* pad through which data goes out of the element */
xing->srcpad =
gst_pad_new_from_template (gst_element_class_get_pad_template (klass,
"src"), "src");
gst_element_add_pad (GST_ELEMENT (xing), xing->srcpad);
xing->adapter = gst_adapter_new ();
xing_reset (xing);
}
static GstFlowReturn
gst_xing_mux_chain (GstPad * pad, GstBuffer * buffer)
{
GstXingMux *xing = GST_XING_MUX (GST_PAD_PARENT (pad));
GstFlowReturn ret = GST_FLOW_OK;
gst_adapter_push (xing->adapter, buffer);
while (gst_adapter_available (xing->adapter) >= 4) {
const guchar *data = gst_adapter_peek (xing->adapter, 4);
guint32 header;
GstBuffer *outbuf;
GstClockTime duration;
guint size, spf;
gulong rate;
GstXingSeekEntry *seek_entry;
header = GST_READ_UINT32_BE (data);
if (!parse_header (header, &size, &spf, &rate)) {
GST_DEBUG ("Lost sync, resyncing");
gst_adapter_flush (xing->adapter, 1);
continue;
}
if (gst_adapter_available (xing->adapter) < size)
break;
outbuf = gst_adapter_take_buffer (xing->adapter, size);
gst_buffer_set_caps (outbuf, GST_PAD_CAPS (xing->srcpad));
if (!xing->sent_xing) {
if (has_xing_header (header, GST_BUFFER_DATA (outbuf), size)) {
GST_LOG_OBJECT (xing, "Dropping old Xing header");
gst_buffer_unref (outbuf);
continue;
} else {
GstBuffer *xing_header;
guint64 xing_header_size;
xing->first_header = header;
xing_header = generate_xing_header (xing);
if (xing_header == NULL) {
GST_ERROR ("Can't generate Xing header");
gst_buffer_unref (outbuf);
return GST_FLOW_ERROR;
}
xing_header_size = GST_BUFFER_SIZE (xing_header);
if (GST_FLOW_IS_FATAL (ret = gst_pad_push (xing->srcpad, xing_header))) {
GST_ERROR_OBJECT (xing, "Failed to push Xing header: %s",
gst_flow_get_name (ret));
gst_buffer_unref (xing_header);
gst_buffer_unref (outbuf);
return ret;
}
xing->byte_count += xing_header_size;
xing->sent_xing = TRUE;
}
}
seek_entry = g_new (GstXingSeekEntry, 1);
seek_entry->timestamp =
(xing->duration == GST_CLOCK_TIME_NONE) ? 0 : xing->duration;
/* Workaround for parsers checking that the first seek table entry is 0 */
seek_entry->byte = (seek_entry->timestamp == 0) ? 0 : xing->byte_count;
xing->seek_table = g_list_append (xing->seek_table, seek_entry);
duration = gst_util_uint64_scale (spf, GST_SECOND, rate);
GST_BUFFER_TIMESTAMP (outbuf) =
(xing->duration == GST_CLOCK_TIME_NONE) ? 0 : xing->duration;
GST_BUFFER_DURATION (outbuf) = duration;
GST_BUFFER_OFFSET (outbuf) = xing->byte_count;
GST_BUFFER_OFFSET_END (outbuf) =
xing->byte_count + GST_BUFFER_SIZE (outbuf);
xing->byte_count += GST_BUFFER_SIZE (outbuf);
if (xing->duration == GST_CLOCK_TIME_NONE)
xing->duration = duration;
else
xing->duration += duration;
if (GST_FLOW_IS_FATAL (ret = gst_pad_push (xing->srcpad, outbuf))) {
GST_ERROR_OBJECT (xing, "Failed to push MP3 frame: %s",
gst_flow_get_name (ret));
return ret;
}
}
return ret;
}
static gboolean
gst_xing_mux_sink_event (GstPad * pad, GstEvent * event)
{
GstXingMux *xing;
gboolean result;
xing = GST_XING_MUX (gst_pad_get_parent (pad));
result = FALSE;
switch (GST_EVENT_TYPE (event)) {
case GST_EVENT_NEWSEGMENT:
if (xing->sent_xing) {
GST_ERROR ("Already sent Xing header, dropping NEWSEGMENT event!");
gst_event_unref (event);
result = FALSE;
} else {
GstFormat fmt;
gst_event_parse_new_segment (event, NULL, NULL, &fmt, NULL, NULL, NULL);
if (fmt == GST_FORMAT_BYTES) {
result = gst_pad_push_event (xing->srcpad, event);
} else {
gst_event_unref (event);
event = gst_event_new_new_segment (FALSE, 1.0, GST_FORMAT_BYTES,
0, GST_CLOCK_TIME_NONE, 0);
result = gst_pad_push_event (xing->srcpad, event);
}
}
break;
case GST_EVENT_EOS:{
GstEvent *n_event;
GST_DEBUG_OBJECT (xing, "handling EOS event");
if (xing->sent_xing) {
n_event = gst_event_new_new_segment (FALSE, 1.0, GST_FORMAT_BYTES,
0, GST_CLOCK_TIME_NONE, 0);
if (G_UNLIKELY (!gst_pad_push_event (xing->srcpad, n_event))) {
GST_WARNING
("Failed to seek to position 0 for pushing the Xing header");
} else {
GstBuffer *header;
GstFlowReturn ret;
header = generate_xing_header (xing);
if (header == NULL) {
GST_ERROR ("Can't generate Xing header");
} else {
GST_INFO ("Writing real Xing header to beginning of stream");
if (GST_FLOW_IS_FATAL (ret = gst_pad_push (xing->srcpad, header)))
GST_WARNING ("Failed to push updated Xing header: %s\n",
gst_flow_get_name (ret));
}
}
}
result = gst_pad_push_event (xing->srcpad, event);
break;
}
default:
result = gst_pad_event_default (pad, event);
break;
}
gst_object_unref (GST_OBJECT (xing));
return result;
}
static GstStateChangeReturn
gst_xing_mux_change_state (GstElement * element, GstStateChange transition)
{
GstXingMux *xing;
GstStateChangeReturn result;
xing = GST_XING_MUX (element);
result = GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
switch (transition) {
case GST_STATE_CHANGE_PAUSED_TO_READY:
xing_reset (xing);
break;
default:
break;
}
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)

View file

@ -1,85 +0,0 @@
/*
* Copyright (c) 2006 Christophe Fergeau <teuf@gnome.org>
* Copyright (c) 2008 Sebastian Dröge <slomo@circular-chaos.org>
*
* 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.
*/
#include <gst/gst.h>
#include <gst/base/gstadapter.h>
#ifndef __GST_XINGMUX_H__
#define __GST_XINGMUX_H__
G_BEGIN_DECLS
/* Standard macros for defining types for this element. */
#define GST_TYPE_XING_MUX \
(gst_xing_mux_get_type())
#define GST_XING_MUX(obj) \
(G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_XING_MUX,GstXingMux))
#define GST_XING_MUX_CLASS(klass) \
(G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_XING_MUX,GstXingMuxClass))
#define GST_IS_XING_MUX(obj) \
(G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_XING_MUX))
#define GST_IS_XING_MUX_CLASS(klass) \
(G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_XING_MUX))
typedef struct _GstXingMux GstXingMux;
typedef struct _GstXingMuxClass GstXingMuxClass;
/* Definition of structure storing data for this element. */
/**
* GstXingMux:
*
* Opaque data structure.
*/
struct _GstXingMux {
GstElement element;
GstPad *sinkpad, *srcpad;
/* < private > */
GstAdapter *adapter;
GstClockTime duration;
guint64 byte_count;
guint64 frame_count;
GList *seek_table;
gboolean sent_xing;
/* Copy of the first frame header */
guint32 first_header;
};
/* Standard definition defining a class for this element. */
/**
* GstXingMuxClass:
*
* Opaque data structure.
*/
struct _GstXingMuxClass {
GstElementClass parent_class;
};
/* Standard function returning type information. */
GType gst_xing_mux_get_type (void);
G_END_DECLS
#endif /* __GST_XINGMUX_H__ */

View file

@ -74,10 +74,9 @@ check_PROGRAMS = \
elements/rglimiter \
elements/rgvolume \
elements/y4menc \
elements/spectrum \
elements/xingmux
elements/spectrum
noinst_HEADERS = elements/xingmux_testdata.h
noinst_HEADERS =
TESTS = $(check_PROGRAMS)

View file

@ -19,4 +19,3 @@ wavpackdec
wavpackenc
wavpackparse
y4menc
xingmux

View file

@ -1,162 +0,0 @@
/* GStreamer
*
* Copyright (C) 2008 Sebastian Dröge <slomo@circular-chaos.org>
*
* xingmux.c: Unit test for the xingmux element
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
* as published by the Free Software Foundation; either version 2.1 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
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301 USA
*/
#include <gst/gst.h>
#include <gst/base/gstbasetransform.h>
#include <gst/check/gstcheck.h>
#include <math.h>
#include "xingmux_testdata.h"
/* For ease of programming we use globals to keep refs for our floating
* src and sink pads we create; otherwise we always have to do get_pad,
* get_peer, and then remove references in every test function */
GstPad *mysrcpad, *mysinkpad;
static GstStaticPadTemplate sinktemplate = GST_STATIC_PAD_TEMPLATE ("sink",
GST_PAD_SINK,
GST_PAD_ALWAYS,
GST_STATIC_CAPS ("audio/mpeg, " "mpegversion = (int) 1," "layer = (int) 3")
);
static GstStaticPadTemplate srctemplate = GST_STATIC_PAD_TEMPLATE ("src",
GST_PAD_SRC,
GST_PAD_ALWAYS,
GST_STATIC_CAPS ("audio/mpeg, " "mpegversion = (int) 1," "layer = (int) 3")
);
GstElement *
setup_xingmux ()
{
GstElement *xingmux;
GST_DEBUG ("setup_xingmux");
xingmux = gst_check_setup_element ("xingmux");
mysrcpad = gst_check_setup_src_pad (xingmux, &srctemplate, NULL);
mysinkpad = gst_check_setup_sink_pad (xingmux, &sinktemplate, NULL);
gst_pad_set_active (mysrcpad, TRUE);
gst_pad_set_active (mysinkpad, TRUE);
return xingmux;
}
void
cleanup_xingmux (GstElement * xingmux)
{
GST_DEBUG ("cleanup_xingmux");
g_list_foreach (buffers, (GFunc) gst_mini_object_unref, NULL);
g_list_free (buffers);
buffers = NULL;
gst_pad_set_active (mysrcpad, FALSE);
gst_pad_set_active (mysinkpad, FALSE);
gst_check_teardown_src_pad (xingmux);
gst_check_teardown_sink_pad (xingmux);
gst_check_teardown_element (xingmux);
}
GST_START_TEST (test_xing_remux)
{
GstElement *xingmux;
GstBuffer *inbuffer;
GList *it;
const guint8 *verify_data;
xingmux = setup_xingmux ();
fail_unless (gst_element_set_state (xingmux,
GST_STATE_PLAYING) == GST_STATE_CHANGE_SUCCESS,
"could not set to playing");
inbuffer = gst_buffer_new_and_alloc (sizeof (test_xing));
memcpy (GST_BUFFER_DATA (inbuffer), test_xing, sizeof (test_xing));
gst_buffer_set_caps (inbuffer, GST_PAD_CAPS (mysrcpad));
ASSERT_BUFFER_REFCOUNT (inbuffer, "inbuffer", 1);
/* pushing gives away my reference ... */
fail_unless (gst_pad_push (mysrcpad, inbuffer) == GST_FLOW_OK);
fail_unless (gst_pad_push_event (mysrcpad, gst_event_new_eos ()));
/* ... and puts a new buffer on the global list */
fail_unless_equals_int (g_list_length (buffers), 93);
verify_data = test_xing;
for (it = buffers; it != NULL; it = it->next) {
GstBuffer *outbuffer = (GstBuffer *) it->data;
if (it == buffers) {
gint j;
/* Empty Xing header, should be the same as input data until the "Xing" marker
* and zeroes afterwards. */
fail_unless (memcmp (test_xing, GST_BUFFER_DATA (outbuffer), 25) == 0);
for (j = 26; j < GST_BUFFER_SIZE (outbuffer); j++)
fail_unless (GST_BUFFER_DATA (outbuffer)[j] == 0);
verify_data += GST_BUFFER_SIZE (outbuffer);
} else if (it->next != NULL) {
/* Should contain the raw MP3 data without changes */
fail_unless (memcmp (verify_data, GST_BUFFER_DATA (outbuffer),
GST_BUFFER_SIZE (outbuffer)) == 0);
verify_data += GST_BUFFER_SIZE (outbuffer);
} else {
/* Last buffer is the rewrite of the first buffer and should be exactly the same
* as the old Xing header we had */
fail_unless (memcmp (test_xing, GST_BUFFER_DATA (outbuffer),
GST_BUFFER_SIZE (outbuffer)) == 0);
}
}
/* cleanup */
cleanup_xingmux (xingmux);
}
GST_END_TEST;
Suite *
xingmux_suite (void)
{
Suite *s = suite_create ("xingmux");
TCase *tc_chain = tcase_create ("general");
suite_add_tcase (s, tc_chain);
tcase_add_test (tc_chain, test_xing_remux);
return s;
}
int
main (int argc, char **argv)
{
int nf;
Suite *s = xingmux_suite ();
SRunner *sr = srunner_create (s);
gst_check_init (&argc, &argv);
srunner_run_all (sr, CK_NORMAL);
nf = srunner_ntests_failed (sr);
srunner_free (sr);
return nf;
}

File diff suppressed because it is too large Load diff