mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-20 23:36:38 +00:00
Code Issues 1 Projects Releases Wiki Activity

vdpau: remove template-caps propery form GstVdpVideoSrcPad

Browse source 
GstVdpVideoSrcPad now use the template property of GstPad instead. Also changed
the _new function to be like gst_pad_new_from_template.
This commit is contained in:
Carl-Anton Ingmarsson 2009-11-28 23:52:15 +01:00
parent baffaea6e8
commit 6afb2c5e8d
2 changed files with 18 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
sys/vdpau/gstvdpvideosrcpad.c
View file

@ -28,8 +28,7 @@ GST_DEBUG_CATEGORY_STATIC (gst_vdp_video_src_pad_debug);
enum enum
{ {
PROP_0, PROP_0,
PROP_DISPLAY, PROP_DISPLAY
PROP_TEMPL_CAPS
}; };
#define DEBUG_INIT(bla) \ #define DEBUG_INIT(bla) \
@ -105,17 +104,17 @@ static void
gst_vdp_video_src_pad_update_caps (GstVdpVideoSrcPad * vdp_pad) gst_vdp_video_src_pad_update_caps (GstVdpVideoSrcPad * vdp_pad)
{ {
GstCaps *yuv_caps, *video_caps; GstCaps *yuv_caps, *video_caps;
const GstCaps *templ_caps;
video_caps = gst_vdp_video_buffer_get_allowed_video_caps (vdp_pad->device); video_caps = gst_vdp_video_buffer_get_allowed_video_caps (vdp_pad->device);
yuv_caps = gst_vdp_video_buffer_get_allowed_yuv_caps (vdp_pad->device); yuv_caps = gst_vdp_video_buffer_get_allowed_yuv_caps (vdp_pad->device);
gst_caps_append (video_caps, yuv_caps); gst_caps_append (video_caps, yuv_caps);
if (vdp_pad->caps) if (vdp_pad->caps)
gst_caps_unref (vdp_pad->caps); gst_caps_unref (vdp_pad->caps);
if (vdp_pad->templ_caps) { if ((templ_caps = gst_pad_get_pad_template_caps (GST_PAD (vdp_pad)))) {
vdp_pad->caps = gst_caps_intersect (video_caps, vdp_pad->templ_caps); vdp_pad->caps = gst_caps_intersect (video_caps, templ_caps);
gst_caps_unref (video_caps); gst_caps_unref (video_caps);
} else } else
vdp_pad->caps = video_caps; vdp_pad->caps = video_caps;
@ -232,10 +231,13 @@ gst_vdp_video_src_pad_getcaps (GstPad * pad)
{ {
GstVdpVideoSrcPad *vdp_pad = (GstVdpVideoSrcPad *) pad; GstVdpVideoSrcPad *vdp_pad = (GstVdpVideoSrcPad *) pad;
const GstCaps *templ_caps;
if (vdp_pad->caps) if (vdp_pad->caps)
return gst_caps_ref (vdp_pad->caps); return gst_caps_copy (vdp_pad->caps);
else if (vdp_pad->templ_caps)
return gst_caps_ref (vdp_pad->templ_caps); else if ((templ_caps = gst_pad_get_pad_template_caps (pad)))
return gst_caps_copy (templ_caps);
return NULL; return NULL;
} }
@ -259,10 +261,13 @@ gst_vdp_video_src_pad_activate_push (GstPad * pad, gboolean active)
} }
GstVdpVideoSrcPad * GstVdpVideoSrcPad *
gst_vdp_video_src_pad_new (GstCaps * templ_caps) gst_vdp_video_src_pad_new (GstPadTemplate * templ, const gchar * name)
{ {
return g_object_new (GST_TYPE_VDP_VIDEO_SRC_PAD, "direction", GST_PAD_SRC, g_return_val_if_fail (GST_IS_PAD_TEMPLATE (templ), NULL);
"template-caps", templ_caps, NULL); g_return_val_if_fail ((templ->direction == GST_PAD_SRC), NULL);
return g_object_new (GST_TYPE_VDP_VIDEO_SRC_PAD,
"name", name, "direction", templ->direction, "template", templ, NULL);
} }
static void static void
@ -275,9 +280,6 @@ gst_vdp_video_src_pad_get_property (GObject * object, guint prop_id,
case PROP_DISPLAY: case PROP_DISPLAY:
g_value_set_string (value, vdp_pad->display); g_value_set_string (value, vdp_pad->display);
break; break;
case PROP_TEMPL_CAPS:
gst_value_set_caps (value, vdp_pad->templ_caps);
break;
default: default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break; break;
@ -294,11 +296,6 @@ gst_vdp_video_src_pad_set_property (GObject * object, guint prop_id,
case PROP_DISPLAY: case PROP_DISPLAY:
vdp_pad->display = g_value_dup_string (value); vdp_pad->display = g_value_dup_string (value);
break; break;
case PROP_TEMPL_CAPS:
if (vdp_pad->templ_caps)
gst_caps_unref (vdp_pad->templ_caps);
vdp_pad->templ_caps = gst_caps_copy (gst_value_get_caps (value));
break;
default: default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break; break;
@ -311,8 +308,6 @@ gst_vdp_video_src_pad_finalize (GObject * object)
GstVdpVideoSrcPad *vdp_pad = (GstVdpVideoSrcPad *) object; GstVdpVideoSrcPad *vdp_pad = (GstVdpVideoSrcPad *) object;
g_free (vdp_pad->display); g_free (vdp_pad->display);
if (vdp_pad->templ_caps)
gst_caps_unref (vdp_pad->templ_caps);
G_OBJECT_CLASS (gst_vdp_video_src_pad_parent_class)->finalize (object); G_OBJECT_CLASS (gst_vdp_video_src_pad_parent_class)->finalize (object);
} }
@ -326,7 +321,6 @@ gst_vdp_video_src_pad_init (GstVdpVideoSrcPad * vdp_pad)
vdp_pad->caps = NULL; vdp_pad->caps = NULL;
vdp_pad->display = NULL; vdp_pad->display = NULL;
vdp_pad->templ_caps = NULL;
gst_pad_set_getcaps_function (pad, gst_pad_set_getcaps_function (pad,
GST_DEBUG_FUNCPTR (gst_vdp_video_src_pad_getcaps)); GST_DEBUG_FUNCPTR (gst_vdp_video_src_pad_getcaps));
@ -346,10 +340,4 @@ gst_vdp_video_src_pad_class_init (GstVdpVideoSrcPadClass * klass)
g_object_class_install_property (object_class, PROP_DISPLAY, g_object_class_install_property (object_class, PROP_DISPLAY,
g_param_spec_string ("display", "Display", "X Display name", g_param_spec_string ("display", "Display", "X Display name",
NULL, G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); NULL, G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
g_object_class_install_property (object_class, PROP_TEMPL_CAPS,
g_param_spec_boxed ("template-caps", "Template caps",
"Template caps", GST_TYPE_CAPS,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
} }

4
sys/vdpau/gstvdpvideosrcpad.h
View file

@ -51,7 +51,6 @@ struct _GstVdpVideoSrcPad
/* properties */ /* properties */
gchar *display; gchar *display;
GstCaps *templ_caps;
}; };
struct _GstVdpVideoSrcPadClass struct _GstVdpVideoSrcPadClass
@ -68,7 +67,8 @@ gboolean gst_vdp_video_src_pad_set_caps (GstVdpVideoSrcPad *vdp_pad, GstCaps *ca
GstCaps *gst_vdp_video_src_pad_get_template_caps (); GstCaps *gst_vdp_video_src_pad_get_template_caps ();
GstVdpVideoSrcPad *gst_vdp_video_src_pad_new (GstCaps *templ_caps); GstVdpVideoSrcPad * gst_vdp_video_src_pad_new (GstPadTemplate * templ, const gchar * name);
GType gst_vdp_video_src_pad_get_type (void) G_GNUC_CONST; GType gst_vdp_video_src_pad_get_type (void) G_GNUC_CONST;
G_END_DECLS G_END_DECLS