From e46f0261c88dd9c62e154a2089f69f486ebea83c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Mon, 15 Mar 2010 18:07:29 +0100 Subject: [PATCH] alphacolor: Some minor cleanup --- gst/alpha/gstalphacolor.c | 29 +++++++++++------------------ 1 file changed, 11 insertions(+), 18 deletions(-) diff --git a/gst/alpha/gstalphacolor.c b/gst/alpha/gstalphacolor.c index a58829465a..e7e7624c13 100644 --- a/gst/alpha/gstalphacolor.c +++ b/gst/alpha/gstalphacolor.c @@ -39,11 +39,6 @@ GST_DEBUG_CATEGORY_STATIC (alpha_color_debug); #define GST_CAT_DEFAULT alpha_color_debug /* elementfactory information */ -static const GstElementDetails gst_alpha_color_details = -GST_ELEMENT_DETAILS ("Alpha color filter", - "Filter/Effect/Video", - "RGBA to AYUV colorspace conversion preserving the alpha channel", - "Wim Taymans "); static GstStaticPadTemplate sink_template = GST_STATIC_PAD_TEMPLATE ("sink", GST_PAD_SINK, @@ -72,7 +67,10 @@ gst_alpha_color_base_init (gpointer g_class) { GstElementClass *element_class = GST_ELEMENT_CLASS (g_class); - gst_element_class_set_details (element_class, &gst_alpha_color_details); + gst_element_class_set_details_simple (element_class, "Alpha color filter", + "Filter/Effect/Video", + "RGBA to AYUV colorspace conversion preserving the alpha channel", + "Wim Taymans "); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&sink_template)); @@ -83,9 +81,8 @@ gst_alpha_color_base_init (gpointer g_class) static void gst_alpha_color_class_init (GstAlphaColorClass * klass) { - GstBaseTransformClass *gstbasetransform_class; - - gstbasetransform_class = (GstBaseTransformClass *) klass; + GstBaseTransformClass *gstbasetransform_class = + (GstBaseTransformClass *) klass; gstbasetransform_class->transform_caps = GST_DEBUG_FUNCPTR (gst_alpha_color_transform_caps); @@ -101,9 +98,7 @@ gst_alpha_color_class_init (GstAlphaColorClass * klass) static void gst_alpha_color_init (GstAlphaColor * alpha, GstAlphaColorClass * g_class) { - GstBaseTransform *btrans = NULL; - - btrans = GST_BASE_TRANSFORM (alpha); + GstBaseTransform *btrans = GST_BASE_TRANSFORM (alpha); btrans->always_in_place = TRUE; } @@ -151,7 +146,8 @@ gst_alpha_color_transform_caps (GstBaseTransform * btrans, gst_caps_unref (local_caps); gst_caps_do_simplify (result); - GST_LOG ("transformed %" GST_PTR_FORMAT " to %" GST_PTR_FORMAT, caps, result); + GST_LOG_OBJECT (btrans, "transformed %" GST_PTR_FORMAT " to %" GST_PTR_FORMAT, + caps, result); return result; } @@ -160,14 +156,13 @@ static gboolean gst_alpha_color_set_caps (GstBaseTransform * btrans, GstCaps * incaps, GstCaps * outcaps) { - GstAlphaColor *alpha; + GstAlphaColor *alpha = GST_ALPHA_COLOR (btrans); GstStructure *structure; gboolean ret; const GValue *fps; gint red_mask, alpha_mask; gint w, h, depth, bpp; - alpha = GST_ALPHA_COLOR (btrans); structure = gst_caps_get_structure (incaps, 0); ret = gst_structure_get_int (structure, "width", &w); @@ -243,9 +238,7 @@ static GstFlowReturn gst_alpha_color_transform_ip (GstBaseTransform * btrans, GstBuffer * inbuf) { GstFlowReturn ret = GST_FLOW_OK; - GstAlphaColor *alpha; - - alpha = GST_ALPHA_COLOR (btrans); + GstAlphaColor *alpha = GST_ALPHA_COLOR (btrans); /* Transform in place */ if (alpha->in_rgba)