mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-19 06:46:38 +00:00
Code Issues 1 Projects Releases Wiki Activity

Merge branch 'master' into 0.11

Browse source 
Conflicts:
	gst/videomixer/gstcollectpads2.c
This commit is contained in:
Wim Taymans 2011-10-28 11:46:40 +02:00
commit 05c025de6d
6 changed files with 18 additions and 2283 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
gst/videomixer/Makefile.am
View file

@ -6,14 +6,11 @@ include $(top_srcdir)/common/orc.mak
libgstvideomixer_la_SOURCES = \ libgstvideomixer_la_SOURCES = \
videomixer.c \ videomixer.c \
blend.c \ blend.c \
videomixer2.c \ videomixer2.c
gstcollectpads2.c
nodist_libgstvideomixer_la_SOURCES = $(ORC_NODIST_SOURCES) nodist_libgstvideomixer_la_SOURCES = $(ORC_NODIST_SOURCES)
libgstvideomixer_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) \ libgstvideomixer_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) \
$(GST_BASE_CFLAGS) $(GST_CONTROLLER_CFLAGS) $(GST_CFLAGS) $(ORC_CFLAGS) \ $(GST_BASE_CFLAGS) $(GST_CONTROLLER_CFLAGS) $(GST_CFLAGS) $(ORC_CFLAGS)
-DGstCollectPads2=GstVideoMixer2Pads \
-DGstCollectPads2Class=GstVideoMixer2PadsClass
libgstvideomixer_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) \ libgstvideomixer_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) \
-lgstvideo-@GST_MAJORMINOR@ \ -lgstvideo-@GST_MAJORMINOR@ \
$(GST_BASE_LIBS) $(GST_CONTROLLER_LIBS) $(GST_LIBS) $(ORC_LIBS) $(GST_BASE_LIBS) $(GST_CONTROLLER_LIBS) $(GST_LIBS) $(ORC_LIBS)
@ -26,8 +23,7 @@ noinst_HEADERS = \
videomixerpad.h \ videomixerpad.h \
blend.h \ blend.h \
videomixer2.h \ videomixer2.h \
videomixer2pad.h \ videomixer2pad.h
gstcollectpads2.h
Android.mk: Makefile.am $(BUILT_SOURCES) Android.mk: Makefile.am $(BUILT_SOURCES)
androgenizer \ androgenizer \

1932
gst/videomixer/gstcollectpads2.c
View file

File diff suppressed because it is too large Load diff

336
gst/videomixer/gstcollectpads2.h
View file

@ -1,336 +0,0 @@
/* GStreamer
* Copyright (C) 2005 Wim Taymans <wim@fluendo.com>
* Copyright (C) 2008 Mark Nauwelaerts <mnauw@users.sourceforge.net>
*
* gstcollectpads2.h:
*
* 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_COLLECT_PADS2_H__
#define __GST_COLLECT_PADS2_H__
#include <gst/gst.h>
G_BEGIN_DECLS
#define GST_TYPE_COLLECT_PADS2 (gst_collect_pads2_get_type())
#define GST_COLLECT_PADS2(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_COLLECT_PADS2,GstCollectPads2))
#define GST_COLLECT_PADS2_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_COLLECT_PADS2,GstCollectPads2Class))
#define GST_COLLECT_PADS2_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj),GST_TYPE_COLLECT_PADS2,GstCollectPads2Class))
#define GST_IS_COLLECT_PADS2(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_COLLECT_PADS2))
#define GST_IS_COLLECT_PADS2_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_COLLECT_PADS2))
typedef struct _GstCollectData2 GstCollectData2;
typedef struct _GstCollectPads2 GstCollectPads2;
typedef struct _GstCollectPads2Class GstCollectPads2Class;
/**
* GstCollectData2DestroyNotify:
* @data: the #GstCollectData2 that will be freed
*
* A function that will be called when the #GstCollectData2 will be freed.
* It is passed the pointer to the structure and should free any custom
* memory and resources allocated for it.
*
* Since: 0.10.12
*/
typedef void (*GstCollectData2DestroyNotify) (GstCollectData2 *data);
/**
* GstCollectPads2StateFlags:
* @GST_COLLECT_PADS2_STATE_EOS: Set if collectdata's pad is EOS.
* @GST_COLLECT_PADS2_STATE_FLUSHING: Set if collectdata's pad is flushing.
* @GST_COLLECT_PADS2_STATE_NEW_SEGMENT: Set if collectdata's pad received a
* new_segment event.
* @GST_COLLECT_PADS2_STATE_WAITING: Set if collectdata's pad must be waited
* for when collecting.
* @GST_COLLECT_PADS2_STATE_LOCKED: Set collectdata's pad WAITING state must
* not be changed.
* #GstCollectPads2StateFlags indicate private state of a collectdata('s pad).
*/
typedef enum {
GST_COLLECT_PADS2_STATE_EOS = 1 << 0,
GST_COLLECT_PADS2_STATE_FLUSHING = 1 << 1,
GST_COLLECT_PADS2_STATE_NEW_SEGMENT = 1 << 2,
GST_COLLECT_PADS2_STATE_WAITING = 1 << 3,
GST_COLLECT_PADS2_STATE_LOCKED = 1 << 4
} GstCollectPads2StateFlags;
/**
* GST_COLLECT_PADS2_STATE:
* @data: a #GstCollectData2.
*
* A flags word containing #GstCollectPads2StateFlags flags set
* on this collected pad.
*/
#define GST_COLLECT_PADS2_STATE(data) (((GstCollectData2 *) data)->state)
/**
* GST_COLLECT_PADS2_STATE_IS_SET:
* @data: a #GstCollectData2.
* @flag: the #GstCollectPads2StateFlags to check.
*
* Gives the status of a specific flag on a collected pad.
*/
#define GST_COLLECT_PADS2_STATE_IS_SET(data,flag) !!(GST_COLLECT_PADS2_STATE (data) & flag)
/**
* GST_COLLECT_PADS2_STATE_SET:
* @data: a #GstCollectData2.
* @flag: the #GstCollectPads2StateFlags to set.
*
* Sets a state flag on a collected pad.
*/
#define GST_COLLECT_PADS2_STATE_SET(data,flag) (GST_COLLECT_PADS2_STATE (data) |= flag)
/**
* GST_COLLECT_PADS2_STATE_UNSET:
* @data: a #GstCollectData2.
* @flag: the #GstCollectPads2StateFlags to clear.
*
* Clears a state flag on a collected pad.
*/
#define GST_COLLECT_PADS2_STATE_UNSET(data,flag) (GST_COLLECT_PADS2_STATE (data) &= ~(flag))
#define GST_COLLECT_PADS2_FLOW_DROP GST_FLOW_CUSTOM_SUCCESS
/**
* GstCollectData2:
* @collect: owner #GstCollectPads2
* @pad: #GstPad managed by this data
* @buffer: currently queued buffer.
* @pos: position in the buffer
* @segment: last segment received.
*
* Structure used by the collect_pads2.
*/
struct _GstCollectData2
{
/* with STREAM_LOCK of @collect */
GstCollectPads2 *collect;
GstPad *pad;
GstBuffer *buffer;
guint pos;
GstSegment segment;
/*< private >*/
/* state: bitfield for easier extension;
* eos, flushing, new_segment, waiting */
guint state;
/* refcounting for struct, and destroy callback */
GstCollectData2DestroyNotify destroy_notify;
gint refcount;
gpointer _gst_reserved[GST_PADDING];
};
/**
* GstCollectPads2Function:
* @pads: the #GstCollectPads2 that trigered the callback
* @user_data: user data passed to gst_collect_pads2_set_function()
*
* A function that will be called when all pads have received data.
*
* Returns: #GST_FLOW_OK for success
*/
typedef GstFlowReturn (*GstCollectPads2Function) (GstCollectPads2 *pads, gpointer user_data);
/**
* GstCollectPads2BufferFunction:
* @pads: the #GstCollectPads2 that trigered the callback
* @data: the #GstCollectData2 of pad that has received the buffer
* @buffer: the #GstBuffer
* @user_data: user data passed to gst_collect_pads2_set_buffer_function()
*
* A function that will be called when a (considered oldest) buffer can be muxed.
* If all pads have reached EOS, this function is called with NULL @buffer
* and NULL @data.
*
* Returns: #GST_FLOW_OK for success
*/
typedef GstFlowReturn (*GstCollectPads2BufferFunction) (GstCollectPads2 *pads, GstCollectData2 *data,
GstBuffer *buffer, gpointer user_data);
/**
* GstCollectPads2CompareFunction:
* @pads: the #GstCollectPads that is comparing the timestamps
* @data1: the first #GstCollectData2
* @timestamp1: the first timestamp
* @data2: the second #GstCollectData2
* @timestamp2: the second timestamp
* @user_data: user data passed to gst_collect_pads2_set_compare_function()
*
* A function for comparing two timestamps of buffers or newsegments collected on one pad.
*
* Returns: Integer less than zero when first timestamp is deemed older than the second one.
* Zero if the timestamps are deemed equally old.
* Integer greate than zero when second timestamp is deemed older than the first one.
*/
typedef gint (*GstCollectPads2CompareFunction) (GstCollectPads2 *pads,
GstCollectData2 * data1, GstClockTime timestamp1,
GstCollectData2 * data2, GstClockTime timestamp2,
gpointer user_data);
/**
* GstCollectPads2EventFunction:
* @pads: the #GstCollectPads2 that trigered the callback
* @pad: the #GstPad that received an event
* @event: the #GstEvent received
* @user_data: user data passed to gst_collect_pads2_set_event_function()
*
* A function that will be called after collectpads has processed the event.
*
* Returns: %TRUE if the pad could handle the event
*/
typedef gboolean (*GstCollectPads2EventFunction) (GstCollectPads2 *pads, GstCollectData2 * pad,
GstEvent * event, gpointer user_data);
/**
* GST_COLLECT_PADS2_GET_STREAM_LOCK:
* @pads: a #GstCollectPads2
*
* Get the stream lock of @pads. The stream lock is used to coordinate and
* serialize execution among the various streams being collected, and in
* protecting the resources used to accomplish this.
*/
#define GST_COLLECT_PADS2_GET_STREAM_LOCK(pads) (&((GstCollectPads2 *)pads)->stream_lock)
/**
* GST_COLLECT_PADS2_STREAM_LOCK:
* @pads: a #GstCollectPads2
*
* Lock the stream lock of @pads.
*/
#define GST_COLLECT_PADS2_STREAM_LOCK(pads) (g_static_rec_mutex_lock(GST_COLLECT_PADS2_GET_STREAM_LOCK (pads)))
/**
* GST_COLLECT_PADS2_STREAM_UNLOCK:
* @pads: a #GstCollectPads2
*
* Unlock the stream lock of @pads.
*/
#define GST_COLLECT_PADS2_STREAM_UNLOCK(pads) (g_static_rec_mutex_unlock(GST_COLLECT_PADS2_GET_STREAM_LOCK (pads)))
/**
* GstCollectPads2:
* @data: #GList of #GstCollectData2 managed by this #GstCollectPads2.
*
* Collectpads object.
*/
struct _GstCollectPads2 {
GstObject object;
/*< public >*/ /* with LOCK and/or STREAM_LOCK */
GSList *data; /* list of CollectData items */
/*< private >*/
GStaticRecMutex stream_lock; /* used to serialize collection among several streams */
/* with LOCK and/or STREAM_LOCK*/
gboolean started;
/* with STREAM_LOCK */
guint32 cookie; /* @data list cookie */
guint numpads; /* number of pads in @data */
guint queuedpads; /* number of pads with a buffer */
guint eospads; /* number of pads that are EOS */
GstClockTime earliest_time; /* Current earliest time */
GstCollectData2 *earliest_data; /* Pad data for current earliest time */
/* with LOCK */
GSList *pad_list; /* updated pad list */
guint32 pad_cookie; /* updated cookie */
GstCollectPads2Function func; /* function and user_data for callback */
gpointer user_data;
GstCollectPads2BufferFunction prepare_buffer_func; /* function and user_data for prepare buffer callback */
gpointer prepare_buffer_user_data;
GstCollectPads2BufferFunction buffer_func; /* function and user_data for buffer callback */
gpointer buffer_user_data;
GstCollectPads2CompareFunction compare_func;
gpointer compare_user_data;
GstCollectPads2EventFunction event_func; /* function and data for event callback */
gpointer event_user_data;
/* no other lock needed */
GMutex *evt_lock; /* these make up sort of poor man's event signaling */
GCond *evt_cond;
guint32 evt_cookie;
gpointer _gst_reserved[GST_PADDING + 0];
};
struct _GstCollectPads2Class {
GstObjectClass parent_class;
/*< private >*/
gpointer _gst_reserved[GST_PADDING];
};
GType gst_collect_pads2_get_type(void);
/* creating the object */
GstCollectPads2* gst_collect_pads2_new (void);
/* set the callbacks */
void gst_collect_pads2_set_function (GstCollectPads2 *pads, GstCollectPads2Function func,
gpointer user_data);
void gst_collect_pads2_set_prepare_buffer_function (GstCollectPads2 *pads,
GstCollectPads2BufferFunction func, gpointer user_data);
void gst_collect_pads2_set_buffer_function (GstCollectPads2 *pads,
GstCollectPads2BufferFunction func, gpointer user_data);
void gst_collect_pads2_set_event_function (GstCollectPads2 *pads,
GstCollectPads2EventFunction func, gpointer user_data);
void gst_collect_pads2_set_compare_function (GstCollectPads2 *pads,
GstCollectPads2CompareFunction func, gpointer user_data);
/* pad management */
GstCollectData2* gst_collect_pads2_add_pad (GstCollectPads2 *pads, GstPad *pad, guint size);
GstCollectData2* gst_collect_pads2_add_pad_full (GstCollectPads2 *pads, GstPad *pad, guint size, GstCollectData2DestroyNotify destroy_notify,
gboolean lock);
gboolean gst_collect_pads2_remove_pad (GstCollectPads2 *pads, GstPad *pad);
gboolean gst_collect_pads2_is_active (GstCollectPads2 *pads, GstPad *pad);
void gst_mux_pads_set_locked (GstCollectPads2 *pads, GstCollectData2 *data,
gboolean locked);
/* start/stop collection */
GstFlowReturn gst_collect_pads2_collect (GstCollectPads2 *pads);
GstFlowReturn gst_collect_pads2_collect_range (GstCollectPads2 *pads, guint64 offset, guint length);
void gst_collect_pads2_start (GstCollectPads2 *pads);
void gst_collect_pads2_stop (GstCollectPads2 *pads);
void gst_collect_pads2_set_flushing (GstCollectPads2 *pads, gboolean flushing);
/* get collected buffers */
GstBuffer* gst_collect_pads2_peek (GstCollectPads2 *pads, GstCollectData2 *data);
GstBuffer* gst_collect_pads2_pop (GstCollectPads2 *pads, GstCollectData2 *data);
/* get collected bytes */
guint gst_collect_pads2_available (GstCollectPads2 *pads);
guint gst_collect_pads2_read (GstCollectPads2 *pads, GstCollectData2 *data,
guint8 **bytes, guint size);
guint gst_collect_pads2_flush (GstCollectPads2 *pads, GstCollectData2 *data,
guint size);
GstBuffer* gst_collect_pads2_read_buffer (GstCollectPads2 * pads, GstCollectData2 * data,
guint size);
GstBuffer* gst_collect_pads2_take_buffer (GstCollectPads2 * pads, GstCollectData2 * data,
guint size);
/* setting and unsetting waiting mode */
void gst_collect_pads2_set_waiting (GstCollectPads2 *pads, GstCollectData2 *data,
gboolean waiting);
G_END_DECLS
#endif /* __GST_COLLECT_PADS22_H__ */

19
gst/videomixer/videomixer2.c
View file

@ -1577,8 +1577,9 @@ done:
} }
static GstFlowReturn static GstFlowReturn
gst_videomixer2_sink_prepare_buffer (GstCollectPads2 * pads, gst_videomixer2_sink_clip (GstCollectPads2 * pads,
GstCollectData2 * data, GstBuffer * buf, GstVideoMixer2 * mix) GstCollectData2 * data, GstBuffer * buf, GstBuffer ** outbuf,
GstVideoMixer2 * mix)
{ {
GstVideoMixer2Pad *pad = GST_VIDEO_MIXER2_PAD (data->pad); GstVideoMixer2Pad *pad = GST_VIDEO_MIXER2_PAD (data->pad);
GstVideoMixer2Collect *mixcol = pad->mixcol; GstVideoMixer2Collect *mixcol = pad->mixcol;
@ -1587,14 +1588,17 @@ gst_videomixer2_sink_prepare_buffer (GstCollectPads2 * pads,
start_time = GST_BUFFER_TIMESTAMP (buf); start_time = GST_BUFFER_TIMESTAMP (buf);
if (start_time == -1) { if (start_time == -1) {
GST_ERROR_OBJECT (pad, "Timestamped buffers required!"); GST_ERROR_OBJECT (pad, "Timestamped buffers required!");
gst_buffer_unref (buf);
return GST_FLOW_ERROR; return GST_FLOW_ERROR;
} }
end_time = GST_BUFFER_DURATION (buf); end_time = GST_BUFFER_DURATION (buf);
if (end_time == -1) if (end_time == -1)
end_time = gst_util_uint64_scale_int (GST_SECOND, pad->fps_d, pad->fps_n); end_time = gst_util_uint64_scale_int (GST_SECOND, pad->fps_d, pad->fps_n);
if (end_time == -1) if (end_time == -1) {
*outbuf = buf;
return GST_FLOW_OK; return GST_FLOW_OK;
}
start_time = MAX (start_time, mixcol->collect.segment.start); start_time = MAX (start_time, mixcol->collect.segment.start);
start_time = start_time =
@ -1615,9 +1619,12 @@ gst_videomixer2_sink_prepare_buffer (GstCollectPads2 * pads,
} }
if (mixcol->buffer != NULL && end_time < mixcol->end_time) { if (mixcol->buffer != NULL && end_time < mixcol->end_time) {
return GST_COLLECT_PADS2_FLOW_DROP; gst_buffer_unref (buf);
*outbuf = NULL;
return GST_FLOW_OK;
} }
*outbuf = buf;
return GST_FLOW_OK; return GST_FLOW_OK;
} }
@ -1988,8 +1995,8 @@ gst_videomixer2_init (GstVideoMixer2 * mix, GstVideoMixer2Class * g_class)
mix); mix);
gst_collect_pads2_set_event_function (mix->collect, gst_collect_pads2_set_event_function (mix->collect,
(GstCollectPads2EventFunction) gst_videomixer2_sink_event, mix); (GstCollectPads2EventFunction) gst_videomixer2_sink_event, mix);
gst_collect_pads2_set_prepare_buffer_function (mix->collect, gst_collect_pads2_set_clip_function (mix->collect,
(GstCollectPads2BufferFunction) gst_videomixer2_sink_prepare_buffer, mix); (GstCollectPads2ClipFunction) gst_videomixer2_sink_clip, mix);
mix->lock = g_mutex_new (); mix->lock = g_mutex_new ();
/* initialize variables */ /* initialize variables */

2
gst/videomixer/videomixer2.h
View file

@ -25,7 +25,7 @@
#include <gst/video/video.h> #include <gst/video/video.h>
#include "blend.h" #include "blend.h"
#include "gstcollectpads2.h" #include <gst/base/gstcollectpads2.h>
G_BEGIN_DECLS G_BEGIN_DECLS

2
gst/videomixer/videomixer2pad.h
View file

@ -24,7 +24,7 @@
#include <gst/gst.h> #include <gst/gst.h>
#include <gst/video/video.h> #include <gst/video/video.h>
#include "gstcollectpads2.h" #include <gst/base/gstcollectpads2.h>
G_BEGIN_DECLS G_BEGIN_DECLS