summaryrefslogtreecommitdiffstats
path: root/gst/videofilter
diff options
context:
space:
mode:
authorWim Taymans <wim.taymans@gmail.com>2006-03-03 14:39:55 +0000
committerWim Taymans <wim.taymans@gmail.com>2006-03-03 14:39:55 +0000
commite85d1638c3e2199998ed8a31af1a2c654354fcba (patch)
treebb2ea8d01a1cde1da78efc69e8e6822018ec90ec /gst/videofilter
parent6be283efae4eb211a99a8130a28ed49258b7f3be (diff)
docs/plugins/: Added videobalance and videoflip to the docs.
Original commit message from CVS: * docs/plugins/Makefile.am: * docs/plugins/gst-plugins-good-plugins-docs.sgml: * docs/plugins/gst-plugins-good-plugins-sections.txt: * docs/plugins/gst-plugins-good-plugins.hierarchy: Added videobalance and videoflip to the docs. * gst/videofilter/Makefile.am: * gst/videofilter/gstvideobalance.c: (gst_video_balance_update_tables_planar411), (gst_video_balance_is_passthrough), (gst_video_balance_update_properties), (oil_tablelookup_u8), (gst_video_balance_planar411_ip), (gst_video_balance_set_caps), (gst_video_balance_transform_ip), (gst_video_balance_base_init), (gst_video_balance_finalize), (gst_video_balance_class_init), (gst_video_balance_init), (gst_video_balance_interface_supported), (gst_video_balance_interface_init), (gst_video_balance_colorbalance_list_channels), (gst_video_balance_colorbalance_set_value), (gst_video_balance_colorbalance_get_value), (gst_video_balance_colorbalance_init), (gst_video_balance_set_property), (gst_video_balance_get_property), (gst_video_balance_get_type), (plugin_init): * gst/videofilter/gstvideobalance.h: Ported to 0.10. (Fixes #326160) Added docs. * gst/videofilter/gstvideoflip.c: * gst/videofilter/gstvideoflip.h: Added docs.
Diffstat (limited to 'gst/videofilter')
-rw-r--r--gst/videofilter/Makefile.am14
-rw-r--r--gst/videofilter/gstvideobalance.c641
-rw-r--r--gst/videofilter/gstvideobalance.h64
-rw-r--r--gst/videofilter/gstvideoflip.c19
-rw-r--r--gst/videofilter/gstvideoflip.h18
5 files changed, 445 insertions, 311 deletions
diff --git a/gst/videofilter/Makefile.am b/gst/videofilter/Makefile.am
index cb5e286b..297ae82d 100644
--- a/gst/videofilter/Makefile.am
+++ b/gst/videofilter/Makefile.am
@@ -1,7 +1,7 @@
# noinst_LTLIBRARIES = libgstvideoexample.la
-plugin_LTLIBRARIES = libgstvideoflip.la
+plugin_LTLIBRARIES = libgstvideoflip.la libgstvideobalance.la
-noinst_HEADERS = gstvideoflip.h
+noinst_HEADERS = gstvideoflip.h gstvideobalance.h
EXTRA_DIST = gstvideotemplate.c make_filter
CLEANFILES = gstvideoexample.c
@@ -17,10 +17,12 @@ libgstvideoflip_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) \
libgstvideoflip_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstvideo-@GST_MAJORMINOR@ $(GST_BASE_LIBS) $(GST_LIBS)
libgstvideoflip_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-# libgstvideobalance_la_SOURCES = gstvideobalance.c
-# libgstvideobalance_la_CFLAGS = $(GST_CFLAGS) $(LIBOIL_CFLAGS)
-# libgstvideobalance_la_LIBADD = $(top_builddir)/gst-libs/gst/libgstinterfaces-$(GST_MAJORMINOR).la
-# libgstvideobalance_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(LIBOIL_LIBS) -lm
+libgstvideobalance_la_SOURCES = gstvideobalance.c
+libgstvideobalance_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) \
+ $(GST_PLUGINS_BASE_CFLAGS)
+libgstvideobalance_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstvideo-@GST_MAJORMINOR@ \
+ -lgstinterfaces-@GST_MAJORMINOR@ $(GST_BASE_LIBS) $(GST_LIBS)
+libgstvideobalance_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
# libgstgamma_la_SOURCES = gstgamma.c
# libgstgamma_la_CFLAGS = $(GST_CFLAGS)
diff --git a/gst/videofilter/gstvideobalance.c b/gst/videofilter/gstvideobalance.c
index 919f13ff..58d098eb 100644
--- a/gst/videofilter/gstvideobalance.c
+++ b/gst/videofilter/gstvideobalance.c
@@ -23,6 +23,25 @@
* gstvideobalance.c,v 1.7 2003/11/08 02:48:59 dschleef Exp
*/
+/**
+ * SECTION:element-videobalance
+ *
+ * <refsect2>
+ * <para>
+ * Adjusts brightness, contrast, hue, saturation on a video stream.
+ * </para>
+ * <title>Example launch line</title>
+ * <para>
+ * <programlisting>
+ * gst-launch videotestsrc ! videobalance saturation=0.0 ! ffmpegcolorspace ! ximagesink
+ * </programlisting>
+ * This pipeline converts the image to black and white by setting the saturation to 0.0.
+ * </para>
+ * </refsect2>
+ *
+ * Last reviewed on 2006-03-03 (0.10.3)
+ */
+
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
@@ -34,112 +53,272 @@
#include <string.h>
#include <math.h>
-#include <gst/colorbalance/colorbalance.h>
+#include <gst/video/video.h>
+#include <gst/interfaces/colorbalance.h>
+
+static GstElementDetails video_balance_details =
+GST_ELEMENT_DETAILS ("Video Balance Control",
+ "Filter/Effect/Video",
+ "Adjusts brightness, contrast, hue, saturation on a video stream",
+ "David Schleef <ds@schleef.org>");
+
+/* GstVideoBalance signals and args */
+#define DEFAULT_PROP_CONTRAST 1.0
+#define DEFAULT_PROP_BRIGHTNESS 0.0
+#define DEFAULT_PROP_HUE 0.0
+#define DEFAULT_PROP_SATURATION 1.0
-/* GstVideobalance signals and args */
enum
{
- ARG_0,
- ARG_CONTRAST,
- ARG_BRIGHTNESS,
- ARG_HUE,
- ARG_SATURATION
- /* FILL ME */
+ PROP_0,
+ PROP_CONTRAST,
+ PROP_BRIGHTNESS,
+ PROP_HUE,
+ PROP_SATURATION
};
-static GstVideofilterClass *parent_class = NULL;
+static GstStaticPadTemplate gst_video_balance_src_template =
+GST_STATIC_PAD_TEMPLATE ("src",
+ GST_PAD_SRC,
+ GST_PAD_ALWAYS,
+ GST_STATIC_CAPS (GST_VIDEO_CAPS_YUV ("{ IYUV, I420, YV12 }"))
+ );
-static void gst_videobalance_base_init (gpointer g_class);
-static void gst_videobalance_class_init (gpointer g_class, gpointer class_data);
-static void gst_videobalance_init (GTypeInstance * instance, gpointer g_class);
+static GstStaticPadTemplate gst_video_balance_sink_template =
+GST_STATIC_PAD_TEMPLATE ("sink",
+ GST_PAD_SINK,
+ GST_PAD_ALWAYS,
+ GST_STATIC_CAPS (GST_VIDEO_CAPS_YUV ("{ IYUV, I420, YV12 }"))
+ );
-static void gst_videobalance_set_property (GObject * object, guint prop_id,
- const GValue * value, GParamSpec * pspec);
-static void gst_videobalance_get_property (GObject * object, guint prop_id,
- GValue * value, GParamSpec * pspec);
+/*
+ * look-up tables (LUT).
+ */
+static void
+gst_video_balance_update_tables_planar411 (GstVideoBalance * vb)
+{
+ gint i, j;
+ gdouble y, u, v, hue_cos, hue_sin;
-static void gst_videobalance_planar411 (GstVideofilter * videofilter,
- void *dest, void *src);
-static void gst_videobalance_setup (GstVideofilter * videofilter);
+ /* Y */
+ for (i = 0; i < 256; i++) {
+ y = 16 + ((i - 16) * vb->contrast + vb->brightness * 255);
+ if (y < 0)
+ y = 0;
+ else if (y > 255)
+ y = 255;
+ vb->tabley[i] = rint (y);
+ }
-static void gst_videobalance_interface_init (GstImplementsInterfaceClass *
- klass);
-static void gst_videobalance_colorbalance_init (GstColorBalanceClass * iface);
+ /* FIXME this is a bogus transformation for hue, but you get
+ * the idea */
+ hue_cos = cos (M_PI * vb->hue);
+ hue_sin = sin (M_PI * vb->hue);
-static void gst_videobalance_dispose (GObject * object);
-static void gst_videobalance_update_properties (GstVideobalance * videobalance);
+ /* U/V lookup tables are 2D, since we need both U/V for each table
+ * separately. */
+ for (i = -128; i < 128; i++) {
+ for (j = -128; j < 128; j++) {
+ u = 128 + ((i * hue_cos + j * hue_sin) * vb->saturation);
+ v = 128 + ((-i * hue_sin + j * hue_cos) * vb->saturation);
+ if (u < 0)
+ u = 0;
+ else if (u > 255)
+ u = 255;
+ if (v < 0)
+ v = 0;
+ else if (v > 255)
+ v = 255;
+ vb->tableu[i + 128][j + 128] = rint (u);
+ vb->tablev[i + 128][j + 128] = rint (v);
+ }
+ }
+}
-GType
-gst_videobalance_get_type (void)
+static gboolean
+gst_video_balance_is_passthrough (GstVideoBalance * videobalance)
{
- static GType videobalance_type = 0;
-
- if (!videobalance_type) {
- static const GTypeInfo videobalance_info = {
- sizeof (GstVideobalanceClass),
- gst_videobalance_base_init,
- NULL,
- gst_videobalance_class_init,
- NULL,
- NULL,
- sizeof (GstVideobalance),
- 0,
- gst_videobalance_init,
- };
+ return videobalance->contrast == 1.0 &&
+ videobalance->brightness == 0.0 &&
+ videobalance->hue == 0.0 && videobalance->saturation == 1.0;
+}
- static const GInterfaceInfo iface_info = {
- (GInterfaceInitFunc) gst_videobalance_interface_init,
- NULL,
- NULL,
- };
+static void
+gst_video_balance_update_properties (GstVideoBalance * videobalance)
+{
+ videobalance->passthru = gst_video_balance_is_passthrough (videobalance);
- static const GInterfaceInfo colorbalance_info = {
- (GInterfaceInitFunc) gst_videobalance_colorbalance_init,
- NULL,
- NULL,
- };
+ if (!videobalance->passthru) {
+ gst_video_balance_update_tables_planar411 (videobalance);
+ }
+}
- videobalance_type = g_type_register_static (GST_TYPE_VIDEOFILTER,
- "GstVideobalance", &videobalance_info, 0);
+#ifndef HAVE_LIBOIL
+void
+oil_tablelookup_u8 (guint8 * dest, int dstr, guint8 * src, int sstr,
+ guint8 * table, int tstr, int n)
+{
+ int i;
- g_type_add_interface_static (videobalance_type,
- GST_TYPE_IMPLEMENTS_INTERFACE, &iface_info);
- g_type_add_interface_static (videobalance_type, GST_TYPE_COLOR_BALANCE,
- &colorbalance_info);
+ for (i = 0; i < n; i++) {
+ *dest = table[*src * tstr];
+ dest += dstr;
+ src += sstr;
}
- return videobalance_type;
}
+#endif
+
+/* Useful macros */
+#define GST_VIDEO_I420_Y_ROWSTRIDE(width) (GST_ROUND_UP_4(width))
+#define GST_VIDEO_I420_U_ROWSTRIDE(width) (GST_ROUND_UP_8(width)/2)
+#define GST_VIDEO_I420_V_ROWSTRIDE(width) ((GST_ROUND_UP_8(GST_VIDEO_I420_Y_ROWSTRIDE(width)))/2)
+
+#define GST_VIDEO_I420_Y_OFFSET(w,h) (0)
+#define GST_VIDEO_I420_U_OFFSET(w,h) (GST_VIDEO_I420_Y_OFFSET(w,h)+(GST_VIDEO_I420_Y_ROWSTRIDE(w)*GST_ROUND_UP_2(h)))
+#define GST_VIDEO_I420_V_OFFSET(w,h) (GST_VIDEO_I420_U_OFFSET(w,h)+(GST_VIDEO_I420_U_ROWSTRIDE(w)*GST_ROUND_UP_2(h)/2))
+#define GST_VIDEO_I420_SIZE(w,h) (GST_VIDEO_I420_V_OFFSET(w,h)+(GST_VIDEO_I420_V_ROWSTRIDE(w)*GST_ROUND_UP_2(h)/2))
static void
-gst_videobalance_base_init (gpointer g_class)
+gst_video_balance_planar411_ip (GstVideoBalance * videobalance, guint8 * data,
+ gint width, gint height)
{
- static GstElementDetails videobalance_details =
- GST_ELEMENT_DETAILS ("Video Balance Control",
- "Filter/Effect/Video",
- "Adjusts brightness, contrast, hue, saturation on a video stream",
- "David Schleef <ds@schleef.org>");
- GstElementClass *element_class = GST_ELEMENT_CLASS (g_class);
- GstVideofilterClass *videofilter_class = GST_VIDEOFILTER_CLASS (g_class);
- int i;
+ int x, y;
+ guint8 *ydata;
+ guint8 *udata, *vdata;
+ gint ystride, ustride, vstride;
+ gint width2, height2;
+
+ ydata = data + GST_VIDEO_I420_Y_OFFSET (width, height);
+ ystride = GST_VIDEO_I420_Y_ROWSTRIDE (width);
+
+ for (y = 0; y < height; y++) {
+ oil_tablelookup_u8 (ydata, 1, ydata, 1, videobalance->tabley, 1, width);
+ ydata += ystride;
+ }
+
+ width2 = width >> 1;
+ height2 = height >> 1;
+
+ udata = data + GST_VIDEO_I420_U_OFFSET (width, height);
+ vdata = data + GST_VIDEO_I420_V_OFFSET (width, height);
+ ustride = GST_VIDEO_I420_U_ROWSTRIDE (width);
+ vstride = GST_VIDEO_I420_V_ROWSTRIDE (width);
+
+ for (y = 0; y < height2; y++) {
+ guint8 *uptr, *vptr;
+ guint8 u1, v1;
- gst_element_class_set_details (element_class, &videobalance_details);
+ uptr = udata + y * ustride;
+ vptr = vdata + y * vstride;
- for (i = 0; i < G_N_ELEMENTS (gst_videobalance_formats); i++) {
- gst_videofilter_class_add_format (videofilter_class,
- gst_videobalance_formats + i);
+ for (x = 0; x < width2; x++) {
+ u1 = *uptr;
+ v1 = *vptr;
+
+ *uptr++ = videobalance->tableu[u1][v1];
+ *vptr++ = videobalance->tablev[u1][v1];
+ }
}
+}
+
+/* get notified of caps and plug in the correct process function */
+static gboolean
+gst_video_balance_set_caps (GstBaseTransform * base, GstCaps * incaps,
+ GstCaps * outcaps)
+{
+ GstVideoBalance *this;
+ GstStructure *structure;
+ gboolean res;
+
+ this = GST_VIDEO_BALANCE (base);
+
+ GST_DEBUG_OBJECT (this,
+ "set_caps: in %" GST_PTR_FORMAT " out %" GST_PTR_FORMAT, incaps, outcaps);
+
+ structure = gst_caps_get_structure (incaps, 0);
+
+ res = gst_structure_get_int (structure, "width", &this->width);
+ res &= gst_structure_get_int (structure, "height", &this->height);
+ if (!res)
+ goto done;
+
+ this->size = GST_VIDEO_I420_SIZE (this->width, this->height);
+
+done:
+ return res;
+}
+
+static GstFlowReturn
+gst_video_balance_transform_ip (GstBaseTransform * base, GstBuffer * outbuf)
+{
+ GstVideoBalance *videobalance;
+ guint8 *data;
+ guint size;
+ gint width, height;
+
+ videobalance = GST_VIDEO_BALANCE (base);
+
+ /* if no change is needed, we are done */
+ if (videobalance->passthru)
+ goto done;
+
+ data = GST_BUFFER_DATA (outbuf);
+ size = GST_BUFFER_SIZE (outbuf);
+
+ width = videobalance->width;
+ height = videobalance->height;
+
+ if (size < videobalance->size)
+ goto wrong_size;
+
+ gst_video_balance_planar411_ip (videobalance, data,
+ videobalance->width, videobalance->height);
+
+done:
+ return GST_FLOW_OK;
+
+ /* ERRORS */
+wrong_size:
+ {
+ GST_ELEMENT_ERROR (videobalance, STREAM, FORMAT,
+ (NULL), ("Invalid buffer size %d, expected %d", size,
+ videobalance->size));
+ return GST_FLOW_ERROR;
+ }
+}
+
+
+/****************
+ * Boilerplate
+ */
+static GstVideoFilterClass *parent_class = NULL;
+
+static void gst_video_balance_set_property (GObject * object, guint prop_id,
+ const GValue * value, GParamSpec * pspec);
+static void gst_video_balance_get_property (GObject * object, guint prop_id,
+ GValue * value, GParamSpec * pspec);
+
+static void
+gst_video_balance_base_init (gpointer g_class)
+{
+ GstElementClass *element_class = GST_ELEMENT_CLASS (g_class);
+
+ gst_element_class_set_details (element_class, &video_balance_details);
- gst_videofilter_class_add_pad_templates (GST_VIDEOFILTER_CLASS (g_class));
+ gst_element_class_add_pad_template (element_class,
+ gst_static_pad_template_get (&gst_video_balance_sink_template));
+ gst_element_class_add_pad_template (element_class,
+ gst_static_pad_template_get (&gst_video_balance_src_template));
}
static void
-gst_videobalance_dispose (GObject * object)
+gst_video_balance_finalize (GObject * object)
{
GList *channels = NULL;
- GstVideobalance *balance;
+ GstVideoBalance *balance;
gint i;
- balance = GST_VIDEOBALANCE (object);
+ balance = GST_VIDEO_BALANCE (object);
if (balance->tableu) {
for (i = 0; i < 256; i++)
@@ -172,38 +351,43 @@ gst_videobalance_dispose (GObject * object)
if (balance->channels)
g_list_free (balance->channels);
- G_OBJECT_CLASS (parent_class)->dispose (object);
+ G_OBJECT_CLASS (parent_class)->finalize (object);
}
static void
-gst_videobalance_class_init (gpointer g_class, gpointer class_data)
+gst_video_balance_class_init (gpointer g_class, gpointer class_data)
{
GObjectClass *gobject_class;
- GstVideofilterClass *videofilter_class;
+ GstBaseTransformClass *trans_class;
+ GstVideoFilterClass *videofilter_class;
gobject_class = G_OBJECT_CLASS (g_class);
- videofilter_class = GST_VIDEOFILTER_CLASS (g_class);
+ trans_class = GST_BASE_TRANSFORM_CLASS (g_class);
+ videofilter_class = GST_VIDEO_FILTER_CLASS (g_class);
- parent_class = g_type_class_ref (GST_TYPE_VIDEOFILTER);
+ parent_class = g_type_class_peek_parent (g_class);
- gobject_class->set_property = gst_videobalance_set_property;
- gobject_class->get_property = gst_videobalance_get_property;
+ gobject_class->set_property = gst_video_balance_set_property;
+ gobject_class->get_property = gst_video_balance_get_property;
- g_object_class_install_property (gobject_class, ARG_CONTRAST,
+ g_object_class_install_property (gobject_class, PROP_CONTRAST,
g_param_spec_double ("contrast", "Contrast", "contrast",
- 0, 2, 1, G_PARAM_READWRITE));
- g_object_class_install_property (gobject_class, ARG_BRIGHTNESS,
+ 0.0, 2.0, DEFAULT_PROP_CONTRAST, G_PARAM_READWRITE));
+ g_object_class_install_property (gobject_class, PROP_BRIGHTNESS,
g_param_spec_double ("brightness", "Brightness", "brightness",
- -1, 1, 0, G_PARAM_READWRITE));
- g_object_class_install_property (gobject_class, ARG_HUE,
- g_param_spec_double ("hue", "Hue", "hue", -1, 1, 0, G_PARAM_READWRITE));
- g_object_class_install_property (gobject_class, ARG_SATURATION,
+ -1.0, 1.0, DEFAULT_PROP_BRIGHTNESS, G_PARAM_READWRITE));
+ g_object_class_install_property (gobject_class, PROP_HUE,
+ g_param_spec_double ("hue", "Hue", "hue",
+ -1.0, 1.0, DEFAULT_PROP_HUE, G_PARAM_READWRITE));
+ g_object_class_install_property (gobject_class, PROP_SATURATION,
g_param_spec_double ("saturation", "Saturation", "saturation",
- 0, 2, 1, G_PARAM_READWRITE));
+ 0.0, 2.0, DEFAULT_PROP_SATURATION, G_PARAM_READWRITE));
- gobject_class->dispose = gst_videobalance_dispose;
+ gobject_class->finalize = GST_DEBUG_FUNCPTR (gst_video_balance_finalize);
- videofilter_class->setup = gst_videobalance_setup;
+ trans_class->set_caps = GST_DEBUG_FUNCPTR (gst_video_balance_set_caps);
+ trans_class->transform_ip =
+ GST_DEBUG_FUNCPTR (gst_video_balance_transform_ip);
#ifdef HAVE_LIBOIL
oil_init ();
@@ -211,27 +395,26 @@ gst_videobalance_class_init (gpointer g_class, gpointer class_data)
}
static void
-gst_videobalance_init (GTypeInstance * instance, gpointer g_class)
+gst_video_balance_init (GTypeInstance * instance, gpointer g_class)
{
- GstVideobalance *videobalance = GST_VIDEOBALANCE (instance);
- GstVideofilter *videofilter;
+ GstVideoBalance *videobalance = GST_VIDEO_BALANCE (instance);
+ GstVideoFilter *videofilter;
char *channels[4] = { "HUE", "SATURATION",
"BRIGHTNESS", "CONTRAST"
};
gint i;
- GST_DEBUG ("gst_videobalance_init");
+ GST_DEBUG ("gst_video_balance_init");
- videofilter = GST_VIDEOFILTER (videobalance);
+ videofilter = GST_VIDEO_FILTER (videobalance);
/* do stuff */
- videobalance->contrast = 1.0;
- videobalance->brightness = 0.0;
- videobalance->saturation = 1.0;
- videobalance->hue = 0.0;
+ videobalance->contrast = DEFAULT_PROP_CONTRAST;
+ videobalance->brightness = DEFAULT_PROP_BRIGHTNESS;
+ videobalance->hue = DEFAULT_PROP_HUE;
+ videobalance->saturation = DEFAULT_PROP_SATURATION;
- videobalance->needupdate = FALSE;
- videofilter->passthru = TRUE;
+ gst_video_balance_update_properties (videobalance);
videobalance->tabley = g_new (guint8, 256);
videobalance->tableu = g_new (guint8 *, 256);
@@ -256,7 +439,7 @@ gst_videobalance_init (GTypeInstance * instance, gpointer g_class)
}
static gboolean
-gst_videobalance_interface_supported (GstImplementsInterface * iface,
+gst_video_balance_interface_supported (GstImplementsInterface * iface,
GType type)
{
g_assert (type == GST_TYPE_COLOR_BALANCE);
@@ -264,31 +447,31 @@ gst_videobalance_interface_supported (GstImplementsInterface * iface,
}
static void
-gst_videobalance_interface_init (GstImplementsInterfaceClass * klass)
+gst_video_balance_interface_init (GstImplementsInterfaceClass * klass)
{
- klass->supported = gst_videobalance_interface_supported;
+ klass->supported = gst_video_balance_interface_supported;
}
static const GList *
-gst_videobalance_colorbalance_list_channels (GstColorBalance * balance)
+gst_video_balance_colorbalance_list_channels (GstColorBalance * balance)
{
- GstVideobalance *videobalance = GST_VIDEOBALANCE (balance);
+ GstVideoBalance *videobalance = GST_VIDEO_BALANCE (balance);
g_return_val_if_fail (videobalance != NULL, NULL);
- g_return_val_if_fail (GST_IS_VIDEOBALANCE (videobalance), NULL);
+ g_return_val_if_fail (GST_IS_VIDEO_BALANCE (videobalance), NULL);
return videobalance->channels;
}
static void
-gst_videobalance_colorbalance_set_value (GstColorBalance * balance,
+gst_video_balance_colorbalance_set_value (GstColorBalance * balance,
GstColorBalanceChannel * channel, gint value)
{
- GstVideobalance *vb = GST_VIDEOBALANCE (balance);
+ GstVideoBalance *vb = GST_VIDEO_BALANCE (balance);
g_return_if_fail (vb != NULL);
- g_return_if_fail (GST_IS_VIDEOBALANCE (vb));
- g_return_if_fail (GST_IS_VIDEOFILTER (vb));
+ g_return_if_fail (GST_IS_VIDEO_BALANCE (vb));
+ g_return_if_fail (GST_IS_VIDEO_FILTER (vb));
g_return_if_fail (channel->label != NULL);
if (!g_ascii_strcasecmp (channel->label, "HUE")) {
@@ -301,18 +484,18 @@ gst_videobalance_colorbalance_set_value (GstColorBalance * balance,
vb->contrast = (value + 1000.0) * 2.0 / 2000.0;
}
- gst_videobalance_update_properties (vb);
+ gst_video_balance_update_properties (vb);
}
static gint
-gst_videobalance_colorbalance_get_value (GstColorBalance * balance,
+gst_video_balance_colorbalance_get_value (GstColorBalance * balance,
GstColorBalanceChannel * channel)
{
- GstVideobalance *vb = GST_VIDEOBALANCE (balance);
+ GstVideoBalance *vb = GST_VIDEO_BALANCE (balance);
gint value = 0;
g_return_val_if_fail (vb != NULL, 0);
- g_return_val_if_fail (GST_IS_VIDEOBALANCE (vb), 0);
+ g_return_val_if_fail (GST_IS_VIDEO_BALANCE (vb), 0);
g_return_val_if_fail (channel->label != NULL, 0);
if (!g_ascii_strcasecmp (channel->label, "HUE")) {
@@ -329,80 +512,62 @@ gst_videobalance_colorbalance_get_value (GstColorBalance * balance,
}
static void
-gst_videobalance_colorbalance_init (GstColorBalanceClass * iface)
+gst_video_balance_colorbalance_init (GstColorBalanceClass * iface)
{
GST_COLOR_BALANCE_TYPE (iface) = GST_COLOR_BALANCE_SOFTWARE;
- iface->list_channels = gst_videobalance_colorbalance_list_channels;
- iface->set_value = gst_videobalance_colorbalance_set_value;
- iface->get_value = gst_videobalance_colorbalance_get_value;
-}
-
-static void
-gst_videobalance_update_properties (GstVideobalance * videobalance)
-{
- GstVideofilter *vf = GST_VIDEOFILTER (videobalance);
-
- videobalance->needupdate = TRUE;
-
- if (videobalance->contrast == 1.0 &&
- videobalance->brightness == 0.0 &&
- videobalance->hue == 0.0 && videobalance->saturation == 1.0) {
- vf->passthru = TRUE;
- } else {
- vf->passthru = FALSE;
- }
+ iface->list_channels = gst_video_balance_colorbalance_list_channels;
+ iface->set_value = gst_video_balance_colorbalance_set_value;
+ iface->get_value = gst_video_balance_colorbalance_get_value;
}
static void
-gst_videobalance_set_property (GObject * object, guint prop_id,
+gst_video_balance_set_property (GObject * object, guint prop_id,
const GValue * value, GParamSpec * pspec)
{
- GstVideobalance *src;
+ GstVideoBalance *src;
- g_return_if_fail (GST_IS_VIDEOBALANCE (object));
- src = GST_VIDEOBALANCE (object);
+ src = GST_VIDEO_BALANCE (object);
- GST_DEBUG ("gst_videobalance_set_property");
+ GST_DEBUG ("gst_video_balance_set_property");
switch (prop_id) {
- case ARG_CONTRAST:
+ case PROP_CONTRAST:
src->contrast = g_value_get_double (value);
break;
- case ARG_BRIGHTNESS:
+ case PROP_BRIGHTNESS:
src->brightness = g_value_get_double (value);
break;
- case ARG_HUE:
+ case PROP_HUE:
src->hue = g_value_get_double (value);
break;
- case ARG_SATURATION:
+ case PROP_SATURATION:
src->saturation = g_value_get_double (value);
break;
default:
break;
}
- gst_videobalance_update_properties (src);
+ gst_video_balance_update_properties (src);
}
static void
-gst_videobalance_get_property (GObject * object, guint prop_id, GValue * value,
+gst_video_balance_get_property (GObject * object, guint prop_id, GValue * value,
GParamSpec * pspec)
{
- GstVideobalance *src;
+ GstVideoBalance *src;
- g_return_if_fail (GST_IS_VIDEOBALANCE (object));
- src = GST_VIDEOBALANCE (object);
+ src = GST_VIDEO_BALANCE (object);
switch (prop_id) {
- case ARG_CONTRAST:
+ case PROP_CONTRAST:
g_value_set_double (value, src->contrast);
break;
- case ARG_BRIGHTNESS:
+ case PROP_BRIGHTNESS:
g_value_set_double (value, src->brightness);
break;
- case ARG_HUE:
+ case PROP_HUE:
g_value_set_double (value, src->hue);
break;
- case ARG_SATURATION:
+ case PROP_SATURATION:
g_value_set_double (value, src->saturation);
break;
default:
@@ -411,141 +576,57 @@ gst_videobalance_get_property (GObject * object, guint prop_id, GValue * value,
}
}
-static gboolean
-plugin_init (GstPlugin * plugin)
-{
- if (!gst_library_load ("gstvideofilter"))
- return FALSE;
-
- return gst_element_register (plugin, "videobalance", GST_RANK_NONE,
- GST_TYPE_VIDEOBALANCE);
-}
-
-GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
- GST_VERSION_MINOR,
- "videobalance",
- "Changes hue, saturation, brightness etc. on video images",
- plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN);
-
-static void
-gst_videobalance_setup (GstVideofilter * videofilter)
+GType
+gst_video_balance_get_type (void)
{
- GstVideobalance *videobalance;
-
- g_return_if_fail (GST_IS_VIDEOBALANCE (videofilter));
- videobalance = GST_VIDEOBALANCE (videofilter);
-
- /* if any setup needs to be done, do it here */
+ static GType video_balance_type = 0;
-}
-
-/*
- * look-up tables (LUT).
- */
+ if (!video_balance_type) {
+ static const GTypeInfo video_balance_info = {
+ sizeof (GstVideoBalanceClass),
+ gst_video_balance_base_init,
+ NULL,
+ gst_video_balance_class_init,
+ NULL,
+ NULL,
+ sizeof (GstVideoBalance),
+ 0,
+ gst_video_balance_init,
+ };
-static void
-gst_videobalance_update_tables_planar411 (GstVideobalance * vb)
-{
- gint i, j;
- gdouble y, u, v, hue_cos, hue_sin;
+ static const GInterfaceInfo iface_info = {
+ (GInterfaceInitFunc) gst_video_balance_interface_init,
+ NULL,
+ NULL,
+ };
- /* Y */
- for (i = 0; i < 256; i++) {
- y = 16 + ((i - 16) * vb->contrast + vb->brightness * 255);
- if (y < 0)
- y = 0;
- else if (y > 255)
- y = 255;
- vb->tabley[i] = rint (y);
- }
+ static const GInterfaceInfo colorbalance_info = {
+ (GInterfaceInitFunc) gst_video_balance_colorbalance_init,
+ NULL,
+ NULL,
+ };
- /* FIXME this is a bogus transformation for hue, but you get
- * the idea */
- hue_cos = cos (M_PI * vb->hue);
- hue_sin = sin (M_PI * vb->hue);
+ video_balance_type = g_type_register_static (GST_TYPE_VIDEO_FILTER,
+ "GstVideoBalance", &video_balance_info, 0);
- /* U/V lookup tables are 2D, since we need both U/V for each table
- * separately. */
- for (i = -128; i < 128; i++) {
- for (j = -128; j < 128; j++) {
- u = 128 + ((i * hue_cos + j * hue_sin) * vb->saturation);
- v = 128 + ((-i * hue_sin + j * hue_cos) * vb->saturation);
- if (u < 0)
- u = 0;
- else if (u > 255)
- u = 255;
- if (v < 0)
- v = 0;
- else if (v > 255)
- v = 255;
- vb->tableu[i + 128][j + 128] = rint (u);
- vb->tablev[i + 128][j + 128] = rint (v);
- }
+ g_type_add_interface_static (video_balance_type,
+ GST_TYPE_IMPLEMENTS_INTERFACE, &iface_info);
+ g_type_add_interface_static (video_balance_type, GST_TYPE_COLOR_BALANCE,
+ &colorbalance_info);
}
+ return video_balance_type;
}
-#ifndef HAVE_LIBOIL
-void
-oil_tablelookup_u8 (guint8 * dest, int dstr, guint8 * src, int sstr,
- guint8 * table, int tstr, int n)
-{
- int i;
-
- for (i = 0; i < n; i++) {
- *dest = table[*src * tstr];
- dest += dstr;
- src += sstr;
- }
-}
-#endif
-static void
-gst_videobalance_planar411 (GstVideofilter * videofilter, void *dest, void *src)
+static gboolean
+plugin_init (GstPlugin * plugin)
{
- GstVideobalance *videobalance;
- int width;
- int height;
- int x, y;
-
- g_return_if_fail (GST_IS_VIDEOBALANCE (videofilter));
- videobalance = GST_VIDEOBALANCE (videofilter);
-
- if (videobalance->needupdate) {
- gst_videobalance_update_tables_planar411 (videobalance);
- videobalance->needupdate = FALSE;
- }
-
- width = videofilter->from_width;
- height = videofilter->from_height;
-
- {
- guint8 *cdest = dest;
- guint8 *csrc = src;
-
- for (y = 0; y < height; y++) {
- oil_tablelookup_u8 (cdest + y * width, 1, csrc + y * width, 1,
- videobalance->tabley, 1, width);
- }
- }
-
- {
- gint u1, v1;
- guint8 *usrc, *vsrc;
- guint8 *udest, *vdest;
-
- usrc = src + width * height;
- udest = dest + width * height;
- vsrc = src + width * height + (width / 2) * (height / 2);
- vdest = dest + width * height + (width / 2) * (height / 2);
-
- for (y = 0; y < height / 2; y++) {
- for (x = 0; x < width / 2; x++) {
- u1 = usrc[y * (width / 2) + x];
- v1 = vsrc[y * (width / 2) + x];
- udest[y * (width / 2) + x] = videobalance->tableu[u1][v1];
- vdest[y * (width / 2) + x] = videobalance->tablev[u1][v1];
- }
- }
- }
-
+ return gst_element_register (plugin, "videobalance", GST_RANK_NONE,
+ GST_TYPE_VIDEO_BALANCE);
}
+
+GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
+ GST_VERSION_MINOR,
+ "videobalance",
+ "Changes hue, saturation, brightness etc. on video images",
+ plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN);
diff --git a/gst/videofilter/gstvideobalance.h b/gst/videofilter/gstvideobalance.h
index ac709f88..49b3dfb5 100644
--- a/gst/videofilter/gstvideobalance.h
+++ b/gst/videofilter/gstvideobalance.h
@@ -18,47 +18,61 @@
*/
-#ifndef __GST_VIDEOBALANCE_H__
-#define __GST_VIDEOBALANCE_H__
+#ifndef __GST_VIDEO_BALANCE_H__
+#define __GST_VIDEO_BALANCE_H__
-#include "gstvideofilter.h"
+#include <gst/video/gstvideofilter.h>
G_BEGIN_DECLS
-#define GST_TYPE_VIDEOBALANCE \
- (gst_videobalance_get_type())
-#define GST_VIDEOBALANCE(obj) \
- (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_VIDEOBALANCE,GstVideobalance))
-#define GST_VIDEOBALANCE_CLASS(klass) \
- (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_VIDEOBALANCE,GstVideobalanceClass))
-#define GST_IS_VIDEOBALANCE(obj) \
- (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_VIDEOBALANCE))
-#define GST_IS_VIDEOBALANCE_CLASS(obj) \
- (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_VIDEOBALANCE))
+#define GST_TYPE_VIDEO_BALANCE \
+ (gst_video_balance_get_type())
+#define GST_VIDEO_BALANCE(obj) \
+ (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_VIDEO_BALANCE,GstVideoBalance))
+#define GST_VIDEO_BALANCE_CLASS(klass) \
+ (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_VIDEO_BALANCE,GstVideoBalanceClass))
+#define GST_IS_VIDEO_BALANCE(obj) \
+ (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_VIDEO_BALANCE))
+#define GST_IS_VIDEO_BALANCE_CLASS(obj) \
+ (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_VIDEO_BALANCE))
-typedef struct _GstVideobalance GstVideobalance;
-typedef struct _GstVideobalanceClass GstVideobalanceClass;
+typedef struct _GstVideoBalance GstVideoBalance;
+typedef struct _GstVideoBalanceClass GstVideoBalanceClass;
-struct _GstVideobalance {
- GstVideofilter videofilter;
+/**
+ * GstVideoBalance:
+ *
+ * Opaque data structure.
+ */
+struct _GstVideoBalance {
+ GstVideoFilter videofilter;
- guint8 *tabley, **tableu, **tablev;
- gboolean needupdate;
+ /* channels for interface */
+ GList *channels;
+ /* properties */
gdouble contrast;
gdouble brightness;
gdouble hue;
gdouble saturation;
-
- GList *channels;
+
+ gboolean passthru;
+
+ /* format */
+ gint width;
+ gint height;
+ gint size;
+
+ /* tables */
+ guint8 *tabley, **tableu, **tablev;
};
-struct _GstVideobalanceClass {
- GstVideofilterClass parent_class;
+struct _GstVideoBalanceClass {
+ GstVideoFilterClass parent_class;
};
-GType gst_videobalance_get_type(void);
+GType gst_video_balance_get_type(void);
G_END_DECLS
-#endif /* __GST_VIDEOBALANCE_H__ */
+#endif /* __GST_VIDEO_BALANCE_H__ */
diff --git a/gst/videofilter/gstvideoflip.c b/gst/videofilter/gstvideoflip.c
index 4b23cf30..e3e22e64 100644
--- a/gst/videofilter/gstvideoflip.c
+++ b/gst/videofilter/gstvideoflip.c
@@ -22,6 +22,25 @@
* This file was (probably) generated from gstvideoflip.c,
* gstvideoflip.c,v 1.7 2003/11/08 02:48:59 dschleef Exp
*/
+/**
+ * SECTION:element-videoflip
+ *
+ * <refsect2>
+ * <para>
+ * Flips and rotates video.
+ * </para>
+ * <title>Example launch line</title>
+ * <para>
+ * <programlisting>
+ * gst-launch videotestsrc ! videoflip method=clockwise ! ffmpegcolorspace ! ximagesink
+ * </programlisting>
+ * This pipeline flips the test image 90 degrees clockwise.
+ * </para>
+ * </refsect2>
+ *
+ * Last reviewed on 2006-03-03 (0.10.3)
+ */
+
#ifdef HAVE_CONFIG_H
#include "config.h"
diff --git a/gst/videofilter/gstvideoflip.h b/gst/videofilter/gstvideoflip.h
index 5ece67c0..cf0f13e7 100644
--- a/gst/videofilter/gstvideoflip.h
+++ b/gst/videofilter/gstvideoflip.h
@@ -24,6 +24,19 @@
G_BEGIN_DECLS
+/**
+ * GstVideoFlipMethod:
+ * @GST_VIDEO_FLIP_METHOD_IDENTITY: Identity (no rotation)
+ * @GST_VIDEO_FLIP_METHOD_90R: Rotate clockwise 90 degrees
+ * @GST_VIDEO_FLIP_METHOD_180: Rotate 180 degrees
+ * @GST_VIDEO_FLIP_METHOD_90L: Rotate counter-clockwise 90 degrees
+ * @GST_VIDEO_FLIP_METHOD_HORIZ: Flip horizontally
+ * @GST_VIDEO_FLIP_METHOD_VERT: Flip vertically
+ * @GST_VIDEO_FLIP_METHOD_TRANS: Flip across upper left/lower right diagonal
+ * @GST_VIDEO_FLIP_METHOD_OTHER: Flip across upper right/lower left diagonal
+ *
+ * The different flip methods.
+ */
typedef enum {
GST_VIDEO_FLIP_METHOD_IDENTITY,
GST_VIDEO_FLIP_METHOD_90R,
@@ -49,6 +62,11 @@ typedef enum {
typedef struct _GstVideoFlip GstVideoFlip;
typedef struct _GstVideoFlipClass GstVideoFlipClass;
+/**
+ * GstVideoFlip:
+ *
+ * Opaque datastructure.
+ */
struct _GstVideoFlip {
GstVideoFilter videofilter;