vpdaumpegdec: remove useless GstVdpDecoder baseclass

5 files changed, 127 insertions, 353 deletions

diff --git a/sys/vdpau/Makefile.am b/sys/vdpau/Makefile.am
index a603ec776..053332b0c 100644
--- a/sys/vdpau/Makefile.am
+++ b/sys/vdpau/Makefile.am
@@ -2,7 +2,6 @@ plugin_LTLIBRARIES = libgstvdpau.la
 
 libgstvdpau_la_SOURCES = \
 	gstvdpdevice.c \
-	gstvdpdecoder.c \
 	gstvdpmpegdecoder.c \
 	mpegutil.c \
 	gstvdpvideoyuv.c \
@@ -18,7 +17,6 @@ libgstvdpau_la_LIBTOOLFLAGS = --tag=disable-static
 
 noinst_HEADERS = \
 	gstvdpdevice.h \
-	gstvdpdecoder.h \
 	gstvdpmpegdecoder.h \
 	mpegutil.h \
 	gstvdpvideoyuv.h \
diff --git a/sys/vdpau/gstvdpdecoder.c b/sys/vdpau/gstvdpdecoder.c
deleted file mode 100644
index b6a28cc7a..000000000
--- a/sys/vdpau/gstvdpdecoder.c
+++ /dev/null
@@ -1,229 +0,0 @@
-/*
- * GStreamer
- * Copyright (C) 2009 Carl-Anton Ingmarsson <ca.ingmarsson@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 <gst/gst.h>
-#include <gst/video/video.h>
-
-#include "gstvdpdecoder.h"
-
-GST_DEBUG_CATEGORY_STATIC (gst_vdp_decoder_debug);
-#define GST_CAT_DEFAULT gst_vdp_decoder_debug
-
-/* Filter signals and args */
-enum
-{
-  /* FILL ME */
-  LAST_SIGNAL
-};
-
-enum
-{
-  PROP_0,
-  PROP_DISPLAY
-};
-
-static GstStaticPadTemplate src_template = GST_STATIC_PAD_TEMPLATE ("src",
-    GST_PAD_SRC,
-    GST_PAD_ALWAYS,
-    GST_STATIC_CAPS ("video/x-vdpau-video, " "chroma-type = (int) 0"));
-
-#define DEBUG_INIT(bla) \
-    GST_DEBUG_CATEGORY_INIT (gst_vdp_decoder_debug, "vdpaudecoder", 0, "vdpaudecoder base class");
-
-GST_BOILERPLATE_FULL (GstVdpDecoder, gst_vdp_decoder, GstElement,
-    GST_TYPE_ELEMENT, DEBUG_INIT);
-
-static void gst_vdp_decoder_finalize (GObject * object);
-static void gst_vdp_decoder_set_property (GObject * object, guint prop_id,
-    const GValue * value, GParamSpec * pspec);
-static void gst_vdp_decoder_get_property (GObject * object, guint prop_id,
-    GValue * value, GParamSpec * pspec);
-
-GstFlowReturn
-gst_vdp_decoder_push_video_buffer (GstVdpDecoder * dec,
-    GstVdpVideoBuffer * buffer)
-{
-  if (GST_BUFFER_TIMESTAMP (buffer) == GST_CLOCK_TIME_NONE) {
-    GST_BUFFER_TIMESTAMP (buffer) = dec->time +
-        gst_util_uint64_scale_int (GST_SECOND,
-        dec->framerate_denominator, dec->framerate_numerator);
-  }
-  gst_buffer_set_caps (GST_BUFFER (buffer), GST_PAD_CAPS (dec->src));
-
-  GST_DEBUG_OBJECT (dec, "Pushing buffer with timestamp: %" GST_TIME_FORMAT,
-      GST_TIME_ARGS (GST_BUFFER_TIMESTAMP (buffer)));
-  dec->time = GST_BUFFER_TIMESTAMP (buffer);
-
-  return gst_pad_push (dec->src, GST_BUFFER (buffer));
-}
-
-static gboolean
-gst_vdp_decoder_sink_set_caps (GstPad * pad, GstCaps * caps)
-{
-  GstVdpDecoder *dec = GST_VDP_DECODER (GST_OBJECT_PARENT (pad));
-  GstVdpDecoderClass *dec_class = GST_VDP_DECODER_GET_CLASS (dec);
-
-  GstCaps *src_caps, *new_caps;
-  GstStructure *structure;
-  gint width, height;
-  gint framerate_numerator, framerate_denominator;
-  gint par_numerator, par_denominator;
-  gboolean res;
-
-  structure = gst_caps_get_structure (caps, 0);
-  gst_structure_get_int (structure, "width", &width);
-  gst_structure_get_int (structure, "height", &height);
-  gst_structure_get_fraction (structure, "framerate",
-      &framerate_numerator, &framerate_denominator);
-  gst_structure_get_fraction (structure, "pixel-aspect-ratio",
-      &par_numerator, &par_denominator);
-
-  src_caps = gst_pad_get_allowed_caps (dec->src);
-  if (G_UNLIKELY (!src_caps))
-    return FALSE;
-
-  new_caps = gst_caps_copy_nth (src_caps, 0);
-  gst_caps_unref (src_caps);
-  structure = gst_caps_get_structure (new_caps, 0);
-  gst_structure_set (structure,
-      "device", G_TYPE_OBJECT, dec->device,
-      "chroma-type", G_TYPE_INT, VDP_CHROMA_TYPE_420,
-      "width", G_TYPE_INT, width,
-      "height", G_TYPE_INT, height,
-      "framerate", GST_TYPE_FRACTION, framerate_numerator,
-      framerate_denominator,
-      "pixel-aspect-ratio", GST_TYPE_FRACTION, par_numerator,
-      par_denominator, NULL);
-
-  gst_pad_fixate_caps (dec->src, new_caps);
-  res = gst_pad_set_caps (dec->src, new_caps);
-
-  gst_caps_unref (new_caps);
-
-  if (G_UNLIKELY (!res))
-    return FALSE;
-
-  dec->width = width;
-  dec->height = height;
-  dec->framerate_numerator = framerate_numerator;
-  dec->framerate_denominator = framerate_denominator;
-
-  if (dec_class->set_caps && !dec_class->set_caps (dec, caps))
-    return FALSE;
-
-  return TRUE;
-}
-
-/* GObject vmethod implementations */
-
-static void
-gst_vdp_decoder_base_init (gpointer klass)
-{
-  GstElementClass *element_class = GST_ELEMENT_CLASS (klass);
-
-  gst_element_class_add_pad_template (element_class,
-      gst_static_pad_template_get (&src_template));
-}
-
-/* initialize the vdpaudecoder's class */
-static void
-gst_vdp_decoder_class_init (GstVdpDecoderClass * klass)
-{
-  GObjectClass *gobject_class;
-  GstElementClass *gstelement_class;
-
-  gobject_class = (GObjectClass *) klass;
-  gstelement_class = (GstElementClass *) klass;
-
-  gobject_class->finalize = gst_vdp_decoder_finalize;
-  gobject_class->set_property = gst_vdp_decoder_set_property;
-  gobject_class->get_property = gst_vdp_decoder_get_property;
-
-  g_object_class_install_property (gobject_class, PROP_DISPLAY,
-      g_param_spec_string ("display", "Display", "X Display name",
-          NULL, G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
-}
-
-static void
-gst_vdp_decoder_init (GstVdpDecoder * dec, GstVdpDecoderClass * klass)
-{
-  dec->display_name = NULL;
-  dec->device = NULL;
-
-  dec->height = 0;
-  dec->width = 0;
-  dec->framerate_numerator = 0;
-  dec->framerate_denominator = 0;
-
-  dec->time = 0;
-
-  dec->src = gst_pad_new_from_static_template (&src_template, "src");
-  gst_element_add_pad (GST_ELEMENT (dec), dec->src);
-
-  dec->sink = gst_pad_new_from_template (gst_element_class_get_pad_template
-      (GST_ELEMENT_CLASS (klass), "sink"), "sink");
-  gst_pad_set_setcaps_function (dec->sink, gst_vdp_decoder_sink_set_caps);
-  gst_element_add_pad (GST_ELEMENT (dec), dec->sink);
-}
-
-static void
-gst_vdp_decoder_finalize (GObject * object)
-{
-  GstVdpDecoder *dec = (GstVdpDecoder *) object;
-
-  g_free (dec->display_name);
-}
-
-static void
-gst_vdp_decoder_set_property (GObject * object, guint prop_id,
-    const GValue * value, GParamSpec * pspec)
-{
-  GstVdpDecoder *dec = GST_VDP_DECODER (object);
-
-  switch (prop_id) {
-    case PROP_DISPLAY:
-      g_free (dec->display_name);
-      dec->display_name = g_value_dup_string (value);
-      break;
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-  }
-}
-
-static void
-gst_vdp_decoder_get_property (GObject * object, guint prop_id,
-    GValue * value, GParamSpec * pspec)
-{
-  GstVdpDecoder *dec = GST_VDP_DECODER (object);
-
-  switch (prop_id) {
-    case PROP_DISPLAY:
-      g_value_set_string (value, dec->display_name);
-      break;
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-  }
-}
diff --git a/sys/vdpau/gstvdpdecoder.h b/sys/vdpau/gstvdpdecoder.h
deleted file mode 100644
index f20db20cc..000000000
--- a/sys/vdpau/gstvdpdecoder.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/* 
- * GStreamer
- * Copyright (C) 2009 Carl-Anton Ingmarsson <ca.ingmarsson@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_VDP_DECODER_H__
-#define __GST_VDP_DECODER_H__
-
-#include <gst/gst.h>
-
-#include "gstvdpdevice.h"
-#include "gstvdpvideobuffer.h"
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_VDP_DECODER            (gst_vdp_decoder_get_type())
-#define GST_VDP_DECODER(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_VDP_DECODER,GstVdpDecoder))
-#define GST_VDP_DECODER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_VDP_DECODER,GstVdpDecoderClass))
-#define GST_VDP_DECODER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GST_TYPE_VDP_DECODER, GstVdpDecoderClass))
-#define GST_IS_VDPAU_DECODER(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_VDP_DECODER))
-#define GST_IS_VDPAU_DECODER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_VDP_DECODER))
-
-typedef struct _GstVdpDecoder      GstVdpDecoder;
-typedef struct _GstVdpDecoderClass GstVdpDecoderClass;
-typedef struct _VdpauFunctions VdpauFunctions;
-
-struct _GstVdpDecoder {
-  GstElement element;
-
-  gchar *display_name;
-  GstVdpDevice *device;
-
-  GstPad *src;
-  GstPad *sink;
-
-  gint width, height;
-  gint framerate_numerator, framerate_denominator;
-  guint32 format;
-
-  GstClockTime time;
-};
-
-struct _GstVdpDecoderClass {
-  GstElementClass parent_class;
-
-  gboolean (*set_caps) (GstVdpDecoder *dec, GstCaps *caps);
-};
-
-GType gst_vdp_decoder_get_type (void);
-
-gboolean gst_vdp_decoder_push_video_buffer (GstVdpDecoder * dec,
-                                              GstVdpVideoBuffer *buffer);
-VdpVideoSurface gst_vdp_decoder_create_video_surface (GstVdpDecoder *dec);
-
-G_END_DECLS
-
-#endif /* __GST_VDP_DECODER_H__ */
diff --git a/sys/vdpau/gstvdpmpegdecoder.c b/sys/vdpau/gstvdpmpegdecoder.c
index fc7aa5a61..a501d5336 100644
--- a/sys/vdpau/gstvdpmpegdecoder.c
+++ b/sys/vdpau/gstvdpmpegdecoder.c
@@ -55,25 +55,31 @@ enum
 
 enum
 {
-  PROP_0
+  PROP_0,
+  PROP_DISPLAY
 };
 
 /* the capabilities of the inputs and outputs.
  *
  * describe the real formats here.
  */
-static GstStaticPadTemplate sink_factory = GST_STATIC_PAD_TEMPLATE ("sink",
+static GstStaticPadTemplate sink_template = GST_STATIC_PAD_TEMPLATE ("sink",
     GST_PAD_SINK,
     GST_PAD_ALWAYS,
     GST_STATIC_CAPS ("video/mpeg, mpegversion = (int) [ 1, 2 ], "
         "systemstream = (boolean) false, parsed = (boolean) true")
     );
+static GstStaticPadTemplate src_template = GST_STATIC_PAD_TEMPLATE ("src",
+    GST_PAD_SRC,
+    GST_PAD_ALWAYS,
+    GST_STATIC_CAPS ("video/x-vdpau-video, " "chroma-type = (int) 0")
+    );
 
 #define DEBUG_INIT(bla) \
 GST_DEBUG_CATEGORY_INIT (gst_vdp_mpeg_decoder_debug, "vdpaumpegdec", 0, "VDPAU powered mpeg decoder");
 
 GST_BOILERPLATE_FULL (GstVdpMpegDecoder, gst_vdp_mpeg_decoder,
-    GstVdpDecoder, GST_TYPE_VDP_DECODER, DEBUG_INIT);
+    GstElement, GST_TYPE_ELEMENT, DEBUG_INIT);
 
 static void gst_vdp_mpeg_decoder_init_info (VdpPictureInfoMPEG1Or2 * vdp_info);
 static void gst_vdp_mpeg_decoder_finalize (GObject * object);
@@ -153,18 +159,54 @@ gst_vdp_mpeg_packetizer_init (GstVdpMpegPacketizer * packetizer,
 }
 
 static gboolean
-gst_vdp_mpeg_decoder_set_caps (GstVdpDecoder * dec, GstCaps * caps)
+gst_vdp_mpeg_decoder_set_caps (GstPad * pad, GstCaps * caps)
 {
-  GstVdpMpegDecoder *mpeg_dec;
+  GstVdpMpegDecoder *mpeg_dec = GST_VDP_MPEG_DECODER (GST_OBJECT_PARENT (pad));
   GstStructure *structure;
+
+  gint width, height;
+  gint fps_n, fps_d;
+  gint par_n, par_d;
+  gboolean interlaced;
+
+  GstCaps *src_caps;
+  gboolean res;
+
   const GValue *value;
   VdpDecoderProfile profile;
   GstVdpDevice *device;
   VdpStatus status;
 
-  mpeg_dec = GST_VDP_MPEG_DECODER (dec);
-
   structure = gst_caps_get_structure (caps, 0);
+
+  /* create src_pad caps */
+  gst_structure_get_int (structure, "width", &width);
+  gst_structure_get_int (structure, "height", &height);
+  gst_structure_get_fraction (structure, "framerate", &fps_d, &fps_d);
+  gst_structure_get_fraction (structure, "pixel-aspect-ratio", &par_n, &par_d);
+  gst_structure_get_boolean (structure, "interlaced", &interlaced);
+
+  src_caps = gst_caps_new_simple ("video/x-vdpau-video",
+      "device", G_TYPE_OBJECT, mpeg_dec->device,
+      "chroma_type", G_TYPE_INT, VDP_CHROMA_TYPE_420,
+      "width", G_TYPE_INT, width,
+      "height", G_TYPE_INT, height,
+      "framerate", GST_TYPE_FRACTION, fps_n, fps_d,
+      "pixel-aspect-ratio", GST_TYPE_FRACTION, par_n, par_d,
+      "interlaced", G_TYPE_BOOLEAN, interlaced, NULL);
+
+  res = gst_pad_set_caps (mpeg_dec->src, src_caps);
+  gst_caps_unref (src_caps);
+  if (!res)
+    return FALSE;
+
+  mpeg_dec->width = width;
+  mpeg_dec->height = height;
+  mpeg_dec->fps_n = fps_n;
+  mpeg_dec->fps_d = fps_d;
+  mpeg_dec->interlaced = interlaced;
+
+  /* parse caps to setup decoder */
   gst_structure_get_int (structure, "mpegversion", &mpeg_dec->version);
   if (mpeg_dec->version == 1)
     profile = VDP_DECODER_PROFILE_MPEG1;
@@ -208,15 +250,15 @@ gst_vdp_mpeg_decoder_set_caps (GstVdpDecoder * dec, GstCaps * caps)
     }
   }
 
-  device = dec->device;
+  device = mpeg_dec->device;
 
   if (mpeg_dec->decoder != VDP_INVALID_HANDLE) {
     device->vdp_decoder_destroy (mpeg_dec->decoder);
     mpeg_dec->decoder = VDP_INVALID_HANDLE;
   }
 
-  status = device->vdp_decoder_create (device->device, profile, dec->width,
-      dec->height, 2, &mpeg_dec->decoder);
+  status = device->vdp_decoder_create (device->device, profile, mpeg_dec->width,
+      mpeg_dec->height, 2, &mpeg_dec->decoder);
   if (status != VDP_STATUS_OK) {
     GST_ELEMENT_ERROR (mpeg_dec, RESOURCE, READ,
         ("Could not create vdpau decoder"),
@@ -227,11 +269,29 @@ gst_vdp_mpeg_decoder_set_caps (GstVdpDecoder * dec, GstCaps * caps)
   return TRUE;
 }
 
+GstFlowReturn
+gst_vdp_mpeg_decoder_push_video_buffer (GstVdpMpegDecoder * mpeg_dec,
+    GstVdpVideoBuffer * buffer)
+{
+  if (GST_BUFFER_TIMESTAMP (buffer) == GST_CLOCK_TIME_NONE) {
+    GST_BUFFER_TIMESTAMP (buffer) = mpeg_dec->time +
+        gst_util_uint64_scale_int (GST_SECOND,
+        mpeg_dec->fps_d, mpeg_dec->fps_n);
+  }
+  gst_buffer_set_caps (GST_BUFFER (buffer), GST_PAD_CAPS (mpeg_dec->src));
+
+  GST_DEBUG_OBJECT (mpeg_dec,
+      "Pushing buffer with timestamp: %" GST_TIME_FORMAT,
+      GST_TIME_ARGS (GST_BUFFER_TIMESTAMP (buffer)));
+  mpeg_dec->time = GST_BUFFER_TIMESTAMP (buffer);
+
+  return gst_pad_push (mpeg_dec->src, GST_BUFFER (buffer));
+}
+
 static GstFlowReturn
 gst_vdp_mpeg_decoder_decode (GstVdpMpegDecoder * mpeg_dec,
     GstClockTime timestamp)
 {
-  GstVdpDecoder *dec;
   VdpPictureInfoMPEG1Or2 *info;
   GstBuffer *buffer;
   GstVdpVideoBuffer *outbuf;
@@ -240,7 +300,6 @@ gst_vdp_mpeg_decoder_decode (GstVdpMpegDecoder * mpeg_dec,
   VdpBitstreamBuffer vbit[1];
   VdpStatus status;
 
-  dec = GST_VDP_DECODER (mpeg_dec);
   info = &mpeg_dec->vdp_info;
 
   buffer = gst_adapter_take_buffer (mpeg_dec->adapter,
@@ -249,7 +308,7 @@ gst_vdp_mpeg_decoder_decode (GstVdpMpegDecoder * mpeg_dec,
   if (info->picture_coding_type != B_FRAME) {
     if (info->backward_reference != VDP_INVALID_HANDLE) {
       gst_buffer_ref (mpeg_dec->b_buffer);
-      gst_vdp_decoder_push_video_buffer (dec,
+      gst_vdp_mpeg_decoder_push_video_buffer (mpeg_dec,
           GST_VDP_VIDEO_BUFFER (mpeg_dec->b_buffer));
     }
 
@@ -264,8 +323,8 @@ gst_vdp_mpeg_decoder_decode (GstVdpMpegDecoder * mpeg_dec,
     info->backward_reference = VDP_INVALID_HANDLE;
   }
 
-  outbuf = gst_vdp_video_buffer_new (dec->device, VDP_CHROMA_TYPE_420,
-      dec->width, dec->height);
+  outbuf = gst_vdp_video_buffer_new (mpeg_dec->device, VDP_CHROMA_TYPE_420,
+      mpeg_dec->width, mpeg_dec->height);
   GST_BUFFER_TIMESTAMP (outbuf) = timestamp;
 
   if (info->forward_reference != VDP_INVALID_HANDLE &&
@@ -279,7 +338,7 @@ gst_vdp_mpeg_decoder_decode (GstVdpMpegDecoder * mpeg_dec,
 
   surface = outbuf->surface;
 
-  device = dec->device;
+  device = mpeg_dec->device;
 
   vbit[0].struct_version = VDP_BITSTREAM_BUFFER_VERSION;
   vbit[0].bitstream = GST_BUFFER_DATA (buffer);
@@ -302,7 +361,8 @@ gst_vdp_mpeg_decoder_decode (GstVdpMpegDecoder * mpeg_dec,
   }
 
   if (info->picture_coding_type == B_FRAME) {
-    gst_vdp_decoder_push_video_buffer (dec, GST_VDP_VIDEO_BUFFER (outbuf));
+    gst_vdp_mpeg_decoder_push_video_buffer (mpeg_dec,
+        GST_VDP_VIDEO_BUFFER (outbuf));
   } else {
     info->backward_reference = surface;
     mpeg_dec->b_buffer = GST_BUFFER (outbuf);
@@ -315,11 +375,9 @@ static gboolean
 gst_vdp_mpeg_decoder_parse_picture_coding (GstVdpMpegDecoder * mpeg_dec,
     GstBuffer * buffer)
 {
-  GstVdpDecoder *dec;
   MPEGPictureExt pic_ext;
   VdpPictureInfoMPEG1Or2 *info;
 
-  dec = GST_VDP_DECODER (mpeg_dec);
   info = &mpeg_dec->vdp_info;
 
   if (!mpeg_util_parse_picture_coding_extension (&pic_ext, buffer))
@@ -343,11 +401,8 @@ static gboolean
 gst_vdp_mpeg_decoder_parse_sequence (GstVdpMpegDecoder * mpeg_dec,
     GstBuffer * buffer)
 {
-  GstVdpDecoder *dec;
   MPEGSeqHdr hdr;
 
-  dec = GST_VDP_DECODER (mpeg_dec);
-
   if (!mpeg_util_parse_sequence_hdr (&hdr, buffer))
     return FALSE;
 
@@ -364,11 +419,8 @@ static gboolean
 gst_vdp_mpeg_decoder_parse_picture (GstVdpMpegDecoder * mpeg_dec,
     GstBuffer * buffer)
 {
-  GstVdpDecoder *dec;
   MPEGPictureHdr pic_hdr;
 
-  dec = GST_VDP_DECODER (mpeg_dec);
-
   if (!mpeg_util_parse_picture_hdr (&pic_hdr, buffer))
     return FALSE;
 
@@ -532,20 +584,16 @@ gst_vdp_mpeg_decoder_chain (GstPad * pad, GstBuffer * buffer)
 static gboolean
 gst_vdp_mpeg_decoder_sink_event (GstPad * pad, GstEvent * event)
 {
-  GstVdpMpegDecoder *mpeg_dec;
-  GstVdpDecoder *dec;
+  GstVdpMpegDecoder *mpeg_dec = GST_VDP_MPEG_DECODER (GST_OBJECT_PARENT (pad));
   gboolean res;
 
-  mpeg_dec = GST_VDP_MPEG_DECODER (GST_OBJECT_PARENT (pad));
-  dec = GST_VDP_DECODER (mpeg_dec);
-
   switch (GST_EVENT_TYPE (event)) {
     case GST_EVENT_FLUSH_STOP:
     {
       GST_DEBUG_OBJECT (mpeg_dec, "flush stop");
 
       gst_vdp_mpeg_decoder_reset (mpeg_dec);
-      res = gst_pad_push_event (dec->src, event);
+      res = gst_pad_push_event (mpeg_dec->src, event);
 
       break;
     }
@@ -561,15 +609,13 @@ gst_vdp_mpeg_decoder_change_state (GstElement * element,
     GstStateChange transition)
 {
   GstVdpMpegDecoder *mpeg_dec;
-  GstVdpDecoder *dec;
   GstStateChangeReturn ret;
 
   mpeg_dec = GST_VDP_MPEG_DECODER (element);
-  dec = GST_VDP_DECODER (mpeg_dec);
 
   switch (transition) {
     case GST_STATE_CHANGE_READY_TO_PAUSED:
-      dec->device = gst_vdp_get_device (dec->display_name);
+      mpeg_dec->device = gst_vdp_get_device (mpeg_dec->display_name);
       break;
     default:
       break;
@@ -581,11 +627,11 @@ gst_vdp_mpeg_decoder_change_state (GstElement * element,
     case GST_STATE_CHANGE_PAUSED_TO_READY:
       gst_vdp_mpeg_decoder_reset (mpeg_dec);
 
-      dec->device->vdp_decoder_destroy (mpeg_dec->decoder);
+      mpeg_dec->device->vdp_decoder_destroy (mpeg_dec->decoder);
       mpeg_dec->decoder = VDP_INVALID_HANDLE;
 
-      g_object_unref (dec->device);
-      dec->device = NULL;
+      g_object_unref (mpeg_dec->device);
+      mpeg_dec->device = NULL;
       break;
     default:
       break;
@@ -608,7 +654,9 @@ gst_vdp_mpeg_decoder_base_init (gpointer gclass)
       "Carl-Anton Ingmarsson <ca.ingmarsson@gmail.com>");
 
   gst_element_class_add_pad_template (element_class,
-      gst_static_pad_template_get (&sink_factory));
+      gst_static_pad_template_get (&sink_template));
+  gst_element_class_add_pad_template (element_class,
+      gst_static_pad_template_get (&src_template));
 }
 
 /* initialize the vdpaumpegdecoder's class */
@@ -617,19 +665,19 @@ gst_vdp_mpeg_decoder_class_init (GstVdpMpegDecoderClass * klass)
 {
   GObjectClass *gobject_class;
   GstElementClass *gstelement_class;
-  GstVdpDecoderClass *vdpaudec_class;
 
   gobject_class = (GObjectClass *) klass;
   gstelement_class = (GstElementClass *) klass;
-  vdpaudec_class = (GstVdpDecoderClass *) klass;
 
   gobject_class->finalize = gst_vdp_mpeg_decoder_finalize;
   gobject_class->set_property = gst_vdp_mpeg_decoder_set_property;
   gobject_class->get_property = gst_vdp_mpeg_decoder_get_property;
 
-  vdpaudec_class->set_caps = gst_vdp_mpeg_decoder_set_caps;
-
   gstelement_class->change_state = gst_vdp_mpeg_decoder_change_state;
+
+  g_object_class_install_property (gobject_class, PROP_DISPLAY,
+      g_param_spec_string ("display", "Display", "X Display name",
+          NULL, G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
 }
 
 static void
@@ -653,19 +701,25 @@ static void
 gst_vdp_mpeg_decoder_init (GstVdpMpegDecoder * mpeg_dec,
     GstVdpMpegDecoderClass * gclass)
 {
-  GstVdpDecoder *dec;
+  mpeg_dec->src = gst_pad_new_from_static_template (&src_template, "src");
+  gst_element_add_pad (GST_ELEMENT (mpeg_dec), mpeg_dec->src);
 
-  dec = GST_VDP_DECODER (mpeg_dec);
+  mpeg_dec->sink = gst_pad_new_from_static_template (&sink_template, "sink");
+  gst_pad_set_setcaps_function (mpeg_dec->sink, gst_vdp_mpeg_decoder_set_caps);
+  gst_pad_set_chain_function (mpeg_dec->sink, gst_vdp_mpeg_decoder_chain);
+  gst_pad_set_event_function (mpeg_dec->sink, gst_vdp_mpeg_decoder_sink_event);
+  gst_element_add_pad (GST_ELEMENT (mpeg_dec), mpeg_dec->sink);
+
+  mpeg_dec->display_name = NULL;
+  mpeg_dec->device = NULL;
 
   mpeg_dec->decoder = VDP_INVALID_HANDLE;
   gst_vdp_mpeg_decoder_init_info (&mpeg_dec->vdp_info);
 
   mpeg_dec->broken_gop = FALSE;
+  mpeg_dec->time = 0;
 
   mpeg_dec->adapter = gst_adapter_new ();
-
-  gst_pad_set_chain_function (dec->sink, gst_vdp_mpeg_decoder_chain);
-  gst_pad_set_event_function (dec->sink, gst_vdp_mpeg_decoder_sink_event);
 }
 
 static void
@@ -680,7 +734,13 @@ static void
 gst_vdp_mpeg_decoder_set_property (GObject * object, guint prop_id,
     const GValue * value, GParamSpec * pspec)
 {
+  GstVdpMpegDecoder *mpeg_dec = GST_VDP_MPEG_DECODER (object);
+
   switch (prop_id) {
+    case PROP_DISPLAY:
+      g_free (mpeg_dec->display_name);
+      mpeg_dec->display_name = g_value_dup_string (value);
+      break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
@@ -691,7 +751,12 @@ static void
 gst_vdp_mpeg_decoder_get_property (GObject * object, guint prop_id,
     GValue * value, GParamSpec * pspec)
 {
+  GstVdpMpegDecoder *mpeg_dec = GST_VDP_MPEG_DECODER (object);
+
   switch (prop_id) {
+    case PROP_DISPLAY:
+      g_value_set_string (value, mpeg_dec->display_name);
+      break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
diff --git a/sys/vdpau/gstvdpmpegdecoder.h b/sys/vdpau/gstvdpmpegdecoder.h
index 06bed84be..a48e0c97a 100644
--- a/sys/vdpau/gstvdpmpegdecoder.h
+++ b/sys/vdpau/gstvdpmpegdecoder.h
@@ -24,7 +24,8 @@
 #include <gst/gst.h>
 #include <gst/base/gstadapter.h>
 
-#include "gstvdpdecoder.h"
+#include "gstvdpdevice.h"
+#include "gstvdpvideobuffer.h"
 
 G_BEGIN_DECLS
 
@@ -39,8 +40,18 @@ typedef struct _GstVdpMpegDecoderClass GstVdpMpegDecoderClass;
 
 struct _GstVdpMpegDecoder
 {
-  GstVdpDecoder dec;
+  GstElement element;
 
+  gchar *display_name;
+  GstVdpDevice *device;
+
+  GstPad *src;
+  GstPad *sink;
+  
+  gint width, height;
+  gint fps_n, fps_d;
+  gboolean interlaced;
+  
   gint version;
   
   VdpDecoder decoder;
@@ -49,13 +60,14 @@ struct _GstVdpMpegDecoder
   GstBuffer *b_buffer;
   
   gboolean broken_gop;
+  GstClockTime time;
   
   GstAdapter *adapter;
 };
 
 struct _GstVdpMpegDecoderClass 
 {
-  GstVdpDecoderClass parent_class;
+  GstElementClass element_class;  
 };
 
 GType gst_vdp_mpeg_decoder_get_type (void);