summaryrefslogtreecommitdiff
path: root/gst/videomixer/videomixer.c
diff options
context:
space:
mode:
authorStefan Kost <ensonic@users.sourceforge.net>2008-01-15 07:42:51 +0000
committerStefan Kost <ensonic@users.sourceforge.net>2008-01-15 07:42:51 +0000
commitaf52f547bd5ec1920baf92461739e17f345960e3 (patch)
treee532fc1d26b5ee84e59fb781833928106f857b86 /gst/videomixer/videomixer.c
parent8a72bf80e7008e2ef0dbf68fd1ec3335f6ce8a8d (diff)
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.
Diffstat (limited to 'gst/videomixer/videomixer.c')
-rw-r--r--gst/videomixer/videomixer.c140
1 files changed, 12 insertions, 128 deletions
diff --git a/gst/videomixer/videomixer.c b/gst/videomixer/videomixer.c
index 7ec99b47b..74e0d0b02 100644
--- a/gst/videomixer/videomixer.c
+++ b/gst/videomixer/videomixer.c
@@ -51,37 +51,16 @@
#include <gst/gst.h>
#include <gst/base/gstcollectpads.h>
+#include <gst/controller/gstcontroller.h>
#include <stdlib.h>
#include <string.h>
+#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,
@@ -232,11 +118,6 @@ gst_videomixer_pad_get_type (void)
}
static void
-gst_videomixer_pad_base_init (gpointer g_class)
-{
-}
-
-static void
gst_videomixer_pad_class_init (GstVideoMixerPadClass * klass)
{
GObjectClass *gobject_class;
@@ -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