configure.ac: Adding videomixer.

Original commit message from CVS:
2005-10-17  Julien MOUTTE  <julien@moutte.net>

* configure.ac: Adding videomixer.
* ext/libpng/gstpngdec.c: (gst_pngdec_class_init),
(user_read_data), (gst_pngdec_chain): More debugging.
* gst/alpha/Makefile.am: Adding alphacolor
* gst/alpha/gstalphacolor.c: (gst_alpha_color_base_init),
(gst_alpha_color_class_init), (gst_alpha_color_init),
(gst_alpha_color_transform_caps), (gst_alpha_color_set_caps),
(transform_rgb), (transform_bgr),
(gst_alpha_color_transform_ip),
(plugin_init): Ported to 0.9 using in place base tranform.
* gst/videomixer/Makefile.am:
* gst/videomixer/videomixer.c: (gst_videomixer_pad_get_type),
(gst_videomixer_pad_class_init),
(gst_videomixer_pad_sink_setcaps),
(gst_videomixer_pad_link), (gst_videomixer_pad_unlink),
(gst_videomixer_pad_init), (gst_videomixer_class_init),
(gst_videomixer_init), (gst_videomixer_getcaps),
(gst_videomixer_request_new_pad), (gst_videomixer_fill_queues),
(gst_videomixer_blend_buffers), (gst_videomixer_update_queues),
(gst_videomixer_collected), (gst_videomixer_change_state):
Ported
to 0.9 using collectpads.
This commit is contained in:
Julien Moutte 2005-10-17 08:46:30 +00:00
parent e509e3980d
commit 1aa9f76c49
7 changed files with 502 additions and 166 deletions

View file

@ -1,3 +1,25 @@
2005-10-17 Julien MOUTTE <julien@moutte.net>
* configure.ac: Adding videomixer.
* ext/libpng/gstpngdec.c: (gst_pngdec_class_init),
(user_read_data), (gst_pngdec_chain): More debugging.
* gst/alpha/Makefile.am: Adding alphacolor
* gst/alpha/gstalphacolor.c: (gst_alpha_color_base_init),
(gst_alpha_color_class_init), (gst_alpha_color_init),
(gst_alpha_color_transform_caps), (gst_alpha_color_set_caps),
(transform_rgb), (transform_bgr), (gst_alpha_color_transform_ip),
(plugin_init): Ported to 0.9 using in place base tranform.
* gst/videomixer/Makefile.am:
* gst/videomixer/videomixer.c: (gst_videomixer_pad_get_type),
(gst_videomixer_pad_class_init), (gst_videomixer_pad_sink_setcaps),
(gst_videomixer_pad_link), (gst_videomixer_pad_unlink),
(gst_videomixer_pad_init), (gst_videomixer_class_init),
(gst_videomixer_init), (gst_videomixer_getcaps),
(gst_videomixer_request_new_pad), (gst_videomixer_fill_queues),
(gst_videomixer_blend_buffers), (gst_videomixer_update_queues),
(gst_videomixer_collected), (gst_videomixer_change_state): Ported
to 0.9 using collectpads.
2005-10-17 Zeeshan Ali <zeenix at gmail dot com> 2005-10-17 Zeeshan Ali <zeenix at gmail dot com>
* configure.ac: * configure.ac:

View file

@ -281,6 +281,7 @@ GST_PLUGINS_ALL="\
smpte \ smpte \
udp \ udp \
videobox \ videobox \
videomixer \
wavenc \ wavenc \
wavparse \ wavparse \
" "
@ -601,6 +602,7 @@ gst/smpte/Makefile
gst/udp/Makefile gst/udp/Makefile
gst/videobox/Makefile gst/videobox/Makefile
gst/videofilter/Makefile gst/videofilter/Makefile
gst/videomixer/Makefile
gst/wavenc/Makefile gst/wavenc/Makefile
gst/wavparse/Makefile gst/wavparse/Makefile
gst/flx/Makefile gst/flx/Makefile

View file

@ -326,7 +326,7 @@ gst_pngdec_chain (GstPad * pad, GstBuffer * buf)
gst_buffer_unref (buf); gst_buffer_unref (buf);
/* Pushing */ /* Pushing */
GST_LOG ("pushing our raw RGB frame"); GST_LOG ("pushing our raw RGB frame of %d bytes", GST_BUFFER_SIZE (out));
ret = gst_pad_push (pngdec->srcpad, out); ret = gst_pad_push (pngdec->srcpad, out);
beach: beach:

View file

@ -1,9 +1,15 @@
plugin_LTLIBRARIES = libgstalpha.la plugin_LTLIBRARIES = libgstalpha.la libgstalphacolor.la
libgstalpha_la_SOURCES = gstalpha.c libgstalpha_la_SOURCES = gstalpha.c
libgstalpha_la_CFLAGS = $(GST_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) libgstalpha_la_CFLAGS = $(GST_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS)
libgstalpha_la_LIBADD = $(GST_LIBS) libgstalpha_la_LIBADD = $(GST_LIBS)
libgstalpha_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstalpha_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
libgstalphacolor_la_SOURCES = gstalphacolor.c
libgstalphacolor_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) \
$(GST_PLUGINS_BASE_CFLAGS)
libgstalphacolor_la_LIBADD = $(GST_LIBS) $(GST_BASE_LIBS)
libgstalphacolor_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
noinst_HEADERS = noinst_HEADERS =

257
gst/alpha/gstalphacolor.c Normal file
View file

@ -0,0 +1,257 @@
/* GStreamer
* Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu>
*
* 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.
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <gst/gst.h>
#include <gst/base/gstbasetransform.h>
#include <gst/video/video.h>
#include <string.h>
GST_DEBUG_CATEGORY (alpha_color_debug);
#define GST_CAT_DEFAULT alpha_color_debug
#define GST_TYPE_ALPHA_COLOR \
(gst_alpha_color_get_type())
#define GST_ALPHA_COLOR(obj) \
(G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_ALPHA_COLOR,GstAlphaColor))
#define GST_ALPHA_COLOR_CLASS(klass) \
(G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_ALPHA_COLOR,GstAlphaColorClass))
#define GST_IS_ALPHA_COLOR(obj) \
(G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_ALPHA_COLOR))
#define GST_IS_ALPHA_COLOR_CLASS(obj) \
(G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_ALPHA_COLOR))
typedef struct _GstAlphaColor GstAlphaColor;
typedef struct _GstAlphaColorClass GstAlphaColorClass;
struct _GstAlphaColor
{
GstBaseTransform element;
/* caps */
gint in_width, in_height;
gboolean in_rgba;
gint out_width, out_height;
};
struct _GstAlphaColorClass
{
GstBaseTransformClass parent_class;
};
/* elementfactory information */
static GstElementDetails gst_alpha_color_details =
GST_ELEMENT_DETAILS ("alpha color filter",
"Filter/Effect/Video",
"RGB->YUV colorspace conversion preserving the alpha channels",
"Wim Taymans <wim@fluendo.com>");
static GstStaticPadTemplate gst_alpha_color_sink_template =
GST_STATIC_PAD_TEMPLATE ("sink",
GST_PAD_SINK,
GST_PAD_ALWAYS,
GST_STATIC_CAPS (GST_VIDEO_CAPS_RGBA ";" GST_VIDEO_CAPS_BGRA)
);
static GstStaticPadTemplate gst_alpha_color_src_template =
GST_STATIC_PAD_TEMPLATE ("src",
GST_PAD_SRC,
GST_PAD_ALWAYS,
GST_STATIC_CAPS (GST_VIDEO_CAPS_YUV ("AYUV"))
);
GST_BOILERPLATE (GstAlphaColor, gst_alpha_color, GstBaseTransform,
GST_TYPE_BASE_TRANSFORM);
static GstCaps *gst_alpha_color_transform_caps (GstBaseTransform * btrans,
GstPadDirection direction, GstCaps * caps);
static gboolean gst_alpha_color_set_caps (GstBaseTransform * btrans,
GstCaps * incaps, GstCaps * outcaps);
static GstFlowReturn gst_alpha_color_transform_ip (GstBaseTransform * btrans,
GstBuffer * inbuf);
static void
gst_alpha_color_base_init (gpointer g_class)
{
GstElementClass *element_class = GST_ELEMENT_CLASS (g_class);
gst_element_class_set_details (element_class, &gst_alpha_color_details);
gst_element_class_add_pad_template (element_class,
gst_static_pad_template_get (&gst_alpha_color_sink_template));
gst_element_class_add_pad_template (element_class,
gst_static_pad_template_get (&gst_alpha_color_src_template));
}
static void
gst_alpha_color_class_init (GstAlphaColorClass * klass)
{
GObjectClass *gobject_class;
GstElementClass *gstelement_class;
GstBaseTransformClass *gstbasetransform_class;
gobject_class = (GObjectClass *) klass;
gstelement_class = (GstElementClass *) klass;
gstbasetransform_class = (GstBaseTransformClass *) klass;
gstbasetransform_class->transform_caps =
GST_DEBUG_FUNCPTR (gst_alpha_color_transform_caps);
gstbasetransform_class->set_caps =
GST_DEBUG_FUNCPTR (gst_alpha_color_set_caps);
gstbasetransform_class->transform_ip =
GST_DEBUG_FUNCPTR (gst_alpha_color_transform_ip);
GST_DEBUG_CATEGORY_INIT (alpha_color_debug, "alphacolor", 0,
"RGB->YUV colorspace conversion preserving the alpha channels");
}
static void
gst_alpha_color_init (GstAlphaColor * alpha, GstAlphaColorClass * g_class)
{
GstBaseTransform *btrans = NULL;
btrans = GST_BASE_TRANSFORM (alpha);
btrans->always_in_place = TRUE;
}
static GstCaps *
gst_alpha_color_transform_caps (GstBaseTransform * btrans,
GstPadDirection direction, GstCaps * caps)
{
GstAlphaColor *alpha;
GstCaps *result;
alpha = GST_ALPHA_COLOR (btrans);
GST_DEBUG ("transforming direction %d caps %s", direction,
gst_caps_to_string (caps));
result = gst_caps_new_simple ("video/x-raw-yuv",
"format", GST_TYPE_FOURCC, GST_MAKE_FOURCC ('A', 'Y', 'U', 'V'),
"width", GST_TYPE_INT_RANGE, 16, 4096,
"height", GST_TYPE_INT_RANGE, 16, 4096,
"framerate", GST_TYPE_DOUBLE_RANGE, 0.0, G_MAXDOUBLE, NULL);
return result;
}
static gboolean
gst_alpha_color_set_caps (GstBaseTransform * btrans, GstCaps * incaps,
GstCaps * outcaps)
{
GstAlphaColor *alpha;
GstStructure *structure;
gboolean ret;
gdouble fps;
gint red_mask;
alpha = GST_ALPHA_COLOR (btrans);
structure = gst_caps_get_structure (incaps, 0);
ret = gst_structure_get_int (structure, "width", &alpha->in_width);
ret &= gst_structure_get_int (structure, "height", &alpha->in_height);
ret &= gst_structure_get_double (structure, "framerate", &fps);
ret &= gst_structure_get_int (structure, "red_mask", &red_mask);
if (!ret)
return FALSE;
alpha->in_rgba = TRUE;
#if (G_BYTE_ORDER == G_BIG_ENDIAN)
if (red_mask != 0x000000ff)
#else
if (red_mask != 0x00ff0000)
#endif
alpha->in_rgba = FALSE;
return TRUE;
}
static void
transform_rgb (guint8 * data, gint size)
{
guint8 y, u, v;
while (size > 0) {
y = data[0] * 0.299 + data[1] * 0.587 + data[2] * 0.114 + 0;
u = data[0] * -0.169 + data[1] * -0.332 + data[2] * 0.500 + 128;
v = data[0] * 0.500 + data[1] * -0.419 + data[2] * -0.0813 + 128;
data[0] = data[3];
data[1] = y;
data[2] = u;
data[3] = v;
data += 4;
size -= 4;
}
}
static void
transform_bgr (guint8 * data, gint size)
{
guint8 y, u, v;
while (size > 0) {
y = data[2] * 0.299 + data[1] * 0.587 + data[0] * 0.114 + 0;
u = data[2] * -0.169 + data[1] * -0.332 + data[0] * 0.500 + 128;
v = data[2] * 0.500 + data[1] * -0.419 + data[0] * -0.0813 + 128;
data[0] = data[3];
data[1] = y;
data[2] = u;
data[3] = v;
data += 4;
size -= 4;
}
}
static GstFlowReturn
gst_alpha_color_transform_ip (GstBaseTransform * btrans, GstBuffer * inbuf)
{
GstFlowReturn ret = GST_FLOW_OK;
GstAlphaColor *alpha;
alpha = GST_ALPHA_COLOR (btrans);
/* Transform in place */
if (alpha->in_rgba)
transform_rgb (GST_BUFFER_DATA (inbuf), GST_BUFFER_SIZE (inbuf));
else
transform_bgr (GST_BUFFER_DATA (inbuf), GST_BUFFER_SIZE (inbuf));
return ret;
}
static gboolean
plugin_init (GstPlugin * plugin)
{
return gst_element_register (plugin, "alphacolor", GST_RANK_NONE,
GST_TYPE_ALPHA_COLOR);
}
GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
GST_VERSION_MINOR,
"alphacolor",
"RGB->YUV colorspace conversion preserving the alpha channels",
plugin_init, VERSION, GST_LICENSE, GST_PACKAGE, GST_ORIGIN)

View file

@ -1,6 +1,6 @@
plugin_LTLIBRARIES = libgstvideomixer.la plugin_LTLIBRARIES = libgstvideomixer.la
libgstvideomixer_la_SOURCES = videomixer.c libgstvideomixer_la_SOURCES = videomixer.c
libgstvideomixer_la_CFLAGS = $(GST_CFLAGS) libgstvideomixer_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS)
libgstvideomixer_la_LIBADD = $(GST_LIBS) libgstvideomixer_la_LIBADD = $(GST_LIBS) $(GST_BASE_LIBS)
libgstvideomixer_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstvideomixer_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)

View file

@ -22,6 +22,8 @@
#endif #endif
#include <gst/gst.h> #include <gst/gst.h>
#include <gst/base/gstcollectpads.h>
#include <string.h> #include <string.h>
GST_DEBUG_CATEGORY_STATIC (gst_videomixer_debug); GST_DEBUG_CATEGORY_STATIC (gst_videomixer_debug);
@ -39,6 +41,7 @@ GST_DEBUG_CATEGORY_STATIC (gst_videomixer_debug);
typedef struct _GstVideoMixerPad GstVideoMixerPad; typedef struct _GstVideoMixerPad GstVideoMixerPad;
typedef struct _GstVideoMixerPadClass GstVideoMixerPadClass; typedef struct _GstVideoMixerPadClass GstVideoMixerPadClass;
typedef struct _GstVideoMixerCollect GstVideoMixerCollect;
#define GST_TYPE_VIDEO_MIXER (gst_videomixer_get_type()) #define GST_TYPE_VIDEO_MIXER (gst_videomixer_get_type())
#define GST_VIDEO_MIXER(obj) \ #define GST_VIDEO_MIXER(obj) \
@ -79,15 +82,21 @@ enum
ARG_PAD_ALPHA, 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 */ /* all information needed for one video stream */
struct _GstVideoMixerPad struct _GstVideoMixerPad
{ {
GstRealPad parent; /* subclass the pad */ GstPad parent; /* subclass the pad */
GstBuffer *buffer; /* the queued buffer for this pad */ guint64 queued;
gboolean eos;
gint64 queued;
guint in_width, in_height; guint in_width, in_height;
gdouble in_framerate; gdouble in_framerate;
@ -96,11 +105,13 @@ struct _GstVideoMixerPad
guint zorder; guint zorder;
gint blend_mode; gint blend_mode;
gdouble alpha; gdouble alpha;
GstVideoMixerCollect *mixcol;
}; };
struct _GstVideoMixerPadClass struct _GstVideoMixerPadClass
{ {
GstRealPadClass parent_class; GstPadClass parent_class;
}; };
static GType static GType
@ -121,8 +132,7 @@ gst_videomixer_pad_get_type (void)
(GInstanceInitFunc) gst_videomixer_pad_init, (GInstanceInitFunc) gst_videomixer_pad_init,
}; };
videomixer_pad_type = videomixer_pad_type = g_type_register_static (GST_TYPE_PAD,
g_type_register_static (GST_TYPE_REAL_PAD,
"GstVideoMixerPad", &videomixer_pad_info, 0); "GstVideoMixerPad", &videomixer_pad_info, 0);
} }
return videomixer_pad_type; return videomixer_pad_type;
@ -145,31 +155,20 @@ gst_videomixer_pad_class_init (GstVideoMixerPadClass * klass)
gobject_class->get_property = gobject_class->get_property =
GST_DEBUG_FUNCPTR (gst_videomixer_pad_get_property); GST_DEBUG_FUNCPTR (gst_videomixer_pad_get_property);
g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_PAD_ZORDER, g_object_class_install_property (gobject_class, ARG_PAD_ZORDER,
g_param_spec_uint ("zorder", "Z-Order", "Z Order of the picture", 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));
g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_PAD_XPOS, g_object_class_install_property (gobject_class, ARG_PAD_XPOS,
g_param_spec_int ("xpos", "X Position", "X Position of the picture", 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));
g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_PAD_YPOS, g_object_class_install_property (gobject_class, ARG_PAD_YPOS,
g_param_spec_int ("ypos", "Y Position", "Y Position of the picture", 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));
g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_PAD_ALPHA, g_object_class_install_property (gobject_class, ARG_PAD_ALPHA,
g_param_spec_double ("alpha", "Alpha", "Alpha of the picture", g_param_spec_double ("alpha", "Alpha", "Alpha of the picture",
0.0, 1.0, DEFAULT_PAD_ALPHA, G_PARAM_READWRITE)); 0.0, 1.0, DEFAULT_PAD_ALPHA, G_PARAM_READWRITE));
} }
static const GstEventMask *
gst_videomixer_pad_get_sink_event_masks (GstPad * pad)
{
static const GstEventMask gst_videomixer_sink_event_masks[] = {
{GST_EVENT_EOS, 0},
{0,}
};
return gst_videomixer_sink_event_masks;
}
static void static void
gst_videomixer_pad_get_property (GObject * object, guint prop_id, gst_videomixer_pad_get_property (GObject * object, guint prop_id,
GValue * value, GParamSpec * pspec) GValue * value, GParamSpec * pspec)
@ -246,8 +245,11 @@ struct _GstVideoMixer
/* pad */ /* pad */
GstPad *srcpad; GstPad *srcpad;
/* Sink pads using Collect Pads from core's base library */
GstCollectPads *collect;
/* sinkpads, a GSList of GstVideoMixerPads */ /* sinkpads, a GSList of GstVideoMixerPads */
GSList *sinkpads; GSList *sinkpads;
gint numpads; gint numpads;
/* the master pad */ /* the master pad */
@ -266,23 +268,29 @@ struct _GstVideoMixerClass
GstElementClass parent_class; GstElementClass parent_class;
}; };
static GstPadLinkReturn static gboolean
gst_videomixer_pad_sinkconnect (GstPad * pad, const GstCaps * vscaps) gst_videomixer_pad_sink_setcaps (GstPad * pad, GstCaps * vscaps)
{ {
GstVideoMixer *mix; GstVideoMixer *mix;
GstVideoMixerPad *mixpad; GstVideoMixerPad *mixpad;
GstStructure *structure; GstStructure *structure;
gint in_width, in_height;
mix = GST_VIDEO_MIXER (gst_pad_get_parent (pad)); mix = GST_VIDEO_MIXER (gst_pad_get_parent (pad));
mixpad = GST_VIDEO_MIXER_PAD (pad); mixpad = GST_VIDEO_MIXER_PAD (pad);
GST_DEBUG ("videomixer: sinkconnect triggered on %s", gst_pad_get_name (pad)); GST_DEBUG ("videomixer: setcaps triggered on %s", gst_pad_get_name (pad));
structure = gst_caps_get_structure (vscaps, 0); structure = gst_caps_get_structure (vscaps, 0);
gst_structure_get_int (structure, "width", &mixpad->in_width); if (!gst_structure_get_int (structure, "width", &in_width)
gst_structure_get_int (structure, "height", &mixpad->in_height); || !gst_structure_get_int (structure, "height", &in_height)
gst_structure_get_double (structure, "framerate", &mixpad->in_framerate); || !gst_structure_get_double (structure, "framerate",
&mixpad->in_framerate))
return FALSE;
mixpad->in_width = in_width;
mixpad->in_height = in_height;
mixpad->xpos = 0; mixpad->xpos = 0;
mixpad->ypos = 0; mixpad->ypos = 0;
@ -294,22 +302,18 @@ gst_videomixer_pad_sinkconnect (GstPad * pad, const GstCaps * vscaps)
mix->master = mixpad; mix->master = mixpad;
} }
return GST_PAD_LINK_OK; return TRUE;
} }
static void static void
gst_videomixer_pad_link (GstPad * pad, GstPad * peer, gpointer data) gst_videomixer_pad_link (GstPad * pad, GstPad * peer, gpointer data)
{ {
//GstVideoMixer *videomixer = GST_VIDEO_MIXER (data);
GST_DEBUG ("pad '%s' connected", gst_pad_get_name (pad)); GST_DEBUG ("pad '%s' connected", gst_pad_get_name (pad));
} }
static void static void
gst_videomixer_pad_unlink (GstPad * pad, GstPad * peer, gpointer data) gst_videomixer_pad_unlink (GstPad * pad, GstPad * peer, gpointer data)
{ {
//GstVideoMixer *videomixer = GST_VIDEO_MIXER (data);
GST_DEBUG ("pad '%s' unlinked", gst_pad_get_name (pad)); GST_DEBUG ("pad '%s' unlinked", gst_pad_get_name (pad));
} }
@ -322,10 +326,8 @@ gst_videomixer_pad_init (GstVideoMixerPad * mixerpad)
G_CALLBACK (gst_videomixer_pad_unlink), (gpointer) mixerpad); G_CALLBACK (gst_videomixer_pad_unlink), (gpointer) mixerpad);
/* setup some pad functions */ /* setup some pad functions */
gst_pad_set_link_function (GST_PAD (mixerpad), gst_pad_set_setcaps_function (GST_PAD (mixerpad),
gst_videomixer_pad_sinkconnect); gst_videomixer_pad_sink_setcaps);
gst_pad_set_event_mask_function (GST_PAD (mixerpad),
gst_videomixer_pad_get_sink_event_masks);
mixerpad->zorder = DEFAULT_PAD_ZORDER; mixerpad->zorder = DEFAULT_PAD_ZORDER;
mixerpad->xpos = DEFAULT_PAD_XPOS; mixerpad->xpos = DEFAULT_PAD_XPOS;
@ -400,9 +402,8 @@ static void gst_videomixer_init (GstVideoMixer * videomixer);
static GstCaps *gst_videomixer_getcaps (GstPad * pad); static GstCaps *gst_videomixer_getcaps (GstPad * pad);
static void gst_videomixer_loop (GstElement * element); static GstFlowReturn gst_videomixer_collected (GstCollectPads * pads,
static gboolean gst_videomixer_handle_src_event (GstPad * pad, GstVideoMixer * mix);
GstEvent * event);
static GstPad *gst_videomixer_request_new_pad (GstElement * element, static GstPad *gst_videomixer_request_new_pad (GstElement * element,
GstPadTemplate * templ, const gchar * name); GstPadTemplate * templ, const gchar * name);
static void gst_videomixer_set_property (GObject * object, guint prop_id, static void gst_videomixer_set_property (GObject * object, guint prop_id,
@ -465,17 +466,16 @@ gst_videomixer_class_init (GstVideoMixerClass * klass)
parent_class = g_type_class_ref (GST_TYPE_ELEMENT); parent_class = g_type_class_ref (GST_TYPE_ELEMENT);
g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_BACKGROUND, gobject_class->get_property = gst_videomixer_get_property;
gobject_class->set_property = gst_videomixer_set_property;
g_object_class_install_property (gobject_class, ARG_BACKGROUND,
g_param_spec_enum ("background", "Background", "Background type", g_param_spec_enum ("background", "Background", "Background type",
GST_TYPE_VIDEO_MIXER_BACKGROUND, GST_TYPE_VIDEO_MIXER_BACKGROUND,
DEFAULT_BACKGROUND, G_PARAM_READWRITE)); DEFAULT_BACKGROUND, G_PARAM_READWRITE));
gstelement_class->request_new_pad = gst_videomixer_request_new_pad; gstelement_class->request_new_pad = gst_videomixer_request_new_pad;
gstelement_class->change_state = gst_videomixer_change_state; gstelement_class->change_state = gst_videomixer_change_state;
gstelement_class->get_property = gst_videomixer_get_property;
gstelement_class->set_property = gst_videomixer_set_property;
} }
static void static void
@ -487,19 +487,17 @@ gst_videomixer_init (GstVideoMixer * mix)
gst_pad_new_from_template (gst_element_class_get_pad_template (klass, gst_pad_new_from_template (gst_element_class_get_pad_template (klass,
"src"), "src"); "src"), "src");
gst_pad_set_getcaps_function (GST_PAD (mix->srcpad), gst_videomixer_getcaps); gst_pad_set_getcaps_function (GST_PAD (mix->srcpad), gst_videomixer_getcaps);
gst_pad_set_event_function (mix->srcpad, gst_videomixer_handle_src_event);
gst_element_add_pad (GST_ELEMENT (mix), mix->srcpad); gst_element_add_pad (GST_ELEMENT (mix), mix->srcpad);
GST_OBJECT_FLAG_SET (GST_ELEMENT (mix), GST_ELEMENT_EVENT_AWARE); mix->collect = gst_collectpads_new ();
mix->sinkpads = NULL;
mix->background = DEFAULT_BACKGROUND; mix->background = DEFAULT_BACKGROUND;
mix->in_width = 0; mix->in_width = 0;
mix->in_height = 0; mix->in_height = 0;
mix->out_width = 0; mix->out_width = 0;
mix->out_height = 0; mix->out_height = 0;
gst_element_set_loop_function (GST_ELEMENT (mix), gst_videomixer_loop); gst_collectpads_set_function (mix->collect,
(GstCollectPadsFunction) gst_videomixer_collected, mix);
} }
static GstCaps * static GstCaps *
@ -507,13 +505,10 @@ gst_videomixer_getcaps (GstPad * pad)
{ {
GstVideoMixer *mix; GstVideoMixer *mix;
GstCaps *caps; GstCaps *caps;
GstPadTemplate *src_pad_template;
GstStructure *structure; GstStructure *structure;
mix = GST_VIDEO_MIXER (gst_pad_get_parent (pad)); mix = GST_VIDEO_MIXER (gst_pad_get_parent (pad));
src_pad_template = gst_static_pad_template_get (&src_factory); caps = gst_caps_copy (gst_pad_get_pad_template_caps (mix->srcpad));
caps = gst_caps_copy (gst_pad_template_get_caps (src_pad_template));
structure = gst_caps_get_structure (caps, 0); structure = gst_caps_get_structure (caps, 0);
@ -535,8 +530,8 @@ static GstPad *
gst_videomixer_request_new_pad (GstElement * element, gst_videomixer_request_new_pad (GstElement * element,
GstPadTemplate * templ, const gchar * req_name) GstPadTemplate * templ, const gchar * req_name)
{ {
GstVideoMixer *mix; GstVideoMixer *mix = NULL;
GstPad *newpad; GstVideoMixerPad *mixpad = NULL;
GstElementClass *klass = GST_ELEMENT_GET_CLASS (element); GstElementClass *klass = GST_ELEMENT_GET_CLASS (element);
g_return_val_if_fail (templ != NULL, NULL); g_return_val_if_fail (templ != NULL, NULL);
@ -551,52 +546,48 @@ gst_videomixer_request_new_pad (GstElement * element,
mix = GST_VIDEO_MIXER (element); mix = GST_VIDEO_MIXER (element);
if (templ == gst_element_class_get_pad_template (klass, "sink_%d")) { if (templ == gst_element_class_get_pad_template (klass, "sink_%d")) {
gchar *name; gint serial = 0;
GstVideoMixerPad *mixpad; gchar *name = NULL;
GstVideoMixerCollect *mixcol = NULL;
if (req_name == NULL || strlen (req_name) < 6) {
/* no name given when requesting the pad, use random serial number */
serial = rand ();
} else {
/* parse serial number from requested padname */
serial = atoi (&req_name[5]);
}
/* create new pad with the name */ /* create new pad with the name */
name = g_strdup_printf ("sink_%02d", mix->numpads); name = g_strdup_printf ("sink_%d", serial);
newpad = mixpad = g_object_new (GST_TYPE_VIDEO_MIXER_PAD, "name", name, "direction",
gst_pad_custom_new_from_template (GST_TYPE_VIDEO_MIXER_PAD, templ, templ->direction, "template", templ, NULL);
name);
g_free (name); g_free (name);
mixpad = GST_VIDEO_MIXER_PAD (newpad);
mixpad->zorder = mix->numpads; mixpad->zorder = mix->numpads;
mixpad->xpos = DEFAULT_PAD_XPOS;
mixpad->ypos = DEFAULT_PAD_YPOS;
mixpad->alpha = DEFAULT_PAD_ALPHA;
mixcol = (GstVideoMixerCollect *)
gst_collectpads_add_pad (mix->collect, GST_PAD (mixpad),
sizeof (GstVideoMixerCollect));
/* Keep track of eachother */
mixcol->mixpad = mixpad;
mixpad->mixcol = mixcol;
/* Keep an internal list of mixpads for zordering */
mix->sinkpads = g_slist_append (mix->sinkpads, mixpad);
mix->numpads++; mix->numpads++;
mix->sinkpads = g_slist_append (mix->sinkpads, newpad);
} else { } else {
g_warning ("videomixer: this is not our template!\n"); g_warning ("videomixer: this is not our template!\n");
return NULL; return NULL;
} }
/* dd the pad to the element */ /* dd the pad to the element */
gst_element_add_pad (element, newpad); gst_element_add_pad (element, GST_PAD (mixpad));
return newpad; return GST_PAD (mixpad);
}
/* handle events */
static gboolean
gst_videomixer_handle_src_event (GstPad * pad, GstEvent * event)
{
GstVideoMixer *mix;
GstEventType type;
mix = GST_VIDEO_MIXER (gst_pad_get_parent (pad));
type = event ? GST_EVENT_TYPE (event) : GST_EVENT_UNKNOWN;
switch (type) {
case GST_EVENT_SEEK:
/* disable seeking for now */
return FALSE;
default:
break;
}
return gst_pad_event_default (pad, event);
} }
#define BLEND_NORMAL(Y1,U1,V1,Y2,U2,V2,alpha,Y,U,V) \ #define BLEND_NORMAL(Y1,U1,V1,Y2,U2,V2,alpha,Y,U,V) \
@ -872,80 +863,57 @@ gst_videomixer_fill_color (guint8 * dest, gint width, gint height,
static gboolean static gboolean
gst_videomixer_fill_queues (GstVideoMixer * mix) gst_videomixer_fill_queues (GstVideoMixer * mix)
{ {
GSList *walk; GSList *walk = NULL;
gboolean eos = TRUE; gboolean eos = TRUE;
/* loop over all pads and fill it with a buffer */ g_return_val_if_fail (GST_IS_VIDEO_MIXER (mix), FALSE);
walk = mix->sinkpads;
/* try to make sure we have a buffer from each usable pad first */
walk = mix->collect->data;
while (walk) { while (walk) {
GstVideoMixerPad *pad = GST_VIDEO_MIXER_PAD (walk->data); GstCollectData *data = (GstCollectData *) walk->data;
GstVideoMixerCollect *mixcol = (GstVideoMixerCollect *) data;
GstVideoMixerPad *mixpad = mixcol->mixpad;
walk = g_slist_next (walk); walk = g_slist_next (walk);
GST_DEBUG ("looking at pad %s", gst_pad_get_name (GST_PAD (pad))); if (mixcol->buffer == NULL) {
GstBuffer *buf = NULL;
/* don't care about eos pads */ GST_LOG ("we need a new buffer");
if (pad->eos) {
GST_DEBUG ("pad %s in eos, skipping", gst_pad_get_name (GST_PAD (pad)));
continue;
}
GST_DEBUG ("pad %s: buffer %p, queued %lld ", buf = gst_collectpads_pop (mix->collect, data);
gst_pad_get_name (GST_PAD (pad)), pad->buffer, pad->queued);
/* this pad is in need of a new buffer */ if (buf) {
if (pad->buffer == NULL) {
GstData *data;
GstBuffer *buffer;
/* as long as not enough buffers have been queued */
while (pad->queued <= 0 && !pad->eos) {
data = gst_pad_pull (GST_PAD (pad));
if (GST_IS_EVENT (data)) {
GstEvent *event = GST_EVENT (data);
switch (GST_EVENT_TYPE (event)) {
case GST_EVENT_EOS:
GST_DEBUG ("videomixer: EOS on pad %s",
gst_pad_get_name (GST_PAD (pad)));
/* mark pad eos */
pad->eos = TRUE;
gst_event_unref (event);
break;
default:
gst_pad_event_default (GST_PAD (pad), GST_EVENT (data));
}
} else {
guint64 duration; guint64 duration;
buffer = GST_BUFFER (data); GST_LOG ("we have a buffer !");
duration = GST_BUFFER_DURATION (buffer);
mixcol->buffer = buf;
duration = GST_BUFFER_DURATION (mixcol->buffer);
/* no duration on the buffer, use the framerate */ /* no duration on the buffer, use the framerate */
if (duration == -1) { if (!GST_CLOCK_TIME_IS_VALID (duration)) {
if (pad->in_framerate == 0.0) { if (mixpad->in_framerate == 0.0) {
duration = G_MAXINT64; duration = GST_CLOCK_TIME_NONE;
} else { } else {
duration = GST_SECOND / pad->in_framerate; duration = GST_SECOND / mixpad->in_framerate;
} }
} }
pad->queued += duration; if (GST_CLOCK_TIME_IS_VALID (duration))
/* this buffer will need to be mixed */ mixpad->queued += duration;
if (pad->queued > 0) { else if (!mixpad->queued)
pad->buffer = buffer; mixpad->queued = GST_CLOCK_TIME_NONE;
} else { } else {
/* skip buffer, it's too old */ GST_LOG ("pop returned a NULL buffer");
gst_buffer_unref (buffer);
} }
} }
GST_DEBUG ("pad %s: in loop, buffer %p, queued %lld ", if (mixcol->buffer !=
gst_pad_get_name (GST_PAD (pad)), pad->buffer, pad->queued); NULL /* && GST_CLOCK_TIME_IS_VALID (mixpad->queued) */ ) {
} /* got a buffer somewhere so we're not eos */
}
if (pad->buffer != NULL) {
/* got a buffer somewhere so were not eos */
eos = FALSE; eos = FALSE;
} }
} }
return eos; return eos;
} }
@ -956,20 +924,21 @@ gst_videomixer_blend_buffers (GstVideoMixer * mix, GstBuffer * outbuf)
GSList *walk; GSList *walk;
walk = mix->sinkpads; walk = mix->sinkpads;
while (walk) { while (walk) { /* We walk with this list because it's ordered */
GstVideoMixerPad *pad = GST_VIDEO_MIXER_PAD (walk->data); GstVideoMixerPad *pad = GST_VIDEO_MIXER_PAD (walk->data);
GstVideoMixerCollect *mixcol = pad->mixcol;
walk = g_slist_next (walk); walk = g_slist_next (walk);
if (pad->buffer != NULL) { if (mixcol->buffer != NULL) {
gst_videomixer_blend_ayuv_ayuv (GST_BUFFER_DATA (pad->buffer), gst_videomixer_blend_ayuv_ayuv (GST_BUFFER_DATA (mixcol->buffer),
pad->xpos, pad->ypos, pad->xpos, pad->ypos,
pad->in_width, pad->in_height, pad->in_width, pad->in_height,
pad->alpha, pad->alpha,
GST_BUFFER_DATA (outbuf), mix->out_width, mix->out_height); GST_BUFFER_DATA (outbuf), mix->out_width, mix->out_height);
if (pad == mix->master) { if (pad == mix->master) {
GST_BUFFER_TIMESTAMP (outbuf) = GST_BUFFER_TIMESTAMP (pad->buffer); GST_BUFFER_TIMESTAMP (outbuf) = GST_BUFFER_TIMESTAMP (mixcol->buffer);
GST_BUFFER_DURATION (outbuf) = GST_BUFFER_DURATION (pad->buffer); GST_BUFFER_DURATION (outbuf) = GST_BUFFER_DURATION (mixcol->buffer);
} }
} }
} }
@ -996,16 +965,18 @@ gst_videomixer_update_queues (GstVideoMixer * mix)
walk = mix->sinkpads; walk = mix->sinkpads;
while (walk) { while (walk) {
GstVideoMixerPad *pad = GST_VIDEO_MIXER_PAD (walk->data); GstVideoMixerPad *pad = GST_VIDEO_MIXER_PAD (walk->data);
GstVideoMixerCollect *mixcol = pad->mixcol;
walk = g_slist_next (walk); walk = g_slist_next (walk);
if (pad->buffer != NULL) { if (mixcol->buffer != NULL && GST_CLOCK_TIME_IS_VALID (pad->queued)) {
pad->queued -= interval; pad->queued -= interval;
GST_DEBUG ("queued now %s %lld", gst_pad_get_name (GST_PAD (pad)), GST_DEBUG ("queued now %s %lld", gst_pad_get_name (GST_PAD (pad)),
pad->queued); pad->queued);
if (pad->queued <= 0) { if (pad->queued == 0) {
gst_buffer_unref (pad->buffer); GST_DEBUG ("unreffing buffer");
pad->buffer = NULL; gst_buffer_unref (mixcol->buffer);
mixcol->buffer = NULL;
} }
} }
} }
@ -1015,7 +986,7 @@ gst_videomixer_update_queues (GstVideoMixer * mix)
* The basic idea is to get a buffer on all pads and mix them together. * The basic idea is to get a buffer on all pads and mix them together.
* Based on the framerate, buffers are removed from the queues to make room * Based on the framerate, buffers are removed from the queues to make room
* for a new buffer. * for a new buffer.
*/
static void static void
gst_videomixer_loop (GstElement * element) gst_videomixer_loop (GstElement * element)
{ {
@ -1079,6 +1050,82 @@ gst_videomixer_loop (GstElement * element)
gst_videomixer_update_queues (mix); gst_videomixer_update_queues (mix);
gst_pad_push (mix->srcpad, GST_DATA (outbuf)); gst_pad_push (mix->srcpad, GST_DATA (outbuf));
}*/
static GstFlowReturn
gst_videomixer_collected (GstCollectPads * pads, GstVideoMixer * mix)
{
GstFlowReturn ret = GST_FLOW_OK;
GstBuffer *outbuf = NULL;
size_t outsize = 0;
gboolean eos = FALSE;
g_return_val_if_fail (GST_IS_VIDEO_MIXER (mix), GST_FLOW_ERROR);
GST_LOG ("all pads are collected");
eos = gst_videomixer_fill_queues (mix);
if (eos) {
/* Push EOS downstream */
GST_LOG ("all our sinkpads are EOS, pushing downstream");
gst_pad_push_event (mix->srcpad, gst_event_new_eos ());
ret = GST_FLOW_WRONG_STATE;
goto beach;
}
/* Calculating out buffer size from input size */
outsize = ROUND_UP_2 (mix->in_width) * ROUND_UP_2 (mix->in_height) * 4;
/* If geometry has changed we need to set new caps on the buffer */
if (mix->in_width != mix->out_width || mix->in_height != mix->out_height) {
GstCaps *newcaps = NULL;
newcaps =
gst_caps_copy (gst_pad_get_negotiated_caps (GST_PAD (mix->master)));
gst_caps_set_simple (newcaps,
"format", GST_TYPE_FOURCC, GST_STR_FOURCC ("AYUV"),
"width", G_TYPE_INT, mix->in_width,
"height", G_TYPE_INT, mix->in_height, NULL);
mix->out_width = mix->in_width;
mix->out_height = mix->in_height;
ret = gst_pad_alloc_buffer (mix->srcpad, GST_BUFFER_OFFSET_NONE, outsize,
newcaps, &outbuf);
gst_caps_unref (newcaps);
} else { /* Otherwise we just allocate a buffer from current caps */
ret = gst_pad_alloc_buffer (mix->srcpad, GST_BUFFER_OFFSET_NONE, outsize,
GST_PAD_CAPS (mix->srcpad), &outbuf);
}
if (ret != GST_FLOW_OK) {
goto beach;
}
switch (mix->background) {
case VIDEO_MIXER_BACKGROUND_CHECKER:
gst_videomixer_fill_checker (GST_BUFFER_DATA (outbuf),
mix->out_width, mix->out_height);
break;
case VIDEO_MIXER_BACKGROUND_BLACK:
gst_videomixer_fill_color (GST_BUFFER_DATA (outbuf),
mix->out_width, mix->out_height, 16, 128, 128);
break;
case VIDEO_MIXER_BACKGROUND_WHITE:
gst_videomixer_fill_color (GST_BUFFER_DATA (outbuf),
mix->out_width, mix->out_height, 240, 128, 128);
break;
}
gst_videomixer_blend_buffers (mix, outbuf);
gst_videomixer_update_queues (mix);
ret = gst_pad_push (mix->srcpad, outbuf);
beach:
return ret;
} }
static void static void
@ -1117,26 +1164,28 @@ static GstStateChangeReturn
gst_videomixer_change_state (GstElement * element, GstStateChange transition) gst_videomixer_change_state (GstElement * element, GstStateChange transition)
{ {
GstVideoMixer *mix; GstVideoMixer *mix;
GstStateChangeReturn ret;
g_return_val_if_fail (GST_IS_VIDEO_MIXER (element), GST_STATE_CHANGE_FAILURE); g_return_val_if_fail (GST_IS_VIDEO_MIXER (element), GST_STATE_CHANGE_FAILURE);
mix = GST_VIDEO_MIXER (element); mix = GST_VIDEO_MIXER (element);
switch (transition) { switch (transition) {
case GST_STATE_CHANGE_NULL_TO_READY:
case GST_STATE_CHANGE_READY_TO_PAUSED: case GST_STATE_CHANGE_READY_TO_PAUSED:
GST_LOG ("starting collectpads");
gst_collectpads_start (mix->collect);
break; break;
case GST_STATE_CHANGE_PAUSED_TO_PLAYING:
case GST_STATE_CHANGE_PLAYING_TO_PAUSED:
case GST_STATE_CHANGE_PAUSED_TO_READY: case GST_STATE_CHANGE_PAUSED_TO_READY:
case GST_STATE_CHANGE_READY_TO_NULL: GST_LOG ("stopping collectpads");
gst_collectpads_stop (mix->collect);
break;
default:
break; break;
} }
if (GST_ELEMENT_CLASS (parent_class)->change_state) ret = GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
return GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
return GST_STATE_CHANGE_SUCCESS; return ret;
} }
static gboolean static gboolean