summaryrefslogtreecommitdiff
path: root/gst/gaudieffects
diff options
context:
space:
mode:
authorLuis de Bethencourt <luis@debethencourt.com>2012-05-08 16:38:48 +0100
committerLuis de Bethencourt <luis@debethencourt.com>2012-05-09 13:18:53 +0100
commitc123ac0735d5513dd37fda2f64d2e5f05a3ddf23 (patch)
tree6006e706f96853fdab4632134294c3575f9064e2 /gst/gaudieffects
parentb2e3e417a5f0b1a4430ce0502c65401ec0759be8 (diff)
downloadgstreamer-plugins-bad-c123ac0735d5513dd37fda2f64d2e5f05a3ddf23.tar.gz
gaudieffects: port burn to 0.11
Diffstat (limited to 'gst/gaudieffects')
-rw-r--r--gst/gaudieffects/gstburn.c73
-rw-r--r--gst/gaudieffects/gstburn.h4
2 files changed, 41 insertions, 36 deletions
diff --git a/gst/gaudieffects/gstburn.c b/gst/gaudieffects/gstburn.c
index bee6c1c68..bc8ed3926 100644
--- a/gst/gaudieffects/gstburn.c
+++ b/gst/gaudieffects/gstburn.c
@@ -1,6 +1,6 @@
/*
* GStreamer
- * Copyright (C) 2010 Luis de Bethencourt <luis@debethencourt.com>
+ * Copyright (C) >2010-2012> Luis de Bethencourt <luis@debethencourt.com>
*
* Burn - curve adjustment video effect.
* Based on Pete Warden's FreeFrame plugin with the same name.
@@ -67,17 +67,17 @@
#include "gstplugin.h"
#include "gstburn.h"
-#include <gst/video/video.h>
-
GST_DEBUG_CATEGORY_STATIC (gst_burn_debug);
#define GST_CAT_DEFAULT gst_burn_debug
#if G_BYTE_ORDER == G_LITTLE_ENDIAN
-#define CAPS_STR GST_VIDEO_CAPS_BGRx ";" GST_VIDEO_CAPS_RGBx
+#define CAPS_STR GST_VIDEO_CAPS_MAKE ("{ BGRx, RGBx }")
#else
-#define CAPS_STR GST_VIDEO_CAPS_xRGB ";" GST_VIDEO_CAPS_xBGR
+#define CAPS_STR GST_VIDEO_CAPS_MAKE ("{ xBGR, xRGB }")
#endif
+G_DEFINE_TYPE (GstBurn, gst_burn, GST_TYPE_VIDEO_FILTER);
+
/* Filter signals and args. */
enum
{
@@ -112,8 +112,6 @@ static GstStaticPadTemplate src_factory = GST_STATIC_PAD_TEMPLATE ("src",
GST_STATIC_CAPS (CAPS_STR)
);
-GST_BOILERPLATE (GstBurn, gst_burn, GstVideoFilter, GST_TYPE_VIDEO_FILTER);
-
static void gst_burn_set_property (GObject * object, guint prop_id,
const GValue * value, GParamSpec * pspec);
static void gst_burn_get_property (GObject * object, guint prop_id,
@@ -126,29 +124,23 @@ static GstFlowReturn gst_burn_transform (GstBaseTransform * btrans,
/* GObject vmethod implementations */
+/* Initialize the burn's class. */
static void
-gst_burn_base_init (gpointer gclass)
+gst_burn_class_init (GstBurnClass * klass)
{
- GstElementClass *element_class = GST_ELEMENT_CLASS (gclass);
+ GObjectClass *gobject_class = (GObjectClass *) klass;
+ GstElementClass *gstelement_class = (GstElementClass *) klass;
+ GstBaseTransformClass *trans_class = (GstBaseTransformClass *) klass;
- gst_element_class_set_details_simple (element_class,
- "Burn",
+ gst_element_class_set_details_simple (gstelement_class, "Burn",
"Filter/Effect/Video",
"Burn adjusts the colors in the video signal.",
"Luis de Bethencourt <luis@debethencourt.com>");
- gst_element_class_add_pad_template (element_class,
+ gst_element_class_add_pad_template (gstelement_class,
gst_static_pad_template_get (&src_factory));
- gst_element_class_add_pad_template (element_class,
+ gst_element_class_add_pad_template (gstelement_class,
gst_static_pad_template_get (&sink_factory));
-}
-
-/* Initialize the burn's class. */
-static void
-gst_burn_class_init (GstBurnClass * klass)
-{
- GObjectClass *gobject_class = (GObjectClass *) klass;
- GstBaseTransformClass *trans_class = (GstBaseTransformClass *) klass;
gobject_class->set_property = gst_burn_set_property;
gobject_class->get_property = gst_burn_get_property;
@@ -172,7 +164,7 @@ gst_burn_class_init (GstBurnClass * klass)
* initialize instance structure.
*/
static void
-gst_burn_init (GstBurn * filter, GstBurnClass * gclass)
+gst_burn_init (GstBurn * filter)
{
filter->adjustment = DEFAULT_ADJUSTMENT;
filter->silent = FALSE;
@@ -225,20 +217,25 @@ static gboolean
gst_burn_set_caps (GstBaseTransform * btrans, GstCaps * incaps,
GstCaps * outcaps)
{
- GstBurn *filter = GST_BURN (btrans);
- GstStructure *structure;
- gboolean ret = FALSE;
+ GstBurn *burn = GST_BURN (btrans);
+ GstVideoInfo info;
- structure = gst_caps_get_structure (incaps, 0);
+ if (!gst_video_info_from_caps (&info, incaps))
+ goto invalid_caps;
- GST_OBJECT_LOCK (filter);
- if (gst_structure_get_int (structure, "width", &filter->width) &&
- gst_structure_get_int (structure, "height", &filter->height)) {
- ret = TRUE;
- }
- GST_OBJECT_UNLOCK (filter);
+ burn->info = info;
+
+ burn->width = GST_VIDEO_INFO_WIDTH (&info);
+ burn->height = GST_VIDEO_INFO_HEIGHT (&info);
+
+ return TRUE;
- return ret;
+ /* ERRORS */
+invalid_caps:
+ {
+ GST_DEBUG_OBJECT (btrans, "could not parse caps");
+ return FALSE;
+ }
}
/* Actual processing. */
@@ -248,10 +245,16 @@ gst_burn_transform (GstBaseTransform * btrans,
{
GstBurn *filter = GST_BURN (btrans);
gint video_size, adjustment;
- guint32 *src = (guint32 *) GST_BUFFER_DATA (in_buf);
- guint32 *dest = (guint32 *) GST_BUFFER_DATA (out_buf);
+ guint32 *src, *dest;
GstClockTime timestamp;
gint64 stream_time;
+ GstVideoFrame in_frame, out_frame;
+
+ gst_video_frame_map (&in_frame, &filter->info, in_buf, GST_MAP_READ);
+ gst_video_frame_map (&out_frame, &filter->info, out_buf, GST_MAP_WRITE);
+
+ src = GST_VIDEO_FRAME_PLANE_DATA (&in_frame, 0);
+ dest = GST_VIDEO_FRAME_PLANE_DATA (&out_frame, 0);
video_size = filter->width * filter->height;
diff --git a/gst/gaudieffects/gstburn.h b/gst/gaudieffects/gstburn.h
index 1a3ed58e1..c2542832d 100644
--- a/gst/gaudieffects/gstburn.h
+++ b/gst/gaudieffects/gstburn.h
@@ -1,7 +1,7 @@
/*
* GStreamer
* Copyright (C) 2010 Luis de Bethencourt <luis@debethencourt.com>
- *
+ *
* Burn - curve adjustment film video effect.
*
* Permission is hereby granted, free of charge, to any person obtaining a
@@ -48,6 +48,7 @@
#include <gst/gst.h>
+#include <gst/video/video.h>
#include <gst/video/gstvideofilter.h>
G_BEGIN_DECLS
@@ -75,6 +76,7 @@ struct _GstBurn
gint width, height;
+ GstVideoInfo info;
gint adjustment;
gboolean silent;
};