From 367708e2ae7435fab215fd93b31234e553220c77 Mon Sep 17 00:00:00 2001 From: Carl-Anton Ingmarsson Date: Wed, 25 Mar 2009 20:41:46 +0100 Subject: vdpau: add version specification to mpegdecoder caps --- sys/vdpau/gstvdpauh264decoder.c | 202 ---------------------------------------- sys/vdpau/gstvdpauh264decoder.h | 88 ----------------- sys/vdpau/gstvdpaumpegdecoder.c | 2 +- 3 files changed, 1 insertion(+), 291 deletions(-) delete mode 100644 sys/vdpau/gstvdpauh264decoder.c delete mode 100644 sys/vdpau/gstvdpauh264decoder.h (limited to 'sys') diff --git a/sys/vdpau/gstvdpauh264decoder.c b/sys/vdpau/gstvdpauh264decoder.c deleted file mode 100644 index ce6eec11..00000000 --- a/sys/vdpau/gstvdpauh264decoder.c +++ /dev/null @@ -1,202 +0,0 @@ -/* - * GStreamer - * Copyright (C) 2005 Thomas Vander Stichele - * Copyright (C) 2005 Ronald S. Bultje - * Copyright (C) 2009 Carl-Anton Ingmarsson - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - * - * Alternatively, the contents of this file may be used under the - * GNU Lesser General Public License Version 2.1 (the "LGPL"), in - * which case the following provisions apply instead of the ones - * mentioned above: - * - * 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-vdpauh264decoder - * - * FIXME:Describe vdpauh264decoder here. - * - * - * Example launch line - * |[ - * gst-launch -v -m fakesrc ! vdpauh264decoder ! fakesink silent=TRUE - * ]| - * - */ - -#ifdef HAVE_CONFIG_H -# include -#endif - -#include - -#include "gstvdpauh264decoder.h" - -GST_DEBUG_CATEGORY_STATIC (gst_vdpau_h264decoder_debug); -#define GST_CAT_DEFAULT gst_vdpau_h264decoder_debug - -/* Filter signals and args */ -enum -{ - /* FILL ME */ - LAST_SIGNAL -}; - -enum -{ - PROP_0, - PROP_SILENT -}; - -/* the capabilities of the inputs and outputs. - * - * describe the real formats here. - */ -static GstStaticPadTemplate sink_factory = GST_STATIC_PAD_TEMPLATE ("sink", - GST_PAD_SINK, - GST_PAD_ALWAYS, - GST_STATIC_CAPS ("video/x-h264") - ); - -GST_BOILERPLATE (GstVdpauH264Decoder, gst_vdpau_h264decoder, GstVdpauDecoder, - GST_TYPE_VDPAU_DECODER); - -static void gst_vdpau_h264decoder_set_property (GObject * object, guint prop_id, - const GValue * value, GParamSpec * pspec); -static void gst_vdpau_h264decoder_get_property (GObject * object, guint prop_id, - GValue * value, GParamSpec * pspec); - -/* GObject vmethod implementations */ - -static void -gst_vdpau_h264decoder_base_init (gpointer gclass) -{ - GstElementClass *element_class = GST_ELEMENT_CLASS (gclass); - - gst_element_class_set_details_simple (element_class, - "VdpauH264Decoder", - "Decoder", - "decode h264 stream with vdpau", - "Carl-Anton Ingmarsson "); - - gst_element_class_add_pad_template (element_class, - gst_static_pad_template_get (&sink_factory)); -} - -/* initialize the vdpauh264decoder's class */ -static void -gst_vdpau_h264decoder_class_init (GstVdpauH264DecoderClass * klass) -{ - GObjectClass *gobject_class; - GstElementClass *gstelement_class; - - gobject_class = (GObjectClass *) klass; - gstelement_class = (GstElementClass *) klass; - - gobject_class->set_property = gst_vdpau_h264decoder_set_property; - gobject_class->get_property = gst_vdpau_h264decoder_get_property; - - g_object_class_install_property (gobject_class, PROP_SILENT, - g_param_spec_boolean ("silent", "Silent", "Produce verbose output ?", - FALSE, G_PARAM_READWRITE)); -} - -static void -gst_vdpau_h264decoder_init (GstVdpauH264Decoder * filter, - GstVdpauH264DecoderClass * gclass) -{ - filter->silent = FALSE; -} - -static void -gst_vdpau_h264decoder_set_property (GObject * object, guint prop_id, - const GValue * value, GParamSpec * pspec) -{ - GstVdpauH264Decoder *filter = GST_VDPAU_H264_DECODER (object); - - switch (prop_id) { - case PROP_SILENT: - filter->silent = g_value_get_boolean (value); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); - break; - } -} - -static void -gst_vdpau_h264decoder_get_property (GObject * object, guint prop_id, - GValue * value, GParamSpec * pspec) -{ - GstVdpauH264Decoder *filter = GST_VDPAU_H264_DECODER (object); - - switch (prop_id) { - case PROP_SILENT: - g_value_set_boolean (value, filter->silent); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); - break; - } -} - -/* entry point to initialize the plug-in - * initialize the plug-in itself - * register the element factories and other features - */ -static gboolean -vdpauh264decoder_init (GstPlugin * vdpauh264decoder) -{ - /* debug category for fltering log messages - * - * exchange the string 'Template vdpauh264decoder' with your description - */ - GST_DEBUG_CATEGORY_INIT (gst_vdpau_h264decoder_debug, "vdpauh264decoder", - 0, "Template vdpauh264decoder"); - - return gst_element_register (vdpauh264decoder, "vdpauh264decoder", - GST_RANK_NONE, GST_TYPE_VDPAU_H264_DECODER); -} - -/* gstreamer looks for this structure to register vdpauh264decoders - * - * exchange the string 'Template vdpauh264decoder' with your vdpauh264decoder description - */ -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, - GST_VERSION_MINOR, - "vdpauh264decoder", - "Template vdpauh264decoder", - vdpauh264decoder_init, - VERSION, "LGPL", "GStreamer", "http://gstreamer.net/") diff --git a/sys/vdpau/gstvdpauh264decoder.h b/sys/vdpau/gstvdpauh264decoder.h deleted file mode 100644 index c3972047..00000000 --- a/sys/vdpau/gstvdpauh264decoder.h +++ /dev/null @@ -1,88 +0,0 @@ -/* - * GStreamer - * Copyright (C) 2005 Thomas Vander Stichele - * Copyright (C) 2005 Ronald S. Bultje - * Copyright (C) 2009 Carl-Anton Ingmarsson - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - * - * Alternatively, the contents of this file may be used under the - * GNU Lesser General Public License Version 2.1 (the "LGPL"), in - * which case the following provisions apply instead of the ones - * mentioned above: - * - * 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_VDPAU_H264_DECODER_H__ -#define __GST_VDPAU_H264_DECODER_H__ - -#include - -#include "gstvdpaudecoder.h" - -G_BEGIN_DECLS - -/* #defines don't like whitespacey bits */ -#define GST_TYPE_VDPAU_H264_DECODER \ - (gst_vdpau_h264decoder_get_type()) -#define GST_VDPAU_H264_DECODER(obj) \ - (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_VDPAU_H264_DECODER,GstVdpauH264Decoder)) -#define GST_VDPAU_H264_DECODER_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_VDPAU_H264_DECODER,GstVdpauH264DecoderClass)) -#define GST_IS_VDPAU_H264_DECODER(obj) \ - (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_VDPAU_H264_DECODER)) -#define GST_IS_VDPAU_H264_DECODER_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_VDPAU_H264_DECODER)) - -typedef struct _GstVdpauH264Decoder GstVdpauH264Decoder; -typedef struct _GstVdpauH264DecoderClass GstVdpauH264DecoderClass; - -struct _GstVdpauH264Decoder -{ - GstVdpauDecoder dec; - - GstPad *sinkpad, *srcpad; - - gboolean silent; -}; - -struct _GstVdpauH264DecoderClass -{ - GstVdpauDecoderClass parent_class; -}; - -GType gst_vdpau_h264decoder_get_type (void); - -G_END_DECLS - -#endif /* __GST_VDPAU_H264_DECODER_H__ */ diff --git a/sys/vdpau/gstvdpaumpegdecoder.c b/sys/vdpau/gstvdpaumpegdecoder.c index 24760474..c22c27f3 100644 --- a/sys/vdpau/gstvdpaumpegdecoder.c +++ b/sys/vdpau/gstvdpaumpegdecoder.c @@ -87,7 +87,7 @@ enum static GstStaticPadTemplate sink_factory = GST_STATIC_PAD_TEMPLATE ("sink", GST_PAD_SINK, GST_PAD_ALWAYS, - GST_STATIC_CAPS ("video/x-mpeg") + GST_STATIC_CAPS ("video/x-mpeg, mpegversion = (int) [ 1, 2 ]") ); GST_BOILERPLATE (GstVdpauMpegDecoder, gst_vdpau_mpeg_decoder, GstVdpauDecoder, -- cgit v1.2.1