summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl-Anton Ingmarsson <ca.ingmarsson@gmail.com>2009-10-08 20:23:33 +0200
committerCarl-Anton Ingmarsson <ca.ingmarsson@gmail.com>2009-11-22 22:38:08 +0100
commit25014f8e7c0285e7808e8e7fc1cae590f065b946 (patch)
tree7482c0b2f476e126f04048afb42f93003e5e9599
parent7753f80cf57998d868e27e9bd9fbed305bf0276b (diff)
vdpau: remove now unneeded vdpauvideoyuv and vdpauyuvvideo elements
-rw-r--r--sys/vdpau/Makefile.am4
-rw-r--r--sys/vdpau/gstvdp.c6
-rw-r--r--sys/vdpau/gstvdpvideoyuv.c494
-rw-r--r--sys/vdpau/gstvdpvideoyuv.h58
-rw-r--r--sys/vdpau/gstvdpyuvvideo.c339
-rw-r--r--sys/vdpau/gstvdpyuvvideo.h57
6 files changed, 0 insertions, 958 deletions
diff --git a/sys/vdpau/Makefile.am b/sys/vdpau/Makefile.am
index b8e415120..fbc841375 100644
--- a/sys/vdpau/Makefile.am
+++ b/sys/vdpau/Makefile.am
@@ -3,9 +3,7 @@ plugin_LTLIBRARIES = libgstvdpau.la
libgstvdpau_la_SOURCES = \
gstvdpmpegdec.c \
mpegutil.c \
- gstvdpvideoyuv.c \
gstvdp.c \
- gstvdpyuvvideo.c \
gstvdputils.c \
gstvdpvideopostprocess.c \
gstvdpsink.c
@@ -20,8 +18,6 @@ libgstvdpau_la_LIBTOOLFLAGS = --tag=disable-static
noinst_HEADERS = \
gstvdpmpegdec.h \
mpegutil.h \
- gstvdpvideoyuv.h \
- gstvdpyuvvideo.h \
gstvdputils.h \
gstvdpvideopostprocess.h \
gstvdpsink.h
diff --git a/sys/vdpau/gstvdp.c b/sys/vdpau/gstvdp.c
index 15931006d..5c127935b 100644
--- a/sys/vdpau/gstvdp.c
+++ b/sys/vdpau/gstvdp.c
@@ -6,8 +6,6 @@
#include <gst/gst.h>
#include "gstvdpmpegdec.h"
-#include "gstvdpvideoyuv.h"
-#include "gstvdpyuvvideo.h"
#include "gstvdpvideopostprocess.h"
#include "gstvdpsink.h"
@@ -18,10 +16,6 @@ vdpau_init (GstPlugin * vdpau_plugin)
* least the generic/states test when there's no device available */
gst_element_register (vdpau_plugin, "vdpaumpegdec",
GST_RANK_NONE, GST_TYPE_VDP_MPEG_DEC);
- gst_element_register (vdpau_plugin, "vdpauvideoyuv",
- GST_RANK_NONE, GST_TYPE_VDP_VIDEO_YUV);
- gst_element_register (vdpau_plugin, "vdpauyuvvideo",
- GST_RANK_NONE, GST_TYPE_VDP_YUV_VIDEO);
gst_element_register (vdpau_plugin, "vdpauvideopostprocess",
GST_RANK_NONE, GST_TYPE_VDP_VIDEO_POST_PROCESS);
gst_element_register (vdpau_plugin, "vdpausink",
diff --git a/sys/vdpau/gstvdpvideoyuv.c b/sys/vdpau/gstvdpvideoyuv.c
deleted file mode 100644
index c01d55935..000000000
--- a/sys/vdpau/gstvdpvideoyuv.c
+++ /dev/null
@@ -1,494 +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 <gst/vdpau/gstvdpvideobuffer.h>
-
-#include "gstvdputils.h"
-#include "gstvdpvideoyuv.h"
-
-GST_DEBUG_CATEGORY_STATIC (gst_vdp_video_yuv_debug);
-#define GST_CAT_DEFAULT gst_vdp_video_yuv_debug
-
-/* Filter signals and args */
-enum
-{
- /* FILL ME */
- LAST_SIGNAL
-};
-
-enum
-{
- PROP_0,
- PROP_DISPLAY
-};
-
-static GstStaticPadTemplate sink_template =
-GST_STATIC_PAD_TEMPLATE (GST_BASE_TRANSFORM_SINK_NAME,
- GST_PAD_SINK,
- GST_PAD_ALWAYS,
- GST_STATIC_CAPS (GST_VDP_VIDEO_CAPS));
-
-static GstStaticPadTemplate src_template =
- GST_STATIC_PAD_TEMPLATE (GST_BASE_TRANSFORM_SRC_NAME,
- GST_PAD_SRC,
- GST_PAD_ALWAYS,
- GST_STATIC_CAPS (GST_VIDEO_CAPS_YUV ("I420") ";"
- GST_VIDEO_CAPS_YUV ("YV12") ";" GST_VIDEO_CAPS_YUV ("NV12") ";"
- GST_VIDEO_CAPS_YUV ("UYVY") ";" GST_VIDEO_CAPS_YUV ("YUY2")));
-
-#define DEBUG_INIT(bla) \
- GST_DEBUG_CATEGORY_INIT (gst_vdp_video_yuv_debug, "vdpauvideoyuv", 0, "VDPAU VdpSurface to YUV");
-
-GST_BOILERPLATE_FULL (GstVdpVideoYUV, gst_vdp_video_yuv, GstBaseTransform,
- GST_TYPE_BASE_TRANSFORM, DEBUG_INIT);
-
-GstFlowReturn
-gst_vdp_video_yuv_transform (GstBaseTransform * trans, GstBuffer * inbuf,
- GstBuffer * outbuf)
-{
- GstVdpVideoYUV *video_yuv = GST_VDP_VIDEO_YUV (trans);
- GstVdpDevice *device;
- VdpVideoSurface surface;
-
- device = GST_VDP_VIDEO_BUFFER (inbuf)->device;
- surface = GST_VDP_VIDEO_BUFFER (inbuf)->surface;
-
- switch (video_yuv->format) {
- case GST_MAKE_FOURCC ('Y', 'V', '1', '2'):
- {
- VdpStatus status;
- guint8 *data[3];
- guint32 stride[3];
-
- data[0] = GST_BUFFER_DATA (outbuf) +
- gst_video_format_get_component_offset (GST_VIDEO_FORMAT_YV12,
- 0, video_yuv->width, video_yuv->height);
- data[1] = GST_BUFFER_DATA (outbuf) +
- gst_video_format_get_component_offset (GST_VIDEO_FORMAT_YV12,
- 2, video_yuv->width, video_yuv->height);
- data[2] = GST_BUFFER_DATA (outbuf) +
- gst_video_format_get_component_offset (GST_VIDEO_FORMAT_YV12,
- 1, video_yuv->width, video_yuv->height);
-
- stride[0] = gst_video_format_get_row_stride (GST_VIDEO_FORMAT_YV12,
- 0, video_yuv->width);
- stride[1] = gst_video_format_get_row_stride (GST_VIDEO_FORMAT_YV12,
- 2, video_yuv->width);
- stride[2] = gst_video_format_get_row_stride (GST_VIDEO_FORMAT_YV12,
- 1, video_yuv->width);
-
- GST_LOG_OBJECT (video_yuv, "Entering vdp_video_surface_get_bits_ycbcr");
- status =
- device->vdp_video_surface_get_bits_ycbcr (surface,
- VDP_YCBCR_FORMAT_YV12, (void *) data, stride);
- GST_LOG_OBJECT (video_yuv,
- "Got status %d from vdp_video_surface_get_bits_ycbcr", status);
- if (G_UNLIKELY (status != VDP_STATUS_OK)) {
- GST_ELEMENT_ERROR (video_yuv, RESOURCE, READ,
- ("Couldn't get data from vdpau"),
- ("Error returned from vdpau was: %s",
- device->vdp_get_error_string (status)));
- return GST_FLOW_ERROR;
- }
- break;
- }
- case GST_MAKE_FOURCC ('I', '4', '2', '0'):
- {
- VdpStatus status;
- guint8 *data[3];
- guint32 stride[3];
-
- data[0] = GST_BUFFER_DATA (outbuf) +
- gst_video_format_get_component_offset (GST_VIDEO_FORMAT_I420,
- 0, video_yuv->width, video_yuv->height);
- data[1] = GST_BUFFER_DATA (outbuf) +
- gst_video_format_get_component_offset (GST_VIDEO_FORMAT_I420,
- 2, video_yuv->width, video_yuv->height);
- data[2] = GST_BUFFER_DATA (outbuf) +
- gst_video_format_get_component_offset (GST_VIDEO_FORMAT_I420,
- 1, video_yuv->width, video_yuv->height);
-
- stride[0] = gst_video_format_get_row_stride (GST_VIDEO_FORMAT_I420,
- 0, video_yuv->width);
- stride[1] = gst_video_format_get_row_stride (GST_VIDEO_FORMAT_I420,
- 2, video_yuv->width);
- stride[2] = gst_video_format_get_row_stride (GST_VIDEO_FORMAT_I420,
- 1, video_yuv->width);
-
- GST_LOG_OBJECT (video_yuv, "Entering vdp_video_surface_get_bits_ycbcr");
- status =
- device->vdp_video_surface_get_bits_ycbcr (surface,
- VDP_YCBCR_FORMAT_YV12, (void *) data, stride);
- GST_LOG_OBJECT (video_yuv,
- "Got status %d from vdp_video_surface_get_bits_ycbcr", status);
- if (G_UNLIKELY (status != VDP_STATUS_OK)) {
- GST_ELEMENT_ERROR (video_yuv, RESOURCE, READ,
- ("Couldn't get data from vdpau"),
- ("Error returned from vdpau was: %s",
- device->vdp_get_error_string (status)));
- return GST_FLOW_ERROR;
- }
- break;
- }
- case GST_MAKE_FOURCC ('N', 'V', '1', '2'):
- {
- VdpStatus status;
- guint8 *data[2];
- guint32 stride[2];
-
- data[0] = GST_BUFFER_DATA (outbuf);
- data[1] = GST_BUFFER_DATA (outbuf) + video_yuv->width * video_yuv->height;
-
- stride[0] = video_yuv->width;
- stride[1] = video_yuv->width;
-
- GST_LOG_OBJECT (video_yuv, "Entering vdp_video_surface_get_bits_ycbcr");
- status =
- device->vdp_video_surface_get_bits_ycbcr (surface,
- VDP_YCBCR_FORMAT_NV12, (void *) data, stride);
- GST_LOG_OBJECT (video_yuv,
- "Got status %d from vdp_video_surface_get_bits_ycbcr", status);
- if (G_UNLIKELY (status != VDP_STATUS_OK)) {
- GST_ELEMENT_ERROR (video_yuv, RESOURCE, READ,
- ("Couldn't get data from vdpau"),
- ("Error returned from vdpau was: %s",
- device->vdp_get_error_string (status)));
- return GST_FLOW_ERROR;
- }
- break;
- }
- case GST_MAKE_FOURCC ('U', 'Y', 'V', 'Y'):
- {
- VdpStatus status;
- guint8 *data[1];
- guint32 stride[1];
-
- data[0] = GST_BUFFER_DATA (outbuf);
-
- stride[0] = gst_video_format_get_row_stride (GST_VIDEO_FORMAT_UYVY,
- 0, video_yuv->width);
-
- GST_LOG_OBJECT (video_yuv, "Entering vdp_video_surface_get_bits_ycbcr");
- status =
- device->vdp_video_surface_get_bits_ycbcr (surface,
- VDP_YCBCR_FORMAT_UYVY, (void *) data, stride);
- GST_LOG_OBJECT (video_yuv,
- "Got status %d from vdp_video_surface_get_bits_ycbcr", status);
- if (G_UNLIKELY (status != VDP_STATUS_OK)) {
- GST_ELEMENT_ERROR (video_yuv, RESOURCE, READ,
- ("Couldn't get data from vdpau"),
- ("Error returned from vdpau was: %s",
- device->vdp_get_error_string (status)));
- return GST_FLOW_ERROR;
- }
- break;
- }
- case GST_MAKE_FOURCC ('Y', 'U', 'Y', '2'):
- {
- VdpStatus status;
- guint8 *data[1];
- guint32 stride[1];
-
- data[0] = GST_BUFFER_DATA (outbuf);
-
- stride[0] = gst_video_format_get_row_stride (GST_VIDEO_FORMAT_YUY2,
- 0, video_yuv->width);
-
- GST_LOG_OBJECT (video_yuv, "Entering vdp_video_surface_get_bits_ycbcr");
- status =
- device->vdp_video_surface_get_bits_ycbcr (surface,
- VDP_YCBCR_FORMAT_YUYV, (void *) data, stride);
- GST_LOG_OBJECT (video_yuv,
- "Got status %d from vdp_video_surface_get_bits_ycbcr", status);
- if (G_UNLIKELY (status != VDP_STATUS_OK)) {
- GST_ELEMENT_ERROR (video_yuv, RESOURCE, READ,
- ("Couldn't get data from vdpau"),
- ("Error returned from vdpau was: %s",
- device->vdp_get_error_string (status)));
- return GST_FLOW_ERROR;
- }
- break;
- }
- default:
- break;
- }
-
- gst_buffer_copy_metadata (outbuf, inbuf,
- GST_BUFFER_COPY_FLAGS | GST_BUFFER_COPY_TIMESTAMPS);
-
- GST_LOG_OBJECT (video_yuv, "Pushing buffer with ts %" GST_TIME_FORMAT,
- GST_TIME_ARGS (GST_BUFFER_TIMESTAMP (outbuf)));
-
- return GST_FLOW_OK;
-}
-
-gboolean
-gst_vdp_video_transform_size (GstBaseTransform * trans,
- GstPadDirection direction, GstCaps * caps, guint size,
- GstCaps * othercaps, guint * othersize)
-{
- GstVdpVideoYUV *video_yuv = GST_VDP_VIDEO_YUV (trans);
-
- if (direction == GST_PAD_SINK) {
- switch (video_yuv->format) {
- case GST_MAKE_FOURCC ('Y', 'V', '1', '2'):
- {
- *othersize =
- gst_video_format_get_size (GST_VIDEO_FORMAT_YV12, video_yuv->width,
- video_yuv->height);
- break;
- }
- case GST_MAKE_FOURCC ('I', '4', '2', '0'):
- {
- *othersize =
- gst_video_format_get_size (GST_VIDEO_FORMAT_YV12, video_yuv->width,
- video_yuv->height);
- break;
- }
- case GST_MAKE_FOURCC ('N', 'V', '1', '2'):
- {
- *othersize =
- video_yuv->width * video_yuv->height +
- video_yuv->width * video_yuv->height / 2;
- break;
- }
- case GST_MAKE_FOURCC ('U', 'Y', 'V', 'Y'):
- {
- *othersize =
- gst_video_format_get_size (GST_VIDEO_FORMAT_UYVY, video_yuv->width,
- video_yuv->height);
- break;
- }
- case GST_MAKE_FOURCC ('Y', 'U', 'Y', '2'):
- {
- *othersize =
- gst_video_format_get_size (GST_VIDEO_FORMAT_YUY2, video_yuv->width,
- video_yuv->height);
- break;
- }
- default:
- return FALSE;
- }
- } else
- *othersize = size;
-
- return TRUE;
-}
-
-gboolean
-gst_vdp_video_yuv_set_caps (GstBaseTransform * trans, GstCaps * incaps,
- GstCaps * outcaps)
-{
- GstVdpVideoYUV *video_yuv = GST_VDP_VIDEO_YUV (trans);
- GstStructure *structure;
-
- structure = gst_caps_get_structure (incaps, 0);
-
- if (!gst_structure_get_int (structure, "width", &video_yuv->width))
- return FALSE;
- if (!gst_structure_get_int (structure, "height", &video_yuv->height))
- return FALSE;
-
- structure = gst_caps_get_structure (outcaps, 0);
- if (!gst_structure_get_fourcc (structure, "format", &video_yuv->format))
- return FALSE;
-
- return TRUE;
-}
-
-GstCaps *
-gst_vdp_video_yuv_transform_caps (GstBaseTransform * trans,
- GstPadDirection direction, GstCaps * caps)
-{
- GstVdpVideoYUV *video_yuv = GST_VDP_VIDEO_YUV (trans);
- GstCaps *result = NULL;
-
- if (direction == GST_PAD_SINK)
- result = gst_vdp_video_to_yuv_caps (caps, video_yuv->device);
-
- else if (direction == GST_PAD_SRC)
- result = gst_vdp_yuv_to_video_caps (caps, video_yuv->device);
-
- GST_LOG ("transformed %" GST_PTR_FORMAT " to %" GST_PTR_FORMAT, caps, result);
-
- return result;
-}
-
-static gboolean
-gst_vdp_video_yuv_start (GstBaseTransform * trans)
-{
- GstVdpVideoYUV *video_yuv = GST_VDP_VIDEO_YUV (trans);
-
- video_yuv->device = gst_vdp_get_device (video_yuv->display);
- if (!video_yuv->device)
- return FALSE;
-
- return TRUE;
-}
-
-static gboolean
-gst_vdp_video_yuv_stop (GstBaseTransform * trans)
-{
- GstVdpVideoYUV *video_yuv = GST_VDP_VIDEO_YUV (trans);
-
- g_object_unref (video_yuv->device);
-
- return TRUE;
-}
-
-static GstFlowReturn
-gst_vdp_video_yuv_buffer_alloc (GstPad * pad, guint64 offset,
- guint size, GstCaps * caps, GstBuffer ** buf)
-{
- GstVdpVideoYUV *video_yuv = GST_VDP_VIDEO_YUV (gst_pad_get_parent (pad));
- GstFlowReturn ret = GST_FLOW_ERROR;
- GstStructure *structure;
- gint width, height;
- gint chroma_type;
-
- structure = gst_caps_get_structure (caps, 0);
- if (!structure)
- goto error;
-
- if (!gst_structure_get_int (structure, "width", &width))
- goto error;
- if (!gst_structure_get_int (structure, "height", &height))
- goto error;
-
- if (!gst_structure_get_int (structure, "chroma-type", &chroma_type))
- goto error;
-
- *buf = GST_BUFFER (gst_vdp_video_buffer_new (video_yuv->device,
- chroma_type, width, height));
-
- if (*buf == NULL)
- goto error;
-
- GST_BUFFER_SIZE (*buf) = size;
- GST_BUFFER_OFFSET (*buf) = offset;
-
- gst_buffer_set_caps (*buf, caps);
-
- ret = GST_FLOW_OK;
-
-error:
- gst_object_unref (video_yuv);
- return ret;
-}
-
-/* GObject vmethod implementations */
-
-static void
-gst_vdp_video_yuv_base_init (gpointer klass)
-{
- GstElementClass *element_class = GST_ELEMENT_CLASS (klass);
-
- gst_element_class_set_details_simple (element_class,
- "VdpauVideoYUV",
- "Filter/Converter/Decoder/Video",
- "VDPAU video surface to YUV",
- "Carl-Anton Ingmarsson <ca.ingmarsson@gmail.com>");
-
- 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));
-}
-
-static void
-gst_vdp_video_yuv_finalize (GObject * object)
-{
- GstVdpVideoYUV *video_yuv = (GstVdpVideoYUV *) object;
-
- g_free (video_yuv->display);
-}
-
-static void
-gst_vdp_video_yuv_set_property (GObject * object, guint prop_id,
- const GValue * value, GParamSpec * pspec)
-{
- GstVdpVideoYUV *video_yuv = GST_VDP_VIDEO_YUV (object);
-
- switch (prop_id) {
- case PROP_DISPLAY:
- g_free (video_yuv->display);
- video_yuv->display = g_value_dup_string (value);
- break;
- default:
- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
- break;
- }
-}
-
-static void
-gst_vdp_video_yuv_get_property (GObject * object, guint prop_id,
- GValue * value, GParamSpec * pspec)
-{
- GstVdpVideoYUV *video_yuv = GST_VDP_VIDEO_YUV (object);
-
- switch (prop_id) {
- case PROP_DISPLAY:
- g_value_set_string (value, video_yuv->display);
- break;
- default:
- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
- break;
- }
-}
-
-static void
-gst_vdp_video_yuv_class_init (GstVdpVideoYUVClass * klass)
-{
- GObjectClass *gobject_class;
- GstBaseTransformClass *trans_class;
-
- gobject_class = (GObjectClass *) klass;
- trans_class = (GstBaseTransformClass *) klass;
-
- gobject_class->finalize = gst_vdp_video_yuv_finalize;
- gobject_class->set_property = gst_vdp_video_yuv_set_property;
- gobject_class->get_property = gst_vdp_video_yuv_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));
-
- trans_class->start = gst_vdp_video_yuv_start;
- trans_class->stop = gst_vdp_video_yuv_stop;
- trans_class->transform_caps = gst_vdp_video_yuv_transform_caps;
- trans_class->transform_size = gst_vdp_video_transform_size;
- trans_class->transform = gst_vdp_video_yuv_transform;
- trans_class->set_caps = gst_vdp_video_yuv_set_caps;
-}
-
-static void
-gst_vdp_video_yuv_init (GstVdpVideoYUV * video_yuv, GstVdpVideoYUVClass * klass)
-{
- video_yuv->display = NULL;
-
- gst_pad_set_bufferalloc_function (GST_BASE_TRANSFORM_SINK_PAD (video_yuv),
- gst_vdp_video_yuv_buffer_alloc);
-}
diff --git a/sys/vdpau/gstvdpvideoyuv.h b/sys/vdpau/gstvdpvideoyuv.h
deleted file mode 100644
index 43f505de9..000000000
--- a/sys/vdpau/gstvdpvideoyuv.h
+++ /dev/null
@@ -1,58 +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_VIDEO_YUV_H__
-#define __GST_VDP_VIDEO_YUV_H__
-
-#include <gst/gst.h>
-#include <gst/base/gstbasetransform.h>
-#include <gst/vdpau/gstvdpdevice.h>
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_VDP_VIDEO_YUV (gst_vdp_video_yuv_get_type())
-#define GST_VDP_VIDEO_YUV(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_VDP_VIDEO_YUV,GstVdpVideoYUV))
-#define GST_VDP_VIDEO_YUV_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_VDP_VIDEO_YUV,GstVdpVideoYUVClass))
-#define GST_VDP_VIDEO_YUV_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GST_TYPE_VDP_VIDEO_YUV, GstVdpVideoYUVClass))
-#define GST_IS_VDP_VIDEO_YUV(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_VDP_VIDEO_YUV))
-#define GST_IS_VDP_VIDEO_YUV_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_VDP_VIDEO_YUV))
-
-typedef struct _GstVdpVideoYUV GstVdpVideoYUV;
-typedef struct _GstVdpVideoYUVClass GstVdpVideoYUVClass;
-
-struct _GstVdpVideoYUV {
- GstBaseTransform transform;
-
- gchar *display;
- GstVdpDevice *device;
-
- gint width, height;
- guint format;
-};
-
-struct _GstVdpVideoYUVClass {
- GstBaseTransformClass transform_class;
-};
-
-GType gst_vdp_video_yuv_get_type (void);
-
-G_END_DECLS
-
-#endif /* __GST_VDP_VIDEO_YUV_H__ */
diff --git a/sys/vdpau/gstvdpyuvvideo.c b/sys/vdpau/gstvdpyuvvideo.c
deleted file mode 100644
index e2e5c744f..000000000
--- a/sys/vdpau/gstvdpyuvvideo.c
+++ /dev/null
@@ -1,339 +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 <gst/vdpau/gstvdpvideobuffer.h>
-
-#include "gstvdputils.h"
-#include "gstvdpyuvvideo.h"
-
-GST_DEBUG_CATEGORY_STATIC (gst_vdp_yuv_video_debug);
-#define GST_CAT_DEFAULT gst_vdp_yuv_video_debug
-
-/* Filter signals and args */
-enum
-{
- /* FILL ME */
- LAST_SIGNAL
-};
-
-enum
-{
- PROP_0
-};
-
-static GstStaticPadTemplate sink_template =
- GST_STATIC_PAD_TEMPLATE (GST_BASE_TRANSFORM_SINK_NAME,
- GST_PAD_SINK,
- GST_PAD_ALWAYS,
- GST_STATIC_CAPS (GST_VIDEO_CAPS_YUV ("I420") ";"
- GST_VIDEO_CAPS_YUV ("YV12") ";" GST_VIDEO_CAPS_YUV ("NV12") ";"
- GST_VIDEO_CAPS_YUV ("UYVY") ";" GST_VIDEO_CAPS_YUV ("YUY2")));
-
-static GstStaticPadTemplate src_template =
-GST_STATIC_PAD_TEMPLATE (GST_BASE_TRANSFORM_SRC_NAME,
- GST_PAD_SRC,
- GST_PAD_ALWAYS,
- GST_STATIC_CAPS (GST_VDP_VIDEO_CAPS));
-
-#define DEBUG_INIT(bla) \
- GST_DEBUG_CATEGORY_INIT (gst_vdp_yuv_video_debug, "vdpauyuvvideo", 0, "YUV to VDPAU video surface");
-
-GST_BOILERPLATE_FULL (GstVdpYUVVideo, gst_vdp_yuv_video, GstBaseTransform,
- GST_TYPE_BASE_TRANSFORM, DEBUG_INIT);
-
-static gboolean
-gst_vdp_yuv_video_transform_size (GstBaseTransform * trans,
- GstPadDirection direction, GstCaps * caps, guint size,
- GstCaps * othercaps, guint * othersize)
-{
- *othersize = size;
-
- return TRUE;
-}
-
-static GstFlowReturn
-gst_vdp_yuv_video_transform (GstBaseTransform * trans, GstBuffer * inbuf,
- GstBuffer * outbuf)
-{
- GstVdpYUVVideo *yuv_video = GST_VDP_YUV_VIDEO (trans);
- GstVdpDevice *device;
- VdpVideoSurface surface;
-
- device = GST_VDP_VIDEO_BUFFER (outbuf)->device;
- if (!yuv_video->device)
- yuv_video->device = g_object_ref (device);
-
- surface = GST_VDP_VIDEO_BUFFER (outbuf)->surface;
-
- switch (yuv_video->format) {
- case GST_MAKE_FOURCC ('Y', 'V', '1', '2'):
- {
- VdpStatus status;
- guint8 *data[3];
- guint32 stride[3];
-
- data[0] = GST_BUFFER_DATA (inbuf) +
- gst_video_format_get_component_offset (GST_VIDEO_FORMAT_YV12,
- 0, yuv_video->width, yuv_video->height);
- data[1] = GST_BUFFER_DATA (inbuf) +
- gst_video_format_get_component_offset (GST_VIDEO_FORMAT_YV12,
- 2, yuv_video->width, yuv_video->height);
- data[2] = GST_BUFFER_DATA (inbuf) +
- gst_video_format_get_component_offset (GST_VIDEO_FORMAT_YV12,
- 1, yuv_video->width, yuv_video->height);
-
- stride[0] = gst_video_format_get_row_stride (GST_VIDEO_FORMAT_YV12,
- 0, yuv_video->width);
- stride[1] = gst_video_format_get_row_stride (GST_VIDEO_FORMAT_YV12,
- 2, yuv_video->width);
- stride[2] = gst_video_format_get_row_stride (GST_VIDEO_FORMAT_YV12,
- 1, yuv_video->width);
-
- status =
- device->vdp_video_surface_put_bits_ycbcr (surface,
- VDP_YCBCR_FORMAT_YV12, (void *) data, stride);
- if (G_UNLIKELY (status != VDP_STATUS_OK)) {
- GST_ELEMENT_ERROR (yuv_video, RESOURCE, READ,
- ("Couldn't push YV12 data to VDPAU"),
- ("Error returned from vdpau was: %s",
- device->vdp_get_error_string (status)));
- return GST_FLOW_ERROR;
- }
- break;
- }
- case GST_MAKE_FOURCC ('I', '4', '2', '0'):
- {
- VdpStatus status;
- guint8 *data[3];
- guint32 stride[3];
-
- data[0] = GST_BUFFER_DATA (inbuf) +
- gst_video_format_get_component_offset (GST_VIDEO_FORMAT_I420,
- 0, yuv_video->width, yuv_video->height);
- data[1] = GST_BUFFER_DATA (inbuf) +
- gst_video_format_get_component_offset (GST_VIDEO_FORMAT_I420,
- 2, yuv_video->width, yuv_video->height);
- data[2] = GST_BUFFER_DATA (inbuf) +
- gst_video_format_get_component_offset (GST_VIDEO_FORMAT_I420,
- 1, yuv_video->width, yuv_video->height);
-
- stride[0] = gst_video_format_get_row_stride (GST_VIDEO_FORMAT_I420,
- 0, yuv_video->width);
- stride[1] = gst_video_format_get_row_stride (GST_VIDEO_FORMAT_I420,
- 2, yuv_video->width);
- stride[2] = gst_video_format_get_row_stride (GST_VIDEO_FORMAT_I420,
- 1, yuv_video->width);
-
- status =
- device->vdp_video_surface_put_bits_ycbcr (surface,
- VDP_YCBCR_FORMAT_YV12, (void *) data, stride);
- if (G_UNLIKELY (status != VDP_STATUS_OK)) {
- GST_ELEMENT_ERROR (yuv_video, RESOURCE, READ,
- ("Couldn't push YV12 data to VDPAU"),
- ("Error returned from vdpau was: %s",
- device->vdp_get_error_string (status)));
- return GST_FLOW_ERROR;
- }
- break;
- }
- case GST_MAKE_FOURCC ('N', 'V', '1', '2'):
- {
- VdpStatus status;
- guint8 *data[2];
- guint32 stride[2];
-
- data[0] = GST_BUFFER_DATA (inbuf);
- data[1] = GST_BUFFER_DATA (inbuf) + yuv_video->width * yuv_video->height;
-
- stride[0] = yuv_video->width;
- stride[1] = yuv_video->width;
-
- status =
- device->vdp_video_surface_put_bits_ycbcr (surface,
- VDP_YCBCR_FORMAT_NV12, (void *) data, stride);
- if (G_UNLIKELY (status != VDP_STATUS_OK)) {
- GST_ELEMENT_ERROR (yuv_video, RESOURCE, READ,
- ("Couldn't get data from vdpau"),
- ("Error returned from vdpau was: %s",
- device->vdp_get_error_string (status)));
- return GST_FLOW_ERROR;
- }
- break;
- }
- case GST_MAKE_FOURCC ('U', 'Y', 'V', 'Y'):
- {
- VdpStatus status;
- guint8 *data[1];
- guint32 stride[1];
-
- data[0] = GST_BUFFER_DATA (inbuf);
-
- stride[0] = gst_video_format_get_row_stride (GST_VIDEO_FORMAT_UYVY,
- 0, yuv_video->width);
-
- status =
- device->vdp_video_surface_put_bits_ycbcr (surface,
- VDP_YCBCR_FORMAT_UYVY, (void *) data, stride);
- if (G_UNLIKELY (status != VDP_STATUS_OK)) {
- GST_ELEMENT_ERROR (yuv_video, RESOURCE, READ,
- ("Couldn't get data from vdpau"),
- ("Error returned from vdpau was: %s",
- device->vdp_get_error_string (status)));
- return GST_FLOW_ERROR;
- }
- break;
- }
- case GST_MAKE_FOURCC ('Y', 'U', 'Y', '2'):
- {
- VdpStatus status;
- guint8 *data[1];
- guint32 stride[1];
-
- data[0] = GST_BUFFER_DATA (inbuf);
-
- stride[0] = gst_video_format_get_row_stride (GST_VIDEO_FORMAT_YUY2,
- 0, yuv_video->width);
-
- status =
- device->vdp_video_surface_put_bits_ycbcr (surface,
- VDP_YCBCR_FORMAT_YUYV, (void *) data, stride);
- if (G_UNLIKELY (status != VDP_STATUS_OK)) {
- GST_ELEMENT_ERROR (yuv_video, RESOURCE, READ,
- ("Couldn't get data from vdpau"),
- ("Error returned from vdpau was: %s",
- device->vdp_get_error_string (status)));
- return GST_FLOW_ERROR;
- }
- break;
- }
- default:
- break;
- }
-
- gst_buffer_copy_metadata (outbuf, inbuf,
- GST_BUFFER_COPY_FLAGS | GST_BUFFER_COPY_TIMESTAMPS);
-
- return GST_FLOW_OK;
-}
-
-static gboolean
-gst_vdp_yuv_video_set_caps (GstBaseTransform * trans, GstCaps * incaps,
- GstCaps * outcaps)
-{
- GstVdpYUVVideo *yuv_video = GST_VDP_YUV_VIDEO (trans);
- GstStructure *structure;
-
- structure = gst_caps_get_structure (incaps, 0);
-
- if (!gst_structure_get_int (structure, "width", &yuv_video->width))
- return FALSE;
- if (!gst_structure_get_int (structure, "height", &yuv_video->height))
- return FALSE;
- if (!gst_structure_get_fourcc (structure, "format", &yuv_video->format))
- return FALSE;
-
- return TRUE;
-}
-
-static GstCaps *
-gst_vdp_yuv_video_transform_caps (GstBaseTransform * trans,
- GstPadDirection direction, GstCaps * caps)
-{
- GstVdpYUVVideo *yuv_video = GST_VDP_YUV_VIDEO (trans);
- GstCaps *result = NULL;
-
- if (direction == GST_PAD_SINK) {
- result = gst_vdp_yuv_to_video_caps (caps, yuv_video->device);
- } else if (direction == GST_PAD_SRC) {
- result = gst_vdp_video_to_yuv_caps (caps, yuv_video->device);
- }
-
- GST_LOG ("transformed %" GST_PTR_FORMAT " to %" GST_PTR_FORMAT, caps, result);
-
- return result;
-}
-
-static gboolean
-gst_vdp_yuv_video_start (GstBaseTransform * trans)
-{
- GstVdpYUVVideo *yuv_video = GST_VDP_YUV_VIDEO (trans);
-
- yuv_video->device = NULL;
-
- return TRUE;
-}
-
-static gboolean
-gst_vdp_yuv_video_stop (GstBaseTransform * trans)
-{
- GstVdpYUVVideo *yuv_video = GST_VDP_YUV_VIDEO (trans);
-
- if (yuv_video->device)
- g_object_unref (yuv_video->device);
-
- return TRUE;
-}
-
-/* GObject vmethod implementations */
-
-static void
-gst_vdp_yuv_video_base_init (gpointer klass)
-{
- GstElementClass *element_class = GST_ELEMENT_CLASS (klass);
-
- gst_element_class_set_details_simple (element_class,
- "VdpauYUVVideo",
- "Filter/Converter/Decoder/Video",
- "VDPAU video surface to YUV",
- "Carl-Anton Ingmarsson <ca.ingmarsson@gmail.com>");
-
- 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));
-}
-
-static void
-gst_vdp_yuv_video_class_init (GstVdpYUVVideoClass * klass)
-{
- GObjectClass *gobject_class;
- GstBaseTransformClass *trans_class;
-
- gobject_class = (GObjectClass *) klass;
- trans_class = (GstBaseTransformClass *) klass;
-
- trans_class->start = gst_vdp_yuv_video_start;
- trans_class->stop = gst_vdp_yuv_video_stop;
- trans_class->transform_caps = gst_vdp_yuv_video_transform_caps;
- trans_class->transform_size = gst_vdp_yuv_video_transform_size;
- trans_class->set_caps = gst_vdp_yuv_video_set_caps;
- trans_class->transform = gst_vdp_yuv_video_transform;
-}
-
-static void
-gst_vdp_yuv_video_init (GstVdpYUVVideo * yuv_video, GstVdpYUVVideoClass * klass)
-{
-}
diff --git a/sys/vdpau/gstvdpyuvvideo.h b/sys/vdpau/gstvdpyuvvideo.h
deleted file mode 100644
index 158077151..000000000
--- a/sys/vdpau/gstvdpyuvvideo.h
+++ /dev/null
@@ -1,57 +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_YUV_VIDEO_H__
-#define __GST_VDP_YUV_VIDEO_H__
-
-#include <gst/gst.h>
-#include <gst/base/gstbasetransform.h>
-#include <gst/vdpau/gstvdpdevice.h>
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_VDP_YUV_VIDEO (gst_vdp_yuv_video_get_type())
-#define GST_VDP_YUV_VIDEO(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_VDP_YUV_VIDEO,GstVdpYUVVideo))
-#define GST_VDP_YUV_VIDEO_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_VDP_YUV_VIDEO,GstVdpYUVVideoClass))
-#define GST_VDP_YUV_VIDEO_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GST_TYPE_VDP_YUV_VIDEO, GstVdpYUVVideoClass))
-#define GST_IS_VDP_YUV_VIDEO(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_VDP_YUV_VIDEO))
-#define GST_IS_VDP_YUV_VIDEO_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_VDP_YUV_VIDEO))
-
-typedef struct _GstVdpYUVVideo GstVdpYUVVideo;
-typedef struct _GstVdpYUVVideoClass GstVdpYUVVideoClass;
-
-struct _GstVdpYUVVideo {
- GstBaseTransform trans;
-
- GstVdpDevice *device;
-
- guint32 format;
- gint width, height;
-};
-
-struct _GstVdpYUVVideoClass {
- GstBaseTransformClass trans_class;
-};
-
-GType gst_vdp_yuv_video_get_type (void);
-
-G_END_DECLS
-
-#endif /* __GST_VDP_YUV_VIDEO_H__ */