From af52f547bd5ec1920baf92461739e17f345960e3 Mon Sep 17 00:00:00 2001 From: Stefan Kost Date: Tue, 15 Jan 2008 07:42:51 +0000 Subject: docs/plugins/: Update plugin docs. Original commit message from CVS: * docs/plugins/Makefile.am: * docs/plugins/gst-plugins-good-plugins.args: * docs/plugins/gst-plugins-good-plugins.signals: * docs/plugins/inspect/plugin-alaw.xml: * docs/plugins/inspect/plugin-alpha.xml: * docs/plugins/inspect/plugin-alphacolor.xml: * docs/plugins/inspect/plugin-annodex.xml: * docs/plugins/inspect/plugin-apetag.xml: * docs/plugins/inspect/plugin-audiofx.xml: * docs/plugins/inspect/plugin-auparse.xml: * docs/plugins/inspect/plugin-autodetect.xml: * docs/plugins/inspect/plugin-avi.xml: * docs/plugins/inspect/plugin-cairo.xml: * docs/plugins/inspect/plugin-cdio.xml: * docs/plugins/inspect/plugin-cutter.xml: * docs/plugins/inspect/plugin-debug.xml: * docs/plugins/inspect/plugin-dv.xml: * docs/plugins/inspect/plugin-efence.xml: * docs/plugins/inspect/plugin-effectv.xml: * docs/plugins/inspect/plugin-flac.xml: * docs/plugins/inspect/plugin-flxdec.xml: * docs/plugins/inspect/plugin-gconfelements.xml: * docs/plugins/inspect/plugin-gdkpixbuf.xml: * docs/plugins/inspect/plugin-goom.xml: * docs/plugins/inspect/plugin-halelements.xml: * docs/plugins/inspect/plugin-icydemux.xml: * docs/plugins/inspect/plugin-id3demux.xml: * docs/plugins/inspect/plugin-jpeg.xml: * docs/plugins/inspect/plugin-ladspa.xml: * docs/plugins/inspect/plugin-level.xml: * docs/plugins/inspect/plugin-matroska.xml: * docs/plugins/inspect/plugin-mulaw.xml: * docs/plugins/inspect/plugin-multipart.xml: * docs/plugins/inspect/plugin-navigationtest.xml: * docs/plugins/inspect/plugin-png.xml: * docs/plugins/inspect/plugin-quicktime.xml: * docs/plugins/inspect/plugin-rtp.xml: * docs/plugins/inspect/plugin-rtsp.xml: * docs/plugins/inspect/plugin-shout2send.xml: * docs/plugins/inspect/plugin-smpte.xml: * docs/plugins/inspect/plugin-speex.xml: * docs/plugins/inspect/plugin-taglib.xml: * docs/plugins/inspect/plugin-udp.xml: * docs/plugins/inspect/plugin-videobalance.xml: * docs/plugins/inspect/plugin-videobox.xml: * docs/plugins/inspect/plugin-videocrop.xml: * docs/plugins/inspect/plugin-videoflip.xml: * docs/plugins/inspect/plugin-videomixer.xml: * docs/plugins/inspect/plugin-wavenc.xml: * docs/plugins/inspect/plugin-wavpack.xml: * docs/plugins/inspect/plugin-wavparse.xml: Update plugin docs. * gst/videomixer/Makefile.am: * gst/videomixer/videomixer.c: * gst/videomixer/videomixer.h: * gst/videomixer/videomixerpad.h: Split out header to fix warnings from the doc-build. --- gst/videomixer/Makefile.am | 3 + gst/videomixer/videomixer.c | 140 ++++------------------------------------- gst/videomixer/videomixer.h | 98 +++++++++++++++++++++++++++++ gst/videomixer/videomixerpad.h | 75 ++++++++++++++++++++++ 4 files changed, 188 insertions(+), 128 deletions(-) create mode 100644 gst/videomixer/videomixer.h create mode 100644 gst/videomixer/videomixerpad.h (limited to 'gst/videomixer') diff --git a/gst/videomixer/Makefile.am b/gst/videomixer/Makefile.am index 5350c389..c970a903 100644 --- a/gst/videomixer/Makefile.am +++ b/gst/videomixer/Makefile.am @@ -4,3 +4,6 @@ libgstvideomixer_la_SOURCES = videomixer.c libgstvideomixer_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) libgstvideomixer_la_LIBADD = $(GST_LIBS) $(GST_BASE_LIBS) libgstvideomixer_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) + +# headers we need but don't want installed +noinst_HEADERS = videomixer.h videomixerpad.h diff --git a/gst/videomixer/videomixer.c b/gst/videomixer/videomixer.c index 7ec99b47..74e0d0b0 100644 --- a/gst/videomixer/videomixer.c +++ b/gst/videomixer/videomixer.c @@ -51,37 +51,16 @@ #include #include +#include #include #include +#include "videomixer.h" + GST_DEBUG_CATEGORY_STATIC (gst_videomixer_debug); #define GST_CAT_DEFAULT gst_videomixer_debug -#define GST_TYPE_VIDEO_MIXER_PAD (gst_videomixer_pad_get_type()) -#define GST_VIDEO_MIXER_PAD(obj) \ - (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_VIDEO_MIXER_PAD, GstVideoMixerPad)) -#define GST_VIDEO_MIXER_PAD_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_VIDEO_MIXER_PAD, GstVideoMixerPadiClass)) -#define GST_IS_VIDEO_MIXER_PAD(obj) \ - (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_VIDEO_MIXER_PAD)) -#define GST_IS_VIDEO_MIXER_PAD_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_VIDEO_MIXER_PAD)) - -typedef struct _GstVideoMixerPad GstVideoMixerPad; -typedef struct _GstVideoMixerPadClass GstVideoMixerPadClass; -typedef struct _GstVideoMixerCollect GstVideoMixerCollect; - -#define GST_TYPE_VIDEO_MIXER (gst_videomixer_get_type()) -#define GST_VIDEO_MIXER(obj) \ - (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_VIDEO_MIXER, GstVideoMixer)) -#define GST_VIDEO_MIXER_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_VIDEO_MIXER, GstVideoMixerClass)) -#define GST_IS_VIDEO_MIXER(obj) \ - (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_VIDEO_MIXER)) -#define GST_IS_VIDEO_MIXER_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_VIDEO_MIXER)) - #define GST_VIDEO_MIXER_GET_STATE_LOCK(mix) \ (GST_VIDEO_MIXER(mix)->state_lock) #define GST_VIDEO_MIXER_STATE_LOCK(mix) \ @@ -91,69 +70,9 @@ typedef struct _GstVideoMixerCollect GstVideoMixerCollect; static GType gst_videomixer_get_type (void); -typedef struct _GstVideoMixer GstVideoMixer; -typedef struct _GstVideoMixerClass GstVideoMixerClass; - -/** - * GstVideoMixerBackground: - * @VIDEO_MIXER_BACKGROUND_CHECKER: checker pattern background - * @VIDEO_MIXER_BACKGROUND_BLACK: solid color black background - * @VIDEO_MIXER_BACKGROUND_WHITE: solid color white background - * - * The different backgrounds videomixer can blend over. - */ -typedef enum -{ - VIDEO_MIXER_BACKGROUND_CHECKER, - VIDEO_MIXER_BACKGROUND_BLACK, - VIDEO_MIXER_BACKGROUND_WHITE -} -GstVideoMixerBackground; - -/** - * GstVideoMixer: - * - * The opaque #GstVideoMixer structure. - */ -struct _GstVideoMixer -{ - GstElement element; - - /* pad */ - GstPad *srcpad; - - /* Lock to prevent the state to change while blending */ - GMutex *state_lock; - /* Sink pads using Collect Pads from core's base library */ - GstCollectPads *collect; - /* sinkpads, a GSList of GstVideoMixerPads */ - GSList *sinkpads; - - gint numpads; - - /* the master pad */ - GstVideoMixerPad *master; - - gint in_width, in_height; - gint out_width, out_height; - gboolean setcaps; - gboolean sendseg; - - GstVideoMixerBackground background; - - gint fps_n; - gint fps_d; -}; -struct _GstVideoMixerClass -{ - GstElementClass parent_class; -}; - -static void gst_videomixer_pad_base_init (gpointer g_class); static void gst_videomixer_pad_class_init (GstVideoMixerPadClass * klass); static void gst_videomixer_pad_init (GstVideoMixerPad * mixerpad); - static void gst_videomixer_pad_get_property (GObject * object, guint prop_id, GValue * value, GParamSpec * pspec); static void gst_videomixer_pad_set_property (GObject * object, guint prop_id, @@ -174,39 +93,6 @@ enum ARG_PAD_ALPHA }; -struct _GstVideoMixerCollect -{ - GstCollectData collect; /* we extend the CollectData */ - - GstBuffer *buffer; /* the queued buffer for this pad */ - - GstVideoMixerPad *mixpad; -}; - -/* all information needed for one video stream */ -struct _GstVideoMixerPad -{ - GstPad parent; /* subclass the pad */ - - gint64 queued; - - guint in_width, in_height; - gint fps_n; - gint fps_d; - - gint xpos, ypos; - guint zorder; - gint blend_mode; - gdouble alpha; - - GstVideoMixerCollect *mixcol; -}; - -struct _GstVideoMixerPadClass -{ - GstPadClass parent_class; -}; - static GType gst_videomixer_pad_get_type (void) { @@ -215,7 +101,7 @@ gst_videomixer_pad_get_type (void) if (!videomixer_pad_type) { static const GTypeInfo videomixer_pad_info = { sizeof (GstVideoMixerPadClass), - gst_videomixer_pad_base_init, + NULL, NULL, (GClassInitFunc) gst_videomixer_pad_class_init, NULL, @@ -231,11 +117,6 @@ gst_videomixer_pad_get_type (void) return videomixer_pad_type; } -static void -gst_videomixer_pad_base_init (gpointer g_class) -{ -} - static void gst_videomixer_pad_class_init (GstVideoMixerPadClass * klass) { @@ -250,16 +131,19 @@ gst_videomixer_pad_class_init (GstVideoMixerPadClass * klass) g_object_class_install_property (gobject_class, ARG_PAD_ZORDER, g_param_spec_uint ("zorder", "Z-Order", "Z Order of the picture", - 0, 10000, DEFAULT_PAD_ZORDER, G_PARAM_READWRITE)); + 0, 10000, DEFAULT_PAD_ZORDER, + G_PARAM_READWRITE | GST_PARAM_CONTROLLABLE)); g_object_class_install_property (gobject_class, ARG_PAD_XPOS, g_param_spec_int ("xpos", "X Position", "X Position of the picture", - G_MININT, G_MAXINT, DEFAULT_PAD_XPOS, G_PARAM_READWRITE)); + G_MININT, G_MAXINT, DEFAULT_PAD_XPOS, + G_PARAM_READWRITE | GST_PARAM_CONTROLLABLE)); g_object_class_install_property (gobject_class, ARG_PAD_YPOS, g_param_spec_int ("ypos", "Y Position", "Y Position of the picture", - G_MININT, G_MAXINT, DEFAULT_PAD_YPOS, G_PARAM_READWRITE)); + G_MININT, G_MAXINT, DEFAULT_PAD_YPOS, + G_PARAM_READWRITE | GST_PARAM_CONTROLLABLE)); g_object_class_install_property (gobject_class, ARG_PAD_ALPHA, - g_param_spec_double ("alpha", "Alpha", "Alpha of the picture", - 0.0, 1.0, DEFAULT_PAD_ALPHA, G_PARAM_READWRITE)); + g_param_spec_double ("alpha", "Alpha", "Alpha of the picture", 0.0, 1.0, + DEFAULT_PAD_ALPHA, G_PARAM_READWRITE | GST_PARAM_CONTROLLABLE)); } static void diff --git a/gst/videomixer/videomixer.h b/gst/videomixer/videomixer.h new file mode 100644 index 00000000..102d3e16 --- /dev/null +++ b/gst/videomixer/videomixer.h @@ -0,0 +1,98 @@ +/* Generic video mixer plugin + * Copyright (C) 2008 Wim Taymans + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + */ + +#ifndef __GST_VIDEO_MIXER_H__ +#define __GST_VIDEO_MIXER_H__ + +#include +#include "videomixerpad.h" + +G_BEGIN_DECLS + +#define GST_TYPE_VIDEO_MIXER (gst_videomixer_get_type()) +#define GST_VIDEO_MIXER(obj) \ + (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_VIDEO_MIXER, GstVideoMixer)) +#define GST_VIDEO_MIXER_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_VIDEO_MIXER, GstVideoMixerClass)) +#define GST_IS_VIDEO_MIXER(obj) \ + (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_VIDEO_MIXER)) +#define GST_IS_VIDEO_MIXER_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_VIDEO_MIXER)) + +typedef struct _GstVideoMixer GstVideoMixer; +typedef struct _GstVideoMixerClass GstVideoMixerClass; + +/** + * GstVideoMixerBackground: + * @VIDEO_MIXER_BACKGROUND_CHECKER: checker pattern background + * @VIDEO_MIXER_BACKGROUND_BLACK: solid color black background + * @VIDEO_MIXER_BACKGROUND_WHITE: solid color white background + * + * The different backgrounds videomixer can blend over. + */ +typedef enum +{ + VIDEO_MIXER_BACKGROUND_CHECKER, + VIDEO_MIXER_BACKGROUND_BLACK, + VIDEO_MIXER_BACKGROUND_WHITE +} +GstVideoMixerBackground; + +/** + * GstVideoMixer: + * + * The opaque #GstVideoMixer structure. + */ +struct _GstVideoMixer +{ + GstElement element; + + /* pad */ + GstPad *srcpad; + + /* Lock to prevent the state to change while blending */ + GMutex *state_lock; + /* Sink pads using Collect Pads from core's base library */ + GstCollectPads *collect; + /* sinkpads, a GSList of GstVideoMixerPads */ + GSList *sinkpads; + + gint numpads; + + /* the master pad */ + GstVideoMixerPad *master; + + gint in_width, in_height; + gint out_width, out_height; + gboolean setcaps; + gboolean sendseg; + + GstVideoMixerBackground background; + + gint fps_n; + gint fps_d; +}; + +struct _GstVideoMixerClass +{ + GstElementClass parent_class; +}; + +G_END_DECLS +#endif /* __GST_VIDEO_MIXER_H__ */ diff --git a/gst/videomixer/videomixerpad.h b/gst/videomixer/videomixerpad.h new file mode 100644 index 00000000..862bd46f --- /dev/null +++ b/gst/videomixer/videomixerpad.h @@ -0,0 +1,75 @@ +/* Video mixer pad + * Copyright (C) 2008 Wim Taymans + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + */ + +#ifndef __GST_VIDEO_MIXER_PAD_H__ +#define __GST_VIDEO_MIXER_PAD_H__ + +#include + +G_BEGIN_DECLS + +#define GST_TYPE_VIDEO_MIXER_PAD (gst_videomixer_pad_get_type()) +#define GST_VIDEO_MIXER_PAD(obj) \ + (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_VIDEO_MIXER_PAD, GstVideoMixerPad)) +#define GST_VIDEO_MIXER_PAD_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_VIDEO_MIXER_PAD, GstVideoMixerPadiClass)) +#define GST_IS_VIDEO_MIXER_PAD(obj) \ + (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_VIDEO_MIXER_PAD)) +#define GST_IS_VIDEO_MIXER_PAD_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_VIDEO_MIXER_PAD)) + +typedef struct _GstVideoMixerPad GstVideoMixerPad; +typedef struct _GstVideoMixerPadClass GstVideoMixerPadClass; +typedef struct _GstVideoMixerCollect GstVideoMixerCollect; + +struct _GstVideoMixerCollect +{ + GstCollectData collect; /* we extend the CollectData */ + + GstBuffer *buffer; /* the queued buffer for this pad */ + + GstVideoMixerPad *mixpad; +}; + +/* all information needed for one video stream */ +struct _GstVideoMixerPad +{ + GstPad parent; /* subclass the pad */ + + gint64 queued; + + guint in_width, in_height; + gint fps_n; + gint fps_d; + + gint xpos, ypos; + guint zorder; + gint blend_mode; + gdouble alpha; + + GstVideoMixerCollect *mixcol; +}; + +struct _GstVideoMixerPadClass +{ + GstPadClass parent_class; +}; + +G_END_DECLS +#endif /* __GST_VIDEO_MIXER_PAD_H__ */ -- cgit