Merge branch 'master' of git://anongit.freedesktop.org/gstreamer/gst-plugins-bad into fdo

28 files changed, 892 insertions, 1396 deletions

diff --git a/ext/Makefile.am b/ext/Makefile.am
index fafa1146..31dd00a4 100644
--- a/ext/Makefile.am
+++ b/ext/Makefile.am
@@ -11,7 +11,7 @@ ASSRENDER_DIR =
 endif
 
 if USE_AMRWB
-AMRWB_DIR = amrwb
+AMRWB_DIR = amrwbenc
 else
 AMRWB_DIR =
 endif
@@ -307,11 +307,17 @@ SOUNDTOUCH_DIR=
 endif
 
 if USE_SPC
-SPC_DIR=spc
+SPC_DIR=gme
 else
 SPC_DIR=
 endif
 
+if USE_GME
+GME_DIR=gme
+else
+GME_DIR=
+endif
+
 if USE_SWFDEC
 #SWFDEC_DIR=swfdec
 else
@@ -392,6 +398,7 @@ SUBDIRS=\
 	$(SMOOTHWAVE_DIR) \
 	$(SNDFILE_DIR) \
 	$(SOUNDTOUCH_DIR) \
+	$(GME_DIR) \
 	$(SPC_DIR) \
 	$(SWFDEC_DIR) \
 	$(TARKIN_DIR) \
@@ -402,7 +409,7 @@ SUBDIRS=\
 
 DIST_SUBDIRS = \
 	alsaspdif \
-	amrwb \
+	amrwbenc \
 	assrender \
 	apexsink \
 	bz2 \
@@ -440,6 +447,7 @@ DIST_SUBDIRS = \
 	sndfile \
 	soundtouch \
 	spc \
+	gme \
 	swfdec \
 	theora \
 	timidity \
diff --git a/ext/amrwb/Makefile.am b/ext/amrwb/Makefile.am
deleted file mode 100644
index c4060d7f..00000000
--- a/ext/amrwb/Makefile.am
+++ /dev/null
@@ -1,18 +0,0 @@
-plugin_LTLIBRARIES = libgstamrwb.la
-
-libgstamrwb_la_SOURCES = 	\
-	gstamrwb.c		\
-	gstamrwbdec.c		\
-	gstamrwbenc.c		\
-	gstamrwbparse.c
-
-libgstamrwb_la_CFLAGS = $(GST_CFLAGS) $(AMRWB_CFLAGS)
-libgstamrwb_la_LIBADD = $(GST_BASE_LIBS) $(AMRWB_LIBS)
-libgstamrwb_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstamrwb_la_LIBTOOLFLAGS = --tag=disable-static
-
-noinst_HEADERS =	\
-	gstamrwbdec.h	\
-	gstamrwbenc.h	\
-	gstamrwbparse.h
-
diff --git a/ext/amrwb/gstamrwbdec.c b/ext/amrwb/gstamrwbdec.c
deleted file mode 100644
index 54e8a830..00000000
--- a/ext/amrwb/gstamrwbdec.c
+++ /dev/null
@@ -1,372 +0,0 @@
-/* GStreamer Adaptive Multi-Rate Narrow-Band (AMR-NB) plugin
- * Copyright (C) 2004 Ronald Bultje <rbultje@ronald.bitfreak.net>
- *
- * 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.
- */
-
-/**
- * SECTION:element-amrwbdec
- * @see_also: #GstAmrwbEnc, #GstAmrwbParse
- *
- * AMR wideband decoder based on the 
- * <ulink url="http://www.penguin.cz/~utx/amr">reference codec implementation</ulink>.
- *
- * <refsect2>
- * <title>Example launch line</title>
- * |[
- * gst-launch filesrc location=abc.amr ! amrwbparse ! amrwbdec ! audioresample ! audioconvert ! alsasink
- * ]|
- * </refsect2>
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "gstamrwbdec.h"
-
-static GstStaticPadTemplate sink_template = GST_STATIC_PAD_TEMPLATE ("sink",
-    GST_PAD_SINK,
-    GST_PAD_ALWAYS,
-    GST_STATIC_CAPS ("audio/AMR-WB, "
-        "rate = (int) 16000, " "channels = (int) 1")
-    );
-
-static GstStaticPadTemplate src_template = GST_STATIC_PAD_TEMPLATE ("src",
-    GST_PAD_SRC,
-    GST_PAD_ALWAYS,
-    GST_STATIC_CAPS ("audio/x-raw-int, "
-        "width = (int) 16, "
-        "depth = (int) 16, "
-        "signed = (boolean) TRUE, "
-        "endianness = (int) BYTE_ORDER, "
-        "rate = (int) 16000, " "channels = (int) 1")
-    );
-
-GST_DEBUG_CATEGORY_STATIC (gst_amrwbdec_debug);
-#define GST_CAT_DEFAULT gst_amrwbdec_debug
-
-extern const UWord8 block_size[];
-
-static gboolean gst_amrwbdec_event (GstPad * pad, GstEvent * event);
-static GstFlowReturn gst_amrwbdec_chain (GstPad * pad, GstBuffer * buffer);
-static gboolean gst_amrwbdec_setcaps (GstPad * pad, GstCaps * caps);
-static GstStateChangeReturn gst_amrwbdec_state_change (GstElement * element,
-    GstStateChange transition);
-
-static void gst_amrwbdec_finalize (GObject * object);
-
-#define _do_init(bla) \
-    GST_DEBUG_CATEGORY_INIT (gst_amrwbdec_debug, "amrwbdec", 0, "AMR-WB audio decoder");
-
-GST_BOILERPLATE_FULL (GstAmrwbDec, gst_amrwbdec, GstElement, GST_TYPE_ELEMENT,
-    _do_init);
-
-static void
-gst_amrwbdec_base_init (gpointer klass)
-{
-  GstElementClass *element_class = GST_ELEMENT_CLASS (klass);
-  GstElementDetails details = GST_ELEMENT_DETAILS ("AMR-WB audio decoder",
-      "Codec/Decoder/Audio",
-      "Adaptive Multi-Rate Wideband audio decoder",
-      "Renato Araujo <renato.filho@indt.org.br>");
-
-  gst_element_class_add_pad_template (element_class,
-      gst_static_pad_template_get (&sink_template));
-  gst_element_class_add_pad_template (element_class,
-      gst_static_pad_template_get (&src_template));
-
-  gst_element_class_set_details (element_class, &details);
-}
-
-static void
-gst_amrwbdec_class_init (GstAmrwbDecClass * klass)
-{
-  GObjectClass *object_class = G_OBJECT_CLASS (klass);
-  GstElementClass *element_class = GST_ELEMENT_CLASS (klass);
-
-  object_class->finalize = gst_amrwbdec_finalize;
-
-  element_class->change_state = GST_DEBUG_FUNCPTR (gst_amrwbdec_state_change);
-}
-
-static void
-gst_amrwbdec_init (GstAmrwbDec * amrwbdec, GstAmrwbDecClass * klass)
-{
-  /* create the sink pad */
-  amrwbdec->sinkpad = gst_pad_new_from_static_template (&sink_template, "sink");
-  gst_pad_set_setcaps_function (amrwbdec->sinkpad, gst_amrwbdec_setcaps);
-  gst_pad_set_event_function (amrwbdec->sinkpad, gst_amrwbdec_event);
-  gst_pad_set_chain_function (amrwbdec->sinkpad, gst_amrwbdec_chain);
-  gst_element_add_pad (GST_ELEMENT (amrwbdec), amrwbdec->sinkpad);
-
-  /* create the src pad */
-  amrwbdec->srcpad = gst_pad_new_from_static_template (&src_template, "src");
-  gst_pad_use_fixed_caps (amrwbdec->srcpad);
-  gst_element_add_pad (GST_ELEMENT (amrwbdec), amrwbdec->srcpad);
-
-  amrwbdec->adapter = gst_adapter_new ();
-
-  /* init rest */
-  amrwbdec->handle = NULL;
-  amrwbdec->channels = 0;
-  amrwbdec->rate = 0;
-  amrwbdec->duration = 0;
-  amrwbdec->ts = -1;
-}
-
-static void
-gst_amrwbdec_finalize (GObject * object)
-{
-  GstAmrwbDec *amrwbdec;
-
-  amrwbdec = GST_AMRWBDEC (object);
-
-  gst_adapter_clear (amrwbdec->adapter);
-  g_object_unref (amrwbdec->adapter);
-
-  G_OBJECT_CLASS (parent_class)->finalize (object);
-}
-
-static gboolean
-gst_amrwbdec_setcaps (GstPad * pad, GstCaps * caps)
-{
-  GstStructure *structure;
-  GstAmrwbDec *amrwbdec;
-  GstCaps *copy;
-
-  amrwbdec = GST_AMRWBDEC (gst_pad_get_parent (pad));
-
-  structure = gst_caps_get_structure (caps, 0);
-
-  /* get channel count */
-  gst_structure_get_int (structure, "channels", &amrwbdec->channels);
-  gst_structure_get_int (structure, "rate", &amrwbdec->rate);
-
-  /* create reverse caps */
-  copy = gst_caps_new_simple ("audio/x-raw-int",
-      "channels", G_TYPE_INT, amrwbdec->channels,
-      "width", G_TYPE_INT, 16,
-      "depth", G_TYPE_INT, 16,
-      "endianness", G_TYPE_INT, G_BYTE_ORDER,
-      "rate", G_TYPE_INT, amrwbdec->rate, "signed", G_TYPE_BOOLEAN, TRUE, NULL);
-
-  amrwbdec->duration = gst_util_uint64_scale_int (GST_SECOND, L_FRAME16k,
-      amrwbdec->rate * amrwbdec->channels);
-
-  gst_pad_set_caps (amrwbdec->srcpad, copy);
-  gst_caps_unref (copy);
-
-  gst_object_unref (amrwbdec);
-
-  return TRUE;
-}
-
-static gboolean
-gst_amrwbdec_event (GstPad * pad, GstEvent * event)
-{
-  GstAmrwbDec *amrwbdec;
-  gboolean ret = TRUE;
-
-  amrwbdec = GST_AMRWBDEC (gst_pad_get_parent (pad));
-
-  switch (GST_EVENT_TYPE (event)) {
-    case GST_EVENT_FLUSH_START:
-      ret = gst_pad_push_event (amrwbdec->srcpad, event);
-      break;
-    case GST_EVENT_FLUSH_STOP:
-      ret = gst_pad_push_event (amrwbdec->srcpad, event);
-      gst_adapter_clear (amrwbdec->adapter);
-      amrwbdec->ts = -1;
-      break;
-    case GST_EVENT_EOS:
-      gst_adapter_clear (amrwbdec->adapter);
-      ret = gst_pad_push_event (amrwbdec->srcpad, event);
-      break;
-    case GST_EVENT_NEWSEGMENT:
-    {
-      GstFormat format;
-      gdouble rate, arate;
-      gint64 start, stop, time;
-      gboolean update;
-
-      gst_event_parse_new_segment_full (event, &update, &rate, &arate, &format,
-          &start, &stop, &time);
-
-      /* we need time for now */
-      if (format != GST_FORMAT_TIME)
-        goto newseg_wrong_format;
-
-      GST_DEBUG_OBJECT (amrwbdec,
-          "newsegment: update %d, rate %g, arate %g, start %" GST_TIME_FORMAT
-          ", stop %" GST_TIME_FORMAT ", time %" GST_TIME_FORMAT,
-          update, rate, arate, GST_TIME_ARGS (start), GST_TIME_ARGS (stop),
-          GST_TIME_ARGS (time));
-
-      /* now configure the values */
-      gst_segment_set_newsegment_full (&amrwbdec->segment, update,
-          rate, arate, format, start, stop, time);
-      ret = gst_pad_push_event (amrwbdec->srcpad, event);
-    }
-      break;
-    default:
-      ret = gst_pad_push_event (amrwbdec->srcpad, event);
-      break;
-  }
-done:
-  gst_object_unref (amrwbdec);
-
-  return ret;
-
-  /* ERRORS */
-newseg_wrong_format:
-  {
-    GST_DEBUG_OBJECT (amrwbdec, "received non TIME newsegment");
-    goto done;
-  }
-}
-
-static GstFlowReturn
-gst_amrwbdec_chain (GstPad * pad, GstBuffer * buffer)
-{
-  GstAmrwbDec *amrwbdec;
-  GstFlowReturn ret = GST_FLOW_OK;
-
-  amrwbdec = GST_AMRWBDEC (gst_pad_get_parent (pad));
-
-  if (amrwbdec->rate == 0 || amrwbdec->channels == 0)
-    goto not_negotiated;
-
-  /* discontinuity, don't combine samples before and after the
-   * DISCONT */
-  if (GST_BUFFER_FLAG_IS_SET (buffer, GST_BUFFER_FLAG_DISCONT)) {
-    gst_adapter_clear (amrwbdec->adapter);
-    amrwbdec->ts = -1;
-    amrwbdec->discont = TRUE;
-  }
-
-  /* take latest timestamp, FIXME timestamp is the one of the
-   * first buffer in the adapter. */
-  if (GST_BUFFER_TIMESTAMP_IS_VALID (buffer))
-    amrwbdec->ts = GST_BUFFER_TIMESTAMP (buffer);
-
-  gst_adapter_push (amrwbdec->adapter, buffer);
-
-  while (TRUE) {
-    GstBuffer *out;
-    const guint8 *data;
-    gint block, mode;
-
-    /* need to peek data to get the size */
-    if (gst_adapter_available (amrwbdec->adapter) < 1)
-      break;
-    data = gst_adapter_peek (amrwbdec->adapter, 1);
-
-    /* get size */
-    mode = (data[0] >> 3) & 0x0F;
-    block = block_size[mode];
-
-    GST_DEBUG_OBJECT (amrwbdec, "mode %d, block %d", mode, block);
-
-    if (!block || gst_adapter_available (amrwbdec->adapter) < block)
-      break;
-
-    /* the library seems to write into the source data, hence the copy. */
-    data = gst_adapter_take (amrwbdec->adapter, block);
-
-    /* get output */
-    out = gst_buffer_new_and_alloc (sizeof (gint16) * L_FRAME16k);
-
-    GST_BUFFER_DURATION (out) = amrwbdec->duration;
-    GST_BUFFER_TIMESTAMP (out) = amrwbdec->ts;
-
-    if (amrwbdec->ts != -1)
-      amrwbdec->ts += amrwbdec->duration;
-    if (amrwbdec->discont) {
-      GST_BUFFER_FLAG_SET (out, GST_BUFFER_FLAG_DISCONT);
-      amrwbdec->discont = FALSE;
-    }
-
-    gst_buffer_set_caps (out, GST_PAD_CAPS (amrwbdec->srcpad));
-
-    /* decode */
-    D_IF_decode (amrwbdec->handle, (UWord8 *) data,
-        (Word16 *) GST_BUFFER_DATA (out), _good_frame);
-
-    g_free ((gpointer) data);
-
-    /* send out */
-    ret = gst_pad_push (amrwbdec->srcpad, out);
-  }
-
-  gst_object_unref (amrwbdec);
-  return ret;
-
-  /* ERRORS */
-not_negotiated:
-  {
-    GST_ELEMENT_ERROR (amrwbdec, STREAM, TYPE_NOT_FOUND, (NULL),
-        ("Decoder is not initialized"));
-    gst_object_unref (amrwbdec);
-    return GST_FLOW_NOT_NEGOTIATED;
-  }
-}
-
-static GstStateChangeReturn
-gst_amrwbdec_state_change (GstElement * element, GstStateChange transition)
-{
-  GstAmrwbDec *amrwbdec;
-  GstStateChangeReturn ret;
-
-  amrwbdec = GST_AMRWBDEC (element);
-
-  switch (transition) {
-    case GST_STATE_CHANGE_NULL_TO_READY:
-      if (!(amrwbdec->handle = D_IF_init ()))
-        goto init_failed;
-      break;
-    case GST_STATE_CHANGE_READY_TO_PAUSED:
-      gst_adapter_clear (amrwbdec->adapter);
-      amrwbdec->rate = 0;
-      amrwbdec->channels = 0;
-      amrwbdec->ts = -1;
-      amrwbdec->discont = TRUE;
-      gst_segment_init (&amrwbdec->segment, GST_FORMAT_TIME);
-      break;
-    default:
-      break;
-  }
-
-  ret = GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
-
-  switch (transition) {
-    case GST_STATE_CHANGE_READY_TO_NULL:
-      D_IF_exit (amrwbdec->handle);
-      break;
-    default:
-      break;
-  }
-
-  return ret;
-
-  /* ERRORS */
-init_failed:
-  {
-    GST_ELEMENT_ERROR (amrwbdec, LIBRARY, INIT, (NULL),
-        ("Failed to open AMR Decoder"));
-    return GST_STATE_CHANGE_FAILURE;
-  }
-}
diff --git a/ext/amrwb/gstamrwbdec.h b/ext/amrwb/gstamrwbdec.h
deleted file mode 100644
index a7a5ce71..00000000
--- a/ext/amrwb/gstamrwbdec.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/* GStreamer Adaptive Multi-Rate Wide-Band (AMR-WB) plugin
- * Copyright (C) 2006 Edgard Lima <edgard.lima@indt.org.br>
- *
- * 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_AMRWBDEC_H__
-#define __GST_AMRWBDEC_H__
-
-#include <gst/gst.h>
-#include <gst/base/gstadapter.h>
-#include <amrwb/typedef.h>
-#include <amrwb/dec_if.h>
-#include <amrwb/if_rom.h>
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_AMRWBDEC			\
-  (gst_amrwbdec_get_type())
-#define GST_AMRWBDEC(obj)						\
-  (G_TYPE_CHECK_INSTANCE_CAST((obj), GST_TYPE_AMRWBDEC, GstAmrwbDec))
-#define GST_AMRWBDEC_CLASS(klass)					\
-  (G_TYPE_CHECK_CLASS_CAST((klass), GST_TYPE_AMRWBDEC, GstAmrwbDecClass))
-#define GST_IS_AMRWBDEC(obj)					\
-  (G_TYPE_CHECK_INSTANCE_TYPE((obj), GST_TYPE_AMRWBDEC))
-#define GST_IS_AMRWBDEC_CLASS(klass)			\
-  (G_TYPE_CHECK_CLASS_TYPE((klass), GST_TYPE_AMRWBDEC))
-
-typedef struct _GstAmrwbDec GstAmrwbDec;
-typedef struct _GstAmrwbDecClass GstAmrwbDecClass;
-
-/**
- * GstAmrwbDec:
- *
- * Opaque data structure.
- */
-struct _GstAmrwbDec {
-  GstElement element;
-
-  /* pads */
-  GstPad *sinkpad, *srcpad;
-  guint64 ts;
-
-  GstAdapter *adapter;
-
-  /* library handle */
-  void *handle;
-
-  /* output settings */
-  gint channels, rate;
-  gint duration;
-
-  GstSegment        segment;
-  gboolean          discont;
-};
-
-struct _GstAmrwbDecClass {
-  GstElementClass parent_class;
-};
-
-GType gst_amrwbdec_get_type (void);
-
-G_END_DECLS
-
-#endif /* __GST_AMRWBDEC_H__ */
diff --git a/ext/amrwb/gstamrwbparse.c b/ext/amrwb/gstamrwbparse.c
deleted file mode 100644
index bcee1704..00000000
--- a/ext/amrwb/gstamrwbparse.c
+++ /dev/null
@@ -1,767 +0,0 @@
-/* GStreamer Adaptive Multi-Rate Wide-Band (AMR-WB) plugin
- * Copyright (C) 2006 Edgard Lima <edgard.lima@indt.org.br>
- *
- * 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.
- */
-
-/**
- * SECTION:element-amrwbparse
- * @see_also: #GstAmrwbDec, #GstAmrwbEnc
- *
- * This is an AMR wideband parser.
- * 
- * <refsect2>
- * <title>Example launch line</title>
- * |[
- * gst-launch filesrc location=abc.amr ! amrwbparse ! amrwbdec ! audioresample ! audioconvert ! alsasink
- * ]|
- * </refsect2>
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <string.h>
-#include "gstamrwbparse.h"
-
-static GstStaticPadTemplate src_template = GST_STATIC_PAD_TEMPLATE ("src",
-    GST_PAD_SRC,
-    GST_PAD_ALWAYS,
-    GST_STATIC_CAPS ("audio/AMR-WB, "
-        "rate = (int) 16000, " "channels = (int) 1")
-    );
-
-static GstStaticPadTemplate sink_template = GST_STATIC_PAD_TEMPLATE ("sink",
-    GST_PAD_SINK,
-    GST_PAD_ALWAYS,
-    GST_STATIC_CAPS ("audio/x-amr-wb-sh")
-    );
-
-GST_DEBUG_CATEGORY_STATIC (gst_amrwbparse_debug);
-#define GST_CAT_DEFAULT gst_amrwbparse_debug
-
-extern const UWord8 block_size[];
-
-#define AMRWB_HEADER_SIZE 9
-#define AMRWB_HEADER_STR "#!AMR-WB\n"
-
-static void gst_amrwbparse_base_init (gpointer klass);
-static void gst_amrwbparse_class_init (GstAmrwbParseClass * klass);
-static void gst_amrwbparse_init (GstAmrwbParse * amrwbparse,
-    GstAmrwbParseClass * klass);
-
-static const GstQueryType *gst_amrwbparse_querytypes (GstPad * pad);
-static gboolean gst_amrwbparse_query (GstPad * pad, GstQuery * query);
-
-static gboolean gst_amrwbparse_sink_event (GstPad * pad, GstEvent * event);
-static gboolean gst_amrwbparse_src_event (GstPad * pad, GstEvent * event);
-static GstFlowReturn gst_amrwbparse_chain (GstPad * pad, GstBuffer * buffer);
-static void gst_amrwbparse_loop (GstPad * pad);
-static gboolean gst_amrwbparse_sink_activate (GstPad * sinkpad);
-static gboolean gst_amrwbparse_sink_activate_pull (GstPad * sinkpad,
-    gboolean active);
-static gboolean gst_amrwbparse_sink_activate_push (GstPad * sinkpad,
-    gboolean active);
-static GstStateChangeReturn gst_amrwbparse_state_change (GstElement * element,
-    GstStateChange transition);
-
-static void gst_amrwbparse_finalize (GObject * object);
-
-#define _do_init(bla) \
-    GST_DEBUG_CATEGORY_INIT (gst_amrwbparse_debug, "amrwbparse", 0, "AMR-WB audio stream parser");
-
-GST_BOILERPLATE_FULL (GstAmrwbParse, gst_amrwbparse, GstElement,
-    GST_TYPE_ELEMENT, _do_init);
-
-static void
-gst_amrwbparse_base_init (gpointer klass)
-{
-  GstElementClass *element_class = GST_ELEMENT_CLASS (klass);
-  GstElementDetails details = GST_ELEMENT_DETAILS ("AMR-WB audio stream parser",
-      "Codec/Parser/Audio",
-      "Adaptive Multi-Rate WideBand audio parser",
-      "Renato Filho <renato.filho@indt.org.br>");
-
-  gst_element_class_add_pad_template (element_class,
-      gst_static_pad_template_get (&sink_template));
-  gst_element_class_add_pad_template (element_class,
-      gst_static_pad_template_get (&src_template));
-
-  gst_element_class_set_details (element_class, &details);
-
-}
-
-static void
-gst_amrwbparse_class_init (GstAmrwbParseClass * klass)
-{
-  GObjectClass *object_class = G_OBJECT_CLASS (klass);
-  GstElementClass *element_class = GST_ELEMENT_CLASS (klass);
-
-  object_class->finalize = gst_amrwbparse_finalize;
-
-  element_class->change_state = GST_DEBUG_FUNCPTR (gst_amrwbparse_state_change);
-}
-
-static void
-gst_amrwbparse_init (GstAmrwbParse * amrwbparse, GstAmrwbParseClass * klass)
-{
-  /* create the sink pad */
-  amrwbparse->sinkpad =
-      gst_pad_new_from_static_template (&sink_template, "sink");
-  gst_pad_set_chain_function (amrwbparse->sinkpad,
-      GST_DEBUG_FUNCPTR (gst_amrwbparse_chain));
-  gst_pad_set_event_function (amrwbparse->sinkpad,
-      GST_DEBUG_FUNCPTR (gst_amrwbparse_sink_event));
-  gst_pad_set_activate_function (amrwbparse->sinkpad,
-      gst_amrwbparse_sink_activate);
-  gst_pad_set_activatepull_function (amrwbparse->sinkpad,
-      gst_amrwbparse_sink_activate_pull);
-  gst_pad_set_activatepush_function (amrwbparse->sinkpad,
-      gst_amrwbparse_sink_activate_push);
-  gst_element_add_pad (GST_ELEMENT (amrwbparse), amrwbparse->sinkpad);
-
-  /* create the src pad */
-  amrwbparse->srcpad = gst_pad_new_from_static_template (&src_template, "src");
-  gst_pad_set_event_function (amrwbparse->srcpad,
-      GST_DEBUG_FUNCPTR (gst_amrwbparse_src_event));
-  gst_pad_set_query_function (amrwbparse->srcpad,
-      GST_DEBUG_FUNCPTR (gst_amrwbparse_query));
-  gst_pad_set_query_type_function (amrwbparse->srcpad,
-      GST_DEBUG_FUNCPTR (gst_amrwbparse_querytypes));
-  gst_element_add_pad (GST_ELEMENT (amrwbparse), amrwbparse->srcpad);
-
-  amrwbparse->adapter = gst_adapter_new ();
-
-  /* init rest */
-  amrwbparse->ts = 0;
-}
-
-static void
-gst_amrwbparse_finalize (GObject * object)
-{
-  GstAmrwbParse *amrwbparse;
-
-  amrwbparse = GST_AMRWBPARSE (object);
-
-  gst_adapter_clear (amrwbparse->adapter);
-  g_object_unref (amrwbparse->adapter);
-
-  G_OBJECT_CLASS (parent_class)->finalize (object);
-}
-
-
-static const GstQueryType *
-gst_amrwbparse_querytypes (GstPad * pad)
-{
-  static const GstQueryType list[] = {
-    GST_QUERY_POSITION,
-    GST_QUERY_DURATION,
-    0
-  };
-
-  return list;
-}
-
-static gboolean
-gst_amrwbparse_query (GstPad * pad, GstQuery * query)
-{
-  GstAmrwbParse *amrwbparse;
-  gboolean res = TRUE;
-
-  amrwbparse = GST_AMRWBPARSE (gst_pad_get_parent (pad));
-
-  switch (GST_QUERY_TYPE (query)) {
-    case GST_QUERY_POSITION:
-    {
-      GstFormat format;
-      gint64 cur;
-
-      gst_query_parse_position (query, &format, NULL);
-
-      if (format != GST_FORMAT_TIME) {
-        res = FALSE;
-        break;
-      }
-
-      cur = amrwbparse->ts;
-
-      gst_query_set_position (query, GST_FORMAT_TIME, cur);
-      res = TRUE;
-      break;
-    }
-    case GST_QUERY_DURATION:
-    {
-      GstFormat format;
-      gint64 tot;
-      GstPad *peer;
-
-      gst_query_parse_duration (query, &format, NULL);
-
-      if (format != GST_FORMAT_TIME) {
-        res = FALSE;
-        break;
-      }
-
-      tot = -1;
-      res = FALSE;
-
-      peer = gst_pad_get_peer (amrwbparse->sinkpad);
-      if (peer) {
-        GstFormat pformat;
-        gint64 ptot;
-
-        pformat = GST_FORMAT_BYTES;
-        res = gst_pad_query_duration (peer, &pformat, &ptot);
-        if (res && amrwbparse->block) {
-          tot = gst_util_uint64_scale_int (ptot, 20 * GST_MSECOND,
-              amrwbparse->block);
-        }
-        gst_object_unref (GST_OBJECT (peer));
-      }
-      gst_query_set_duration (query, GST_FORMAT_TIME, tot);
-      res = TRUE;
-      break;
-    }
-    default:
-      res = gst_pad_query_default (pad, query);
-      break;
-  }
-
-  gst_object_unref (amrwbparse);
-  return res;
-}
-
-
-static gboolean
-gst_amrwbparse_handle_pull_seek (GstAmrwbParse * amrwbparse, GstPad * pad,
-    GstEvent * event)
-{
-  GstFormat format;
-  gdouble rate;
-  GstSeekFlags flags;
-  GstSeekType cur_type, stop_type;
-  gint64 cur, stop;
-  gint64 byte_cur = -1, byte_stop = -1;
-  gboolean flush;
-
-  gst_event_parse_seek (event, &rate, &format, &flags, &cur_type, &cur,
-      &stop_type, &stop);
-
-  GST_DEBUG_OBJECT (amrwbparse, "Performing seek to %" GST_TIME_FORMAT,
-      GST_TIME_ARGS (cur));
-
-  /* For any format other than TIME, see if upstream handles
-   * it directly or fail. For TIME, try upstream, but do it ourselves if
-   * it fails upstream */
-  if (format != GST_FORMAT_TIME) {
-    return gst_pad_push_event (amrwbparse->sinkpad, event);
-  } else {
-    if (gst_pad_push_event (amrwbparse->sinkpad, event))
-      return TRUE;
-  }
-
-  flush = flags & GST_SEEK_FLAG_FLUSH;
-
-  /* send flush start */
-  if (flush)
-    gst_pad_push_event (amrwbparse->sinkpad, gst_event_new_flush_start ());
-  /* we only handle FLUSH seeks at the moment */
-  else
-    return FALSE;
-
-  /* grab streaming lock, this should eventually be possible, either
-   * because the task is paused or our streaming thread stopped
-   * because our peer is flushing. */
-  GST_PAD_STREAM_LOCK (amrwbparse->sinkpad);
-
-  /* Convert the TIME to the appropriate BYTE position at which to resume
-   * decoding. */
-  cur = cur / (20 * GST_MSECOND) * (20 * GST_MSECOND);
-  if (cur != -1)
-    byte_cur = amrwbparse->block * (cur / 20 / GST_MSECOND) + AMRWB_HEADER_SIZE;
-  if (stop != -1)
-    byte_stop =
-        amrwbparse->block * (stop / 20 / GST_MSECOND) + AMRWB_HEADER_SIZE;
-  amrwbparse->offset = byte_cur;
-  amrwbparse->ts = cur;
-
-  GST_DEBUG_OBJECT (amrwbparse, "Seeking to byte range %" G_GINT64_FORMAT
-      " to %" G_GINT64_FORMAT, byte_cur, cur);
-
-  /* and prepare to continue streaming */
-  /* send flush stop, peer will accept data and events again. We
-   * are not yet providing data as we still have the STREAM_LOCK. */
-  gst_pad_push_event (amrwbparse->sinkpad, gst_event_new_flush_stop ());
-  gst_pad_push_event (amrwbparse->srcpad, gst_event_new_new_segment (FALSE,
-          rate, format, cur, -1, cur));
-
-  /* and restart the task in case it got paused explicitely or by
-   * the FLUSH_START event we pushed out. */
-  gst_pad_start_task (amrwbparse->sinkpad,
-      (GstTaskFunction) gst_amrwbparse_loop, amrwbparse->sinkpad);
-
-  /* and release the lock again so we can continue streaming */
-  GST_PAD_STREAM_UNLOCK (amrwbparse->sinkpad);
-
-  return TRUE;
-}
-
-static gboolean
-gst_amrwbparse_handle_push_seek (GstAmrwbParse * amrwbparse, GstPad * pad,
-    GstEvent * event)
-{
-  GstFormat format;
-  gdouble rate;
-  GstSeekFlags flags;
-  GstSeekType cur_type, stop_type;
-  gint64 cur, stop;
-  gint64 byte_cur = -1, byte_stop = -1;
-
-  gst_event_parse_seek (event, &rate, &format, &flags, &cur_type, &cur,
-      &stop_type, &stop);
-
-  GST_DEBUG_OBJECT (amrwbparse, "Performing seek to %" GST_TIME_FORMAT,
-      GST_TIME_ARGS (cur));
-
-  /* For any format other than TIME, see if upstream handles
-   * it directly or fail. For TIME, try upstream, but do it ourselves if
-   * it fails upstream */
-  if (format != GST_FORMAT_TIME) {
-    return gst_pad_push_event (amrwbparse->sinkpad, event);
-  } else {
-    if (gst_pad_push_event (amrwbparse->sinkpad, event))
-      return TRUE;
-  }
-
-  /* Convert the TIME to the appropriate BYTE position at which to resume
-   * decoding. */
-  cur = cur / (20 * GST_MSECOND) * (20 * GST_MSECOND);
-  if (cur != -1)
-    byte_cur = amrwbparse->block * (cur / 20 / GST_MSECOND) + AMRWB_HEADER_SIZE;
-  if (stop != -1)
-    byte_stop =
-        amrwbparse->block * (stop / 20 / GST_MSECOND) + AMRWB_HEADER_SIZE;
-  amrwbparse->ts = cur;
-
-  GST_DEBUG_OBJECT (amrwbparse, "Seeking to byte range %" G_GINT64_FORMAT
-      " to %" G_GINT64_FORMAT, byte_cur, byte_stop);
-
-  /* Send BYTE based seek upstream */
-  event = gst_event_new_seek (rate, GST_FORMAT_BYTES, flags, cur_type,
-      byte_cur, stop_type, byte_stop);
-
-  return gst_pad_push_event (amrwbparse->sinkpad, event);
-}
-
-static gboolean
-gst_amrwbparse_src_event (GstPad * pad, GstEvent * event)
-{
-  GstAmrwbParse *amrwbparse = GST_AMRWBPARSE (gst_pad_get_parent (pad));
-  gboolean res;
-
-  GST_DEBUG_OBJECT (amrwbparse, "handling event %d", GST_EVENT_TYPE (event));
-
-  switch (GST_EVENT_TYPE (event)) {
-    case GST_EVENT_SEEK:
-      if (amrwbparse->seek_handler)
-        res = amrwbparse->seek_handler (amrwbparse, pad, event);
-      else
-        res = FALSE;
-      break;
-    default:
-      res = gst_pad_push_event (amrwbparse->sinkpad, event);
-      break;
-  }
-  gst_object_unref (amrwbparse);
-
-  return res;
-}
-
-
-/*
- * Data reading.
- */
-static gboolean
-gst_amrwbparse_sink_event (GstPad * pad, GstEvent * event)
-{
-  GstAmrwbParse *amrwbparse;
-  gboolean res;
-
-  amrwbparse = GST_AMRWBPARSE (gst_pad_get_parent (pad));
-
-  GST_LOG ("handling event %d", GST_EVENT_TYPE (event));
-
-  switch (GST_EVENT_TYPE (event)) {
-    case GST_EVENT_FLUSH_START:
-      res = gst_pad_push_event (amrwbparse->srcpad, event);
-      break;
-    case GST_EVENT_FLUSH_STOP:
-      gst_adapter_clear (amrwbparse->adapter);
-      gst_segment_init (&amrwbparse->segment, GST_FORMAT_TIME);
-      res = gst_pad_push_event (amrwbparse->srcpad, event);
-      break;
-    case GST_EVENT_EOS:
-      res = gst_pad_push_event (amrwbparse->srcpad, event);
-      break;
-    case GST_EVENT_NEWSEGMENT:
-    {
-      /* eat for now, we send a newsegment at start with infinite
-       * duration. */
-      gst_event_unref (event);
-      res = TRUE;
-      break;
-    }
-    default:
-      res = gst_pad_push_event (amrwbparse->srcpad, event);
-      break;
-  }
-  gst_object_unref (amrwbparse);
-
-  return res;
-}
-
-/* streaming mode */
-static GstFlowReturn
-gst_amrwbparse_chain (GstPad * pad, GstBuffer * buffer)
-{
-  GstAmrwbParse *amrwbparse;
-  GstFlowReturn res = GST_FLOW_OK;
-  gint mode;
-  const guint8 *data;
-  GstBuffer *out;
-  GstClockTime timestamp;
-
-  amrwbparse = GST_AMRWBPARSE (gst_pad_get_parent (pad));
-
-  timestamp = GST_BUFFER_TIMESTAMP (buffer);
-  if (GST_CLOCK_TIME_IS_VALID (timestamp)) {
-    GST_DEBUG_OBJECT (amrwbparse, "Lock on timestamp %" GST_TIME_FORMAT,
-        GST_TIME_ARGS (timestamp));
-    amrwbparse->ts = timestamp;
-  }
-
-  gst_adapter_push (amrwbparse->adapter, buffer);
-
-  /* init */
-  if (amrwbparse->need_header) {
-    GstEvent *segev;
-    GstCaps *caps;
-
-    if (gst_adapter_available (amrwbparse->adapter) < AMRWB_HEADER_SIZE)
-      goto done;
-
-    data = gst_adapter_peek (amrwbparse->adapter, AMRWB_HEADER_SIZE);
-    if (memcmp (data, AMRWB_HEADER_STR, AMRWB_HEADER_SIZE) != 0)
-      goto done;
-
-    gst_adapter_flush (amrwbparse->adapter, AMRWB_HEADER_SIZE);
-
-    amrwbparse->need_header = FALSE;
-
-    caps = gst_caps_new_simple ("audio/AMR-WB",
-        "rate", G_TYPE_INT, 16000, "channels", G_TYPE_INT, 1, NULL);
-    gst_pad_set_caps (amrwbparse->srcpad, caps);
-    gst_caps_unref (caps);
-
-    GST_DEBUG_OBJECT (amrwbparse, "Sending first segment");
-    segev = gst_event_new_new_segment_full (FALSE, 1.0, 1.0,
-        GST_FORMAT_TIME, 0, -1, 0);
-
-    gst_pad_push_event (amrwbparse->srcpad, segev);
-  }
-
-  while (TRUE) {
-    if (gst_adapter_available (amrwbparse->adapter) < 1)
-      break;
-
-    data = gst_adapter_peek (amrwbparse->adapter, 1);
-
-    /* get size */
-    mode = (data[0] >> 3) & 0x0F;
-    amrwbparse->block = block_size[mode] + 1;   /* add one for the mode */
-
-    if (gst_adapter_available (amrwbparse->adapter) < amrwbparse->block)
-      break;
-
-    out = gst_buffer_new_and_alloc (amrwbparse->block);
-
-    data = gst_adapter_peek (amrwbparse->adapter, amrwbparse->block);
-    memcpy (GST_BUFFER_DATA (out), data, amrwbparse->block);
-
-    /* timestamp, all constants that won't overflow */
-    GST_BUFFER_DURATION (out) = GST_SECOND * L_FRAME16k / 16000;
-    GST_BUFFER_TIMESTAMP (out) = amrwbparse->ts;
-    if (GST_CLOCK_TIME_IS_VALID (amrwbparse->ts))
-      amrwbparse->ts += GST_BUFFER_DURATION (out);
-
-    gst_buffer_set_caps (out, GST_PAD_CAPS (amrwbparse->srcpad));
-
-    GST_DEBUG_OBJECT (amrwbparse, "Pushing %d bytes of data",
-        amrwbparse->block);
-
-    res = gst_pad_push (amrwbparse->srcpad, out);
-
-    gst_adapter_flush (amrwbparse->adapter, amrwbparse->block);
-  }
-done:
-
-  gst_object_unref (amrwbparse);
-  return res;
-}
-
-static gboolean
-gst_amrwbparse_pull_header (GstAmrwbParse * amrwbparse)
-{
-  GstBuffer *buffer;
-  GstFlowReturn ret;
-  guint8 *data;
-  gint size;
-
-  ret = gst_pad_pull_range (amrwbparse->sinkpad, G_GUINT64_CONSTANT (0),
-      AMRWB_HEADER_SIZE, &buffer);
-  if (ret != GST_FLOW_OK)
-    return FALSE;
-
-  data = GST_BUFFER_DATA (buffer);
-  size = GST_BUFFER_SIZE (buffer);
-
-  if (size < AMRWB_HEADER_SIZE)
-    goto not_enough;
-
-  if (memcmp (data, AMRWB_HEADER_STR, AMRWB_HEADER_SIZE))
-    goto no_header;
-
-  gst_buffer_unref (buffer);
-
-  amrwbparse->offset = AMRWB_HEADER_SIZE;
-  return TRUE;
-
-not_enough:
-  {
-    gst_buffer_unref (buffer);
-    return FALSE;
-  }
-no_header:
-  {
-    gst_buffer_unref (buffer);
-    return FALSE;
-  }
-}
-
-/* random access mode, could just read a fixed size buffer and push it to
- * the chain function but we don't... */
-static void
-gst_amrwbparse_loop (GstPad * pad)
-{
-  GstAmrwbParse *amrwbparse;
-  GstBuffer *buffer;
-  guint8 *data;
-  gint size;
-  gint block, mode;
-  GstFlowReturn ret = GST_FLOW_OK;
-
-  amrwbparse = GST_AMRWBPARSE (GST_PAD_PARENT (pad));
-
-  /* init */
-  if (G_UNLIKELY (amrwbparse->need_header)) {
-    GstCaps *caps;
-
-    if (!gst_amrwbparse_pull_header (amrwbparse)) {
-      GST_ELEMENT_ERROR (amrwbparse, STREAM, WRONG_TYPE, (NULL), (NULL));
-      GST_LOG_OBJECT (amrwbparse, "could not read header");
-      goto need_pause;
-    }
-
-    caps = gst_caps_new_simple ("audio/AMR-WB",
-        "rate", G_TYPE_INT, 16000, "channels", G_TYPE_INT, 1, NULL);
-    gst_pad_set_caps (amrwbparse->srcpad, caps);
-    gst_caps_unref (caps);
-
-    GST_DEBUG_OBJECT (amrwbparse, "Sending newsegment event");
-    gst_pad_push_event (amrwbparse->srcpad,
-        gst_event_new_new_segment_full (FALSE, 1.0, 1.0,
-            GST_FORMAT_TIME, 0, -1, 0));
-
-    amrwbparse->need_header = FALSE;
-  }
-
-  ret =
-      gst_pad_pull_range (amrwbparse->sinkpad, amrwbparse->offset, 1, &buffer);
-
-  if (ret == GST_FLOW_UNEXPECTED)
-    goto eos;
-  else if (ret != GST_FLOW_OK)
-    goto need_pause;
-
-  data = GST_BUFFER_DATA (buffer);
-  size = GST_BUFFER_SIZE (buffer);
-
-  /* EOS */
-  if (size < 1) {
-    gst_buffer_unref (buffer);
-    goto eos;
-  }
-
-  /* get size */
-  mode = (data[0] >> 3) & 0x0F;
-  block = block_size[mode];     /* add one for the mode */
-
-  gst_buffer_unref (buffer);
-
-  ret = gst_pad_pull_range (amrwbparse->sinkpad,
-      amrwbparse->offset, block, &buffer);
-
-  if (ret == GST_FLOW_UNEXPECTED)
-    goto eos;
-  else if (ret != GST_FLOW_OK)
-    goto need_pause;
-
-  amrwbparse->offset += block;
-
-  /* output */
-  GST_BUFFER_DURATION (buffer) = GST_SECOND * L_FRAME16k / 16000;
-  GST_BUFFER_TIMESTAMP (buffer) = amrwbparse->ts;
-
-  gst_buffer_set_caps (buffer,
-      (GstCaps *) gst_pad_get_pad_template_caps (amrwbparse->srcpad));
-
-  ret = gst_pad_push (amrwbparse->srcpad, buffer);
-
-  if (ret != GST_FLOW_OK) {
-    GST_DEBUG_OBJECT (amrwbparse, "Flow: %s", gst_flow_get_name (ret));
-    if (GST_FLOW_IS_FATAL (ret)) {
-      GST_ELEMENT_ERROR (amrwbparse, STREAM, FAILED, (NULL),    /* _("Internal data flow error.")), */
-          ("streaming task paused, reason: %s", gst_flow_get_name (ret)));
-      gst_pad_push_event (pad, gst_event_new_eos ());
-    }
-    goto need_pause;
-  }
-
-  amrwbparse->ts += GST_BUFFER_DURATION (buffer);
-
-  return;
-
-need_pause:
-  {
-    GST_LOG_OBJECT (amrwbparse, "pausing task");
-    gst_pad_pause_task (pad);
-    return;
-  }
-eos:
-  {
-    GST_LOG_OBJECT (amrwbparse, "pausing task %d", ret);
-    gst_pad_push_event (amrwbparse->srcpad, gst_event_new_eos ());
-    gst_pad_pause_task (pad);
-    return;
-  }
-}
-
-static gboolean
-gst_amrwbparse_sink_activate (GstPad * sinkpad)
-{
-  gboolean result = FALSE;
-  GstAmrwbParse *amrwbparse;
-
-  amrwbparse = GST_AMRWBPARSE (gst_pad_get_parent (sinkpad));
-
-  if (gst_pad_check_pull_range (sinkpad)) {
-    GST_DEBUG ("Trying to activate in pull mode");
-    amrwbparse->seekable = TRUE;
-    amrwbparse->ts = 0;
-    result = gst_pad_activate_pull (sinkpad, TRUE);
-  } else {
-    GST_DEBUG ("Try to activate in push mode");
-    amrwbparse->seekable = FALSE;
-    result = gst_pad_activate_push (sinkpad, TRUE);
-  }
-
-  gst_object_unref (amrwbparse);
-  return result;
-}
-
-
-
-static gboolean
-gst_amrwbparse_sink_activate_push (GstPad * sinkpad, gboolean active)
-{
-  GstAmrwbParse *amrwbparse = GST_AMRWBPARSE (gst_pad_get_parent (sinkpad));
-
-  if (active) {
-    amrwbparse->seek_handler = gst_amrwbparse_handle_push_seek;
-  } else {
-    amrwbparse->seek_handler = NULL;
-  }
-
-  gst_object_unref (amrwbparse);
-  return TRUE;
-}
-
-static gboolean
-gst_amrwbparse_sink_activate_pull (GstPad * sinkpad, gboolean active)
-{
-  gboolean result;
-  GstAmrwbParse *amrwbparse;
-
-  amrwbparse = GST_AMRWBPARSE (gst_pad_get_parent (sinkpad));
-  if (active) {
-    amrwbparse->seek_handler = gst_amrwbparse_handle_pull_seek;
-    result = gst_pad_start_task (sinkpad,
-        (GstTaskFunction) gst_amrwbparse_loop, sinkpad);
-  } else {
-    amrwbparse->seek_handler = NULL;
-    result = gst_pad_stop_task (sinkpad);
-  }
-
-  gst_object_unref (amrwbparse);
-  return result;
-}
-
-
-static GstStateChangeReturn
-gst_amrwbparse_state_change (GstElement * element, GstStateChange transition)
-{
-  GstAmrwbParse *amrwbparse;
-  GstStateChangeReturn ret;
-
-  amrwbparse = GST_AMRWBPARSE (element);
-
-  switch (transition) {
-    case GST_STATE_CHANGE_NULL_TO_READY:
-      break;
-    case GST_STATE_CHANGE_READY_TO_PAUSED:
-      amrwbparse->need_header = TRUE;
-      amrwbparse->ts = -1;
-      amrwbparse->block = 0;
-      gst_segment_init (&amrwbparse->segment, GST_FORMAT_TIME);
-      break;
-    default:
-      break;
-  }
-
-  ret = GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
-
-  switch (transition) {
-    case GST_STATE_CHANGE_PAUSED_TO_READY:
-      break;
-    case GST_STATE_CHANGE_READY_TO_NULL:
-      break;
-    default:
-      break;
-  }
-
-  return ret;
-}
diff --git a/ext/amrwb/gstamrwbparse.h b/ext/amrwb/gstamrwbparse.h
deleted file mode 100644
index 6cbe7b74..00000000
--- a/ext/amrwb/gstamrwbparse.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/* GStreamer Adaptive Multi-Rate Wide-Band (AMR-WB) plugin
- * Copyright (C) 2006 Edgard Lima <edgard.lima@indt.org.br>
- *
- * 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_AMRWBPARSE_H__
-#define __GST_AMRWBPARSE_H__
-
-#include <gst/gst.h>
-#include <gst/base/gstadapter.h>
-#include <amrwb/typedef.h>
-#include <amrwb/dec_if.h>
-#include <amrwb/if_rom.h>
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_AMRWBPARSE			\
-  (gst_amrwbparse_get_type())
-#define GST_AMRWBPARSE(obj)						\
-  (G_TYPE_CHECK_INSTANCE_CAST((obj), GST_TYPE_AMRWBPARSE, GstAmrwbParse))
-#define GST_AMRWBPARSE_CLASS(klass)					\
-  (G_TYPE_CHECK_CLASS_CAST((klass), GST_TYPE_AMRWBPARSE, GstAmrwbParseClass))
-#define GST_IS_AMRWBPARSE(obj)					\
-  (G_TYPE_CHECK_INSTANCE_TYPE((obj), GST_TYPE_AMRWBPARSE))
-#define GST_IS_AMRWBPARSE_CLASS(klass)				\
-  (G_TYPE_CHECK_CLASS_TYPE((klass), GST_TYPE_AMRWBPARSE))
-
-typedef struct _GstAmrwbParse GstAmrwbParse;
-typedef struct _GstAmrwbParseClass GstAmrwbParseClass;
-
-typedef gboolean (*GstAmrwbSeekHandler) (GstAmrwbParse * amrwbparse, GstPad * pad,
-		    GstEvent * event);
-
-struct _GstAmrwbParse {
-  GstElement element;
-
-  /* pads */
-  GstPad *sinkpad, *srcpad;
-
-  GstAdapter *adapter;
-
-  gboolean seekable;
-  gboolean need_header;
-  gint64 offset;
-  gint block;
-  
-  GstAmrwbSeekHandler seek_handler;
-
-  guint64 ts;
-
-  /* for seeking etc */
-  GstSegment segment;
-};
-
-struct _GstAmrwbParseClass {
-  GstElementClass parent_class;
-};
-
-GType gst_amrwbparse_get_type (void);
-
-G_END_DECLS
-
-#endif /* __GST_AMRWBPARSE_H__ */
diff --git a/ext/amrwbenc/GstAmrwbEnc.prs b/ext/amrwbenc/GstAmrwbEnc.prs
new file mode 100644
index 00000000..57658494
--- /dev/null
+++ b/ext/amrwbenc/GstAmrwbEnc.prs
@@ -0,0 +1,11 @@
+[_presets_]
+version=0.10
+element-name=GstAmrwbEnc
+
+[enhance-size]
+_meta/comment=Maximize compression, lowest bitrate
+band-mode=0
+
+[enhance-quality]
+_meta/comment=Maximize quality, highest bitrate
+band-mode=8
diff --git a/ext/amrwbenc/Makefile.am b/ext/amrwbenc/Makefile.am
new file mode 100644
index 00000000..4c4ea3b3
--- /dev/null
+++ b/ext/amrwbenc/Makefile.am
@@ -0,0 +1,19 @@
+plugin_LTLIBRARIES = libgstamrwbenc.la
+
+libgstamrwbenc_la_SOURCES = 	\
+	gstamrwb.c		\
+	gstamrwbenc.c
+
+libgstamrwbenc_la_CFLAGS = $(GST_CFLAGS) $(AMRWB_CFLAGS)
+libgstamrwbenc_la_LIBADD = $(GST_BASE_LIBS) $(AMRWB_LIBS)
+libgstamrwbenc_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
+libgstamrwbenc_la_LIBTOOLFLAGS = --tag=disable-static
+
+noinst_HEADERS =	\
+	gstamrwbenc.h
+
+presetdir = $(datadir)/gstreamer-$(GST_MAJORMINOR)/presets
+preset_DATA = GstAmrwbEnc.prs
+
+EXTRA_DIST = $(preset_DATA)
+
diff --git a/ext/amrwb/README b/ext/amrwbenc/README
index 82d33715..9d158728 100644
--- a/ext/amrwb/README
+++ b/ext/amrwbenc/README
@@ -1,7 +1,7 @@
-Compiling AMRWB codec:
-======================
+Compiling AMRWB encoder:
+========================
 
-To compile the amrwb codec, you need to download the source code from 
+To compile the amrwb encoder, you need to download the source code from 
 "http://www.3gpp.org/ftp/Specs/html-info/26204.htm" and uncompress the 
 files inside an amrwb-code directory;
 
diff --git a/ext/amrwb/gstamrwb.c b/ext/amrwbenc/gstamrwb.c
index fd47b371..6cd734b1 100644
--- a/ext/amrwb/gstamrwb.c
+++ b/ext/amrwbenc/gstamrwb.c
@@ -1,4 +1,4 @@
-/* GStreamer Adaptive Multi-Rate Wide-Band (AMR-WB) plugin
+/* GStreamer Adaptive Multi-Rate Wide-Band (AMR-WB) Encoder plugin
  * Copyright (C) 2006 Edgard Lima <edgard.lima@indt.org.br>
  *
  * This library is free software; you can redistribute it and/or
@@ -21,25 +21,19 @@
 #include "config.h"
 #endif
 
-#include "gstamrwbdec.h"
 #include "gstamrwbenc.h"
-#include "gstamrwbparse.h"
 
 static gboolean
 plugin_init (GstPlugin * plugin)
 {
-  return gst_element_register (plugin, "amrwbdec",
-      GST_RANK_PRIMARY, GST_TYPE_AMRWBDEC) &&
-      gst_element_register (plugin, "amrwbparse",
-      GST_RANK_PRIMARY, GST_TYPE_AMRWBPARSE) &&
-      gst_element_register (plugin, "amrwbenc",
+  return gst_element_register (plugin, "amrwbenc",
       GST_RANK_NONE, GST_TYPE_AMRWBENC);
 }
 
 
 GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
     GST_VERSION_MINOR,
-    "amrwb",
-    "Adaptive Multi-Rate Wide-Band",
+    "amrwbenc",
+    "Adaptive Multi-Rate Wide-Band Encoder",
     plugin_init, VERSION, GST_LICENSE_UNKNOWN, GST_PACKAGE_NAME,
     GST_PACKAGE_ORIGIN);
diff --git a/ext/amrwb/gstamrwbenc.c b/ext/amrwbenc/gstamrwbenc.c
index caf2adb7..3b46d3e9 100644
--- a/ext/amrwb/gstamrwbenc.c
+++ b/ext/amrwbenc/gstamrwbenc.c
@@ -116,8 +116,21 @@ static gboolean gst_amrwbenc_setcaps (GstPad * pad, GstCaps * caps);
 static GstStateChangeReturn gst_amrwbenc_state_change (GstElement * element,
     GstStateChange transition);
 
-#define _do_init(bla) \
-    GST_DEBUG_CATEGORY_INIT (gst_amrwbenc_debug, "amrwbenc", 0, "AMR-WB audio encoder");
+static void
+_do_init (GType object_type)
+{
+  const GInterfaceInfo preset_interface_info = {
+    NULL,                       /* interface init */
+    NULL,                       /* interface finalize */
+    NULL                        /* interface_data */
+  };
+
+  g_type_add_interface_static (object_type, GST_TYPE_PRESET,
+      &preset_interface_info);
+
+  GST_DEBUG_CATEGORY_INIT (gst_amrwbenc_debug, "amrwbenc", 0,
+      "AMR-WB audio encoder");
+}
 
 GST_BOILERPLATE_FULL (GstAmrwbEnc, gst_amrwbenc, GstElement, GST_TYPE_ELEMENT,
     _do_init);
diff --git a/ext/amrwb/gstamrwbenc.h b/ext/amrwbenc/gstamrwbenc.h
index 034a5bed..034a5bed 100644
--- a/ext/amrwb/gstamrwbenc.h
+++ b/ext/amrwbenc/gstamrwbenc.h
diff --git a/ext/gme/Makefile.am b/ext/gme/Makefile.am
new file mode 100644
index 00000000..f9a7b139
--- /dev/null
+++ b/ext/gme/Makefile.am
@@ -0,0 +1,10 @@
+plugin_LTLIBRARIES = libgstgme.la
+
+libgstgme_la_SOURCES = gstgme.c
+
+libgstgme_la_CFLAGS = $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(GME_CFLAGS)
+libgstgme_la_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS) $(GME_LIBS)
+libgstgme_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
+libgstgme_la_LIBTOOLFLAGS = --tag=disable-static
+
+noinst_HEADERS = gstgme.h
diff --git a/ext/gme/gstgme.c b/ext/gme/gstgme.c
new file mode 100644
index 00000000..e3f145c5
--- /dev/null
+++ b/ext/gme/gstgme.c
@@ -0,0 +1,545 @@
+/* Copyright (C) 2004-2005,2009 Michael Pyne <mpyne at kde org>
+ * Copyright (C) 2004-2006 Chris Lee <clee at kde org>
+ * Copyright (C) 2007 Brian Koropoff <bkoropoff at gmail com>
+ *
+ * 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 "gstgme.h"
+
+#include <string.h>
+#include <glib/gprintf.h>
+#include <glib.h>
+
+static GstStaticPadTemplate sink_factory =
+    GST_STATIC_PAD_TEMPLATE ("sink", GST_PAD_SINK, GST_PAD_ALWAYS,
+    GST_STATIC_CAPS ("audio/x-ay; "
+        "audio/x-gbs; "
+        "audio/x-gym; "
+        "audio/x-hes; "
+        "audio/x-kss; "
+        "audio/x-nsf; " "audio/x-sap; " "audio/x-spc; " "audio/x-vgm"));
+
+static GstStaticPadTemplate src_factory =
+GST_STATIC_PAD_TEMPLATE ("src", GST_PAD_SRC, GST_PAD_ALWAYS,
+    GST_STATIC_CAPS ("audio/x-raw-int, "
+        "endianness = (int) BYTE_ORDER, "
+        "signed = (boolean) TRUE, "
+        "width = (int) 16, "
+        "depth = (int) 16, " "rate = (int) 32000, " "channels = (int) 2"));
+
+GST_BOILERPLATE (GstGmeDec, gst_gme_dec, GstElement, GST_TYPE_ELEMENT);
+
+static GstFlowReturn gst_gme_dec_chain (GstPad * pad, GstBuffer * buffer);
+static gboolean gst_gme_dec_sink_event (GstPad * pad, GstEvent * event);
+static gboolean gst_gme_dec_src_event (GstPad * pad, GstEvent * event);
+static gboolean gst_gme_dec_src_query (GstPad * pad, GstQuery * query);
+static GstStateChangeReturn gst_gme_dec_change_state (GstElement * element,
+    GstStateChange transition);
+static void gst_gme_play (GstPad * pad);
+static void gst_gme_dec_dispose (GObject * object);
+static gboolean gme_setup (GstGmeDec * gme);
+
+static gboolean
+gme_negotiate (GstGmeDec * gme)
+{
+  GstCaps *allowed, *caps;
+  GstStructure *structure;
+  gint width = 16, depth = 16;
+  gboolean sign;
+  int rate = 32000;
+  int channels = 2;
+
+  allowed = gst_pad_get_allowed_caps (gme->srcpad);
+  if (!allowed) {
+    GST_DEBUG_OBJECT (gme, "couldn't get allowed caps");
+    return FALSE;
+  }
+
+  GST_DEBUG_OBJECT (gme, "allowed caps: %" GST_PTR_FORMAT, allowed);
+
+  structure = gst_caps_get_structure (allowed, 0);
+  gst_structure_get_int (structure, "width", &width);
+  gst_structure_get_int (structure, "depth", &depth);
+
+  if (width && depth && width != depth) {
+    GST_DEBUG_OBJECT (gme, "width %d and depth %d are different", width, depth);
+    gst_caps_unref (allowed);
+    return FALSE;
+  }
+
+  gst_structure_get_boolean (structure, "signed", &sign);
+  gst_structure_get_int (structure, "rate", &rate);
+  gst_structure_get_int (structure, "channels", &channels);
+
+  caps = gst_caps_new_simple ("audio/x-raw-int",
+      "endianness", G_TYPE_INT, G_BYTE_ORDER,
+      "signed", G_TYPE_BOOLEAN, TRUE,
+      "width", G_TYPE_INT, width,
+      "depth", G_TYPE_INT, depth,
+      "rate", G_TYPE_INT, rate, "channels", G_TYPE_INT, channels, NULL);
+  gst_pad_set_caps (gme->srcpad, caps);
+
+  gst_caps_unref (caps);
+  gst_caps_unref (allowed);
+
+  return TRUE;
+}
+
+static void
+gst_gme_dec_base_init (gpointer g_class)
+{
+  GstElementClass *element_class = GST_ELEMENT_CLASS (g_class);
+
+  gst_element_class_set_details_simple (element_class,
+      "Gaming console music file decoder", "Codec/Audio/Decoder",
+      "Uses libgme to emulate a gaming console sound processors",
+      "Chris Lee <clee@kde.org>, Brian Koropoff <bkoropoff@gmail.com>, "
+      "Michael Pyne <mpyne@kde.org>, Sebastian Dröge <sebastian.droege@collabora.co.uk>");
+
+  gst_element_class_add_pad_template (element_class,
+      gst_static_pad_template_get (&sink_factory));
+  gst_element_class_add_pad_template (element_class,
+      gst_static_pad_template_get (&src_factory));
+}
+
+static void
+gst_gme_dec_class_init (GstGmeDecClass * klass)
+{
+  GstElementClass *element_class = (GstElementClass *) klass;
+  GObjectClass *gobject_class = (GObjectClass *) klass;
+
+  element_class->change_state = GST_DEBUG_FUNCPTR (gst_gme_dec_change_state);
+  gobject_class->dispose = gst_gme_dec_dispose;
+}
+
+static const GstQueryType *
+gst_gme_dec_src_query_type (GstPad * pad)
+{
+  static const GstQueryType query_types[] = {
+    GST_QUERY_DURATION,
+    GST_QUERY_POSITION,
+    (GstQueryType) 0
+  };
+
+  return query_types;
+}
+
+
+static void
+gst_gme_dec_init (GstGmeDec * gme, GstGmeDecClass * klass)
+{
+  gme->sinkpad = gst_pad_new_from_static_template (&sink_factory, "sink");
+  /* gst_pad_set_query_function (gme->sinkpad, NULL); */
+  gst_pad_set_event_function (gme->sinkpad, gst_gme_dec_sink_event);
+  gst_pad_set_chain_function (gme->sinkpad, gst_gme_dec_chain);
+  gst_element_add_pad (GST_ELEMENT (gme), gme->sinkpad);
+
+  gme->srcpad = gst_pad_new_from_static_template (&src_factory, "src");
+  gst_pad_set_event_function (gme->srcpad, gst_gme_dec_src_event);
+  gst_pad_set_query_function (gme->srcpad, gst_gme_dec_src_query);
+  gst_pad_set_query_type_function (gme->srcpad, gst_gme_dec_src_query_type);
+  gst_pad_use_fixed_caps (gme->srcpad);
+  gst_element_add_pad (GST_ELEMENT (gme), gme->srcpad);
+
+  gme->adapter = gst_adapter_new ();
+  gme->player = NULL;
+  gme->total_duration = GST_CLOCK_TIME_NONE;
+  gme->initialized = FALSE;
+}
+
+static void
+gst_gme_dec_dispose (GObject * object)
+{
+  GstGmeDec *gme = GST_GME_DEC (object);
+
+  if (gme->adapter) {
+    gst_object_unref (gme->adapter);
+    gme->adapter = NULL;
+  }
+}
+
+static GstFlowReturn
+gst_gme_dec_chain (GstPad * pad, GstBuffer * buffer)
+{
+  GstGmeDec *gme = GST_GME_DEC (gst_pad_get_parent (pad));
+
+  /* Accumulate GME data until end-of-stream, then commence playback. */
+  gst_adapter_push (gme->adapter, buffer);
+
+  gst_object_unref (gme);
+
+  return GST_FLOW_OK;
+}
+
+static gboolean
+gst_gme_dec_sink_event (GstPad * pad, GstEvent * event)
+{
+  GstGmeDec *gme = GST_GME_DEC (gst_pad_get_parent (pad));
+  gboolean result = TRUE;
+  gboolean forward = FALSE;
+
+  switch (GST_EVENT_TYPE (event)) {
+    case GST_EVENT_EOS:
+      /* we get EOS when we loaded the complete file, now try to initialize the
+       * decoding */
+      if (!(result = gme_setup (gme))) {
+        /* can't start, post an ERROR and push EOS downstream */
+        GST_ELEMENT_ERROR (gme, STREAM, DEMUX, (NULL),
+            ("can't start playback"));
+        forward = TRUE;
+      }
+      break;
+    default:
+      break;
+  }
+  if (forward)
+    result = gst_pad_push_event (gme->srcpad, event);
+  else
+    gst_event_unref (event);
+
+  gst_object_unref (gme);
+
+  return result;
+}
+
+static gboolean
+gst_gme_dec_src_event (GstPad * pad, GstEvent * event)
+{
+  GstGmeDec *gme = GST_GME_DEC (gst_pad_get_parent (pad));
+  gboolean result = FALSE;
+
+  switch (GST_EVENT_TYPE (event)) {
+    case GST_EVENT_SEEK:
+    {
+      gdouble rate;
+      GstFormat format;
+      GstSeekFlags flags;
+      GstSeekType start_type, stop_type;
+      gint64 start, stop;
+      gboolean flush;
+
+      gst_event_parse_seek (event, &rate, &format, &flags, &start_type, &start,
+          &stop_type, &stop);
+
+      gst_event_unref (event);
+
+      if (format != GST_FORMAT_TIME) {
+        GST_DEBUG_OBJECT (gme, "seeking is only supported in TIME format");
+        break;
+      }
+
+      if (start_type != GST_SEEK_TYPE_SET || stop_type != GST_SEEK_TYPE_NONE) {
+        GST_DEBUG_OBJECT (gme, "unsupported seek type");
+        break;
+      }
+
+      if (stop_type == GST_SEEK_TYPE_NONE)
+        stop = GST_CLOCK_TIME_NONE;
+
+      if (start_type == GST_SEEK_TYPE_SET) {
+        guint64 cur = gme_tell (gme->player) * GST_MSECOND;
+        guint64 dest = (guint64) start;
+
+        if (gme->total_duration != GST_CLOCK_TIME_NONE)
+          dest = CLAMP (dest, 0, gme->total_duration);
+        else
+          dest = MAX (0, dest);
+
+        if (dest == cur)
+          break;
+
+        flush = (flags & GST_SEEK_FLAG_FLUSH) == GST_SEEK_FLAG_FLUSH;
+
+        if (flush) {
+          gst_pad_push_event (gme->srcpad, gst_event_new_flush_start ());
+        } else {
+          gst_pad_stop_task (gme->srcpad);
+        }
+
+        GST_PAD_STREAM_LOCK (gme->srcpad);
+
+        if (flags & GST_SEEK_FLAG_SEGMENT) {
+          gst_element_post_message (GST_ELEMENT (gme),
+              gst_message_new_segment_start (GST_OBJECT (gme), format, cur));
+        }
+
+        if (flush) {
+          gst_pad_push_event (gme->srcpad, gst_event_new_flush_stop ());
+        }
+
+        if (stop == GST_CLOCK_TIME_NONE
+            && gme->total_duration != GST_CLOCK_TIME_NONE)
+          stop = gme->total_duration;
+
+        gst_pad_push_event (gme->srcpad, gst_event_new_new_segment (FALSE, rate,
+                GST_FORMAT_TIME, dest, stop, dest));
+
+        gme->seekpoint = dest / GST_MSECOND;    /* nsecs to msecs */
+        gme->seeking = TRUE;
+
+        gst_pad_start_task (gme->srcpad, (GstTaskFunction) gst_gme_play,
+            gme->srcpad);
+
+        GST_PAD_STREAM_UNLOCK (gme->srcpad);
+        result = TRUE;
+      }
+      break;
+    }
+    default:
+      result = gst_pad_push_event (gme->sinkpad, event);
+      break;
+  }
+
+  gst_object_unref (gme);
+
+  return result;
+}
+
+static gboolean
+gst_gme_dec_src_query (GstPad * pad, GstQuery * query)
+{
+  GstGmeDec *gme = GST_GME_DEC (gst_pad_get_parent (pad));
+  gboolean result = TRUE;
+
+  switch (GST_QUERY_TYPE (query)) {
+    case GST_QUERY_DURATION:
+    {
+      GstFormat format;
+
+      gst_query_parse_duration (query, &format, NULL);
+      if (!gme->initialized || format != GST_FORMAT_TIME
+          || gme->total_duration == GST_CLOCK_TIME_NONE) {
+        result = FALSE;
+        break;
+      }
+      gst_query_set_duration (query, GST_FORMAT_TIME, gme->total_duration);
+      break;
+    }
+    case GST_QUERY_POSITION:
+    {
+      GstFormat format;
+
+      gst_query_parse_position (query, &format, NULL);
+      if (!gme->initialized || format != GST_FORMAT_TIME) {
+        result = FALSE;
+        break;
+      }
+      gst_query_set_position (query, GST_FORMAT_TIME,
+          (gint64) gme_tell (gme->player) * GST_MSECOND);
+      break;
+    }
+    default:
+      result = gst_pad_query_default (pad, query);
+      break;
+  }
+
+  gst_object_unref (gme);
+
+  return result;
+}
+
+static void
+gst_gme_play (GstPad * pad)
+{
+  GstGmeDec *gme = GST_GME_DEC (gst_pad_get_parent (pad));
+  GstFlowReturn flow_return;
+  GstBuffer *out;
+  gboolean seeking = gme->seeking;
+  gme_err_t gme_err = NULL;
+  const int NUM_SAMPLES = 1600; /* 4 bytes (stereo 16-bit) per sample */
+
+  if (!seeking) {
+    out = gst_buffer_new_and_alloc (NUM_SAMPLES * 4);
+    gst_buffer_set_caps (out, GST_PAD_CAPS (pad));
+    GST_BUFFER_TIMESTAMP (out) = gme_tell (gme->player) * GST_MSECOND;
+
+    gme_err =
+        gme_play (gme->player, NUM_SAMPLES * 2,
+        (short *) GST_BUFFER_DATA (out));
+    if (gme_err) {
+      GST_ELEMENT_ERROR (gme, STREAM, DEMUX, (NULL), (gme_err));
+      gst_pad_pause_task (pad);
+      gst_pad_push_event (pad, gst_event_new_eos ());
+      gst_object_unref (gme);
+      return;
+    }
+  } else {
+    gme_seek (gme->player, gme->seekpoint);
+    gme->seeking = FALSE;
+
+    out = gst_buffer_new ();
+    gst_buffer_set_caps (out, GST_PAD_CAPS (pad));
+  }
+
+  if ((flow_return = gst_pad_push (gme->srcpad, out)) != GST_FLOW_OK) {
+    GST_DEBUG_OBJECT (gme, "pausing task, reason %s",
+        gst_flow_get_name (flow_return));
+
+    gst_pad_pause_task (pad);
+
+    if (GST_FLOW_IS_FATAL (flow_return) || flow_return == GST_FLOW_NOT_LINKED) {
+      gst_pad_push_event (pad, gst_event_new_eos ());
+    }
+  }
+
+  if (gme_track_ended (gme->player)) {
+    gst_pad_pause_task (pad);
+    gst_pad_push_event (pad, gst_event_new_eos ());
+  }
+
+  gst_object_unref (gme);
+
+  return;
+}
+
+static gboolean
+gme_setup (GstGmeDec * gme)
+{
+  gme_info_t *info;
+  gme_err_t gme_err = NULL;
+  GstTagList *taglist;
+  guint64 total_duration;
+  GstBuffer *buffer;
+
+  if (!gst_adapter_available (gme->adapter) || !gme_negotiate (gme)) {
+    return FALSE;
+  }
+
+  buffer =
+      gst_adapter_take_buffer (gme->adapter,
+      gst_adapter_available (gme->adapter));
+
+  gme_err =
+      gme_open_data (GST_BUFFER_DATA (buffer), GST_BUFFER_SIZE (buffer),
+      &gme->player, 32000);
+  gst_buffer_unref (buffer);
+
+  if (gme_err || !gme->player) {
+    if (gme->player) {
+      gme_delete (gme->player);
+      gme->player = NULL;
+    }
+
+    GST_ELEMENT_ERROR (gme, STREAM, DEMUX, (NULL), (gme_err));
+
+    return FALSE;
+  }
+
+  gme_err = gme_track_info (gme->player, &info, 0);
+
+  taglist = gst_tag_list_new ();
+
+  if (info->song && *info->song)
+    gst_tag_list_add (taglist, GST_TAG_MERGE_REPLACE, GST_TAG_TITLE,
+        info->song, NULL);
+  if (info->author && *info->author)
+    gst_tag_list_add (taglist, GST_TAG_MERGE_REPLACE, GST_TAG_ARTIST,
+        info->author, NULL);
+  /* Prefer the name of the official soundtrack over the name of the game (since this is
+   * how track numbers are derived)
+   */
+  if (info->game && *info->game)
+    gst_tag_list_add (taglist, GST_TAG_MERGE_REPLACE, GST_TAG_ALBUM, info->game,
+        NULL);
+
+  if (info->comment && *info->comment)
+    gst_tag_list_add (taglist, GST_TAG_MERGE_REPLACE, GST_TAG_COMMENT,
+        info->comment, NULL);
+  if (info->dumper && *info->dumper)
+    gst_tag_list_add (taglist, GST_TAG_MERGE_REPLACE, GST_TAG_CONTACT,
+        info->dumper, NULL);
+  if (info->copyright && *info->copyright)
+    gst_tag_list_add (taglist, GST_TAG_MERGE_REPLACE, GST_TAG_COPYRIGHT,
+        info->copyright, NULL);
+  if (info->system && *info->system)
+    gst_tag_list_add (taglist, GST_TAG_MERGE_REPLACE, GST_TAG_ENCODER,
+        info->system, NULL);
+
+  gme->total_duration = total_duration =
+      gst_util_uint64_scale_int (info->play_length, GST_MSECOND, 1);
+
+  gst_tag_list_add (taglist, GST_TAG_MERGE_REPLACE,
+      GST_TAG_DURATION, total_duration, NULL);
+
+  gst_element_found_tags_for_pad (GST_ELEMENT (gme), gme->srcpad, taglist);
+
+  g_free (info);
+
+#ifdef HAVE_LIBGME_ACCURACY
+  /* TODO: Is it worth it to make this optional? */
+  gme_enable_accuracy (gme->player, 1);
+#endif
+  gme_start_track (gme->player, 0);
+
+  gst_pad_push_event (gme->srcpad, gst_event_new_new_segment (FALSE, 1.0,
+          GST_FORMAT_TIME, 0, -1, 0));
+
+  gst_pad_start_task (gme->srcpad, (GstTaskFunction) gst_gme_play, gme->srcpad);
+
+  gme->initialized = TRUE;
+  gme->seeking = FALSE;
+  gme->seekpoint = 0;
+  return gme->initialized;
+}
+
+static GstStateChangeReturn
+gst_gme_dec_change_state (GstElement * element, GstStateChange transition)
+{
+  GstStateChangeReturn result;
+  GstGmeDec *dec;
+
+  dec = GST_GME_DEC (element);
+
+  switch (transition) {
+    case GST_STATE_CHANGE_READY_TO_PAUSED:
+      dec->total_duration = GST_CLOCK_TIME_NONE;
+      break;
+    default:
+      break;
+  }
+
+  result = GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
+  if (result == GST_STATE_CHANGE_FAILURE)
+    return result;
+
+  switch (transition) {
+    case GST_STATE_CHANGE_PAUSED_TO_READY:
+      gst_adapter_clear (dec->adapter);
+      break;
+    default:
+      break;
+  }
+
+  return result;
+}
+
+static gboolean
+plugin_init (GstPlugin * plugin)
+{
+  return gst_element_register (plugin, "gmedec", GST_RANK_PRIMARY,
+      GST_TYPE_GME_DEC);
+}
+
+GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
+    GST_VERSION_MINOR,
+    "gmedec",
+    "GME Audio Decoder",
+    plugin_init, VERSION, "LGPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN);
diff --git a/ext/gme/gstgme.h b/ext/gme/gstgme.h
new file mode 100644
index 00000000..5fe969d3
--- /dev/null
+++ b/ext/gme/gstgme.h
@@ -0,0 +1,68 @@
+/* Copyright (C) 2004-2005, 2009 Michael Pyne <michael dot pyne at kdemail net>
+ * Copyright (C) 2004-2006 Chris Lee <clee at kde org>
+ * Copyright (C) 2007 Brian Koropoff <bkoropoff at gmail com>
+ *
+ * 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_GME_DEC_H__
+#define __GST_GME_DEC_H__
+
+#include <gst/gst.h>
+#include <gst/base/gstadapter.h>
+
+#include <gme/gme.h>
+
+G_BEGIN_DECLS
+
+#define GST_TYPE_GME_DEC \
+  (gst_gme_dec_get_type())
+#define GST_GME_DEC(obj) \
+  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_GME_DEC,GstGmeDec))
+#define GST_GME_DEC_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_GME_DEC,GstGmeDecClass))
+#define GST_IS_GME_DEC(obj) \
+  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_GME_DEC))
+#define GST_IS_GME_DEC_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_GME_DEC))
+
+typedef struct _GstGmeDec GstGmeDec;
+typedef struct _GstGmeDecClass GstGmeDecClass;
+
+struct _GstGmeDec
+{
+  GstElement  element;
+
+  GstPad     *sinkpad;
+  GstPad     *srcpad;
+
+  GstAdapter *adapter;
+  Music_Emu  *player;
+  gboolean    initialized;
+  gboolean    seeking;
+  int         seekpoint;
+
+  GstClockTime total_duration;
+};
+
+struct _GstGmeDecClass
+{
+  GstElementClass parent_class;
+};
+
+G_END_DECLS
+
+#endif /* __GST_GME_DEC_H__ */
diff --git a/ext/kate/gstkatedec.c b/ext/kate/gstkatedec.c
index fe5ac51c..eb4bb2ba 100644
--- a/ext/kate/gstkatedec.c
+++ b/ext/kate/gstkatedec.c
@@ -74,8 +74,6 @@
  * </refsect2>
  */
 
-/* FIXME: post appropriate GST_ELEMENT_ERROR when returning FLOW_ERROR */
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -298,7 +296,8 @@ gst_kate_dec_chain (GstPad * pad, GstBuffer * buf)
                 gst_flow_get_name (rflow));
           }
         } else {
-          GST_WARNING_OBJECT (kd, "failed to create buffer");
+          GST_ELEMENT_ERROR (kd, STREAM, DECODE, (NULL),
+              ("Failed to create buffer"));
           rflow = GST_FLOW_ERROR;
         }
       } else {
@@ -307,7 +306,8 @@ gst_kate_dec_chain (GstPad * pad, GstBuffer * buf)
       }
       g_free (escaped);
     } else {
-      GST_WARNING_OBJECT (kd, "failed to allocate string");
+      GST_ELEMENT_ERROR (kd, STREAM, DECODE, (NULL),
+          ("Failed to allocate string"));
       rflow = GST_FLOW_ERROR;
     }
 
@@ -329,7 +329,8 @@ gst_kate_dec_chain (GstPad * pad, GstBuffer * buf)
               gst_flow_get_name (rflow));
         }
       } else {
-        GST_WARNING_OBJECT (kd, "failed to create SPU from paletted bitmap");
+        GST_ELEMENT_ERROR (kd, STREAM, DECODE, (NULL),
+            ("failed to create SPU from paletted bitmap"));
         rflow = GST_FLOW_ERROR;
       }
     }
diff --git a/ext/kate/gstkateenc.c b/ext/kate/gstkateenc.c
index 80709eb3..42333509 100644
--- a/ext/kate/gstkateenc.c
+++ b/ext/kate/gstkateenc.c
@@ -68,7 +68,6 @@
  * </refsect2>
  */
 
-/* FIXME: post appropriate GST_ELEMENT_ERROR when returning FLOW_ERROR */
 /* FIXME: should we automatically pick up the language code from the
  * upstream event tags if none was set via the property? */
 
@@ -398,7 +397,7 @@ gst_kate_enc_create_buffer (GstKateEnc * ke, kate_packet * kp,
 {
   GstBuffer *buffer;
 
-  buffer = gst_buffer_new_and_alloc (kp->nbytes);
+  buffer = gst_buffer_try_new_and_alloc (kp->nbytes);
   if (G_UNLIKELY (!buffer)) {
     GST_WARNING_OBJECT (ke, "Failed to allocate buffer for %u bytes",
         kp->nbytes);
@@ -426,7 +425,7 @@ gst_kate_enc_create_buffer (GstKateEnc * ke, kate_packet * kp,
 static GstFlowReturn
 gst_kate_enc_push_buffer (GstKateEnc * ke, GstBuffer * buffer)
 {
-  GstFlowReturn rflow;
+  GstFlowReturn flow;
 
   ke->last_timestamp = GST_BUFFER_TIMESTAMP (buffer);
   if (GST_BUFFER_TIMESTAMP (buffer) + GST_BUFFER_DURATION (buffer) >
@@ -438,12 +437,12 @@ gst_kate_enc_push_buffer (GstKateEnc * ke, GstBuffer * buffer)
   /* Hack to flush each packet on its own page - taken off the CMML encoder element */
   GST_BUFFER_DURATION (buffer) = G_MAXINT64;
 
-  rflow = gst_pad_push (ke->srcpad, buffer);
-  if (G_UNLIKELY (rflow != GST_FLOW_OK)) {
-    GST_ERROR_OBJECT (ke, "Failed to push buffer: %d", rflow);
+  flow = gst_pad_push (ke->srcpad, buffer);
+  if (G_UNLIKELY (flow != GST_FLOW_OK)) {
+    GST_WARNING_OBJECT (ke->srcpad, "push flow: %s", gst_flow_get_name (flow));
   }
 
-  return rflow;
+  return flow;
 }
 
 static GstFlowReturn
@@ -457,7 +456,8 @@ gst_kate_enc_push_and_free_kate_packet (GstKateEnc * ke, kate_packet * kp,
   buffer =
       gst_kate_enc_create_buffer (ke, kp, granpos, timestamp, duration, header);
   if (G_UNLIKELY (!buffer)) {
-    GST_WARNING_OBJECT (ke, "Failed to create buffer, %u bytes", kp->nbytes);
+    GST_ELEMENT_ERROR (ke, STREAM, ENCODE, (NULL),
+        ("Failed to create buffer, %u bytes", kp->nbytes));
     kate_packet_clear (kp);
     return GST_FLOW_ERROR;
   }
@@ -548,9 +548,12 @@ gst_kate_enc_send_headers (GstKateEnc * ke)
     kate_packet kp;
     int ret = kate_encode_headers (&ke->k, &ke->kc, &kp);
     if (ret == 0) {
-      GstBuffer *buffer =
-          gst_kate_enc_create_buffer (ke, &kp, 0ll, 0ll, 0ll, TRUE);
+      GstBuffer *buffer;
+
+      buffer = gst_kate_enc_create_buffer (ke, &kp, 0, 0, 0, TRUE);
       if (!buffer) {
+        GST_ELEMENT_ERROR (ke, STREAM, ENCODE, (NULL),
+            ("Failed to create buffer, %u bytes", kp.nbytes));
         rflow = GST_FLOW_ERROR;
         break;
       }
@@ -561,7 +564,8 @@ gst_kate_enc_send_headers (GstKateEnc * ke)
       GST_LOG_OBJECT (ke, "Last header encoded");
       break;
     } else {
-      GST_LOG_OBJECT (ke, "Error encoding header: %d", ret);
+      GST_ELEMENT_ERROR (ke, STREAM, ENCODE, (NULL),
+          ("kate_encode_headers: %d", ret));
       rflow = GST_FLOW_ERROR;
       break;
     }
@@ -634,7 +638,8 @@ gst_kate_enc_chain_push_packet (GstKateEnc * ke, kate_packet * kp,
 
   granpos = kate_encode_get_granule (&ke->k);
   if (G_UNLIKELY (granpos < 0)) {
-    GST_WARNING_OBJECT (ke, "Negative granpos for packet");
+    GST_ELEMENT_ERROR (ke, STREAM, ENCODE, (NULL),
+        ("Negative granpos for packet"));
     kate_packet_clear (kp);
     return GST_FLOW_ERROR;
   }
@@ -685,6 +690,8 @@ gst_kate_enc_flush_waiting (GstKateEnc * ke, GstClockTime now)
 
     ret = kate_encode_text (&ke->k, t0, t1, "", 0, &kp);
     if (G_UNLIKELY (ret < 0)) {
+      GST_ELEMENT_ERROR (ke, STREAM, ENCODE, (NULL),
+          ("kate_encode_text: %d", ret));
       rflow = GST_FLOW_ERROR;
     } else {
       rflow =
@@ -747,7 +754,7 @@ gst_kate_enc_chain_spu (GstKateEnc * ke, GstBuffer * buf)
       g_free (kbitmap);
     if (kpalette)
       g_free (kpalette);
-    GST_ERROR_OBJECT (ke, "Out of memory");
+    GST_ELEMENT_ERROR (ke, STREAM, ENCODE, (NULL), ("Out of memory"));
     return GST_FLOW_ERROR;
   }
 
@@ -802,17 +809,20 @@ gst_kate_enc_chain_spu (GstKateEnc * ke, GstBuffer * buf)
         kbitmap->width, kbitmap->height, GST_BUFFER_SIZE (buf), t0, t1);
     ret = kate_encode_set_region (&ke->k, kregion);
     if (G_UNLIKELY (ret < 0)) {
-      GST_WARNING_OBJECT (ke, "Failed to set event region (%d)", ret);
+      GST_ELEMENT_ERROR (ke, STREAM, ENCODE, (NULL),
+          ("kate_encode_set_region: %d", ret));
       rflow = GST_FLOW_ERROR;
     } else {
       ret = kate_encode_set_palette (&ke->k, kpalette);
       if (G_UNLIKELY (ret < 0)) {
-        GST_WARNING_OBJECT (ke, "Failed to set event palette (%d)", ret);
+        GST_ELEMENT_ERROR (ke, STREAM, ENCODE, (NULL),
+            ("kate_encode_set_palette: %d", ret));
         rflow = GST_FLOW_ERROR;
       } else {
         ret = kate_encode_set_bitmap (&ke->k, kbitmap);
         if (G_UNLIKELY (ret < 0)) {
-          GST_WARNING_OBJECT (ke, "Failed to set event bitmap (%d)", ret);
+          GST_ELEMENT_ERROR (ke, STREAM, ENCODE, (NULL),
+              ("kate_encode_set_bitmap: %d", ret));
           rflow = GST_FLOW_ERROR;
         } else {
           /* Some SPUs have no hide time - so I'm going to delay the encoding of the packet
@@ -833,8 +843,8 @@ gst_kate_enc_chain_spu (GstKateEnc * ke, GstBuffer * buf)
           } else {
             ret = kate_encode_text (&ke->k, t0, t1, "", 0, &kp);
             if (G_UNLIKELY (ret < 0)) {
-              GST_WARNING_OBJECT (ke,
-                  "Failed to encode empty text for SPU buffer (%d)", ret);
+              GST_ELEMENT_ERROR (ke, STREAM, ENCODE, (NULL),
+                  ("Failed to encode empty text for SPU buffer: %d", ret));
               rflow = GST_FLOW_ERROR;
             } else {
               rflow =
@@ -875,7 +885,8 @@ gst_kate_enc_chain_text (GstKateEnc * ke, GstBuffer * buf,
   }
 
   if (G_UNLIKELY (ret < 0)) {
-    GST_WARNING_OBJECT (ke, "Failed to set markup type (%d)", ret);
+    GST_ELEMENT_ERROR (ke, STREAM, ENCODE, (NULL),
+        ("kate_encode_set_markup_type: %d", ret));
     rflow = GST_FLOW_ERROR;
   } else {
     const char *text = (const char *) GST_BUFFER_DATA (buf);
@@ -888,13 +899,17 @@ gst_kate_enc_chain_text (GstKateEnc * ke, GstBuffer * buf,
           GST_BUFFER_SIZE (buf), t0, t1);
       ret = kate_encode_text (&ke->k, t0, t1, text, text_len, &kp);
       if (G_UNLIKELY (ret < 0)) {
+        GST_ELEMENT_ERROR (ke, STREAM, ENCODE, (NULL),
+            ("Failed to encode text: %d", ret));
         rflow = GST_FLOW_ERROR;
       } else {
         rflow =
             gst_kate_enc_chain_push_packet (ke, &kp, start, stop - start + 1);
       }
     } else {
-      GST_WARNING_OBJECT (ke, "No text in text packet");
+      /* FIXME: this should not be an error, we should ignore it and move on */
+      GST_ELEMENT_ERROR (ke, STREAM, ENCODE, (NULL),
+          ("no text in text packet"));
       rflow = GST_FLOW_ERROR;
     }
   }
@@ -918,8 +933,8 @@ gst_kate_enc_chain (GstPad * pad, GstBuffer * buf)
   /* get the type of the data we're being sent */
   caps = GST_PAD_CAPS (pad);
   if (G_UNLIKELY (caps == NULL)) {
-    GST_ERROR_OBJECT (ke, ": Could not get caps of pad");
-    rflow = GST_FLOW_ERROR;
+    GST_WARNING_OBJECT (ke, "No input caps set");
+    rflow = GST_FLOW_NOT_NEGOTIATED;
   } else {
     const GstStructure *structure = gst_caps_get_structure (caps, 0);
     if (structure)
diff --git a/ext/kate/gstkateparse.c b/ext/kate/gstkateparse.c
index 89d17514..e4a83477 100644
--- a/ext/kate/gstkateparse.c
+++ b/ext/kate/gstkateparse.c
@@ -58,8 +58,6 @@
  *
  */
 
-/* FIXME: post appropriate GST_ELEMENT_ERROR when returning FLOW_ERROR */
-
 #ifdef HAVE_CONFIG_H
 #  include "config.h"
 #endif
@@ -174,7 +172,8 @@ gst_kate_parse_push_headers (GstKateParse * parse)
       gst_pad_get_negotiated_caps (parse->sinkpad), parse->streamheader);
 
   if (G_UNLIKELY (!caps)) {
-    GST_ERROR_OBJECT (parse, "Failed to set headers on caps");
+    GST_ELEMENT_ERROR (parse, STREAM, DECODE, (NULL),
+        ("Failed to set headers on caps"));
     return GST_FLOW_ERROR;
   }
 
@@ -182,8 +181,8 @@ gst_kate_parse_push_headers (GstKateParse * parse)
   res = gst_pad_set_caps (parse->srcpad, caps);
   gst_caps_unref (caps);
   if (G_UNLIKELY (!res)) {
-    GST_WARNING_OBJECT (parse, "Failed to set pad caps");
-    return GST_FLOW_ERROR;
+    GST_WARNING_OBJECT (parse->srcpad, "Failed to set caps on source pad");
+    return GST_FLOW_NOT_NEGOTIATED;
   }
 
   headers = parse->streamheader;
@@ -243,7 +242,7 @@ static GstFlowReturn
 gst_kate_parse_push_buffer (GstKateParse * parse, GstBuffer * buf,
     gint64 granulepos)
 {
-  GST_LOG_OBJECT (parse, "granulepos %16llx", granulepos);
+  GST_LOG_OBJECT (parse, "granulepos %16" G_GINT64_MODIFIER "x", granulepos);
   if (granulepos < 0) {
     /* packets coming not from Ogg won't have a granpos in the offset end,
        so we have to synthesize one here - only problem is we don't know
@@ -331,7 +330,7 @@ gst_kate_parse_queue_buffer (GstKateParse * parse, GstBuffer * buf)
 
   /* oggdemux stores the granule pos in the offset end */
   granpos = GST_BUFFER_OFFSET_END (buf);
-  GST_LOG_OBJECT (parse, "granpos %16llx", granpos);
+  GST_LOG_OBJECT (parse, "granpos %16" G_GINT64_MODIFIER "x", granpos);
   g_queue_push_tail (parse->buffer_queue, buf);
 
 #if 1
@@ -343,7 +342,8 @@ gst_kate_parse_queue_buffer (GstKateParse * parse, GstBuffer * buf)
   if (granpos >= 0) {
     ret = gst_kate_parse_drain_queue (parse, granpos);
   } else {
-    GST_WARNING_OBJECT (parse, "granulepos < 0 (%lld)", granpos);
+    GST_ELEMENT_ERROR (parse, STREAM, DECODE, (NULL),
+        ("Bad granulepos %" G_GINT64_FORMAT, granpos));
     ret = GST_FLOW_ERROR;
   }
 #endif
diff --git a/ext/kate/gstkatespu.c b/ext/kate/gstkatespu.c
index f05ae421..cc54cc4f 100644
--- a/ext/kate/gstkatespu.c
+++ b/ext/kate/gstkatespu.c
@@ -253,9 +253,21 @@ gst_kate_spu_crop_bitmap (GstKateEnc * ke, kate_bitmap * kb, guint16 * dx,
   kb->height = h;
 }
 
-#define CHECK(x) do { guint16 _ = (x); if (G_UNLIKELY((_) > sz)) { GST_WARNING_OBJECT (ke, "SPU overflow"); return GST_FLOW_ERROR; } } while (0)
-#define ADVANCE(x) do { guint16 _ = (x); ptr += (_); sz -= (_); } while (0)
-#define IGNORE(x) do { guint16 __ = (x); CHECK (__); ADVANCE (__); } while (0)
+#define CHECK(x) G_STMT_START { \
+      guint16 _ = (x); \
+      if (G_UNLIKELY((_) > sz)) { \
+        GST_ELEMENT_ERROR (ke, STREAM, ENCODE, (NULL), ("Read outside buffer")); \
+        return GST_FLOW_ERROR; \
+      } \
+    } G_STMT_END
+#define ADVANCE(x) G_STMT_START { \
+      guint16 _ = (x); ptr += (_); sz -= (_); \
+    } G_STMT_END
+#define IGNORE(x) G_STMT_START { \
+      guint16 __ = (x); \
+      CHECK (__); \
+      ADVANCE (__); \
+    } G_STMT_END
 
 static GstFlowReturn
 gst_kate_spu_decode_command_sequence (GstKateEnc * ke, GstBuffer * buf,
@@ -267,8 +279,9 @@ gst_kate_spu_decode_command_sequence (GstKateEnc * ke, GstBuffer * buf,
   guint16 sz;
 
   if (command_sequence_offset >= GST_BUFFER_SIZE (buf)) {
-    GST_WARNING_OBJECT (ke, "Command sequence offset %u is out of range %u",
-        command_sequence_offset, GST_BUFFER_SIZE (buf));
+    GST_ELEMENT_ERROR (ke, STREAM, DECODE, (NULL),
+        ("Command sequence offset %u is out of range %u",
+            command_sequence_offset, GST_BUFFER_SIZE (buf)));
     return GST_FLOW_ERROR;
   }
 
@@ -348,10 +361,12 @@ gst_kate_spu_decode_command_sequence (GstKateEnc * ke, GstBuffer * buf,
         }
         break;
       default:
-        GST_WARNING_OBJECT (ke, "invalid SPU command: %u", cmd);
+        GST_ELEMENT_ERROR (ke, STREAM, ENCODE, (NULL),
+            ("Invalid SPU command: %u", cmd));
         return GST_FLOW_ERROR;
     }
   }
+  GST_ELEMENT_ERROR (ke, STREAM, ENCODE, (NULL), ("Error parsing SPU"));
   return GST_FLOW_ERROR;
 }
 
@@ -395,9 +410,10 @@ gst_kate_spu_create_spu_palette (GstKateEnc * ke, kate_palette * kp)
   kate_palette_init (kp);
   kp->ncolors = 4;
   kp->colors = (kate_color *) g_malloc (kp->ncolors * sizeof (kate_color));
-  if (G_UNLIKELY (!kp->colors))
+  if (G_UNLIKELY (!kp->colors)) {
+    GST_ELEMENT_ERROR (ke, STREAM, ENCODE, (NULL), ("Out of memory"));
     return GST_FLOW_ERROR;
-
+  }
 #if 1
   for (n = 0; n < kp->ncolors; ++n) {
     int idx = ke->spu_colormap[n];
@@ -478,7 +494,8 @@ gst_kate_spu_decode_spu (GstKateEnc * ke, GstBuffer * buf, kate_region * kr,
   if (G_UNLIKELY (ke->spu_right - ke->spu_left < 0
           || ke->spu_bottom - ke->spu_top < 0 || ke->spu_pix_data[0] == 0
           || ke->spu_pix_data[1] == 0)) {
-    GST_WARNING_OBJECT (ke, "SPU area is empty, nothing to encode");
+    GST_ELEMENT_ERROR (ke, STREAM, ENCODE, (NULL),
+        ("SPU area is empty, nothing to encode"));
     return GST_FLOW_ERROR;
   }
 
@@ -495,7 +512,8 @@ gst_kate_spu_decode_spu (GstKateEnc * ke, GstBuffer * buf, kate_region * kr,
   kb->type = kate_bitmap_type_paletted;
   kb->pixels = (unsigned char *) g_malloc (kb->width * kb->height);
   if (G_UNLIKELY (!kb->pixels)) {
-    GST_WARNING_OBJECT (ke, "Failed to allocate memory for pixel data");
+    GST_ELEMENT_ERROR (ke, STREAM, ENCODE, (NULL),
+        ("Failed to allocate memory for pixel data"));
     return GST_FLOW_ERROR;
   }
 
diff --git a/ext/kate/gstkatetag.c b/ext/kate/gstkatetag.c
index f5734c12..ac4e925f 100644
--- a/ext/kate/gstkatetag.c
+++ b/ext/kate/gstkatetag.c
@@ -63,8 +63,6 @@
  * </refsect2>
  */
 
-/* FIXME: post appropriate GST_ELEMENT_ERROR when returning FLOW_ERROR */
-
 #ifdef HAVE_CONFIG_H
 #  include "config.h"
 #endif
diff --git a/ext/kate/gstkatetiger.c b/ext/kate/gstkatetiger.c
index 3e72285a..433a3106 100644
--- a/ext/kate/gstkatetiger.c
+++ b/ext/kate/gstkatetiger.c
@@ -73,8 +73,6 @@
  * </refsect2>
  */
 
-/* FIXME: post appropriate GST_ELEMENT_ERROR when returning FLOW_ERROR */
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/ext/kate/gstkateutil.c b/ext/kate/gstkateutil.c
index ca245f99..f99247be 100644
--- a/ext/kate/gstkateutil.c
+++ b/ext/kate/gstkateutil.c
@@ -17,7 +17,6 @@
  * Boston, MA 02111-1307, USA.
  */
 
-/* FIXME: post appropriate GST_ELEMENT_ERROR when returning FLOW_ERROR */
 /* FIXME: shouldn't all this GstKateDecoderBase stuff really be a base class? */
 
 #ifdef HAVE_CONFIG_H
@@ -165,7 +164,8 @@ gst_kate_util_decoder_base_chain_kate_packet (GstKateDecoderBase * decoder,
   kate_packet_wrap (&kp, GST_BUFFER_SIZE (buf), GST_BUFFER_DATA (buf));
   ret = kate_high_decode_packetin (&decoder->k, &kp, ev);
   if (G_UNLIKELY (ret < 0)) {
-    GST_WARNING_OBJECT (element, "kate_high_decode_packetin failed (%d)", ret);
+    GST_ELEMENT_ERROR (element, STREAM, DECODE, (NULL),
+        ("Failed to decode Kate packet: %d", ret));
     return GST_FLOW_ERROR;
   } else if (G_UNLIKELY (ret > 0)) {
     GST_DEBUG_OBJECT (element,
diff --git a/ext/mimic/gstmimdec.c b/ext/mimic/gstmimdec.c
index 6a0abce5..a0878a13 100644
--- a/ext/mimic/gstmimdec.c
+++ b/ext/mimic/gstmimdec.c
@@ -68,6 +68,8 @@ static GstFlowReturn gst_mimdec_chain (GstPad * pad, GstBuffer * in);
 static GstStateChangeReturn
 gst_mimdec_change_state (GstElement * element, GstStateChange transition);
 
+static gboolean gst_mimdec_sink_event (GstPad * pad, GstEvent * event);
+
 
 GST_BOILERPLATE (GstMimDec, gst_mimdec, GstElement, GST_TYPE_ELEMENT);
 
@@ -111,15 +113,12 @@ gst_mimdec_class_init (GstMimDecClass * klass)
 static void
 gst_mimdec_init (GstMimDec * mimdec, GstMimDecClass * klass)
 {
-  mimdec->sinkpad =
-      gst_pad_new_from_template (gst_static_pad_template_get (&sink_factory),
-      "sink");
+  mimdec->sinkpad = gst_pad_new_from_static_template (&sink_factory, "sink");
   gst_element_add_pad (GST_ELEMENT (mimdec), mimdec->sinkpad);
   gst_pad_set_chain_function (mimdec->sinkpad, gst_mimdec_chain);
+  gst_pad_set_event_function (mimdec->sinkpad, gst_mimdec_sink_event);
 
-  mimdec->srcpad =
-      gst_pad_new_from_template (gst_static_pad_template_get (&src_factory),
-      "src");
+  mimdec->srcpad = gst_pad_new_from_static_template (&src_factory, "src");
   gst_element_add_pad (GST_ELEMENT (mimdec), mimdec->srcpad);
 
   mimdec->adapter = gst_adapter_new ();
@@ -138,6 +137,8 @@ gst_mimdec_finalize (GObject * object)
 
   gst_adapter_clear (mimdec->adapter);
   g_object_unref (mimdec->adapter);
+
+  GST_CALL_PARENT (G_OBJECT_CLASS, finalize, (object));
 }
 
 static GstFlowReturn
@@ -213,6 +214,9 @@ gst_mimdec_chain (GstPad * pad, GstBuffer * in)
         (guchar *) gst_adapter_peek (mimdec->adapter, mimdec->payload_size);
 
     if (mimdec->dec == NULL) {
+      GstEvent *event = NULL;
+      gboolean result = TRUE;
+
       /* Check if its a keyframe, otherwise skip it */
       if (GUINT32_FROM_LE (*((guint32 *) (frame_body + 12))) != 0) {
         gst_adapter_flush (mimdec->adapter, mimdec->payload_size);
@@ -254,6 +258,20 @@ gst_mimdec_chain (GstPad * pad, GstBuffer * in)
         res = GST_FLOW_ERROR;
         goto out;
       }
+
+      if (mimdec->need_newsegment)
+        event = gst_event_new_new_segment (FALSE, 1.0, GST_FORMAT_TIME,
+            mimdec->current_ts * GST_MSECOND, -1, 0);
+      mimdec->need_newsegment = FALSE;
+      GST_OBJECT_UNLOCK (mimdec);
+      if (event)
+        result = gst_pad_push_event (mimdec->srcpad, event);
+      GST_OBJECT_LOCK (mimdec);
+      if (!result) {
+        GST_WARNING_OBJECT (mimdec, "gst_pad_push_event failed");
+        res = GST_FLOW_ERROR;
+        goto out;
+      }
     }
 
     out_buf = gst_buffer_new_and_alloc (mimdec->buffer_size);
@@ -270,7 +288,10 @@ gst_mimdec_chain (GstPad * pad, GstBuffer * in)
       goto out;
     }
 
-    GST_BUFFER_TIMESTAMP (out_buf) = in_time;
+    if (GST_CLOCK_TIME_IS_VALID (in_time))
+      GST_BUFFER_TIMESTAMP (out_buf) = in_time;
+    else
+      GST_BUFFER_TIMESTAMP (out_buf) = mimdec->current_ts * GST_MSECOND;
 
     mimic_get_property (mimdec->dec, "width", &width);
     mimic_get_property (mimdec->dec, "height", &height);
@@ -312,6 +333,7 @@ gst_mimdec_change_state (GstElement * element, GstStateChange transition)
 
   switch (transition) {
     case GST_STATE_CHANGE_READY_TO_NULL:
+      GST_OBJECT_LOCK (element);
       if (mimdec->dec != NULL) {
         mimic_close (mimdec->dec);
         mimdec->dec = NULL;
@@ -319,8 +341,13 @@ gst_mimdec_change_state (GstElement * element, GstStateChange transition)
         mimdec->have_header = FALSE;
         mimdec->payload_size = -1;
         mimdec->current_ts = -1;
-        GST_OBJECT_UNLOCK (element);
       }
+      GST_OBJECT_UNLOCK (element);
+      break;
+    case GST_STATE_CHANGE_READY_TO_PAUSED:
+      GST_OBJECT_LOCK (element);
+      mimdec->need_newsegment = TRUE;
+      GST_OBJECT_UNLOCK (element);
       break;
     default:
       break;
@@ -328,3 +355,72 @@ gst_mimdec_change_state (GstElement * element, GstStateChange transition)
 
   return GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
 }
+
+static gboolean
+gst_mimdec_sink_event (GstPad * pad, GstEvent * event)
+{
+  gboolean res = TRUE;
+  GstMimDec *mimdec = GST_MIMDEC (gst_pad_get_parent (pad));
+
+  /*
+   * Ignore upstream newsegment event, its EVIL, we should implement
+   * proper seeking instead
+   */
+  switch (GST_EVENT_TYPE (event)) {
+    case GST_EVENT_NEWSEGMENT:
+    {
+      gboolean update;
+      GstFormat format;
+      gdouble rate, arate;
+      gint64 start, stop, time;
+
+      gst_event_parse_new_segment_full (event, &update, &rate, &arate,
+          &format, &start, &stop, &time);
+
+      /* we need TIME and a positive rate */
+      if (format != GST_FORMAT_TIME)
+        goto newseg_wrong_format;
+
+      if (rate <= 0.0)
+        goto newseg_wrong_rate;
+
+      GST_OBJECT_LOCK (mimdec);
+      mimdec->need_newsegment = FALSE;
+      GST_OBJECT_UNLOCK (mimdec);
+
+      res = gst_pad_push_event (mimdec->srcpad, event);
+    }
+      break;
+    case GST_EVENT_FLUSH_STOP:
+      GST_OBJECT_LOCK (mimdec);
+      mimdec->need_newsegment = TRUE;
+      GST_OBJECT_UNLOCK (mimdec);
+
+      res = gst_pad_push_event (mimdec->srcpad, event);
+      break;
+    default:
+      res = gst_pad_push_event (mimdec->srcpad, event);
+      break;
+  }
+
+done:
+
+  gst_object_unref (mimdec);
+
+  return res;
+
+newseg_wrong_format:
+  {
+    GST_DEBUG_OBJECT (mimdec, "received non TIME newsegment");
+    gst_event_unref (event);
+    goto done;
+  }
+newseg_wrong_rate:
+  {
+    GST_DEBUG_OBJECT (mimdec, "negative rates not supported yet");
+    gst_event_unref (event);
+    goto done;
+  }
+
+
+}
diff --git a/ext/mimic/gstmimdec.h b/ext/mimic/gstmimdec.h
index 7db6b1b8..e1db38d1 100644
--- a/ext/mimic/gstmimdec.h
+++ b/ext/mimic/gstmimdec.h
@@ -57,6 +57,8 @@ struct _GstMimDec
   gboolean have_header;
   guint32 payload_size;
   guint32 current_ts;
+
+  gboolean need_newsegment;
 };
 
 struct _GstMimDecClass
diff --git a/ext/mimic/gstmimenc.c b/ext/mimic/gstmimenc.c
index 2418e7c8..4a65b9fd 100644
--- a/ext/mimic/gstmimenc.c
+++ b/ext/mimic/gstmimenc.c
@@ -142,17 +142,13 @@ gst_mimenc_class_init (GstMimEncClass * klass)
 static void
 gst_mimenc_init (GstMimEnc * mimenc, GstMimEncClass * klass)
 {
-  mimenc->sinkpad =
-      gst_pad_new_from_template (gst_static_pad_template_get (&sink_factory),
-      "sink");
+  mimenc->sinkpad = gst_pad_new_from_static_template (&sink_factory, "sink");
   gst_element_add_pad (GST_ELEMENT (mimenc), mimenc->sinkpad);
   gst_pad_set_setcaps_function (mimenc->sinkpad, gst_mimenc_setcaps);
   gst_pad_set_chain_function (mimenc->sinkpad, gst_mimenc_chain);
   gst_pad_set_event_function (mimenc->sinkpad, gst_mimenc_event);
 
-  mimenc->srcpad =
-      gst_pad_new_from_template (gst_static_pad_template_get (&src_factory),
-      "src");
+  mimenc->srcpad = gst_pad_new_from_static_template (&src_factory, "src");
   gst_element_add_pad (GST_ELEMENT (mimenc), mimenc->srcpad);
 
   mimenc->enc = NULL;
@@ -538,6 +534,8 @@ paused_mode_task (gpointer data)
     GST_OBJECT_LOCK (mimenc);
     mimenc->clock_id = NULL;
     GST_OBJECT_UNLOCK (mimenc);
+
+    gst_clock_id_unref (id);
   }
   return;
 
diff --git a/ext/musepack/gstmusepackdec.c b/ext/musepack/gstmusepackdec.c
index fea4bc05..30a34bff 100644
--- a/ext/musepack/gstmusepackdec.c
+++ b/ext/musepack/gstmusepackdec.c
@@ -300,6 +300,7 @@ gst_musepackdec_get_src_query_types (GstPad * pad)
   static const GstQueryType query_types[] = {
     GST_QUERY_POSITION,
     GST_QUERY_DURATION,
+    GST_QUERY_SEEKING,
     (GstQueryType) 0
   };
 
@@ -358,6 +359,18 @@ gst_musepackdec_src_query (GstPad * pad, GstQuery * query)
       }
       break;
     }
+    case GST_QUERY_SEEKING:{
+      GstFormat fmt;
+
+      res = TRUE;
+      gst_query_parse_seeking (query, &fmt, NULL, NULL, NULL);
+      if (fmt == GST_FORMAT_TIME || fmt == GST_FORMAT_DEFAULT)
+        gst_query_set_seeking (query, fmt, TRUE, 0, -1);
+      else
+        gst_query_set_seeking (query, fmt, FALSE, -1, -1);
+
+      break;
+    }
     default:
       res = gst_pad_query_default (pad, query);
       break;
diff --git a/ext/spc/Makefile.am b/ext/spc/Makefile.am
index 89f0f721..067ea669 100644
--- a/ext/spc/Makefile.am
+++ b/ext/spc/Makefile.am
@@ -8,3 +8,4 @@ libgstspc_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstspc_la_LIBTOOLFLAGS = --tag=disable-static
 
 noinst_HEADERS = gstspc.h tag.h
+
diff --git a/ext/spc/gstspc.c b/ext/spc/gstspc.c
index c8ece379..7032065a 100644
--- a/ext/spc/gstspc.c
+++ b/ext/spc/gstspc.c
@@ -584,7 +584,7 @@ gst_spc_dec_change_state (GstElement * element, GstStateChange transition)
 static gboolean
 plugin_init (GstPlugin * plugin)
 {
-  return gst_element_register (plugin, "spcdec", GST_RANK_PRIMARY,
+  return gst_element_register (plugin, "spcdec", GST_RANK_SECONDARY,
       GST_TYPE_SPC_DEC);
 }