alphacolor: Some minor cleanup

This commit is contained in:
Sebastian Dröge 2010-03-15 18:07:29 +01:00
parent fdc7b73675
commit e46f0261c8

View file

@ -39,11 +39,6 @@ GST_DEBUG_CATEGORY_STATIC (alpha_color_debug);
#define GST_CAT_DEFAULT alpha_color_debug #define GST_CAT_DEFAULT alpha_color_debug
/* elementfactory information */ /* 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 <wim@fluendo.com>");
static GstStaticPadTemplate sink_template = GST_STATIC_PAD_TEMPLATE ("sink", static GstStaticPadTemplate sink_template = GST_STATIC_PAD_TEMPLATE ("sink",
GST_PAD_SINK, GST_PAD_SINK,
@ -72,7 +67,10 @@ gst_alpha_color_base_init (gpointer g_class)
{ {
GstElementClass *element_class = GST_ELEMENT_CLASS (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 <wim@fluendo.com>");
gst_element_class_add_pad_template (element_class, gst_element_class_add_pad_template (element_class,
gst_static_pad_template_get (&sink_template)); gst_static_pad_template_get (&sink_template));
@ -83,9 +81,8 @@ gst_alpha_color_base_init (gpointer g_class)
static void static void
gst_alpha_color_class_init (GstAlphaColorClass * klass) gst_alpha_color_class_init (GstAlphaColorClass * klass)
{ {
GstBaseTransformClass *gstbasetransform_class; GstBaseTransformClass *gstbasetransform_class =
(GstBaseTransformClass *) klass;
gstbasetransform_class = (GstBaseTransformClass *) klass;
gstbasetransform_class->transform_caps = gstbasetransform_class->transform_caps =
GST_DEBUG_FUNCPTR (gst_alpha_color_transform_caps); GST_DEBUG_FUNCPTR (gst_alpha_color_transform_caps);
@ -101,9 +98,7 @@ gst_alpha_color_class_init (GstAlphaColorClass * klass)
static void static void
gst_alpha_color_init (GstAlphaColor * alpha, GstAlphaColorClass * g_class) gst_alpha_color_init (GstAlphaColor * alpha, GstAlphaColorClass * g_class)
{ {
GstBaseTransform *btrans = NULL; GstBaseTransform *btrans = GST_BASE_TRANSFORM (alpha);
btrans = GST_BASE_TRANSFORM (alpha);
btrans->always_in_place = TRUE; btrans->always_in_place = TRUE;
} }
@ -151,7 +146,8 @@ gst_alpha_color_transform_caps (GstBaseTransform * btrans,
gst_caps_unref (local_caps); gst_caps_unref (local_caps);
gst_caps_do_simplify (result); 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; return result;
} }
@ -160,14 +156,13 @@ static gboolean
gst_alpha_color_set_caps (GstBaseTransform * btrans, GstCaps * incaps, gst_alpha_color_set_caps (GstBaseTransform * btrans, GstCaps * incaps,
GstCaps * outcaps) GstCaps * outcaps)
{ {
GstAlphaColor *alpha; GstAlphaColor *alpha = GST_ALPHA_COLOR (btrans);
GstStructure *structure; GstStructure *structure;
gboolean ret; gboolean ret;
const GValue *fps; const GValue *fps;
gint red_mask, alpha_mask; gint red_mask, alpha_mask;
gint w, h, depth, bpp; gint w, h, depth, bpp;
alpha = GST_ALPHA_COLOR (btrans);
structure = gst_caps_get_structure (incaps, 0); structure = gst_caps_get_structure (incaps, 0);
ret = gst_structure_get_int (structure, "width", &w); ret = gst_structure_get_int (structure, "width", &w);
@ -243,9 +238,7 @@ static GstFlowReturn
gst_alpha_color_transform_ip (GstBaseTransform * btrans, GstBuffer * inbuf) gst_alpha_color_transform_ip (GstBaseTransform * btrans, GstBuffer * inbuf)
{ {
GstFlowReturn ret = GST_FLOW_OK; GstFlowReturn ret = GST_FLOW_OK;
GstAlphaColor *alpha; GstAlphaColor *alpha = GST_ALPHA_COLOR (btrans);
alpha = GST_ALPHA_COLOR (btrans);
/* Transform in place */ /* Transform in place */
if (alpha->in_rgba) if (alpha->in_rgba)