Commit 024ed989 authored by Andy Wingo Wingo's avatar Andy Wingo Wingo

Hook it up.

Original commit message from CVS:
2006-02-05  Lutz Mueller <lutz@topfrose.de>

reviewed by: Andy Wingo <wingo@pobox.com>

* configure.ac:
* ext/Makefile.am: Hook it up.
* ext/bz2/gstbz2.c:
* ext/bz2/gstbz2dec.h:
* ext/bz2/gstbz2dec.c:
* ext/bz2/gstbz2enc.h:
* ext/bz2/gstbz2enc.c: New plugin, implements bz2 encoding and
decoding (#303167).
parent fdde7f24
2006-02-05 Lutz Mueller <lutz@topfrose.de>
reviewed by: Andy Wingo <wingo@pobox.com>
* configure.ac:
* ext/Makefile.am: Hook it up.
* ext/bz2/gstbz2.c:
* ext/bz2/gstbz2dec.h:
* ext/bz2/gstbz2dec.c:
* ext/bz2/gstbz2enc.h:
* ext/bz2/gstbz2enc.c: New plugin, implements bz2 encoding and
decoding (#303167).
2006-01-30 Andy Wingo <wingo@pobox.com>
* sys/glsink/Makefile.am (libgstglimagesink_la_LIBADD)
......
......@@ -400,6 +400,13 @@ else
AC_SUBST(X_LIBS)
fi
dnl *** BZ2 ***
translit(bz2, m, l) AM_CONDITIONAL(USE_BZ2, true)
GST_CHECK_FEATURE(BZ2, [bz2 library], bz2, [
GST_CHECK_LIBHEADER(BZ2, bz2, BZ2_bzCompress, ,bzlib.h, BZ2_LIBS="-lbz2")
AC_SUBST(BZ2_LIBS)
])
dnl *** DTS ***
translit(dnm, m, l) AM_CONDITIONAL(USE_DTS, true)
GST_CHECK_FEATURE(DTS, [dts library], dtsdec, [
......@@ -652,6 +659,7 @@ sys/glsink/Makefile
examples/Makefile
examples/directfb/Makefile
ext/Makefile
ext/bz2/Makefile
ext/directfb/Makefile
ext/faac/Makefile
ext/faad/Makefile
......
......@@ -22,6 +22,12 @@ AUDIOFILE_DIR=
AUDIORESAMPLE_DIR=
# endif
if USE_BZ2
BZ2_DIR=bz2
else
BZ2_DIR=
endif
# if USE_CDAUDIO
# CDAUDIO_DIR=cdaudio
# else
......@@ -207,6 +213,7 @@ SUBDIRS=\
$(ARTSC_DIR) \
$(AUDIOFILE_DIR) \
$(AUDIORESAMPLE_DIR) \
$(BZ2_DIR) \
$(CDAUDIO_DIR) \
$(DIRAC_DIR) \
$(DIRECTFB_DIR) \
......@@ -239,6 +246,7 @@ SUBDIRS=\
$(XVID_DIR)
DIST_SUBDIRS= \
bz2 \
directfb \
faac \
faad \
......
plugin_LTLIBRARIES = libgstbz2.la
libgstbz2_la_SOURCES = \
gstbz2.c gstbz2dec.c gstbz2enc.c
libgstbz2_la_CFLAGS = $(GST_CFLAGS)
libgstbz2_la_LIBADD = $(BZ2_LIBS)
libgstbz2_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
noinst_HEADERS = \
gstbz2dec.h gstbz2enc.h
/* GStreamer
*
* 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.
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include "gstbz2enc.h"
#include "gstbz2dec.h"
#include <gst/gstplugin.h>
#include <string.h>
static gboolean
plugin_init (GstPlugin * p)
{
if (!gst_element_register (p, "bz2enc", GST_RANK_NONE, GST_TYPE_BZ2ENC))
return FALSE;
if (!gst_element_register (p, "bz2dec", GST_RANK_NONE, GST_TYPE_BZ2DEC))
return FALSE;
return TRUE;
}
GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, GST_VERSION_MINOR, "bz2",
"Compress or decompress streams",
plugin_init, VERSION, GST_LICENSE, GST_PACKAGE, GST_ORIGIN)
/* GStreamer
*
* 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.
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include "gstbz2dec.h"
#include <bzlib.h>
#include <string.h>
GST_DEBUG_CATEGORY_STATIC (bz2dec_debug);
#define GST_CAT_DEFAULT bz2dec_debug
static GstElementDetails bz2dec_details = GST_ELEMENT_DETAILS ("BZ2 decoder",
"Codec/Decoder", "Decodes compressed streams",
"Lutz Mueller <lutz@users.sourceforge.net>");
static GstStaticPadTemplate sink_template =
GST_STATIC_PAD_TEMPLATE ("sink", GST_PAD_SINK, GST_PAD_ALWAYS,
GST_STATIC_CAPS ("application/x-bz2"));
static GstStaticPadTemplate src_template =
GST_STATIC_PAD_TEMPLATE ("src", GST_PAD_SRC, GST_PAD_ALWAYS,
GST_STATIC_CAPS ("application/octet-stream"));
struct _GstBz2dec
{
GstElement parent;
/* Properties */
guint buffer_size;
gboolean ready;
bz_stream stream;
guint64 offset;
};
struct _GstBz2decClass
{
GstElementClass parent_class;
};
GST_BOILERPLATE (GstBz2dec, gst_bz2dec, GstElement, GST_TYPE_ELEMENT);
#define DEFAULT_BUFFER_SIZE 1024
enum
{
PROP_0,
PROP_BUFFER_SIZE
};
static void
gst_bz2dec_decompress_end (GstBz2dec * b)
{
g_return_if_fail (GST_IS_BZ2DEC (b));
if (b->ready) {
BZ2_bzDecompressEnd (&b->stream);
memset (&b->stream, 0, sizeof (b->stream));
b->ready = FALSE;
}
}
static void
gst_bz2dec_decompress_init (GstBz2dec * b)
{
g_return_if_fail (GST_IS_BZ2DEC (b));
gst_bz2dec_decompress_end (b);
b->offset = 0;
switch (BZ2_bzDecompressInit (&b->stream, 0, 0)) {
case BZ_OK:
b->ready = TRUE;
return;
default:
b->ready = FALSE;
GST_ELEMENT_ERROR (b, CORE, FAILED, (NULL),
("Failed to start decompression."));
return;
}
}
static GstFlowReturn
gst_bz2dec_chain (GstPad * pad, GstBuffer * in)
{
GstBz2dec *b = GST_BZ2DEC (gst_pad_get_parent (pad));
GstPad *src = gst_element_get_pad (GST_ELEMENT (b), "src");
int r = BZ_OK;
GstFlowReturn fr;
guint n;
gst_object_unref (b);
gst_object_unref (src);
if (!b->ready) {
GST_ELEMENT_ERROR (b, CORE, FAILED, (NULL), ("Decompressor not ready."));
return GST_FLOW_ERROR;
}
b->stream.next_in = (char *) GST_BUFFER_DATA (in);
b->stream.avail_in = GST_BUFFER_SIZE (in);
while (r != BZ_STREAM_END) {
GstBuffer *out;
if ((fr = gst_pad_alloc_buffer (src, b->offset, b->buffer_size,
GST_PAD_CAPS (pad), &out)) != GST_FLOW_OK) {
gst_bz2dec_decompress_init (b);
return fr;
}
b->stream.next_out = (char *) GST_BUFFER_DATA (out);
b->stream.avail_out = GST_BUFFER_SIZE (out);
r = BZ2_bzDecompress (&b->stream);
if ((r != BZ_OK) && (r != BZ_STREAM_END)) {
GST_ELEMENT_ERROR (b, STREAM, DECODE, (NULL),
("Failed to decompress data (error code %i).", r));
gst_bz2dec_decompress_init (b);
gst_buffer_unref (out);
return GST_FLOW_ERROR;
}
if (b->stream.avail_out >= GST_BUFFER_SIZE (out)) {
gst_buffer_unref (out);
break;
}
GST_BUFFER_SIZE (out) -= b->stream.avail_out;
GST_BUFFER_OFFSET (out) = b->stream.total_out_lo32 - GST_BUFFER_SIZE (out);
n = GST_BUFFER_SIZE (out);
if ((fr = gst_pad_push (src, out)) != GST_FLOW_OK) {
gst_buffer_unref (out);
return fr;
}
b->offset += n;
}
gst_buffer_unref (in);
return GST_FLOW_OK;
}
static void
gst_bz2dec_init (GstBz2dec * b, GstBz2decClass * klass)
{
GstPad *pad;
b->buffer_size = DEFAULT_BUFFER_SIZE;
pad =
gst_pad_new_from_template (gst_static_pad_template_get (&sink_template),
"sink");
gst_pad_set_chain_function (pad, gst_bz2dec_chain);
gst_element_add_pad (GST_ELEMENT (b), pad);
pad =
gst_pad_new_from_template (gst_static_pad_template_get (&src_template),
"src");
gst_element_add_pad (GST_ELEMENT (b), pad);
gst_bz2dec_decompress_init (b);
}
static void
gst_bz2dec_base_init (gpointer g_class)
{
GstElementClass *ec = GST_ELEMENT_CLASS (g_class);
gst_element_class_add_pad_template (ec,
gst_static_pad_template_get (&sink_template));
gst_element_class_add_pad_template (ec,
gst_static_pad_template_get (&src_template));
gst_element_class_set_details (ec, &bz2dec_details);
}
static void
gst_bz2dec_finalize (GObject * object)
{
GstBz2dec *b = GST_BZ2DEC (object);
gst_bz2dec_decompress_end (b);
G_OBJECT_CLASS (parent_class)->finalize (object);
}
static void
gst_bz2dec_get_property (GObject * object, guint prop_id,
GValue * value, GParamSpec * pspec)
{
GstBz2dec *b = GST_BZ2DEC (object);
switch (prop_id) {
case PROP_BUFFER_SIZE:
g_value_set_uint (value, b->buffer_size);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
}
}
static void
gst_bz2dec_set_property (GObject * object, guint prop_id,
const GValue * value, GParamSpec * pspec)
{
GstBz2dec *b = GST_BZ2DEC (object);
switch (prop_id) {
case PROP_BUFFER_SIZE:
b->buffer_size = g_value_get_uint (value);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
}
}
static void
gst_bz2dec_class_init (GstBz2decClass * klass)
{
GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
parent_class = g_type_class_ref (GST_TYPE_ELEMENT);
gobject_class->finalize = gst_bz2dec_finalize;
gobject_class->get_property = gst_bz2dec_get_property;
gobject_class->set_property = gst_bz2dec_set_property;
g_object_class_install_property (G_OBJECT_CLASS (klass), PROP_BUFFER_SIZE,
g_param_spec_uint ("buffer_size", "Buffer size", "Buffer size",
1, G_MAXUINT, DEFAULT_BUFFER_SIZE, G_PARAM_READWRITE));
GST_DEBUG_CATEGORY_INIT (bz2dec_debug, "bz2dec", 0, "BZ2 decompressor");
}
/* bz2dec: Encoder plugin for GStreamer
*
* 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_BZ2DEC_H_
#define __GST_BZ2DEC_H__
#include <gst/gst.h>
G_BEGIN_DECLS
#define GST_TYPE_BZ2DEC (gst_bz2dec_get_type())
#define GST_BZ2DEC(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_BZ2DEC,GstBz2dec))
#define GST_BZ2DEC_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_BZ2DEC,GstBz2dec))
#define GST_IS_BZ2DEC(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_BZ2DEC))
#define GST_IS_BZ2DEC_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_BZ2DEC))
typedef struct _GstBz2dec GstBz2dec;
typedef struct _GstBz2decClass GstBz2decClass;
GType
gst_bz2dec_get_type (void)
G_GNUC_CONST;
G_END_DECLS
#endif /* __GST_BZ2DEC_H__ */
/* GStreamer
*
* 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.
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include "gstbz2enc.h"
#include <bzlib.h>
#include <string.h>
GST_DEBUG_CATEGORY_STATIC (bz2enc_debug);
#define GST_CAT_DEFAULT bz2enc_debug
static GstElementDetails bz2enc_details = GST_ELEMENT_DETAILS ("BZ2 encoder",
"Codec/Encoder", "Compresses streams",
"Lutz Mueller <lutz@users.sourceforge.net>");
static GstStaticPadTemplate sink_template =
GST_STATIC_PAD_TEMPLATE ("sink", GST_PAD_SINK, GST_PAD_ALWAYS,
GST_STATIC_CAPS ("application/octet-stream"));
static GstStaticPadTemplate src_template =
GST_STATIC_PAD_TEMPLATE ("src", GST_PAD_SRC, GST_PAD_ALWAYS,
GST_STATIC_CAPS ("application/x-bz2"));
#define DEFAULT_BLOCK_SIZE 6
#define DEFAULT_BUFFER_SIZE 1024
enum
{
PROP_0,
PROP_BLOCK_SIZE,
PROP_BUFFER_SIZE
};
struct _GstBz2enc
{
GstElement parent;
/* Properties */
guint block_size;
guint buffer_size;
gboolean ready;
bz_stream stream;
guint64 offset;
};
struct _GstBz2encClass
{
GstElementClass parent_class;
};
GST_BOILERPLATE (GstBz2enc, gst_bz2enc, GstElement, GST_TYPE_ELEMENT);
static void
gst_bz2enc_compress_end (GstBz2enc * b)
{
g_return_if_fail (GST_IS_BZ2ENC (b));
if (b->ready) {
BZ2_bzCompressEnd (&b->stream);
memset (&b->stream, 0, sizeof (b->stream));
b->ready = FALSE;
}
}
static void
gst_bz2enc_compress_init (GstBz2enc * b)
{
g_return_if_fail (GST_IS_BZ2ENC (b));
gst_bz2enc_compress_end (b);
b->offset = 0;
switch (BZ2_bzCompressInit (&b->stream, b->block_size, 0, 0)) {
case BZ_OK:
b->ready = TRUE;
return;
default:
b->ready = FALSE;
GST_ELEMENT_ERROR (b, CORE, FAILED, (NULL),
("Failed to start compression."));
return;
}
}
static gboolean
gst_bz2enc_event (GstPad * pad, GstEvent * e)
{
GstBz2enc *b = GST_BZ2ENC (gst_pad_get_parent (pad));
GstPad *src = gst_element_get_pad (GST_ELEMENT (b), "src");
int r = BZ_FINISH_OK;
GstFlowReturn fr;
gst_object_unref (b);
gst_object_unref (src);
switch (GST_EVENT_TYPE (e)) {
case GST_EVENT_EOS:
while (r != BZ_STREAM_END) {
GstBuffer *out;
if ((fr = gst_pad_alloc_buffer (src, b->offset, b->buffer_size,
GST_PAD_CAPS (src), &out)) != GST_FLOW_OK) {
GST_ELEMENT_ERROR (b, STREAM, DECODE, (NULL),
("Failed to allocate buffer of size %i.", b->buffer_size));
break;
}
b->stream.next_out = (char *) GST_BUFFER_DATA (out);
b->stream.avail_out = GST_BUFFER_SIZE (out);
r = BZ2_bzCompress (&b->stream, BZ_FINISH);
if ((r != BZ_FINISH_OK) && (r != BZ_STREAM_END)) {
GST_ELEMENT_ERROR (b, STREAM, DECODE, (NULL),
("Failed to finish to compress (error code %i).", r));
gst_buffer_unref (out);
break;
}
if (b->stream.avail_out >= GST_BUFFER_SIZE (out)) {
gst_buffer_unref (out);
break;
}
GST_BUFFER_SIZE (out) -= b->stream.avail_out;
GST_BUFFER_OFFSET (out) =
b->stream.total_out_lo32 - GST_BUFFER_SIZE (out);
if ((fr = gst_pad_push (src, out)) != GST_FLOW_OK) {
GST_ELEMENT_ERROR (b, STREAM, DECODE, (NULL),
("Could not push last packet (error code %i).", r));
gst_buffer_unref (out);
break;
}
}
gst_bz2enc_compress_init (b);
break;
default:
break;
}
return gst_pad_event_default (pad, e);
}
static GstFlowReturn
gst_bz2enc_chain (GstPad * pad, GstBuffer * in)
{
GstBz2enc *b = GST_BZ2ENC (gst_pad_get_parent (pad));
GstPad *src = gst_element_get_pad (GST_ELEMENT (b), "src");
GstFlowReturn fr = GST_FLOW_OK;
guint n;
gst_object_unref (b);
gst_object_unref (src);
if (!b->ready) {
GST_ELEMENT_ERROR (b, CORE, FAILED, (NULL), ("Compressor not ready."));
return GST_FLOW_ERROR;
}
b->stream.next_in = (char *) GST_BUFFER_DATA (in);
b->stream.avail_in = GST_BUFFER_SIZE (in);
while ((fr == GST_FLOW_OK) && b->stream.avail_in) {
GstBuffer *out;
int r;
if ((fr = gst_pad_alloc_buffer (src, b->offset, b->buffer_size,
GST_PAD_CAPS (pad), &out)) != GST_FLOW_OK) {
gst_bz2enc_compress_init (b);
return fr;
}
b->stream.next_out = (char *) GST_BUFFER_DATA (out);
b->stream.avail_out = GST_BUFFER_SIZE (out);
r = BZ2_bzCompress (&b->stream, BZ_RUN);
if (r != BZ_RUN_OK) {
GST_ELEMENT_ERROR (b, STREAM, DECODE, (NULL),
("Failed to compress data (error code %i).", r));
gst_bz2enc_compress_init (b);
gst_buffer_unref (out);
return GST_FLOW_ERROR;
}
if (b->stream.avail_out >= GST_BUFFER_SIZE (out)) {
gst_buffer_unref (out);
break;
}
GST_BUFFER_SIZE (out) -= b->stream.avail_out;
GST_BUFFER_OFFSET (out) = b->stream.total_out_lo32 - GST_BUFFER_SIZE (out);
n = GST_BUFFER_SIZE (out);
if ((fr = gst_pad_push (src, out)) != GST_FLOW_OK) {
gst_buffer_unref (out);
return fr;
}
b->offset += n;
}
gst_buffer_unref (in);
return GST_FLOW_OK;
}
static void
gst_bz2enc_init (GstBz2enc * b, GstBz2encClass * klass)
{
GstPad *pad;
pad =
gst_pad_new_from_template (gst_static_pad_template_get (&sink_template),
"sink");
gst_pad_set_chain_function (pad, gst_bz2enc_chain);
gst_pad_set_event_function (pad, gst_bz2enc_event);
gst_element_add_pad (GST_ELEMENT (b), pad);
pad =
gst_pad_new_from_template (gst_static_pad_template_get (&src_template),
"src");
gst_element_add_pad (GST_ELEMENT (b), pad);
b->block_size = DEFAULT_BLOCK_SIZE;
b->buffer_size = DEFAULT_BUFFER_SIZE;
gst_bz2enc_compress_init (b);
}
static void
gst_bz2enc_base_init (gpointer g_class)
{
GstElementClass *ec = GST_ELEMENT_CLASS (g_class);
gst_element_class_add_pad_template (ec,
gst_static_pad_template_get (&sink_template));
gst_element_class_add_pad_template (ec,
gst_static_pad_template_get (&src_template));
gst_element_class_set_details (ec, &bz2enc_details);
}
static void
gst_bz2enc_finalize (GObject * object)
{
GstBz2enc *b = GST_BZ2ENC (object);
gst_bz2enc_compress_end (b);
G_OBJECT_CLASS (parent_class)->finalize (object);
}
static void
gst_bz2enc_get_property (GObject * object, guint prop_id,
GValue * value, GParamSpec * pspec)
{
GstBz2enc *b = GST_BZ2ENC (object);
switch (prop_id) {