mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-24 01:00:37 +00:00
Code Issues 1 Projects Releases Wiki Activity

videomixer: Remove videomixer and register videomixer2 as videomixer

Browse source
This commit is contained in:
Sebastian Dröge 2012-01-09 14:51:44 +01:00
parent 43986a661d
commit 4cdacf4ca9
6 changed files with 13 additions and 2126 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
gst/videomixer/Makefile.am
View file

@ -4,7 +4,6 @@ ORC_SOURCE=blendorc
include $(top_srcdir)/common/orc.mak include $(top_srcdir)/common/orc.mak
libgstvideomixer_la_SOURCES = \ libgstvideomixer_la_SOURCES = \
videomixer.c \
blend.c \ blend.c \
videomixer2.c videomixer2.c
@ -19,8 +18,6 @@ libgstvideomixer_la_LIBTOOLFLAGS = --tag=disable-static
# headers we need but don't want installed # headers we need but don't want installed
noinst_HEADERS = \ noinst_HEADERS = \
videomixer.h \
videomixerpad.h \
blend.h \ blend.h \
videomixer2.h \ videomixer2.h \
videomixer2pad.h videomixer2pad.h

1907
gst/videomixer/videomixer.c
View file

File diff suppressed because it is too large Load diff

132
gst/videomixer/videomixer.h
View file

@ -1,132 +0,0 @@
/* Generic video mixer plugin
* Copyright (C) 2008 Wim Taymans <wim@fluendo.com>
*
* 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 <gst/gst.h>
#include <gst/video/video.h>
#include "videomixerpad.h"
#include "blend.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
* @VIDEO_MIXER_BACKGROUND_TRANSPARENT: background is left transparent and layers are composited using "A OVER B" composition rules. This is only applicable to AYUV and ARGB (and variants) as it preserves the alpha channel and allows for further mixing.
*
* The different backgrounds videomixer can blend over.
*/
typedef enum
{
VIDEO_MIXER_BACKGROUND_CHECKER,
VIDEO_MIXER_BACKGROUND_BLACK,
VIDEO_MIXER_BACKGROUND_WHITE,
VIDEO_MIXER_BACKGROUND_TRANSPARENT,
}
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;
GstClockTime last_ts;
GstClockTime last_duration;
/* the master pad */
GstVideoMixerPad *master;
GstVideoFormat fmt;
gint in_width, in_height;
gint out_width, out_height;
gboolean setcaps;
gboolean sendseg;
GstVideoMixerBackground background;
gint fps_n;
gint fps_d;
gint par_n;
gint par_d;
/* Next available sinkpad index */
gint next_sinkpad;
/* sink event handling */
GstPadEventFunction collect_event;
guint64 segment_position;
/* Current downstream segment */
GstSegment segment;
/* QoS stuff */
gdouble proportion;
GstClockTime earliest_time;
BlendFunction blend, overlay;
FillCheckerFunction fill_checker;
FillColorFunction fill_color;
gboolean flush_stop_pending;
};
struct _GstVideoMixerClass
{
GstElementClass parent_class;
};
GType gst_video_mixer_get_type (void);
G_END_DECLS
#endif /* __GST_VIDEO_MIXER_H__ */

18
gst/videomixer/videomixer2.c
View file

@ -2002,12 +2002,20 @@ gst_videomixer2_init (GstVideoMixer2 * mix, GstVideoMixer2Class * g_class)
} }
/* Element registration */ /* Element registration */
gboolean static gboolean
gst_videomixer2_register (GstPlugin * plugin) plugin_init (GstPlugin * plugin)
{ {
GST_DEBUG_CATEGORY_INIT (gst_videomixer2_debug, "videomixer2", 0, GST_DEBUG_CATEGORY_INIT (gst_videomixer_debug, "videomixer", 0,
"video mixer 2"); "video mixer");
return gst_element_register (plugin, "videomixer2", GST_RANK_SECONDARY, gst_video_mixer_init_blend ();
return gst_element_register (plugin, "videomixer", GST_RANK_PRIMARY,
GST_TYPE_VIDEO_MIXER2); GST_TYPE_VIDEO_MIXER2);
} }
GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
GST_VERSION_MINOR,
"videomixer",
"Video mixer", plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME,
GST_PACKAGE_ORIGIN)

1
gst/videomixer/videomixer2.h
View file

@ -119,7 +119,6 @@ struct _GstVideoMixer2Class
}; };
GType gst_videomixer2_get_type (void); GType gst_videomixer2_get_type (void);
gboolean gst_videomixer2_register (GstPlugin * plugin);
G_END_DECLS G_END_DECLS
#endif /* __GST_VIDEO_MIXER2_H__ */ #endif /* __GST_VIDEO_MIXER2_H__ */

78
gst/videomixer/videomixerpad.h
View file

@ -1,78 +0,0 @@
/* Video mixer pad
* Copyright (C) 2008 Wim Taymans <wim@fluendo.com>
*
* 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 <gst/gst.h>
#include <gst/base/gstcollectpads.h>
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 par_n;
gint par_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__ */