mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-07 07:58:51 +00:00
Code Issues 1 Projects Releases Wiki Activity

bz2: port to 0.11

Browse source
This commit is contained in:
Mark Nauwelaerts 2012-03-18 18:32:41 +01:00
parent 3354fda883
commit 0abb7fb3f4
3 changed files with 76 additions and 90 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
configure.ac
View file

@ -310,7 +310,7 @@ GST_PLUGINS_NONPORTED=" aiff asfmux \
sdi segmentclip siren speed subenc stereo tta videofilters \ sdi segmentclip siren speed subenc stereo tta videofilters \
videomeasure videosignal vmnc \ videomeasure videosignal vmnc \
decklink fbdev linsys shm vcd \ decklink fbdev linsys shm vcd \
apexsink bz2 cdaudio cog curl dc1394 dirac directfb resindvd \ apexsink cdaudio cog curl dc1394 dirac directfb resindvd \
gsettings jp2k ladspa mimic \ gsettings jp2k ladspa mimic \
musepack musicbrainz nas neon ofa openal opencv rsvg sdl smooth sndfile soundtouch spandsp spc timidity \ musepack musicbrainz nas neon ofa openal opencv rsvg sdl smooth sndfile soundtouch spandsp spc timidity \
wildmidi xvid lv2 teletextdec dvb" wildmidi xvid lv2 teletextdec dvb"

66
ext/bz2/gstbz2dec.c
View file

@ -57,7 +57,8 @@ struct _GstBz2decClass
GstElementClass parent_class; GstElementClass parent_class;
}; };
GST_BOILERPLATE (GstBz2dec, gst_bz2dec, GstElement, GST_TYPE_ELEMENT); #define gst_bz2dec_parent_class parent_class
G_DEFINE_TYPE (GstBz2dec, gst_bz2dec, GST_TYPE_ELEMENT);
#define DEFAULT_FIRST_BUFFER_SIZE 1024 #define DEFAULT_FIRST_BUFFER_SIZE 1024
#define DEFAULT_BUFFER_SIZE 1024 #define DEFAULT_BUFFER_SIZE 1024
@ -101,48 +102,47 @@ gst_bz2dec_decompress_init (GstBz2dec * b)
} }
static GstFlowReturn static GstFlowReturn
gst_bz2dec_chain (GstPad * pad, GstBuffer * in) gst_bz2dec_chain (GstPad * pad, GstObject * parent, GstBuffer * in)
{ {
GstFlowReturn flow; GstFlowReturn flow;
GstBuffer *out; GstBuffer *out;
GstBz2dec *b; GstBz2dec *b;
int r = BZ_OK; int r = BZ_OK;
GstMapInfo map, omap;
b = GST_BZ2DEC (GST_PAD_PARENT (pad)); b = GST_BZ2DEC (parent);
if (!b->ready) if (!b->ready)
goto not_ready; goto not_ready;
b->stream.next_in = (char *) GST_BUFFER_DATA (in); gst_buffer_map (in, &map, GST_MAP_READ);
b->stream.avail_in = GST_BUFFER_SIZE (in); b->stream.next_in = (char *) map.data;
b->stream.avail_in = map.size;
do { do {
guint n; guint n;
/* Create the output buffer */ /* Create the output buffer */
flow = gst_pad_alloc_buffer (b->src, b->offset, out =
b->offset ? b->buffer_size : b->first_buffer_size, gst_buffer_new_and_alloc (b->offset ? b->buffer_size : b->
GST_PAD_CAPS (b->src), &out); first_buffer_size);
if (flow != GST_FLOW_OK) {
GST_DEBUG_OBJECT (b, "pad alloc failed: %s", gst_flow_get_name (flow));
gst_bz2dec_decompress_init (b);
break;
}
/* Decode */ /* Decode */
b->stream.next_out = (char *) GST_BUFFER_DATA (out); gst_buffer_map (out, &omap, GST_MAP_WRITE);
b->stream.avail_out = GST_BUFFER_SIZE (out); b->stream.next_out = (char *) omap.data;
b->stream.avail_out = omap.size;
r = BZ2_bzDecompress (&b->stream); r = BZ2_bzDecompress (&b->stream);
gst_buffer_unmap (out, &omap);
if ((r != BZ_OK) && (r != BZ_STREAM_END)) if ((r != BZ_OK) && (r != BZ_STREAM_END))
goto decode_failed; goto decode_failed;
if (b->stream.avail_out >= GST_BUFFER_SIZE (out)) { if (b->stream.avail_out >= gst_buffer_get_size (out)) {
gst_buffer_unref (out); gst_buffer_unref (out);
break; break;
} }
GST_BUFFER_SIZE (out) -= b->stream.avail_out; gst_buffer_resize (out, 0, gst_buffer_get_size (out) - b->stream.avail_out);
GST_BUFFER_OFFSET (out) = b->stream.total_out_lo32 - GST_BUFFER_SIZE (out); GST_BUFFER_OFFSET (out) =
b->stream.total_out_lo32 - gst_buffer_get_size (out);
/* Configure source pad (if necessary) */ /* Configure source pad (if necessary) */
if (!b->offset) { if (!b->offset) {
@ -150,7 +150,6 @@ gst_bz2dec_chain (GstPad * pad, GstBuffer * in)
caps = gst_type_find_helper_for_buffer (GST_OBJECT (b), out, NULL); caps = gst_type_find_helper_for_buffer (GST_OBJECT (b), out, NULL);
if (caps) { if (caps) {
gst_buffer_set_caps (out, caps);
gst_pad_set_caps (b->src, caps); gst_pad_set_caps (b->src, caps);
gst_pad_use_fixed_caps (b->src); gst_pad_use_fixed_caps (b->src);
gst_caps_unref (caps); gst_caps_unref (caps);
@ -160,7 +159,7 @@ gst_bz2dec_chain (GstPad * pad, GstBuffer * in)
} }
/* Push data */ /* Push data */
n = GST_BUFFER_SIZE (out); n = gst_buffer_get_size (out);
flow = gst_pad_push (b->src, out); flow = gst_pad_push (b->src, out);
if (flow != GST_FLOW_OK) if (flow != GST_FLOW_OK)
break; break;
@ -169,6 +168,7 @@ gst_bz2dec_chain (GstPad * pad, GstBuffer * in)
done: done:
gst_buffer_unmap (in, &map);
gst_buffer_unref (in); gst_buffer_unref (in);
return flow; return flow;
@ -191,7 +191,7 @@ not_ready:
} }
static void static void
gst_bz2dec_init (GstBz2dec * b, GstBz2decClass * klass) gst_bz2dec_init (GstBz2dec * b)
{ {
b->first_buffer_size = DEFAULT_FIRST_BUFFER_SIZE; b->first_buffer_size = DEFAULT_FIRST_BUFFER_SIZE;
b->buffer_size = DEFAULT_BUFFER_SIZE; b->buffer_size = DEFAULT_BUFFER_SIZE;
@ -207,20 +207,6 @@ gst_bz2dec_init (GstBz2dec * b, GstBz2decClass * klass)
gst_bz2dec_decompress_init (b); 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_simple (ec, "BZ2 decoder",
"Codec/Decoder", "Decodes compressed streams",
"Lutz Mueller <lutz@users.sourceforge.net>");
}
static void static void
gst_bz2dec_finalize (GObject * object) gst_bz2dec_finalize (GObject * object)
{ {
@ -310,5 +296,13 @@ gst_bz2dec_class_init (GstBz2decClass * klass)
1, G_MAXUINT, DEFAULT_BUFFER_SIZE, 1, G_MAXUINT, DEFAULT_BUFFER_SIZE,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
gst_element_class_add_pad_template (gstelement_class,
gst_static_pad_template_get (&sink_template));
gst_element_class_add_pad_template (gstelement_class,
gst_static_pad_template_get (&src_template));
gst_element_class_set_details_simple (gstelement_class, "BZ2 decoder",
"Codec/Decoder", "Decodes compressed streams",
"Lutz Mueller <lutz@users.sourceforge.net>");
GST_DEBUG_CATEGORY_INIT (bz2dec_debug, "bz2dec", 0, "BZ2 decompressor"); GST_DEBUG_CATEGORY_INIT (bz2dec_debug, "bz2dec", 0, "BZ2 decompressor");
} }

98
ext/bz2/gstbz2enc.c
View file

@ -65,7 +65,8 @@ struct _GstBz2encClass
GstElementClass parent_class; GstElementClass parent_class;
}; };
GST_BOILERPLATE (GstBz2enc, gst_bz2enc, GstElement, GST_TYPE_ELEMENT); #define gst_bz2enc_parent_class parent_class
G_DEFINE_TYPE (GstBz2enc, gst_bz2enc, GST_TYPE_ELEMENT);
static void static void
gst_bz2enc_compress_end (GstBz2enc * b) gst_bz2enc_compress_end (GstBz2enc * b)
@ -99,12 +100,12 @@ gst_bz2enc_compress_init (GstBz2enc * b)
} }
static gboolean static gboolean
gst_bz2enc_event (GstPad * pad, GstEvent * e) gst_bz2enc_event (GstPad * pad, GstObject * parent, GstEvent * e)
{ {
GstBz2enc *b; GstBz2enc *b;
gboolean ret; gboolean ret;
b = GST_BZ2ENC (gst_pad_get_parent (pad)); b = GST_BZ2ENC (parent);
switch (GST_EVENT_TYPE (e)) { switch (GST_EVENT_TYPE (e)) {
case GST_EVENT_EOS:{ case GST_EVENT_EOS:{
GstFlowReturn flow; GstFlowReturn flow;
@ -112,19 +113,16 @@ gst_bz2enc_event (GstPad * pad, GstEvent * e)
do { do {
GstBuffer *out; GstBuffer *out;
GstMapInfo omap;
guint n;
flow = gst_pad_alloc_buffer (b->src, b->offset, b->buffer_size, out = gst_buffer_new_and_alloc (b->buffer_size);
GST_PAD_CAPS (b->src), &out);
if (flow != GST_FLOW_OK) { gst_buffer_map (out, &omap, GST_MAP_WRITE);
GST_DEBUG_OBJECT (b, "pad alloc on EOS failed: %s", b->stream.next_out = (char *) omap.data;
gst_flow_get_name (flow)); b->stream.avail_out = omap.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); r = BZ2_bzCompress (&b->stream, BZ_FINISH);
gst_buffer_unmap (out, &omap);
if ((r != BZ_FINISH_OK) && (r != BZ_STREAM_END)) { if ((r != BZ_FINISH_OK) && (r != BZ_STREAM_END)) {
GST_ELEMENT_ERROR (b, STREAM, ENCODE, (NULL), GST_ELEMENT_ERROR (b, STREAM, ENCODE, (NULL),
("Failed to finish to compress (error code %i).", r)); ("Failed to finish to compress (error code %i).", r));
@ -132,14 +130,15 @@ gst_bz2enc_event (GstPad * pad, GstEvent * e)
break; break;
} }
if (b->stream.avail_out >= GST_BUFFER_SIZE (out)) { n = gst_buffer_get_size (out);
if (b->stream.avail_out >= n) {
gst_buffer_unref (out); gst_buffer_unref (out);
break; break;
} }
GST_BUFFER_SIZE (out) -= b->stream.avail_out; gst_buffer_resize (out, 0, n - b->stream.avail_out);
GST_BUFFER_OFFSET (out) = n = gst_buffer_get_size (out);
b->stream.total_out_lo32 - GST_BUFFER_SIZE (out); GST_BUFFER_OFFSET (out) = b->stream.total_out_lo32 - n;
flow = gst_pad_push (b->src, out); flow = gst_pad_push (b->src, out);
@ -150,7 +149,7 @@ gst_bz2enc_event (GstPad * pad, GstEvent * e)
} }
} while (r != BZ_STREAM_END); } while (r != BZ_STREAM_END);
ret = gst_pad_event_default (pad, e); ret = gst_pad_event_default (pad, parent, e);
if (r != BZ_STREAM_END || flow != GST_FLOW_OK) if (r != BZ_STREAM_END || flow != GST_FLOW_OK)
ret = FALSE; ret = FALSE;
@ -159,54 +158,51 @@ gst_bz2enc_event (GstPad * pad, GstEvent * e)
break; break;
} }
default: default:
ret = gst_pad_event_default (pad, e); ret = gst_pad_event_default (pad, parent, e);
break; break;
} }
gst_object_unref (b);
return ret; return ret;
} }
static GstFlowReturn static GstFlowReturn
gst_bz2enc_chain (GstPad * pad, GstBuffer * in) gst_bz2enc_chain (GstPad * pad, GstObject * parent, GstBuffer * in)
{ {
GstFlowReturn flow = GST_FLOW_OK; GstFlowReturn flow = GST_FLOW_OK;
GstBuffer *out; GstBuffer *out;
GstBz2enc *b; GstBz2enc *b;
guint n; guint n;
int bz2_ret; int bz2_ret;
GstMapInfo map, omap;
b = GST_BZ2ENC (GST_PAD_PARENT (pad)); b = GST_BZ2ENC (parent);
if (!b->ready) if (!b->ready)
goto not_ready; goto not_ready;
b->stream.next_in = (char *) GST_BUFFER_DATA (in); gst_buffer_map (in, &map, GST_MAP_READ);
b->stream.avail_in = GST_BUFFER_SIZE (in); b->stream.next_in = (char *) map.data;
b->stream.avail_in = map.size;
while (b->stream.avail_in) { while (b->stream.avail_in) {
flow = gst_pad_alloc_buffer (b->src, b->offset, b->buffer_size, out = gst_buffer_new_and_alloc (b->buffer_size);
GST_PAD_CAPS (pad), &out);
if (flow != GST_FLOW_OK) { gst_buffer_map (out, &omap, GST_MAP_WRITE);
gst_bz2enc_compress_init (b); b->stream.next_out = (char *) omap.data;
break; b->stream.avail_out = omap.size;
}
b->stream.next_out = (char *) GST_BUFFER_DATA (out);
b->stream.avail_out = GST_BUFFER_SIZE (out);
bz2_ret = BZ2_bzCompress (&b->stream, BZ_RUN); bz2_ret = BZ2_bzCompress (&b->stream, BZ_RUN);
gst_buffer_unmap (out, &omap);
if (bz2_ret != BZ_RUN_OK) if (bz2_ret != BZ_RUN_OK)
goto compress_error; goto compress_error;
if (b->stream.avail_out >= GST_BUFFER_SIZE (out)) { n = gst_buffer_get_size (out);
if (b->stream.avail_out >= n) {
gst_buffer_unref (out); gst_buffer_unref (out);
break; break;
} }
GST_BUFFER_SIZE (out) -= b->stream.avail_out; gst_buffer_resize (out, 0, n - b->stream.avail_out);
GST_BUFFER_OFFSET (out) = b->stream.total_out_lo32 - GST_BUFFER_SIZE (out); n = gst_buffer_get_size (out);
n = GST_BUFFER_SIZE (out); GST_BUFFER_OFFSET (out) = b->stream.total_out_lo32 - n;
flow = gst_pad_push (b->src, out); flow = gst_pad_push (b->src, out);
@ -218,6 +214,7 @@ gst_bz2enc_chain (GstPad * pad, GstBuffer * in)
done: done:
gst_buffer_unmap (in, &map);
gst_buffer_unref (in); gst_buffer_unref (in);
return flow; return flow;
@ -240,7 +237,7 @@ compress_error:
} }
static void static void
gst_bz2enc_init (GstBz2enc * b, GstBz2encClass * klass) gst_bz2enc_init (GstBz2enc * b)
{ {
b->sink = gst_pad_new_from_static_template (&sink_template, "sink"); b->sink = gst_pad_new_from_static_template (&sink_template, "sink");
gst_pad_set_chain_function (b->sink, GST_DEBUG_FUNCPTR (gst_bz2enc_chain)); gst_pad_set_chain_function (b->sink, GST_DEBUG_FUNCPTR (gst_bz2enc_chain));
@ -257,20 +254,6 @@ gst_bz2enc_init (GstBz2enc * b, GstBz2encClass * klass)
gst_bz2enc_compress_init (b); 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_simple (ec, "BZ2 encoder",
"Codec/Encoder", "Compresses streams",
"Lutz Mueller <lutz@users.sourceforge.net>");
}
static void static void
gst_bz2enc_finalize (GObject * object) gst_bz2enc_finalize (GObject * object)
{ {
@ -322,6 +305,7 @@ static void
gst_bz2enc_class_init (GstBz2encClass * klass) gst_bz2enc_class_init (GstBz2encClass * klass)
{ {
GObjectClass *gobject_class = G_OBJECT_CLASS (klass); GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
GstElementClass *gstelement_class = GST_ELEMENT_CLASS (klass);
gobject_class->finalize = gst_bz2enc_finalize; gobject_class->finalize = gst_bz2enc_finalize;
gobject_class->set_property = gst_bz2enc_set_property; gobject_class->set_property = gst_bz2enc_set_property;
@ -336,5 +320,13 @@ gst_bz2enc_class_init (GstBz2encClass * klass)
1, G_MAXUINT, DEFAULT_BUFFER_SIZE, 1, G_MAXUINT, DEFAULT_BUFFER_SIZE,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
gst_element_class_add_pad_template (gstelement_class,
gst_static_pad_template_get (&sink_template));
gst_element_class_add_pad_template (gstelement_class,
gst_static_pad_template_get (&src_template));
gst_element_class_set_details_simple (gstelement_class, "BZ2 encoder",
"Codec/Encoder", "Compresses streams",
"Lutz Mueller <lutz@users.sourceforge.net>");
GST_DEBUG_CATEGORY_INIT (bz2enc_debug, "bz2enc", 0, "BZ2 compressor"); GST_DEBUG_CATEGORY_INIT (bz2enc_debug, "bz2enc", 0, "BZ2 compressor");
} }