2010-12-31 00:43:37 +00:00
|
|
|
/* GStreamer input selector
|
2008-01-29 07:38:31 +00:00
|
|
|
* Copyright (C) 2003 Julien Moutte <julien@moutte.net>
|
|
|
|
* Copyright (C) 2005 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
|
|
|
|
* Copyright (C) 2005 Jan Schmidt <thaytan@mad.scientist.com>
|
|
|
|
* Copyright (C) 2007 Wim Taymans <wim.taymans@gmail.com>
|
|
|
|
* Copyright (C) 2007 Andy Wingo <wingo@pobox.com>
|
|
|
|
* Copyright (C) 2008 Nokia Corporation. (contact <stefan.kost@nokia.com>)
|
2011-03-19 07:55:57 +00:00
|
|
|
* Copyright (C) 2011 Sebastian Dröge <sebastian.droege@collabora.co.uk>
|
2008-01-29 07:38:31 +00:00
|
|
|
*
|
|
|
|
* 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.
|
|
|
|
*/
|
|
|
|
|
|
|
|
/**
|
|
|
|
* SECTION:element-input-selector
|
|
|
|
* @see_also: #GstOutputSelector
|
|
|
|
*
|
|
|
|
* Direct one out of N input streams to the output pad.
|
2010-12-31 00:43:37 +00:00
|
|
|
*
|
2011-01-06 18:18:29 +00:00
|
|
|
* The input pads are from a GstPad subclass and have additional
|
|
|
|
* properties, which users may find useful, namely:
|
|
|
|
*
|
|
|
|
* <itemizedlist>
|
|
|
|
* <listitem>
|
|
|
|
* "running-time": Running time of stream on pad (#gint64)
|
|
|
|
* </listitem>
|
|
|
|
* <listitem>
|
|
|
|
* "tags": The currently active tags on the pad (#GstTagList, boxed type)
|
|
|
|
* </listitem>
|
|
|
|
* <listitem>
|
|
|
|
* "active": If the pad is currently active (#gboolean)
|
|
|
|
* </listitem>
|
|
|
|
* <listitem>
|
|
|
|
* "always-ok" : Make an inactive pads return #GST_FLOW_OK instead of
|
|
|
|
* #GST_FLOW_NOT_LINKED
|
|
|
|
* </listitem>
|
|
|
|
* </itemizedlist>
|
|
|
|
*
|
2010-12-31 00:43:37 +00:00
|
|
|
* Since: 0.10.32
|
2008-01-29 07:38:31 +00:00
|
|
|
*/
|
|
|
|
|
|
|
|
#ifdef HAVE_CONFIG_H
|
|
|
|
#include "config.h"
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#include <string.h>
|
|
|
|
|
|
|
|
#include "gstinputselector.h"
|
|
|
|
|
2011-12-04 13:35:38 +00:00
|
|
|
#include "gst/glib-compat-private.h"
|
|
|
|
|
2008-01-29 07:38:31 +00:00
|
|
|
GST_DEBUG_CATEGORY_STATIC (input_selector_debug);
|
|
|
|
#define GST_CAT_DEFAULT input_selector_debug
|
|
|
|
|
|
|
|
static GstStaticPadTemplate gst_input_selector_sink_factory =
|
2011-11-03 16:49:45 +00:00
|
|
|
GST_STATIC_PAD_TEMPLATE ("sink_%u",
|
2008-01-29 07:38:31 +00:00
|
|
|
GST_PAD_SINK,
|
|
|
|
GST_PAD_REQUEST,
|
|
|
|
GST_STATIC_CAPS_ANY);
|
|
|
|
|
|
|
|
static GstStaticPadTemplate gst_input_selector_src_factory =
|
|
|
|
GST_STATIC_PAD_TEMPLATE ("src",
|
|
|
|
GST_PAD_SRC,
|
|
|
|
GST_PAD_ALWAYS,
|
|
|
|
GST_STATIC_CAPS_ANY);
|
|
|
|
|
|
|
|
enum
|
|
|
|
{
|
plugins/elements/gstinputselector.*: Various cleanups.
Original commit message from CVS:
* plugins/elements/gstinputselector.c: (gst_selector_pad_class_init),
(gst_selector_pad_finalize), (gst_selector_pad_get_property),
(gst_selector_pad_event), (gst_input_selector_class_init),
(gst_input_selector_init), (gst_input_selector_set_active_pad),
(gst_input_selector_set_property),
(gst_input_selector_get_property),
(gst_input_selector_request_new_pad),
(gst_input_selector_release_pad),
(gst_input_selector_push_pending_stop),
(gst_input_selector_switch):
* plugins/elements/gstinputselector.h:
Various cleanups.
Added tags to the pads.
Select active pad based on the pad object instead of its name.
Fix refcount in set_active_pad.
Add property to get the number of pads.
* plugins/elements/gstoutputselector.c:
(gst_output_selector_class_init),
(gst_output_selector_set_property),
(gst_output_selector_get_property):
Various cleanups.
Select the active pad based on the pad object instead of its name.
Fix locking when setting the active pad.
* plugins/elements/gstselector-marshal.list:
* tests/check/elements/selector.c: (cleanup_pad),
(selector_set_active_pad), (run_input_selector_buffer_count):
Fixes for pad instead of padname for pad selection.
2008-03-13 16:46:04 +00:00
|
|
|
PROP_0,
|
|
|
|
PROP_N_PADS,
|
2011-03-19 09:28:49 +00:00
|
|
|
PROP_ACTIVE_PAD,
|
|
|
|
PROP_SYNC_STREAMS
|
2008-01-29 07:38:31 +00:00
|
|
|
};
|
|
|
|
|
2012-02-21 21:06:17 +00:00
|
|
|
#define DEFAULT_SYNC_STREAMS TRUE
|
2011-03-19 09:28:49 +00:00
|
|
|
|
2010-12-31 00:43:37 +00:00
|
|
|
#define DEFAULT_PAD_ALWAYS_OK TRUE
|
plugins/elements/gstinputselector.c: Add pad property to configure behaviour of the unselected pad, it can return OK or N...
Original commit message from CVS:
* plugins/elements/gstinputselector.c: (gst_selector_pad_class_init),
(gst_selector_pad_init), (gst_selector_pad_set_property),
(gst_selector_pad_get_property), (gst_selector_pad_event),
(gst_selector_pad_bufferalloc), (gst_selector_pad_chain),
(gst_input_selector_set_active_pad):
Add pad property to configure behaviour of the unselected pad, it can
return OK or NOT_LINKED, based on the use case.
2008-03-20 17:07:07 +00:00
|
|
|
|
2008-01-29 07:38:31 +00:00
|
|
|
enum
|
|
|
|
{
|
plugins/elements/gstinputselector.*: Various cleanups.
Original commit message from CVS:
* plugins/elements/gstinputselector.c: (gst_selector_pad_class_init),
(gst_selector_pad_finalize), (gst_selector_pad_get_property),
(gst_selector_pad_event), (gst_input_selector_class_init),
(gst_input_selector_init), (gst_input_selector_set_active_pad),
(gst_input_selector_set_property),
(gst_input_selector_get_property),
(gst_input_selector_request_new_pad),
(gst_input_selector_release_pad),
(gst_input_selector_push_pending_stop),
(gst_input_selector_switch):
* plugins/elements/gstinputselector.h:
Various cleanups.
Added tags to the pads.
Select active pad based on the pad object instead of its name.
Fix refcount in set_active_pad.
Add property to get the number of pads.
* plugins/elements/gstoutputselector.c:
(gst_output_selector_class_init),
(gst_output_selector_set_property),
(gst_output_selector_get_property):
Various cleanups.
Select the active pad based on the pad object instead of its name.
Fix locking when setting the active pad.
* plugins/elements/gstselector-marshal.list:
* tests/check/elements/selector.c: (cleanup_pad),
(selector_set_active_pad), (run_input_selector_buffer_count):
Fixes for pad instead of padname for pad selection.
2008-03-13 16:46:04 +00:00
|
|
|
PROP_PAD_0,
|
|
|
|
PROP_PAD_RUNNING_TIME,
|
|
|
|
PROP_PAD_TAGS,
|
|
|
|
PROP_PAD_ACTIVE,
|
2010-12-31 00:43:37 +00:00
|
|
|
PROP_PAD_ALWAYS_OK
|
2008-01-29 07:38:31 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
enum
|
|
|
|
{
|
|
|
|
/* methods */
|
|
|
|
SIGNAL_BLOCK,
|
|
|
|
SIGNAL_SWITCH,
|
|
|
|
LAST_SIGNAL
|
|
|
|
};
|
|
|
|
static guint gst_input_selector_signals[LAST_SIGNAL] = { 0 };
|
|
|
|
|
2009-11-03 22:21:19 +00:00
|
|
|
static inline gboolean gst_input_selector_is_active_sinkpad (GstInputSelector *
|
|
|
|
sel, GstPad * pad);
|
2008-01-29 07:38:31 +00:00
|
|
|
static GstPad *gst_input_selector_activate_sinkpad (GstInputSelector * sel,
|
|
|
|
GstPad * pad);
|
2011-04-01 06:46:14 +00:00
|
|
|
static GstPad *gst_input_selector_get_linked_pad (GstInputSelector * sel,
|
|
|
|
GstPad * pad, gboolean strict);
|
2008-01-29 07:38:31 +00:00
|
|
|
|
|
|
|
#define GST_TYPE_SELECTOR_PAD \
|
|
|
|
(gst_selector_pad_get_type())
|
|
|
|
#define GST_SELECTOR_PAD(obj) \
|
|
|
|
(G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_SELECTOR_PAD, GstSelectorPad))
|
|
|
|
#define GST_SELECTOR_PAD_CLASS(klass) \
|
|
|
|
(G_TYPE_CHECK_CLASS_CAST ((klass), GST_TYPE_SELECTOR_PAD, GstSelectorPadClass))
|
|
|
|
#define GST_IS_SELECTOR_PAD(obj) \
|
|
|
|
(G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_SELECTOR_PAD))
|
|
|
|
#define GST_IS_SELECTOR_PAD_CLASS(klass) \
|
|
|
|
(G_TYPE_CHECK_CLASS_TYPE ((klass), GST_TYPE_SELECTOR_PAD))
|
|
|
|
#define GST_SELECTOR_PAD_CAST(obj) \
|
|
|
|
((GstSelectorPad *)(obj))
|
|
|
|
|
|
|
|
typedef struct _GstSelectorPad GstSelectorPad;
|
|
|
|
typedef struct _GstSelectorPadClass GstSelectorPadClass;
|
|
|
|
|
|
|
|
struct _GstSelectorPad
|
|
|
|
{
|
|
|
|
GstPad parent;
|
|
|
|
|
plugins/elements/gstinputselector.*: Various cleanups.
Original commit message from CVS:
* plugins/elements/gstinputselector.c: (gst_selector_pad_class_init),
(gst_selector_pad_finalize), (gst_selector_pad_get_property),
(gst_selector_pad_event), (gst_input_selector_class_init),
(gst_input_selector_init), (gst_input_selector_set_active_pad),
(gst_input_selector_set_property),
(gst_input_selector_get_property),
(gst_input_selector_request_new_pad),
(gst_input_selector_release_pad),
(gst_input_selector_push_pending_stop),
(gst_input_selector_switch):
* plugins/elements/gstinputselector.h:
Various cleanups.
Added tags to the pads.
Select active pad based on the pad object instead of its name.
Fix refcount in set_active_pad.
Add property to get the number of pads.
* plugins/elements/gstoutputselector.c:
(gst_output_selector_class_init),
(gst_output_selector_set_property),
(gst_output_selector_get_property):
Various cleanups.
Select the active pad based on the pad object instead of its name.
Fix locking when setting the active pad.
* plugins/elements/gstselector-marshal.list:
* tests/check/elements/selector.c: (cleanup_pad),
(selector_set_active_pad), (run_input_selector_buffer_count):
Fixes for pad instead of padname for pad selection.
2008-03-13 16:46:04 +00:00
|
|
|
gboolean active; /* when buffer have passed the pad */
|
2011-03-16 17:19:11 +00:00
|
|
|
gboolean pushed; /* when buffer was pushed downstream since activation */
|
plugins/elements/gstinputselector.*: Various cleanups.
Original commit message from CVS:
* plugins/elements/gstinputselector.c: (gst_selector_pad_class_init),
(gst_selector_pad_finalize), (gst_selector_pad_get_property),
(gst_selector_pad_event), (gst_input_selector_class_init),
(gst_input_selector_init), (gst_input_selector_set_active_pad),
(gst_input_selector_set_property),
(gst_input_selector_get_property),
(gst_input_selector_request_new_pad),
(gst_input_selector_release_pad),
(gst_input_selector_push_pending_stop),
(gst_input_selector_switch):
* plugins/elements/gstinputselector.h:
Various cleanups.
Added tags to the pads.
Select active pad based on the pad object instead of its name.
Fix refcount in set_active_pad.
Add property to get the number of pads.
* plugins/elements/gstoutputselector.c:
(gst_output_selector_class_init),
(gst_output_selector_set_property),
(gst_output_selector_get_property):
Various cleanups.
Select the active pad based on the pad object instead of its name.
Fix locking when setting the active pad.
* plugins/elements/gstselector-marshal.list:
* tests/check/elements/selector.c: (cleanup_pad),
(selector_set_active_pad), (run_input_selector_buffer_count):
Fixes for pad instead of padname for pad selection.
2008-03-13 16:46:04 +00:00
|
|
|
gboolean eos; /* when EOS has been received */
|
2011-03-17 13:10:49 +00:00
|
|
|
gboolean eos_sent; /* when EOS was sent downstream */
|
plugins/elements/gstinputselector.*: Figure out the locking a bit more.
Original commit message from CVS:
* plugins/elements/gstinputselector.c:
(gst_selector_pad_get_running_time), (gst_selector_pad_reset),
(gst_selector_pad_event), (gst_selector_pad_bufferalloc),
(gst_input_selector_wait), (gst_selector_pad_chain),
(gst_input_selector_class_init), (gst_input_selector_init),
(gst_input_selector_dispose), (gst_segment_set_start),
(gst_input_selector_set_active_pad),
(gst_input_selector_set_property),
(gst_input_selector_get_property),
(gst_input_selector_get_linked_pad),
(gst_input_selector_is_active_sinkpad),
(gst_input_selector_activate_sinkpad),
(gst_input_selector_request_new_pad),
(gst_input_selector_release_pad),
(gst_input_selector_change_state), (gst_input_selector_block),
(gst_input_selector_switch):
* plugins/elements/gstinputselector.h:
Figure out the locking a bit more.
Mark buffers with discont after switching.
Fix initial segment forwarding, make sure to only forward one segment
regardless of what the sequence of buffers/segments is. See #522203.
Improve flushing when blocked.
Return NOT_LINKED when a stream is not selected.
Not API change for the switch signal in the docs.
Fix start/time/accum values of the new segment.
Correctly unlock and flush a blocking selector when going to READY.
2008-03-20 16:48:46 +00:00
|
|
|
gboolean discont; /* after switching we create a discont */
|
2011-03-19 07:55:57 +00:00
|
|
|
gboolean flushing; /* set after flush-start and before flush-stop */
|
plugins/elements/gstinputselector.c: Add pad property to configure behaviour of the unselected pad, it can return OK or N...
Original commit message from CVS:
* plugins/elements/gstinputselector.c: (gst_selector_pad_class_init),
(gst_selector_pad_init), (gst_selector_pad_set_property),
(gst_selector_pad_get_property), (gst_selector_pad_event),
(gst_selector_pad_bufferalloc), (gst_selector_pad_chain),
(gst_input_selector_set_active_pad):
Add pad property to configure behaviour of the unselected pad, it can
return OK or NOT_LINKED, based on the use case.
2008-03-20 17:07:07 +00:00
|
|
|
gboolean always_ok;
|
plugins/elements/gstinputselector.*: Various cleanups.
Original commit message from CVS:
* plugins/elements/gstinputselector.c: (gst_selector_pad_class_init),
(gst_selector_pad_finalize), (gst_selector_pad_get_property),
(gst_selector_pad_event), (gst_input_selector_class_init),
(gst_input_selector_init), (gst_input_selector_set_active_pad),
(gst_input_selector_set_property),
(gst_input_selector_get_property),
(gst_input_selector_request_new_pad),
(gst_input_selector_release_pad),
(gst_input_selector_push_pending_stop),
(gst_input_selector_switch):
* plugins/elements/gstinputselector.h:
Various cleanups.
Added tags to the pads.
Select active pad based on the pad object instead of its name.
Fix refcount in set_active_pad.
Add property to get the number of pads.
* plugins/elements/gstoutputselector.c:
(gst_output_selector_class_init),
(gst_output_selector_set_property),
(gst_output_selector_get_property):
Various cleanups.
Select the active pad based on the pad object instead of its name.
Fix locking when setting the active pad.
* plugins/elements/gstselector-marshal.list:
* tests/check/elements/selector.c: (cleanup_pad),
(selector_set_active_pad), (run_input_selector_buffer_count):
Fixes for pad instead of padname for pad selection.
2008-03-13 16:46:04 +00:00
|
|
|
GstTagList *tags; /* last tags received on the pad */
|
|
|
|
|
2011-05-19 10:11:43 +00:00
|
|
|
GstClockTime position; /* the current position in the segment */
|
|
|
|
GstSegment segment; /* the current segment on the pad */
|
|
|
|
guint32 segment_seqnum; /* sequence number of the current segment */
|
|
|
|
|
2008-01-29 07:38:31 +00:00
|
|
|
gboolean segment_pending;
|
|
|
|
};
|
|
|
|
|
|
|
|
struct _GstSelectorPadClass
|
|
|
|
{
|
|
|
|
GstPadClass parent;
|
|
|
|
};
|
|
|
|
|
2011-04-18 16:07:06 +00:00
|
|
|
GType gst_selector_pad_get_type (void);
|
2008-01-29 07:38:31 +00:00
|
|
|
static void gst_selector_pad_finalize (GObject * object);
|
|
|
|
static void gst_selector_pad_get_property (GObject * object,
|
|
|
|
guint prop_id, GValue * value, GParamSpec * pspec);
|
plugins/elements/gstinputselector.c: Add pad property to configure behaviour of the unselected pad, it can return OK or N...
Original commit message from CVS:
* plugins/elements/gstinputselector.c: (gst_selector_pad_class_init),
(gst_selector_pad_init), (gst_selector_pad_set_property),
(gst_selector_pad_get_property), (gst_selector_pad_event),
(gst_selector_pad_bufferalloc), (gst_selector_pad_chain),
(gst_input_selector_set_active_pad):
Add pad property to configure behaviour of the unselected pad, it can
return OK or NOT_LINKED, based on the use case.
2008-03-20 17:07:07 +00:00
|
|
|
static void gst_selector_pad_set_property (GObject * object,
|
|
|
|
guint prop_id, const GValue * value, GParamSpec * pspec);
|
2008-01-29 07:38:31 +00:00
|
|
|
|
|
|
|
static gint64 gst_selector_pad_get_running_time (GstSelectorPad * pad);
|
|
|
|
static void gst_selector_pad_reset (GstSelectorPad * pad);
|
2011-11-17 11:40:45 +00:00
|
|
|
static gboolean gst_selector_pad_event (GstPad * pad, GstObject * parent,
|
|
|
|
GstEvent * event);
|
2011-11-16 16:22:56 +00:00
|
|
|
static gboolean gst_selector_pad_query (GstPad * pad, GstObject * parent,
|
|
|
|
GstQuery * query);
|
2011-11-16 16:49:46 +00:00
|
|
|
static GstIterator *gst_selector_pad_iterate_linked_pads (GstPad * pad,
|
|
|
|
GstObject * parent);
|
2011-11-17 11:40:45 +00:00
|
|
|
static GstFlowReturn gst_selector_pad_chain (GstPad * pad, GstObject * parent,
|
|
|
|
GstBuffer * buf);
|
2008-01-29 07:38:31 +00:00
|
|
|
|
2011-04-18 16:07:06 +00:00
|
|
|
G_DEFINE_TYPE (GstSelectorPad, gst_selector_pad, GST_TYPE_PAD);
|
2008-01-29 07:38:31 +00:00
|
|
|
|
|
|
|
static void
|
|
|
|
gst_selector_pad_class_init (GstSelectorPadClass * klass)
|
|
|
|
{
|
|
|
|
GObjectClass *gobject_class;
|
|
|
|
|
|
|
|
gobject_class = (GObjectClass *) klass;
|
|
|
|
|
plugins/elements/gstinputselector.*: Various cleanups.
Original commit message from CVS:
* plugins/elements/gstinputselector.c: (gst_selector_pad_class_init),
(gst_selector_pad_finalize), (gst_selector_pad_get_property),
(gst_selector_pad_event), (gst_input_selector_class_init),
(gst_input_selector_init), (gst_input_selector_set_active_pad),
(gst_input_selector_set_property),
(gst_input_selector_get_property),
(gst_input_selector_request_new_pad),
(gst_input_selector_release_pad),
(gst_input_selector_push_pending_stop),
(gst_input_selector_switch):
* plugins/elements/gstinputselector.h:
Various cleanups.
Added tags to the pads.
Select active pad based on the pad object instead of its name.
Fix refcount in set_active_pad.
Add property to get the number of pads.
* plugins/elements/gstoutputselector.c:
(gst_output_selector_class_init),
(gst_output_selector_set_property),
(gst_output_selector_get_property):
Various cleanups.
Select the active pad based on the pad object instead of its name.
Fix locking when setting the active pad.
* plugins/elements/gstselector-marshal.list:
* tests/check/elements/selector.c: (cleanup_pad),
(selector_set_active_pad), (run_input_selector_buffer_count):
Fixes for pad instead of padname for pad selection.
2008-03-13 16:46:04 +00:00
|
|
|
gobject_class->finalize = gst_selector_pad_finalize;
|
|
|
|
|
2009-11-03 17:11:13 +00:00
|
|
|
gobject_class->get_property = gst_selector_pad_get_property;
|
|
|
|
gobject_class->set_property = gst_selector_pad_set_property;
|
plugins/elements/gstinputselector.*: Various cleanups.
Original commit message from CVS:
* plugins/elements/gstinputselector.c: (gst_selector_pad_class_init),
(gst_selector_pad_finalize), (gst_selector_pad_get_property),
(gst_selector_pad_event), (gst_input_selector_class_init),
(gst_input_selector_init), (gst_input_selector_set_active_pad),
(gst_input_selector_set_property),
(gst_input_selector_get_property),
(gst_input_selector_request_new_pad),
(gst_input_selector_release_pad),
(gst_input_selector_push_pending_stop),
(gst_input_selector_switch):
* plugins/elements/gstinputselector.h:
Various cleanups.
Added tags to the pads.
Select active pad based on the pad object instead of its name.
Fix refcount in set_active_pad.
Add property to get the number of pads.
* plugins/elements/gstoutputselector.c:
(gst_output_selector_class_init),
(gst_output_selector_set_property),
(gst_output_selector_get_property):
Various cleanups.
Select the active pad based on the pad object instead of its name.
Fix locking when setting the active pad.
* plugins/elements/gstselector-marshal.list:
* tests/check/elements/selector.c: (cleanup_pad),
(selector_set_active_pad), (run_input_selector_buffer_count):
Fixes for pad instead of padname for pad selection.
2008-03-13 16:46:04 +00:00
|
|
|
|
|
|
|
g_object_class_install_property (gobject_class, PROP_PAD_RUNNING_TIME,
|
2008-01-29 07:38:31 +00:00
|
|
|
g_param_spec_int64 ("running-time", "Running time",
|
2010-10-19 10:43:14 +00:00
|
|
|
"Running time of stream on pad", 0, G_MAXINT64, 0,
|
|
|
|
G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
|
plugins/elements/gstinputselector.*: Various cleanups.
Original commit message from CVS:
* plugins/elements/gstinputselector.c: (gst_selector_pad_class_init),
(gst_selector_pad_finalize), (gst_selector_pad_get_property),
(gst_selector_pad_event), (gst_input_selector_class_init),
(gst_input_selector_init), (gst_input_selector_set_active_pad),
(gst_input_selector_set_property),
(gst_input_selector_get_property),
(gst_input_selector_request_new_pad),
(gst_input_selector_release_pad),
(gst_input_selector_push_pending_stop),
(gst_input_selector_switch):
* plugins/elements/gstinputselector.h:
Various cleanups.
Added tags to the pads.
Select active pad based on the pad object instead of its name.
Fix refcount in set_active_pad.
Add property to get the number of pads.
* plugins/elements/gstoutputselector.c:
(gst_output_selector_class_init),
(gst_output_selector_set_property),
(gst_output_selector_get_property):
Various cleanups.
Select the active pad based on the pad object instead of its name.
Fix locking when setting the active pad.
* plugins/elements/gstselector-marshal.list:
* tests/check/elements/selector.c: (cleanup_pad),
(selector_set_active_pad), (run_input_selector_buffer_count):
Fixes for pad instead of padname for pad selection.
2008-03-13 16:46:04 +00:00
|
|
|
g_object_class_install_property (gobject_class, PROP_PAD_TAGS,
|
|
|
|
g_param_spec_boxed ("tags", "Tags",
|
|
|
|
"The currently active tags on the pad", GST_TYPE_TAG_LIST,
|
2010-10-19 10:43:14 +00:00
|
|
|
G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
|
plugins/elements/gstinputselector.*: Various cleanups.
Original commit message from CVS:
* plugins/elements/gstinputselector.c: (gst_selector_pad_class_init),
(gst_selector_pad_finalize), (gst_selector_pad_get_property),
(gst_selector_pad_event), (gst_input_selector_class_init),
(gst_input_selector_init), (gst_input_selector_set_active_pad),
(gst_input_selector_set_property),
(gst_input_selector_get_property),
(gst_input_selector_request_new_pad),
(gst_input_selector_release_pad),
(gst_input_selector_push_pending_stop),
(gst_input_selector_switch):
* plugins/elements/gstinputselector.h:
Various cleanups.
Added tags to the pads.
Select active pad based on the pad object instead of its name.
Fix refcount in set_active_pad.
Add property to get the number of pads.
* plugins/elements/gstoutputselector.c:
(gst_output_selector_class_init),
(gst_output_selector_set_property),
(gst_output_selector_get_property):
Various cleanups.
Select the active pad based on the pad object instead of its name.
Fix locking when setting the active pad.
* plugins/elements/gstselector-marshal.list:
* tests/check/elements/selector.c: (cleanup_pad),
(selector_set_active_pad), (run_input_selector_buffer_count):
Fixes for pad instead of padname for pad selection.
2008-03-13 16:46:04 +00:00
|
|
|
g_object_class_install_property (gobject_class, PROP_PAD_ACTIVE,
|
|
|
|
g_param_spec_boolean ("active", "Active",
|
2010-10-19 10:43:14 +00:00
|
|
|
"If the pad is currently active", FALSE,
|
|
|
|
G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
|
2010-12-31 00:43:37 +00:00
|
|
|
/* FIXME: better property name? */
|
plugins/elements/gstinputselector.c: Add pad property to configure behaviour of the unselected pad, it can return OK or N...
Original commit message from CVS:
* plugins/elements/gstinputselector.c: (gst_selector_pad_class_init),
(gst_selector_pad_init), (gst_selector_pad_set_property),
(gst_selector_pad_get_property), (gst_selector_pad_event),
(gst_selector_pad_bufferalloc), (gst_selector_pad_chain),
(gst_input_selector_set_active_pad):
Add pad property to configure behaviour of the unselected pad, it can
return OK or NOT_LINKED, based on the use case.
2008-03-20 17:07:07 +00:00
|
|
|
g_object_class_install_property (gobject_class, PROP_PAD_ALWAYS_OK,
|
|
|
|
g_param_spec_boolean ("always-ok", "Always OK",
|
|
|
|
"Make an inactive pad return OK instead of NOT_LINKED",
|
2010-10-19 10:43:14 +00:00
|
|
|
DEFAULT_PAD_ALWAYS_OK, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
|
2008-01-29 07:38:31 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
gst_selector_pad_init (GstSelectorPad * pad)
|
|
|
|
{
|
plugins/elements/gstinputselector.c: Add pad property to configure behaviour of the unselected pad, it can return OK or N...
Original commit message from CVS:
* plugins/elements/gstinputselector.c: (gst_selector_pad_class_init),
(gst_selector_pad_init), (gst_selector_pad_set_property),
(gst_selector_pad_get_property), (gst_selector_pad_event),
(gst_selector_pad_bufferalloc), (gst_selector_pad_chain),
(gst_input_selector_set_active_pad):
Add pad property to configure behaviour of the unselected pad, it can
return OK or NOT_LINKED, based on the use case.
2008-03-20 17:07:07 +00:00
|
|
|
pad->always_ok = DEFAULT_PAD_ALWAYS_OK;
|
2008-01-29 07:38:31 +00:00
|
|
|
gst_selector_pad_reset (pad);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
gst_selector_pad_finalize (GObject * object)
|
|
|
|
{
|
|
|
|
GstSelectorPad *pad;
|
|
|
|
|
|
|
|
pad = GST_SELECTOR_PAD_CAST (object);
|
|
|
|
|
plugins/elements/gstinputselector.*: Various cleanups.
Original commit message from CVS:
* plugins/elements/gstinputselector.c: (gst_selector_pad_class_init),
(gst_selector_pad_finalize), (gst_selector_pad_get_property),
(gst_selector_pad_event), (gst_input_selector_class_init),
(gst_input_selector_init), (gst_input_selector_set_active_pad),
(gst_input_selector_set_property),
(gst_input_selector_get_property),
(gst_input_selector_request_new_pad),
(gst_input_selector_release_pad),
(gst_input_selector_push_pending_stop),
(gst_input_selector_switch):
* plugins/elements/gstinputselector.h:
Various cleanups.
Added tags to the pads.
Select active pad based on the pad object instead of its name.
Fix refcount in set_active_pad.
Add property to get the number of pads.
* plugins/elements/gstoutputselector.c:
(gst_output_selector_class_init),
(gst_output_selector_set_property),
(gst_output_selector_get_property):
Various cleanups.
Select the active pad based on the pad object instead of its name.
Fix locking when setting the active pad.
* plugins/elements/gstselector-marshal.list:
* tests/check/elements/selector.c: (cleanup_pad),
(selector_set_active_pad), (run_input_selector_buffer_count):
Fixes for pad instead of padname for pad selection.
2008-03-13 16:46:04 +00:00
|
|
|
if (pad->tags)
|
|
|
|
gst_tag_list_free (pad->tags);
|
|
|
|
|
2011-04-18 16:07:06 +00:00
|
|
|
G_OBJECT_CLASS (gst_selector_pad_parent_class)->finalize (object);
|
2008-01-29 07:38:31 +00:00
|
|
|
}
|
|
|
|
|
plugins/elements/gstinputselector.c: Add pad property to configure behaviour of the unselected pad, it can return OK or N...
Original commit message from CVS:
* plugins/elements/gstinputselector.c: (gst_selector_pad_class_init),
(gst_selector_pad_init), (gst_selector_pad_set_property),
(gst_selector_pad_get_property), (gst_selector_pad_event),
(gst_selector_pad_bufferalloc), (gst_selector_pad_chain),
(gst_input_selector_set_active_pad):
Add pad property to configure behaviour of the unselected pad, it can
return OK or NOT_LINKED, based on the use case.
2008-03-20 17:07:07 +00:00
|
|
|
static void
|
|
|
|
gst_selector_pad_set_property (GObject * object, guint prop_id,
|
|
|
|
const GValue * value, GParamSpec * pspec)
|
|
|
|
{
|
|
|
|
GstSelectorPad *spad = GST_SELECTOR_PAD_CAST (object);
|
|
|
|
|
|
|
|
switch (prop_id) {
|
|
|
|
case PROP_PAD_ALWAYS_OK:
|
|
|
|
GST_OBJECT_LOCK (object);
|
|
|
|
spad->always_ok = g_value_get_boolean (value);
|
|
|
|
GST_OBJECT_UNLOCK (object);
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2008-01-29 07:38:31 +00:00
|
|
|
static void
|
|
|
|
gst_selector_pad_get_property (GObject * object, guint prop_id,
|
|
|
|
GValue * value, GParamSpec * pspec)
|
|
|
|
{
|
|
|
|
GstSelectorPad *spad = GST_SELECTOR_PAD_CAST (object);
|
|
|
|
|
|
|
|
switch (prop_id) {
|
plugins/elements/gstinputselector.*: Various cleanups.
Original commit message from CVS:
* plugins/elements/gstinputselector.c: (gst_selector_pad_class_init),
(gst_selector_pad_finalize), (gst_selector_pad_get_property),
(gst_selector_pad_event), (gst_input_selector_class_init),
(gst_input_selector_init), (gst_input_selector_set_active_pad),
(gst_input_selector_set_property),
(gst_input_selector_get_property),
(gst_input_selector_request_new_pad),
(gst_input_selector_release_pad),
(gst_input_selector_push_pending_stop),
(gst_input_selector_switch):
* plugins/elements/gstinputselector.h:
Various cleanups.
Added tags to the pads.
Select active pad based on the pad object instead of its name.
Fix refcount in set_active_pad.
Add property to get the number of pads.
* plugins/elements/gstoutputselector.c:
(gst_output_selector_class_init),
(gst_output_selector_set_property),
(gst_output_selector_get_property):
Various cleanups.
Select the active pad based on the pad object instead of its name.
Fix locking when setting the active pad.
* plugins/elements/gstselector-marshal.list:
* tests/check/elements/selector.c: (cleanup_pad),
(selector_set_active_pad), (run_input_selector_buffer_count):
Fixes for pad instead of padname for pad selection.
2008-03-13 16:46:04 +00:00
|
|
|
case PROP_PAD_RUNNING_TIME:
|
2008-01-29 07:38:31 +00:00
|
|
|
g_value_set_int64 (value, gst_selector_pad_get_running_time (spad));
|
|
|
|
break;
|
plugins/elements/gstinputselector.*: Various cleanups.
Original commit message from CVS:
* plugins/elements/gstinputselector.c: (gst_selector_pad_class_init),
(gst_selector_pad_finalize), (gst_selector_pad_get_property),
(gst_selector_pad_event), (gst_input_selector_class_init),
(gst_input_selector_init), (gst_input_selector_set_active_pad),
(gst_input_selector_set_property),
(gst_input_selector_get_property),
(gst_input_selector_request_new_pad),
(gst_input_selector_release_pad),
(gst_input_selector_push_pending_stop),
(gst_input_selector_switch):
* plugins/elements/gstinputselector.h:
Various cleanups.
Added tags to the pads.
Select active pad based on the pad object instead of its name.
Fix refcount in set_active_pad.
Add property to get the number of pads.
* plugins/elements/gstoutputselector.c:
(gst_output_selector_class_init),
(gst_output_selector_set_property),
(gst_output_selector_get_property):
Various cleanups.
Select the active pad based on the pad object instead of its name.
Fix locking when setting the active pad.
* plugins/elements/gstselector-marshal.list:
* tests/check/elements/selector.c: (cleanup_pad),
(selector_set_active_pad), (run_input_selector_buffer_count):
Fixes for pad instead of padname for pad selection.
2008-03-13 16:46:04 +00:00
|
|
|
case PROP_PAD_TAGS:
|
|
|
|
GST_OBJECT_LOCK (object);
|
|
|
|
g_value_set_boxed (value, spad->tags);
|
|
|
|
GST_OBJECT_UNLOCK (object);
|
|
|
|
break;
|
|
|
|
case PROP_PAD_ACTIVE:
|
|
|
|
{
|
|
|
|
GstInputSelector *sel;
|
2008-01-29 07:38:31 +00:00
|
|
|
|
plugins/elements/gstinputselector.*: Various cleanups.
Original commit message from CVS:
* plugins/elements/gstinputselector.c: (gst_selector_pad_class_init),
(gst_selector_pad_finalize), (gst_selector_pad_get_property),
(gst_selector_pad_event), (gst_input_selector_class_init),
(gst_input_selector_init), (gst_input_selector_set_active_pad),
(gst_input_selector_set_property),
(gst_input_selector_get_property),
(gst_input_selector_request_new_pad),
(gst_input_selector_release_pad),
(gst_input_selector_push_pending_stop),
(gst_input_selector_switch):
* plugins/elements/gstinputselector.h:
Various cleanups.
Added tags to the pads.
Select active pad based on the pad object instead of its name.
Fix refcount in set_active_pad.
Add property to get the number of pads.
* plugins/elements/gstoutputselector.c:
(gst_output_selector_class_init),
(gst_output_selector_set_property),
(gst_output_selector_get_property):
Various cleanups.
Select the active pad based on the pad object instead of its name.
Fix locking when setting the active pad.
* plugins/elements/gstselector-marshal.list:
* tests/check/elements/selector.c: (cleanup_pad),
(selector_set_active_pad), (run_input_selector_buffer_count):
Fixes for pad instead of padname for pad selection.
2008-03-13 16:46:04 +00:00
|
|
|
sel = GST_INPUT_SELECTOR (gst_pad_get_parent (spad));
|
|
|
|
g_value_set_boolean (value, gst_input_selector_is_active_sinkpad (sel,
|
|
|
|
GST_PAD_CAST (spad)));
|
|
|
|
gst_object_unref (sel);
|
|
|
|
break;
|
|
|
|
}
|
plugins/elements/gstinputselector.c: Add pad property to configure behaviour of the unselected pad, it can return OK or N...
Original commit message from CVS:
* plugins/elements/gstinputselector.c: (gst_selector_pad_class_init),
(gst_selector_pad_init), (gst_selector_pad_set_property),
(gst_selector_pad_get_property), (gst_selector_pad_event),
(gst_selector_pad_bufferalloc), (gst_selector_pad_chain),
(gst_input_selector_set_active_pad):
Add pad property to configure behaviour of the unselected pad, it can
return OK or NOT_LINKED, based on the use case.
2008-03-20 17:07:07 +00:00
|
|
|
case PROP_PAD_ALWAYS_OK:
|
|
|
|
GST_OBJECT_LOCK (object);
|
|
|
|
g_value_set_boolean (value, spad->always_ok);
|
|
|
|
GST_OBJECT_UNLOCK (object);
|
|
|
|
break;
|
2008-01-29 07:38:31 +00:00
|
|
|
default:
|
|
|
|
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static gint64
|
|
|
|
gst_selector_pad_get_running_time (GstSelectorPad * pad)
|
|
|
|
{
|
|
|
|
gint64 ret = 0;
|
|
|
|
|
|
|
|
GST_OBJECT_LOCK (pad);
|
|
|
|
if (pad->active) {
|
2011-05-19 10:11:43 +00:00
|
|
|
guint64 position = pad->position;
|
2011-05-16 14:59:20 +00:00
|
|
|
GstFormat format = pad->segment.format;
|
2008-01-29 07:38:31 +00:00
|
|
|
|
2011-05-19 10:11:43 +00:00
|
|
|
ret = gst_segment_to_running_time (&pad->segment, format, position);
|
2008-01-29 07:38:31 +00:00
|
|
|
}
|
|
|
|
GST_OBJECT_UNLOCK (pad);
|
|
|
|
|
|
|
|
GST_DEBUG_OBJECT (pad, "running time: %" GST_TIME_FORMAT,
|
|
|
|
GST_TIME_ARGS (ret));
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
gst_selector_pad_reset (GstSelectorPad * pad)
|
|
|
|
{
|
plugins/elements/gstinputselector.*: Figure out the locking a bit more.
Original commit message from CVS:
* plugins/elements/gstinputselector.c:
(gst_selector_pad_get_running_time), (gst_selector_pad_reset),
(gst_selector_pad_event), (gst_selector_pad_bufferalloc),
(gst_input_selector_wait), (gst_selector_pad_chain),
(gst_input_selector_class_init), (gst_input_selector_init),
(gst_input_selector_dispose), (gst_segment_set_start),
(gst_input_selector_set_active_pad),
(gst_input_selector_set_property),
(gst_input_selector_get_property),
(gst_input_selector_get_linked_pad),
(gst_input_selector_is_active_sinkpad),
(gst_input_selector_activate_sinkpad),
(gst_input_selector_request_new_pad),
(gst_input_selector_release_pad),
(gst_input_selector_change_state), (gst_input_selector_block),
(gst_input_selector_switch):
* plugins/elements/gstinputselector.h:
Figure out the locking a bit more.
Mark buffers with discont after switching.
Fix initial segment forwarding, make sure to only forward one segment
regardless of what the sequence of buffers/segments is. See #522203.
Improve flushing when blocked.
Return NOT_LINKED when a stream is not selected.
Not API change for the switch signal in the docs.
Fix start/time/accum values of the new segment.
Correctly unlock and flush a blocking selector when going to READY.
2008-03-20 16:48:46 +00:00
|
|
|
GST_OBJECT_LOCK (pad);
|
2008-01-29 07:38:31 +00:00
|
|
|
pad->active = FALSE;
|
2011-03-16 17:19:11 +00:00
|
|
|
pad->pushed = FALSE;
|
2008-01-29 07:38:31 +00:00
|
|
|
pad->eos = FALSE;
|
2011-03-17 13:10:49 +00:00
|
|
|
pad->eos_sent = FALSE;
|
plugins/elements/gstinputselector.*: Figure out the locking a bit more.
Original commit message from CVS:
* plugins/elements/gstinputselector.c:
(gst_selector_pad_get_running_time), (gst_selector_pad_reset),
(gst_selector_pad_event), (gst_selector_pad_bufferalloc),
(gst_input_selector_wait), (gst_selector_pad_chain),
(gst_input_selector_class_init), (gst_input_selector_init),
(gst_input_selector_dispose), (gst_segment_set_start),
(gst_input_selector_set_active_pad),
(gst_input_selector_set_property),
(gst_input_selector_get_property),
(gst_input_selector_get_linked_pad),
(gst_input_selector_is_active_sinkpad),
(gst_input_selector_activate_sinkpad),
(gst_input_selector_request_new_pad),
(gst_input_selector_release_pad),
(gst_input_selector_change_state), (gst_input_selector_block),
(gst_input_selector_switch):
* plugins/elements/gstinputselector.h:
Figure out the locking a bit more.
Mark buffers with discont after switching.
Fix initial segment forwarding, make sure to only forward one segment
regardless of what the sequence of buffers/segments is. See #522203.
Improve flushing when blocked.
Return NOT_LINKED when a stream is not selected.
Not API change for the switch signal in the docs.
Fix start/time/accum values of the new segment.
Correctly unlock and flush a blocking selector when going to READY.
2008-03-20 16:48:46 +00:00
|
|
|
pad->segment_pending = FALSE;
|
2008-09-08 20:27:23 +00:00
|
|
|
pad->discont = FALSE;
|
2011-03-19 07:55:57 +00:00
|
|
|
pad->flushing = FALSE;
|
2011-05-19 10:11:43 +00:00
|
|
|
pad->position = GST_CLOCK_TIME_NONE;
|
2008-01-29 07:38:31 +00:00
|
|
|
gst_segment_init (&pad->segment, GST_FORMAT_UNDEFINED);
|
plugins/elements/gstinputselector.*: Figure out the locking a bit more.
Original commit message from CVS:
* plugins/elements/gstinputselector.c:
(gst_selector_pad_get_running_time), (gst_selector_pad_reset),
(gst_selector_pad_event), (gst_selector_pad_bufferalloc),
(gst_input_selector_wait), (gst_selector_pad_chain),
(gst_input_selector_class_init), (gst_input_selector_init),
(gst_input_selector_dispose), (gst_segment_set_start),
(gst_input_selector_set_active_pad),
(gst_input_selector_set_property),
(gst_input_selector_get_property),
(gst_input_selector_get_linked_pad),
(gst_input_selector_is_active_sinkpad),
(gst_input_selector_activate_sinkpad),
(gst_input_selector_request_new_pad),
(gst_input_selector_release_pad),
(gst_input_selector_change_state), (gst_input_selector_block),
(gst_input_selector_switch):
* plugins/elements/gstinputselector.h:
Figure out the locking a bit more.
Mark buffers with discont after switching.
Fix initial segment forwarding, make sure to only forward one segment
regardless of what the sequence of buffers/segments is. See #522203.
Improve flushing when blocked.
Return NOT_LINKED when a stream is not selected.
Not API change for the switch signal in the docs.
Fix start/time/accum values of the new segment.
Correctly unlock and flush a blocking selector when going to READY.
2008-03-20 16:48:46 +00:00
|
|
|
GST_OBJECT_UNLOCK (pad);
|
2008-01-29 07:38:31 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* strictly get the linked pad from the sinkpad. If the pad is active we return
|
|
|
|
* the srcpad else we return NULL */
|
2009-08-19 15:05:32 +00:00
|
|
|
static GstIterator *
|
2011-11-16 16:49:46 +00:00
|
|
|
gst_selector_pad_iterate_linked_pads (GstPad * pad, GstObject * parent)
|
2009-08-19 15:05:32 +00:00
|
|
|
{
|
2011-04-01 06:46:14 +00:00
|
|
|
GstInputSelector *sel;
|
2009-11-03 17:12:21 +00:00
|
|
|
GstPad *otherpad;
|
2011-06-28 17:01:57 +00:00
|
|
|
GstIterator *it = NULL;
|
2011-03-17 10:32:11 +00:00
|
|
|
GValue val = { 0, };
|
2009-11-03 17:12:21 +00:00
|
|
|
|
2011-11-16 16:49:46 +00:00
|
|
|
sel = GST_INPUT_SELECTOR (parent);
|
2011-04-01 06:46:14 +00:00
|
|
|
|
|
|
|
otherpad = gst_input_selector_get_linked_pad (sel, pad, TRUE);
|
2011-06-28 17:01:57 +00:00
|
|
|
if (otherpad) {
|
|
|
|
g_value_init (&val, GST_TYPE_PAD);
|
|
|
|
g_value_set_object (&val, otherpad);
|
|
|
|
it = gst_iterator_new_single (GST_TYPE_PAD, &val);
|
|
|
|
g_value_unset (&val);
|
2009-11-03 17:12:21 +00:00
|
|
|
gst_object_unref (otherpad);
|
2011-06-28 17:01:57 +00:00
|
|
|
}
|
2008-01-29 07:38:31 +00:00
|
|
|
|
2009-09-25 09:07:02 +00:00
|
|
|
return it;
|
2008-01-29 07:38:31 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static gboolean
|
2011-11-17 11:40:45 +00:00
|
|
|
gst_selector_pad_event (GstPad * pad, GstObject * parent, GstEvent * event)
|
2008-01-29 07:38:31 +00:00
|
|
|
{
|
|
|
|
gboolean res = TRUE;
|
2011-01-05 15:53:28 +00:00
|
|
|
gboolean forward;
|
2008-01-29 07:38:31 +00:00
|
|
|
GstInputSelector *sel;
|
|
|
|
GstSelectorPad *selpad;
|
2009-02-11 16:21:20 +00:00
|
|
|
GstPad *prev_active_sinkpad;
|
2009-02-11 00:22:54 +00:00
|
|
|
GstPad *active_sinkpad;
|
2008-01-29 07:38:31 +00:00
|
|
|
|
2011-11-17 11:40:45 +00:00
|
|
|
sel = GST_INPUT_SELECTOR (parent);
|
2008-01-29 07:38:31 +00:00
|
|
|
selpad = GST_SELECTOR_PAD_CAST (pad);
|
|
|
|
|
2009-02-11 00:22:54 +00:00
|
|
|
GST_INPUT_SELECTOR_LOCK (sel);
|
2009-02-11 16:21:20 +00:00
|
|
|
prev_active_sinkpad = sel->active_sinkpad;
|
|
|
|
active_sinkpad = gst_input_selector_activate_sinkpad (sel, pad);
|
2008-01-29 07:38:31 +00:00
|
|
|
|
2011-01-05 15:53:28 +00:00
|
|
|
/* only forward if we are dealing with the active sinkpad */
|
|
|
|
forward = (pad == active_sinkpad);
|
2010-01-25 11:21:34 +00:00
|
|
|
GST_INPUT_SELECTOR_UNLOCK (sel);
|
2009-02-11 00:22:54 +00:00
|
|
|
|
2010-12-31 11:27:45 +00:00
|
|
|
if (prev_active_sinkpad != active_sinkpad && pad == active_sinkpad) {
|
2009-02-11 00:22:54 +00:00
|
|
|
g_object_notify (G_OBJECT (sel), "active-pad");
|
2010-12-31 11:27:45 +00:00
|
|
|
}
|
2008-02-25 08:53:51 +00:00
|
|
|
|
2008-01-29 07:38:31 +00:00
|
|
|
switch (GST_EVENT_TYPE (event)) {
|
plugins/elements/gstinputselector.*: Figure out the locking a bit more.
Original commit message from CVS:
* plugins/elements/gstinputselector.c:
(gst_selector_pad_get_running_time), (gst_selector_pad_reset),
(gst_selector_pad_event), (gst_selector_pad_bufferalloc),
(gst_input_selector_wait), (gst_selector_pad_chain),
(gst_input_selector_class_init), (gst_input_selector_init),
(gst_input_selector_dispose), (gst_segment_set_start),
(gst_input_selector_set_active_pad),
(gst_input_selector_set_property),
(gst_input_selector_get_property),
(gst_input_selector_get_linked_pad),
(gst_input_selector_is_active_sinkpad),
(gst_input_selector_activate_sinkpad),
(gst_input_selector_request_new_pad),
(gst_input_selector_release_pad),
(gst_input_selector_change_state), (gst_input_selector_block),
(gst_input_selector_switch):
* plugins/elements/gstinputselector.h:
Figure out the locking a bit more.
Mark buffers with discont after switching.
Fix initial segment forwarding, make sure to only forward one segment
regardless of what the sequence of buffers/segments is. See #522203.
Improve flushing when blocked.
Return NOT_LINKED when a stream is not selected.
Not API change for the switch signal in the docs.
Fix start/time/accum values of the new segment.
Correctly unlock and flush a blocking selector when going to READY.
2008-03-20 16:48:46 +00:00
|
|
|
case GST_EVENT_FLUSH_START:
|
2011-03-19 07:55:57 +00:00
|
|
|
/* Unblock the pad if it's waiting */
|
|
|
|
GST_INPUT_SELECTOR_LOCK (sel);
|
|
|
|
selpad->flushing = TRUE;
|
|
|
|
GST_INPUT_SELECTOR_BROADCAST (sel);
|
|
|
|
GST_INPUT_SELECTOR_UNLOCK (sel);
|
plugins/elements/gstinputselector.*: Figure out the locking a bit more.
Original commit message from CVS:
* plugins/elements/gstinputselector.c:
(gst_selector_pad_get_running_time), (gst_selector_pad_reset),
(gst_selector_pad_event), (gst_selector_pad_bufferalloc),
(gst_input_selector_wait), (gst_selector_pad_chain),
(gst_input_selector_class_init), (gst_input_selector_init),
(gst_input_selector_dispose), (gst_segment_set_start),
(gst_input_selector_set_active_pad),
(gst_input_selector_set_property),
(gst_input_selector_get_property),
(gst_input_selector_get_linked_pad),
(gst_input_selector_is_active_sinkpad),
(gst_input_selector_activate_sinkpad),
(gst_input_selector_request_new_pad),
(gst_input_selector_release_pad),
(gst_input_selector_change_state), (gst_input_selector_block),
(gst_input_selector_switch):
* plugins/elements/gstinputselector.h:
Figure out the locking a bit more.
Mark buffers with discont after switching.
Fix initial segment forwarding, make sure to only forward one segment
regardless of what the sequence of buffers/segments is. See #522203.
Improve flushing when blocked.
Return NOT_LINKED when a stream is not selected.
Not API change for the switch signal in the docs.
Fix start/time/accum values of the new segment.
Correctly unlock and flush a blocking selector when going to READY.
2008-03-20 16:48:46 +00:00
|
|
|
break;
|
2008-01-29 07:38:31 +00:00
|
|
|
case GST_EVENT_FLUSH_STOP:
|
plugins/elements/gstinputselector.*: Figure out the locking a bit more.
Original commit message from CVS:
* plugins/elements/gstinputselector.c:
(gst_selector_pad_get_running_time), (gst_selector_pad_reset),
(gst_selector_pad_event), (gst_selector_pad_bufferalloc),
(gst_input_selector_wait), (gst_selector_pad_chain),
(gst_input_selector_class_init), (gst_input_selector_init),
(gst_input_selector_dispose), (gst_segment_set_start),
(gst_input_selector_set_active_pad),
(gst_input_selector_set_property),
(gst_input_selector_get_property),
(gst_input_selector_get_linked_pad),
(gst_input_selector_is_active_sinkpad),
(gst_input_selector_activate_sinkpad),
(gst_input_selector_request_new_pad),
(gst_input_selector_release_pad),
(gst_input_selector_change_state), (gst_input_selector_block),
(gst_input_selector_switch):
* plugins/elements/gstinputselector.h:
Figure out the locking a bit more.
Mark buffers with discont after switching.
Fix initial segment forwarding, make sure to only forward one segment
regardless of what the sequence of buffers/segments is. See #522203.
Improve flushing when blocked.
Return NOT_LINKED when a stream is not selected.
Not API change for the switch signal in the docs.
Fix start/time/accum values of the new segment.
Correctly unlock and flush a blocking selector when going to READY.
2008-03-20 16:48:46 +00:00
|
|
|
GST_INPUT_SELECTOR_LOCK (sel);
|
2008-01-29 07:38:31 +00:00
|
|
|
gst_selector_pad_reset (selpad);
|
plugins/elements/gstinputselector.*: Figure out the locking a bit more.
Original commit message from CVS:
* plugins/elements/gstinputselector.c:
(gst_selector_pad_get_running_time), (gst_selector_pad_reset),
(gst_selector_pad_event), (gst_selector_pad_bufferalloc),
(gst_input_selector_wait), (gst_selector_pad_chain),
(gst_input_selector_class_init), (gst_input_selector_init),
(gst_input_selector_dispose), (gst_segment_set_start),
(gst_input_selector_set_active_pad),
(gst_input_selector_set_property),
(gst_input_selector_get_property),
(gst_input_selector_get_linked_pad),
(gst_input_selector_is_active_sinkpad),
(gst_input_selector_activate_sinkpad),
(gst_input_selector_request_new_pad),
(gst_input_selector_release_pad),
(gst_input_selector_change_state), (gst_input_selector_block),
(gst_input_selector_switch):
* plugins/elements/gstinputselector.h:
Figure out the locking a bit more.
Mark buffers with discont after switching.
Fix initial segment forwarding, make sure to only forward one segment
regardless of what the sequence of buffers/segments is. See #522203.
Improve flushing when blocked.
Return NOT_LINKED when a stream is not selected.
Not API change for the switch signal in the docs.
Fix start/time/accum values of the new segment.
Correctly unlock and flush a blocking selector when going to READY.
2008-03-20 16:48:46 +00:00
|
|
|
GST_INPUT_SELECTOR_UNLOCK (sel);
|
2008-01-29 07:38:31 +00:00
|
|
|
break;
|
2011-05-13 16:07:24 +00:00
|
|
|
case GST_EVENT_SEGMENT:
|
2008-01-29 07:38:31 +00:00
|
|
|
{
|
plugins/elements/gstinputselector.*: Figure out the locking a bit more.
Original commit message from CVS:
* plugins/elements/gstinputselector.c:
(gst_selector_pad_get_running_time), (gst_selector_pad_reset),
(gst_selector_pad_event), (gst_selector_pad_bufferalloc),
(gst_input_selector_wait), (gst_selector_pad_chain),
(gst_input_selector_class_init), (gst_input_selector_init),
(gst_input_selector_dispose), (gst_segment_set_start),
(gst_input_selector_set_active_pad),
(gst_input_selector_set_property),
(gst_input_selector_get_property),
(gst_input_selector_get_linked_pad),
(gst_input_selector_is_active_sinkpad),
(gst_input_selector_activate_sinkpad),
(gst_input_selector_request_new_pad),
(gst_input_selector_release_pad),
(gst_input_selector_change_state), (gst_input_selector_block),
(gst_input_selector_switch):
* plugins/elements/gstinputselector.h:
Figure out the locking a bit more.
Mark buffers with discont after switching.
Fix initial segment forwarding, make sure to only forward one segment
regardless of what the sequence of buffers/segments is. See #522203.
Improve flushing when blocked.
Return NOT_LINKED when a stream is not selected.
Not API change for the switch signal in the docs.
Fix start/time/accum values of the new segment.
Correctly unlock and flush a blocking selector when going to READY.
2008-03-20 16:48:46 +00:00
|
|
|
GST_INPUT_SELECTOR_LOCK (sel);
|
|
|
|
GST_OBJECT_LOCK (selpad);
|
2011-05-18 14:56:13 +00:00
|
|
|
gst_event_copy_segment (event, &selpad->segment);
|
2011-05-19 10:11:43 +00:00
|
|
|
selpad->segment_seqnum = gst_event_get_seqnum (event);
|
|
|
|
|
|
|
|
/* Update the position */
|
|
|
|
if (selpad->position == GST_CLOCK_TIME_NONE
|
|
|
|
|| selpad->segment.position > selpad->position) {
|
|
|
|
selpad->position = selpad->segment.position;
|
|
|
|
} else if (selpad->position != GST_CLOCK_TIME_NONE
|
|
|
|
&& selpad->position > selpad->segment.position) {
|
|
|
|
selpad->segment.position = selpad->position;
|
|
|
|
|
|
|
|
if (forward) {
|
|
|
|
gst_event_unref (event);
|
|
|
|
event = gst_event_new_segment (&selpad->segment);
|
|
|
|
gst_event_set_seqnum (event, selpad->segment_seqnum);
|
|
|
|
}
|
|
|
|
}
|
2011-05-13 16:07:24 +00:00
|
|
|
GST_DEBUG_OBJECT (pad, "configured SEGMENT %" GST_SEGMENT_FORMAT,
|
|
|
|
&selpad->segment);
|
plugins/elements/gstinputselector.*: Figure out the locking a bit more.
Original commit message from CVS:
* plugins/elements/gstinputselector.c:
(gst_selector_pad_get_running_time), (gst_selector_pad_reset),
(gst_selector_pad_event), (gst_selector_pad_bufferalloc),
(gst_input_selector_wait), (gst_selector_pad_chain),
(gst_input_selector_class_init), (gst_input_selector_init),
(gst_input_selector_dispose), (gst_segment_set_start),
(gst_input_selector_set_active_pad),
(gst_input_selector_set_property),
(gst_input_selector_get_property),
(gst_input_selector_get_linked_pad),
(gst_input_selector_is_active_sinkpad),
(gst_input_selector_activate_sinkpad),
(gst_input_selector_request_new_pad),
(gst_input_selector_release_pad),
(gst_input_selector_change_state), (gst_input_selector_block),
(gst_input_selector_switch):
* plugins/elements/gstinputselector.h:
Figure out the locking a bit more.
Mark buffers with discont after switching.
Fix initial segment forwarding, make sure to only forward one segment
regardless of what the sequence of buffers/segments is. See #522203.
Improve flushing when blocked.
Return NOT_LINKED when a stream is not selected.
Not API change for the switch signal in the docs.
Fix start/time/accum values of the new segment.
Correctly unlock and flush a blocking selector when going to READY.
2008-03-20 16:48:46 +00:00
|
|
|
|
2011-01-05 15:53:28 +00:00
|
|
|
/* If we aren't forwarding the event because the pad is not the
|
|
|
|
* active_sinkpad, then set the flag on the pad
|
2009-04-23 10:04:46 +00:00
|
|
|
* that says a segment needs sending if/when that pad is activated.
|
|
|
|
* For all other cases, we send the event immediately, which makes
|
|
|
|
* sparse streams and other segment updates work correctly downstream.
|
|
|
|
*/
|
|
|
|
if (!forward)
|
|
|
|
selpad->segment_pending = TRUE;
|
|
|
|
|
2011-05-19 10:11:43 +00:00
|
|
|
GST_OBJECT_UNLOCK (selpad);
|
2009-04-23 10:04:46 +00:00
|
|
|
GST_INPUT_SELECTOR_UNLOCK (sel);
|
2008-01-29 07:38:31 +00:00
|
|
|
break;
|
|
|
|
}
|
plugins/elements/gstinputselector.*: Various cleanups.
Original commit message from CVS:
* plugins/elements/gstinputselector.c: (gst_selector_pad_class_init),
(gst_selector_pad_finalize), (gst_selector_pad_get_property),
(gst_selector_pad_event), (gst_input_selector_class_init),
(gst_input_selector_init), (gst_input_selector_set_active_pad),
(gst_input_selector_set_property),
(gst_input_selector_get_property),
(gst_input_selector_request_new_pad),
(gst_input_selector_release_pad),
(gst_input_selector_push_pending_stop),
(gst_input_selector_switch):
* plugins/elements/gstinputselector.h:
Various cleanups.
Added tags to the pads.
Select active pad based on the pad object instead of its name.
Fix refcount in set_active_pad.
Add property to get the number of pads.
* plugins/elements/gstoutputselector.c:
(gst_output_selector_class_init),
(gst_output_selector_set_property),
(gst_output_selector_get_property):
Various cleanups.
Select the active pad based on the pad object instead of its name.
Fix locking when setting the active pad.
* plugins/elements/gstselector-marshal.list:
* tests/check/elements/selector.c: (cleanup_pad),
(selector_set_active_pad), (run_input_selector_buffer_count):
Fixes for pad instead of padname for pad selection.
2008-03-13 16:46:04 +00:00
|
|
|
case GST_EVENT_TAG:
|
|
|
|
{
|
2009-03-24 14:23:03 +00:00
|
|
|
GstTagList *tags, *oldtags, *newtags;
|
plugins/elements/gstinputselector.*: Various cleanups.
Original commit message from CVS:
* plugins/elements/gstinputselector.c: (gst_selector_pad_class_init),
(gst_selector_pad_finalize), (gst_selector_pad_get_property),
(gst_selector_pad_event), (gst_input_selector_class_init),
(gst_input_selector_init), (gst_input_selector_set_active_pad),
(gst_input_selector_set_property),
(gst_input_selector_get_property),
(gst_input_selector_request_new_pad),
(gst_input_selector_release_pad),
(gst_input_selector_push_pending_stop),
(gst_input_selector_switch):
* plugins/elements/gstinputselector.h:
Various cleanups.
Added tags to the pads.
Select active pad based on the pad object instead of its name.
Fix refcount in set_active_pad.
Add property to get the number of pads.
* plugins/elements/gstoutputselector.c:
(gst_output_selector_class_init),
(gst_output_selector_set_property),
(gst_output_selector_get_property):
Various cleanups.
Select the active pad based on the pad object instead of its name.
Fix locking when setting the active pad.
* plugins/elements/gstselector-marshal.list:
* tests/check/elements/selector.c: (cleanup_pad),
(selector_set_active_pad), (run_input_selector_buffer_count):
Fixes for pad instead of padname for pad selection.
2008-03-13 16:46:04 +00:00
|
|
|
|
|
|
|
gst_event_parse_tag (event, &tags);
|
2009-03-24 14:23:03 +00:00
|
|
|
|
|
|
|
GST_OBJECT_LOCK (selpad);
|
|
|
|
oldtags = selpad->tags;
|
|
|
|
|
|
|
|
newtags = gst_tag_list_merge (oldtags, tags, GST_TAG_MERGE_REPLACE);
|
|
|
|
selpad->tags = newtags;
|
|
|
|
if (oldtags)
|
|
|
|
gst_tag_list_free (oldtags);
|
|
|
|
GST_DEBUG_OBJECT (pad, "received tags %" GST_PTR_FORMAT, newtags);
|
plugins/elements/gstinputselector.*: Various cleanups.
Original commit message from CVS:
* plugins/elements/gstinputselector.c: (gst_selector_pad_class_init),
(gst_selector_pad_finalize), (gst_selector_pad_get_property),
(gst_selector_pad_event), (gst_input_selector_class_init),
(gst_input_selector_init), (gst_input_selector_set_active_pad),
(gst_input_selector_set_property),
(gst_input_selector_get_property),
(gst_input_selector_request_new_pad),
(gst_input_selector_release_pad),
(gst_input_selector_push_pending_stop),
(gst_input_selector_switch):
* plugins/elements/gstinputselector.h:
Various cleanups.
Added tags to the pads.
Select active pad based on the pad object instead of its name.
Fix refcount in set_active_pad.
Add property to get the number of pads.
* plugins/elements/gstoutputselector.c:
(gst_output_selector_class_init),
(gst_output_selector_set_property),
(gst_output_selector_get_property):
Various cleanups.
Select the active pad based on the pad object instead of its name.
Fix locking when setting the active pad.
* plugins/elements/gstselector-marshal.list:
* tests/check/elements/selector.c: (cleanup_pad),
(selector_set_active_pad), (run_input_selector_buffer_count):
Fixes for pad instead of padname for pad selection.
2008-03-13 16:46:04 +00:00
|
|
|
GST_OBJECT_UNLOCK (selpad);
|
2009-06-04 06:56:29 +00:00
|
|
|
|
|
|
|
g_object_notify (G_OBJECT (selpad), "tags");
|
plugins/elements/gstinputselector.*: Various cleanups.
Original commit message from CVS:
* plugins/elements/gstinputselector.c: (gst_selector_pad_class_init),
(gst_selector_pad_finalize), (gst_selector_pad_get_property),
(gst_selector_pad_event), (gst_input_selector_class_init),
(gst_input_selector_init), (gst_input_selector_set_active_pad),
(gst_input_selector_set_property),
(gst_input_selector_get_property),
(gst_input_selector_request_new_pad),
(gst_input_selector_release_pad),
(gst_input_selector_push_pending_stop),
(gst_input_selector_switch):
* plugins/elements/gstinputselector.h:
Various cleanups.
Added tags to the pads.
Select active pad based on the pad object instead of its name.
Fix refcount in set_active_pad.
Add property to get the number of pads.
* plugins/elements/gstoutputselector.c:
(gst_output_selector_class_init),
(gst_output_selector_set_property),
(gst_output_selector_get_property):
Various cleanups.
Select the active pad based on the pad object instead of its name.
Fix locking when setting the active pad.
* plugins/elements/gstselector-marshal.list:
* tests/check/elements/selector.c: (cleanup_pad),
(selector_set_active_pad), (run_input_selector_buffer_count):
Fixes for pad instead of padname for pad selection.
2008-03-13 16:46:04 +00:00
|
|
|
break;
|
|
|
|
}
|
2008-01-29 07:38:31 +00:00
|
|
|
case GST_EVENT_EOS:
|
|
|
|
selpad->eos = TRUE;
|
2011-03-17 13:10:49 +00:00
|
|
|
|
|
|
|
if (forward) {
|
|
|
|
selpad->eos_sent = TRUE;
|
|
|
|
} else {
|
|
|
|
GstSelectorPad *tmp;
|
|
|
|
|
|
|
|
/* If the active sinkpad is in EOS state but EOS
|
|
|
|
* was not sent downstream this means that the pad
|
|
|
|
* got EOS before it was set as active pad and that
|
|
|
|
* the previously active pad got EOS after it was
|
|
|
|
* active
|
|
|
|
*/
|
|
|
|
GST_INPUT_SELECTOR_LOCK (sel);
|
|
|
|
active_sinkpad = gst_input_selector_activate_sinkpad (sel, pad);
|
|
|
|
tmp = GST_SELECTOR_PAD (active_sinkpad);
|
|
|
|
forward = (tmp->eos && !tmp->eos_sent);
|
|
|
|
tmp->eos_sent = TRUE;
|
|
|
|
GST_INPUT_SELECTOR_UNLOCK (sel);
|
|
|
|
}
|
2008-03-14 17:22:21 +00:00
|
|
|
GST_DEBUG_OBJECT (pad, "received EOS");
|
2008-01-29 07:38:31 +00:00
|
|
|
break;
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
2008-03-14 17:22:21 +00:00
|
|
|
if (forward) {
|
|
|
|
GST_DEBUG_OBJECT (pad, "forwarding event");
|
2008-01-29 07:38:31 +00:00
|
|
|
res = gst_pad_push_event (sel->srcpad, event);
|
2008-03-14 17:22:21 +00:00
|
|
|
} else
|
2008-02-01 17:08:18 +00:00
|
|
|
gst_event_unref (event);
|
2008-01-29 07:38:31 +00:00
|
|
|
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
2011-11-09 10:22:36 +00:00
|
|
|
static gboolean
|
2011-11-16 16:22:56 +00:00
|
|
|
gst_selector_pad_query (GstPad * pad, GstObject * parent, GstQuery * query)
|
2011-11-09 10:22:36 +00:00
|
|
|
{
|
|
|
|
gboolean res = FALSE;
|
|
|
|
|
|
|
|
switch (GST_QUERY_TYPE (query)) {
|
|
|
|
default:
|
2011-11-16 16:22:56 +00:00
|
|
|
res = gst_pad_query_default (pad, parent, query);
|
2011-11-09 10:22:36 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
plugins/elements/gstinputselector.*: Figure out the locking a bit more.
Original commit message from CVS:
* plugins/elements/gstinputselector.c:
(gst_selector_pad_get_running_time), (gst_selector_pad_reset),
(gst_selector_pad_event), (gst_selector_pad_bufferalloc),
(gst_input_selector_wait), (gst_selector_pad_chain),
(gst_input_selector_class_init), (gst_input_selector_init),
(gst_input_selector_dispose), (gst_segment_set_start),
(gst_input_selector_set_active_pad),
(gst_input_selector_set_property),
(gst_input_selector_get_property),
(gst_input_selector_get_linked_pad),
(gst_input_selector_is_active_sinkpad),
(gst_input_selector_activate_sinkpad),
(gst_input_selector_request_new_pad),
(gst_input_selector_release_pad),
(gst_input_selector_change_state), (gst_input_selector_block),
(gst_input_selector_switch):
* plugins/elements/gstinputselector.h:
Figure out the locking a bit more.
Mark buffers with discont after switching.
Fix initial segment forwarding, make sure to only forward one segment
regardless of what the sequence of buffers/segments is. See #522203.
Improve flushing when blocked.
Return NOT_LINKED when a stream is not selected.
Not API change for the switch signal in the docs.
Fix start/time/accum values of the new segment.
Correctly unlock and flush a blocking selector when going to READY.
2008-03-20 16:48:46 +00:00
|
|
|
/* must be called with the SELECTOR_LOCK, will block while the pad is blocked
|
|
|
|
* or return TRUE when flushing */
|
2008-01-29 07:38:31 +00:00
|
|
|
static gboolean
|
2011-03-19 07:55:57 +00:00
|
|
|
gst_input_selector_wait (GstInputSelector * self, GstSelectorPad * pad)
|
2008-01-29 07:38:31 +00:00
|
|
|
{
|
2011-03-19 07:55:57 +00:00
|
|
|
while (self->blocked && !self->flushing && !pad->flushing) {
|
plugins/elements/gstinputselector.*: Figure out the locking a bit more.
Original commit message from CVS:
* plugins/elements/gstinputselector.c:
(gst_selector_pad_get_running_time), (gst_selector_pad_reset),
(gst_selector_pad_event), (gst_selector_pad_bufferalloc),
(gst_input_selector_wait), (gst_selector_pad_chain),
(gst_input_selector_class_init), (gst_input_selector_init),
(gst_input_selector_dispose), (gst_segment_set_start),
(gst_input_selector_set_active_pad),
(gst_input_selector_set_property),
(gst_input_selector_get_property),
(gst_input_selector_get_linked_pad),
(gst_input_selector_is_active_sinkpad),
(gst_input_selector_activate_sinkpad),
(gst_input_selector_request_new_pad),
(gst_input_selector_release_pad),
(gst_input_selector_change_state), (gst_input_selector_block),
(gst_input_selector_switch):
* plugins/elements/gstinputselector.h:
Figure out the locking a bit more.
Mark buffers with discont after switching.
Fix initial segment forwarding, make sure to only forward one segment
regardless of what the sequence of buffers/segments is. See #522203.
Improve flushing when blocked.
Return NOT_LINKED when a stream is not selected.
Not API change for the switch signal in the docs.
Fix start/time/accum values of the new segment.
Correctly unlock and flush a blocking selector when going to READY.
2008-03-20 16:48:46 +00:00
|
|
|
/* we can be unlocked here when we are shutting down (flushing) or when we
|
|
|
|
* get unblocked */
|
|
|
|
GST_INPUT_SELECTOR_WAIT (self);
|
|
|
|
}
|
|
|
|
return self->flushing;
|
2008-01-29 07:38:31 +00:00
|
|
|
}
|
|
|
|
|
2011-03-19 09:28:49 +00:00
|
|
|
/* must be called with the SELECTOR_LOCK, will block until the running time
|
|
|
|
* of the active pad is after this pad or return TRUE when flushing */
|
|
|
|
static gboolean
|
|
|
|
gst_input_selector_wait_running_time (GstInputSelector * sel,
|
|
|
|
GstSelectorPad * pad, GstBuffer * buf)
|
|
|
|
{
|
|
|
|
GstPad *active_sinkpad;
|
|
|
|
GstSelectorPad *active_selpad;
|
|
|
|
GstSegment *seg, *active_seg;
|
2012-01-01 15:47:14 +00:00
|
|
|
GstClockTime running_time, active_running_time = GST_CLOCK_TIME_NONE;
|
2011-03-19 09:28:49 +00:00
|
|
|
|
|
|
|
seg = &pad->segment;
|
|
|
|
|
|
|
|
active_sinkpad =
|
|
|
|
gst_input_selector_activate_sinkpad (sel, GST_PAD_CAST (pad));
|
|
|
|
active_selpad = GST_SELECTOR_PAD_CAST (active_sinkpad);
|
|
|
|
active_seg = &active_selpad->segment;
|
|
|
|
|
|
|
|
/* We can only sync if the segments are in time format or
|
|
|
|
* if the active pad had no newsegment event yet */
|
|
|
|
if (seg->format != GST_FORMAT_TIME ||
|
|
|
|
(active_seg->format != GST_FORMAT_TIME
|
|
|
|
&& active_seg->format != GST_FORMAT_UNDEFINED))
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
/* If we have no valid timestamp we can't sync this buffer */
|
|
|
|
if (!GST_BUFFER_TIMESTAMP_IS_VALID (buf))
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
running_time = GST_BUFFER_TIMESTAMP (buf);
|
|
|
|
/* If possible try to get the running time at the end of the buffer */
|
|
|
|
if (GST_BUFFER_DURATION_IS_VALID (buf))
|
|
|
|
running_time += GST_BUFFER_DURATION (buf);
|
|
|
|
if (running_time > seg->stop)
|
|
|
|
running_time = seg->stop;
|
|
|
|
running_time =
|
|
|
|
gst_segment_to_running_time (seg, GST_FORMAT_TIME, running_time);
|
|
|
|
/* If this is outside the segment don't sync */
|
|
|
|
if (running_time == -1)
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
/* Get active pad's running time, if no configured segment yet keep at -1 */
|
|
|
|
if (active_seg->format == GST_FORMAT_TIME)
|
|
|
|
active_running_time =
|
|
|
|
gst_segment_to_running_time (active_seg, GST_FORMAT_TIME,
|
2011-05-19 10:11:43 +00:00
|
|
|
active_selpad->position);
|
2011-03-19 09:28:49 +00:00
|
|
|
|
|
|
|
/* Wait until
|
|
|
|
* a) this is the active pad
|
|
|
|
* b) the pad or the selector is flushing
|
|
|
|
* c) the selector is not blocked
|
|
|
|
* d) the active pad has no running time or the active
|
|
|
|
* pad's running time is before this running time
|
|
|
|
* e) the active pad has a non-time segment
|
2012-03-29 11:39:40 +00:00
|
|
|
* f) the active pad changed and has not pushed anything
|
2011-03-19 09:28:49 +00:00
|
|
|
*/
|
2012-03-29 11:39:40 +00:00
|
|
|
while (pad != active_selpad && !sel->flushing && !pad->flushing
|
|
|
|
&& active_selpad->pushed && (sel->blocked || active_running_time == -1
|
2011-03-19 09:28:49 +00:00
|
|
|
|| running_time >= active_running_time)) {
|
|
|
|
if (!sel->blocked)
|
|
|
|
GST_DEBUG_OBJECT (pad,
|
|
|
|
"Waiting for active streams to advance. %" GST_TIME_FORMAT " >= %"
|
|
|
|
GST_TIME_FORMAT, GST_TIME_ARGS (running_time),
|
|
|
|
GST_TIME_ARGS (active_running_time));
|
|
|
|
|
|
|
|
GST_INPUT_SELECTOR_WAIT (sel);
|
|
|
|
|
|
|
|
/* Get new active pad, it might have changed */
|
|
|
|
active_sinkpad =
|
|
|
|
gst_input_selector_activate_sinkpad (sel, GST_PAD_CAST (pad));
|
|
|
|
active_selpad = GST_SELECTOR_PAD_CAST (active_sinkpad);
|
|
|
|
active_seg = &active_selpad->segment;
|
|
|
|
|
|
|
|
/* If the active segment is configured but not to time format
|
|
|
|
* we can't do any syncing at all */
|
|
|
|
if (active_seg->format != GST_FORMAT_TIME
|
|
|
|
&& active_seg->format != GST_FORMAT_UNDEFINED)
|
|
|
|
break;
|
|
|
|
|
|
|
|
/* Get the new active pad running time */
|
|
|
|
if (active_seg->format == GST_FORMAT_TIME)
|
|
|
|
active_running_time =
|
|
|
|
gst_segment_to_running_time (active_seg, GST_FORMAT_TIME,
|
2011-05-19 10:11:43 +00:00
|
|
|
active_selpad->position);
|
2011-03-19 09:28:49 +00:00
|
|
|
else
|
|
|
|
active_running_time = -1;
|
|
|
|
|
|
|
|
if (!sel->blocked)
|
|
|
|
GST_DEBUG_OBJECT (pad,
|
|
|
|
"Waited for active streams to advance. %" GST_TIME_FORMAT " >= %"
|
|
|
|
GST_TIME_FORMAT, GST_TIME_ARGS (running_time),
|
|
|
|
GST_TIME_ARGS (active_running_time));
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Return TRUE if the selector or the pad is flushing */
|
|
|
|
return (sel->flushing || pad->flushing);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2008-01-29 07:38:31 +00:00
|
|
|
static GstFlowReturn
|
2011-11-17 11:40:45 +00:00
|
|
|
gst_selector_pad_chain (GstPad * pad, GstObject * parent, GstBuffer * buf)
|
2008-01-29 07:38:31 +00:00
|
|
|
{
|
|
|
|
GstInputSelector *sel;
|
|
|
|
GstFlowReturn res;
|
|
|
|
GstPad *active_sinkpad;
|
2008-12-04 17:51:37 +00:00
|
|
|
GstPad *prev_active_sinkpad;
|
2008-01-29 07:38:31 +00:00
|
|
|
GstSelectorPad *selpad;
|
2009-11-09 10:49:15 +00:00
|
|
|
GstClockTime start_time;
|
2008-01-29 07:38:31 +00:00
|
|
|
GstSegment *seg;
|
2011-05-13 16:07:24 +00:00
|
|
|
GstEvent *start_event = NULL;
|
2008-01-29 07:38:31 +00:00
|
|
|
|
2011-11-17 11:40:45 +00:00
|
|
|
sel = GST_INPUT_SELECTOR (parent);
|
2008-01-29 07:38:31 +00:00
|
|
|
selpad = GST_SELECTOR_PAD_CAST (pad);
|
|
|
|
seg = &selpad->segment;
|
|
|
|
|
plugins/elements/gstinputselector.*: Figure out the locking a bit more.
Original commit message from CVS:
* plugins/elements/gstinputselector.c:
(gst_selector_pad_get_running_time), (gst_selector_pad_reset),
(gst_selector_pad_event), (gst_selector_pad_bufferalloc),
(gst_input_selector_wait), (gst_selector_pad_chain),
(gst_input_selector_class_init), (gst_input_selector_init),
(gst_input_selector_dispose), (gst_segment_set_start),
(gst_input_selector_set_active_pad),
(gst_input_selector_set_property),
(gst_input_selector_get_property),
(gst_input_selector_get_linked_pad),
(gst_input_selector_is_active_sinkpad),
(gst_input_selector_activate_sinkpad),
(gst_input_selector_request_new_pad),
(gst_input_selector_release_pad),
(gst_input_selector_change_state), (gst_input_selector_block),
(gst_input_selector_switch):
* plugins/elements/gstinputselector.h:
Figure out the locking a bit more.
Mark buffers with discont after switching.
Fix initial segment forwarding, make sure to only forward one segment
regardless of what the sequence of buffers/segments is. See #522203.
Improve flushing when blocked.
Return NOT_LINKED when a stream is not selected.
Not API change for the switch signal in the docs.
Fix start/time/accum values of the new segment.
Correctly unlock and flush a blocking selector when going to READY.
2008-03-20 16:48:46 +00:00
|
|
|
GST_INPUT_SELECTOR_LOCK (sel);
|
|
|
|
/* wait or check for flushing */
|
2011-03-19 07:55:57 +00:00
|
|
|
if (gst_input_selector_wait (sel, selpad))
|
plugins/elements/gstinputselector.*: Figure out the locking a bit more.
Original commit message from CVS:
* plugins/elements/gstinputselector.c:
(gst_selector_pad_get_running_time), (gst_selector_pad_reset),
(gst_selector_pad_event), (gst_selector_pad_bufferalloc),
(gst_input_selector_wait), (gst_selector_pad_chain),
(gst_input_selector_class_init), (gst_input_selector_init),
(gst_input_selector_dispose), (gst_segment_set_start),
(gst_input_selector_set_active_pad),
(gst_input_selector_set_property),
(gst_input_selector_get_property),
(gst_input_selector_get_linked_pad),
(gst_input_selector_is_active_sinkpad),
(gst_input_selector_activate_sinkpad),
(gst_input_selector_request_new_pad),
(gst_input_selector_release_pad),
(gst_input_selector_change_state), (gst_input_selector_block),
(gst_input_selector_switch):
* plugins/elements/gstinputselector.h:
Figure out the locking a bit more.
Mark buffers with discont after switching.
Fix initial segment forwarding, make sure to only forward one segment
regardless of what the sequence of buffers/segments is. See #522203.
Improve flushing when blocked.
Return NOT_LINKED when a stream is not selected.
Not API change for the switch signal in the docs.
Fix start/time/accum values of the new segment.
Correctly unlock and flush a blocking selector when going to READY.
2008-03-20 16:48:46 +00:00
|
|
|
goto flushing;
|
2008-01-29 07:38:31 +00:00
|
|
|
|
2010-11-01 20:40:36 +00:00
|
|
|
GST_LOG_OBJECT (pad, "getting active pad");
|
2008-03-14 17:22:21 +00:00
|
|
|
|
2008-12-04 17:51:37 +00:00
|
|
|
prev_active_sinkpad = sel->active_sinkpad;
|
2008-01-29 07:38:31 +00:00
|
|
|
active_sinkpad = gst_input_selector_activate_sinkpad (sel, pad);
|
|
|
|
|
2011-03-19 09:28:49 +00:00
|
|
|
/* In sync mode wait until the active pad has advanced
|
|
|
|
* after the running time of the current buffer */
|
|
|
|
if (sel->sync_streams && active_sinkpad != pad) {
|
|
|
|
if (gst_input_selector_wait_running_time (sel, selpad, buf))
|
|
|
|
goto flushing;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Might have changed while waiting */
|
|
|
|
active_sinkpad = gst_input_selector_activate_sinkpad (sel, pad);
|
|
|
|
|
plugins/elements/gstinputselector.*: Figure out the locking a bit more.
Original commit message from CVS:
* plugins/elements/gstinputselector.c:
(gst_selector_pad_get_running_time), (gst_selector_pad_reset),
(gst_selector_pad_event), (gst_selector_pad_bufferalloc),
(gst_input_selector_wait), (gst_selector_pad_chain),
(gst_input_selector_class_init), (gst_input_selector_init),
(gst_input_selector_dispose), (gst_segment_set_start),
(gst_input_selector_set_active_pad),
(gst_input_selector_set_property),
(gst_input_selector_get_property),
(gst_input_selector_get_linked_pad),
(gst_input_selector_is_active_sinkpad),
(gst_input_selector_activate_sinkpad),
(gst_input_selector_request_new_pad),
(gst_input_selector_release_pad),
(gst_input_selector_change_state), (gst_input_selector_block),
(gst_input_selector_switch):
* plugins/elements/gstinputselector.h:
Figure out the locking a bit more.
Mark buffers with discont after switching.
Fix initial segment forwarding, make sure to only forward one segment
regardless of what the sequence of buffers/segments is. See #522203.
Improve flushing when blocked.
Return NOT_LINKED when a stream is not selected.
Not API change for the switch signal in the docs.
Fix start/time/accum values of the new segment.
Correctly unlock and flush a blocking selector when going to READY.
2008-03-20 16:48:46 +00:00
|
|
|
/* update the segment on the srcpad */
|
2009-11-09 10:48:00 +00:00
|
|
|
start_time = GST_BUFFER_TIMESTAMP (buf);
|
|
|
|
if (GST_CLOCK_TIME_IS_VALID (start_time)) {
|
2010-11-01 20:40:36 +00:00
|
|
|
GST_LOG_OBJECT (pad, "received start time %" GST_TIME_FORMAT,
|
2009-11-09 10:48:00 +00:00
|
|
|
GST_TIME_ARGS (start_time));
|
2009-11-09 10:49:15 +00:00
|
|
|
if (GST_BUFFER_DURATION_IS_VALID (buf))
|
2010-11-01 20:40:36 +00:00
|
|
|
GST_LOG_OBJECT (pad, "received end time %" GST_TIME_FORMAT,
|
2009-11-09 10:49:15 +00:00
|
|
|
GST_TIME_ARGS (start_time + GST_BUFFER_DURATION (buf)));
|
plugins/elements/gstinputselector.*: Figure out the locking a bit more.
Original commit message from CVS:
* plugins/elements/gstinputselector.c:
(gst_selector_pad_get_running_time), (gst_selector_pad_reset),
(gst_selector_pad_event), (gst_selector_pad_bufferalloc),
(gst_input_selector_wait), (gst_selector_pad_chain),
(gst_input_selector_class_init), (gst_input_selector_init),
(gst_input_selector_dispose), (gst_segment_set_start),
(gst_input_selector_set_active_pad),
(gst_input_selector_set_property),
(gst_input_selector_get_property),
(gst_input_selector_get_linked_pad),
(gst_input_selector_is_active_sinkpad),
(gst_input_selector_activate_sinkpad),
(gst_input_selector_request_new_pad),
(gst_input_selector_release_pad),
(gst_input_selector_change_state), (gst_input_selector_block),
(gst_input_selector_switch):
* plugins/elements/gstinputselector.h:
Figure out the locking a bit more.
Mark buffers with discont after switching.
Fix initial segment forwarding, make sure to only forward one segment
regardless of what the sequence of buffers/segments is. See #522203.
Improve flushing when blocked.
Return NOT_LINKED when a stream is not selected.
Not API change for the switch signal in the docs.
Fix start/time/accum values of the new segment.
Correctly unlock and flush a blocking selector when going to READY.
2008-03-20 16:48:46 +00:00
|
|
|
|
|
|
|
GST_OBJECT_LOCK (pad);
|
2011-05-19 10:11:43 +00:00
|
|
|
selpad->position = start_time;
|
plugins/elements/gstinputselector.*: Figure out the locking a bit more.
Original commit message from CVS:
* plugins/elements/gstinputselector.c:
(gst_selector_pad_get_running_time), (gst_selector_pad_reset),
(gst_selector_pad_event), (gst_selector_pad_bufferalloc),
(gst_input_selector_wait), (gst_selector_pad_chain),
(gst_input_selector_class_init), (gst_input_selector_init),
(gst_input_selector_dispose), (gst_segment_set_start),
(gst_input_selector_set_active_pad),
(gst_input_selector_set_property),
(gst_input_selector_get_property),
(gst_input_selector_get_linked_pad),
(gst_input_selector_is_active_sinkpad),
(gst_input_selector_activate_sinkpad),
(gst_input_selector_request_new_pad),
(gst_input_selector_release_pad),
(gst_input_selector_change_state), (gst_input_selector_block),
(gst_input_selector_switch):
* plugins/elements/gstinputselector.h:
Figure out the locking a bit more.
Mark buffers with discont after switching.
Fix initial segment forwarding, make sure to only forward one segment
regardless of what the sequence of buffers/segments is. See #522203.
Improve flushing when blocked.
Return NOT_LINKED when a stream is not selected.
Not API change for the switch signal in the docs.
Fix start/time/accum values of the new segment.
Correctly unlock and flush a blocking selector when going to READY.
2008-03-20 16:48:46 +00:00
|
|
|
GST_OBJECT_UNLOCK (pad);
|
2008-01-29 07:38:31 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Ignore buffers from pads except the selected one */
|
2008-08-05 09:05:35 +00:00
|
|
|
if (pad != active_sinkpad)
|
2008-01-29 07:38:31 +00:00
|
|
|
goto ignore;
|
|
|
|
|
2011-03-19 09:28:49 +00:00
|
|
|
/* Tell all non-active pads that we advanced the running time */
|
|
|
|
if (sel->sync_streams)
|
|
|
|
GST_INPUT_SELECTOR_BROADCAST (sel);
|
|
|
|
|
plugins/elements/gstinputselector.*: Figure out the locking a bit more.
Original commit message from CVS:
* plugins/elements/gstinputselector.c:
(gst_selector_pad_get_running_time), (gst_selector_pad_reset),
(gst_selector_pad_event), (gst_selector_pad_bufferalloc),
(gst_input_selector_wait), (gst_selector_pad_chain),
(gst_input_selector_class_init), (gst_input_selector_init),
(gst_input_selector_dispose), (gst_segment_set_start),
(gst_input_selector_set_active_pad),
(gst_input_selector_set_property),
(gst_input_selector_get_property),
(gst_input_selector_get_linked_pad),
(gst_input_selector_is_active_sinkpad),
(gst_input_selector_activate_sinkpad),
(gst_input_selector_request_new_pad),
(gst_input_selector_release_pad),
(gst_input_selector_change_state), (gst_input_selector_block),
(gst_input_selector_switch):
* plugins/elements/gstinputselector.h:
Figure out the locking a bit more.
Mark buffers with discont after switching.
Fix initial segment forwarding, make sure to only forward one segment
regardless of what the sequence of buffers/segments is. See #522203.
Improve flushing when blocked.
Return NOT_LINKED when a stream is not selected.
Not API change for the switch signal in the docs.
Fix start/time/accum values of the new segment.
Correctly unlock and flush a blocking selector when going to READY.
2008-03-20 16:48:46 +00:00
|
|
|
/* if we have a pending segment, push it out now */
|
2011-05-20 10:18:48 +00:00
|
|
|
if (G_UNLIKELY (prev_active_sinkpad != active_sinkpad
|
|
|
|
|| selpad->segment_pending)) {
|
2011-12-07 10:01:49 +00:00
|
|
|
if (G_UNLIKELY (seg->format == GST_FORMAT_UNDEFINED)) {
|
|
|
|
GST_ERROR_OBJECT (pad, "Buffers arrived before NEWSEGMENT event");
|
|
|
|
} else {
|
|
|
|
GST_DEBUG_OBJECT (pad,
|
|
|
|
"pushing pending NEWSEGMENT update %d, rate %lf, applied rate %lf, "
|
2011-12-08 00:39:10 +00:00
|
|
|
"format %d, " "%" G_GINT64_FORMAT " -- %" G_GINT64_FORMAT ", time %"
|
2011-12-07 10:01:49 +00:00
|
|
|
G_GINT64_FORMAT, FALSE, seg->rate, seg->applied_rate, seg->format,
|
|
|
|
seg->start, seg->stop, seg->time);
|
2008-01-29 07:38:31 +00:00
|
|
|
|
2011-12-08 00:39:10 +00:00
|
|
|
start_event = gst_event_new_segment (seg);
|
|
|
|
gst_event_set_seqnum (start_event, selpad->segment_seqnum);
|
2011-12-07 10:01:49 +00:00
|
|
|
selpad->segment_pending = FALSE;
|
|
|
|
}
|
2008-01-29 07:38:31 +00:00
|
|
|
}
|
2010-01-25 11:21:34 +00:00
|
|
|
GST_INPUT_SELECTOR_UNLOCK (sel);
|
plugins/elements/gstinputselector.*: Figure out the locking a bit more.
Original commit message from CVS:
* plugins/elements/gstinputselector.c:
(gst_selector_pad_get_running_time), (gst_selector_pad_reset),
(gst_selector_pad_event), (gst_selector_pad_bufferalloc),
(gst_input_selector_wait), (gst_selector_pad_chain),
(gst_input_selector_class_init), (gst_input_selector_init),
(gst_input_selector_dispose), (gst_segment_set_start),
(gst_input_selector_set_active_pad),
(gst_input_selector_set_property),
(gst_input_selector_get_property),
(gst_input_selector_get_linked_pad),
(gst_input_selector_is_active_sinkpad),
(gst_input_selector_activate_sinkpad),
(gst_input_selector_request_new_pad),
(gst_input_selector_release_pad),
(gst_input_selector_change_state), (gst_input_selector_block),
(gst_input_selector_switch):
* plugins/elements/gstinputselector.h:
Figure out the locking a bit more.
Mark buffers with discont after switching.
Fix initial segment forwarding, make sure to only forward one segment
regardless of what the sequence of buffers/segments is. See #522203.
Improve flushing when blocked.
Return NOT_LINKED when a stream is not selected.
Not API change for the switch signal in the docs.
Fix start/time/accum values of the new segment.
Correctly unlock and flush a blocking selector when going to READY.
2008-03-20 16:48:46 +00:00
|
|
|
|
2010-12-31 11:27:45 +00:00
|
|
|
if (prev_active_sinkpad != active_sinkpad && pad == active_sinkpad) {
|
2008-12-04 17:51:37 +00:00
|
|
|
g_object_notify (G_OBJECT (sel), "active-pad");
|
2010-12-31 11:27:45 +00:00
|
|
|
}
|
2008-12-04 17:51:37 +00:00
|
|
|
|
plugins/elements/gstinputselector.*: Figure out the locking a bit more.
Original commit message from CVS:
* plugins/elements/gstinputselector.c:
(gst_selector_pad_get_running_time), (gst_selector_pad_reset),
(gst_selector_pad_event), (gst_selector_pad_bufferalloc),
(gst_input_selector_wait), (gst_selector_pad_chain),
(gst_input_selector_class_init), (gst_input_selector_init),
(gst_input_selector_dispose), (gst_segment_set_start),
(gst_input_selector_set_active_pad),
(gst_input_selector_set_property),
(gst_input_selector_get_property),
(gst_input_selector_get_linked_pad),
(gst_input_selector_is_active_sinkpad),
(gst_input_selector_activate_sinkpad),
(gst_input_selector_request_new_pad),
(gst_input_selector_release_pad),
(gst_input_selector_change_state), (gst_input_selector_block),
(gst_input_selector_switch):
* plugins/elements/gstinputselector.h:
Figure out the locking a bit more.
Mark buffers with discont after switching.
Fix initial segment forwarding, make sure to only forward one segment
regardless of what the sequence of buffers/segments is. See #522203.
Improve flushing when blocked.
Return NOT_LINKED when a stream is not selected.
Not API change for the switch signal in the docs.
Fix start/time/accum values of the new segment.
Correctly unlock and flush a blocking selector when going to READY.
2008-03-20 16:48:46 +00:00
|
|
|
if (start_event)
|
|
|
|
gst_pad_push_event (sel->srcpad, start_event);
|
|
|
|
|
|
|
|
if (selpad->discont) {
|
2011-03-23 19:52:27 +00:00
|
|
|
buf = gst_buffer_make_writable (buf);
|
plugins/elements/gstinputselector.*: Figure out the locking a bit more.
Original commit message from CVS:
* plugins/elements/gstinputselector.c:
(gst_selector_pad_get_running_time), (gst_selector_pad_reset),
(gst_selector_pad_event), (gst_selector_pad_bufferalloc),
(gst_input_selector_wait), (gst_selector_pad_chain),
(gst_input_selector_class_init), (gst_input_selector_init),
(gst_input_selector_dispose), (gst_segment_set_start),
(gst_input_selector_set_active_pad),
(gst_input_selector_set_property),
(gst_input_selector_get_property),
(gst_input_selector_get_linked_pad),
(gst_input_selector_is_active_sinkpad),
(gst_input_selector_activate_sinkpad),
(gst_input_selector_request_new_pad),
(gst_input_selector_release_pad),
(gst_input_selector_change_state), (gst_input_selector_block),
(gst_input_selector_switch):
* plugins/elements/gstinputselector.h:
Figure out the locking a bit more.
Mark buffers with discont after switching.
Fix initial segment forwarding, make sure to only forward one segment
regardless of what the sequence of buffers/segments is. See #522203.
Improve flushing when blocked.
Return NOT_LINKED when a stream is not selected.
Not API change for the switch signal in the docs.
Fix start/time/accum values of the new segment.
Correctly unlock and flush a blocking selector when going to READY.
2008-03-20 16:48:46 +00:00
|
|
|
|
|
|
|
GST_DEBUG_OBJECT (pad, "Marking discont buffer %p", buf);
|
|
|
|
GST_BUFFER_FLAG_SET (buf, GST_BUFFER_FLAG_DISCONT);
|
|
|
|
selpad->discont = FALSE;
|
|
|
|
}
|
2008-01-29 07:38:31 +00:00
|
|
|
|
|
|
|
/* forward */
|
2010-11-01 20:40:36 +00:00
|
|
|
GST_LOG_OBJECT (pad, "Forwarding buffer %p", buf);
|
plugins/elements/gstinputselector.*: Figure out the locking a bit more.
Original commit message from CVS:
* plugins/elements/gstinputselector.c:
(gst_selector_pad_get_running_time), (gst_selector_pad_reset),
(gst_selector_pad_event), (gst_selector_pad_bufferalloc),
(gst_input_selector_wait), (gst_selector_pad_chain),
(gst_input_selector_class_init), (gst_input_selector_init),
(gst_input_selector_dispose), (gst_segment_set_start),
(gst_input_selector_set_active_pad),
(gst_input_selector_set_property),
(gst_input_selector_get_property),
(gst_input_selector_get_linked_pad),
(gst_input_selector_is_active_sinkpad),
(gst_input_selector_activate_sinkpad),
(gst_input_selector_request_new_pad),
(gst_input_selector_release_pad),
(gst_input_selector_change_state), (gst_input_selector_block),
(gst_input_selector_switch):
* plugins/elements/gstinputselector.h:
Figure out the locking a bit more.
Mark buffers with discont after switching.
Fix initial segment forwarding, make sure to only forward one segment
regardless of what the sequence of buffers/segments is. See #522203.
Improve flushing when blocked.
Return NOT_LINKED when a stream is not selected.
Not API change for the switch signal in the docs.
Fix start/time/accum values of the new segment.
Correctly unlock and flush a blocking selector when going to READY.
2008-03-20 16:48:46 +00:00
|
|
|
|
2008-01-29 07:38:31 +00:00
|
|
|
res = gst_pad_push (sel->srcpad, buf);
|
2011-03-16 17:19:11 +00:00
|
|
|
selpad->pushed = TRUE;
|
plugins/elements/gstinputselector.*: Figure out the locking a bit more.
Original commit message from CVS:
* plugins/elements/gstinputselector.c:
(gst_selector_pad_get_running_time), (gst_selector_pad_reset),
(gst_selector_pad_event), (gst_selector_pad_bufferalloc),
(gst_input_selector_wait), (gst_selector_pad_chain),
(gst_input_selector_class_init), (gst_input_selector_init),
(gst_input_selector_dispose), (gst_segment_set_start),
(gst_input_selector_set_active_pad),
(gst_input_selector_set_property),
(gst_input_selector_get_property),
(gst_input_selector_get_linked_pad),
(gst_input_selector_is_active_sinkpad),
(gst_input_selector_activate_sinkpad),
(gst_input_selector_request_new_pad),
(gst_input_selector_release_pad),
(gst_input_selector_change_state), (gst_input_selector_block),
(gst_input_selector_switch):
* plugins/elements/gstinputselector.h:
Figure out the locking a bit more.
Mark buffers with discont after switching.
Fix initial segment forwarding, make sure to only forward one segment
regardless of what the sequence of buffers/segments is. See #522203.
Improve flushing when blocked.
Return NOT_LINKED when a stream is not selected.
Not API change for the switch signal in the docs.
Fix start/time/accum values of the new segment.
Correctly unlock and flush a blocking selector when going to READY.
2008-03-20 16:48:46 +00:00
|
|
|
|
2008-01-29 07:38:31 +00:00
|
|
|
done:
|
|
|
|
return res;
|
plugins/elements/gstinputselector.*: Figure out the locking a bit more.
Original commit message from CVS:
* plugins/elements/gstinputselector.c:
(gst_selector_pad_get_running_time), (gst_selector_pad_reset),
(gst_selector_pad_event), (gst_selector_pad_bufferalloc),
(gst_input_selector_wait), (gst_selector_pad_chain),
(gst_input_selector_class_init), (gst_input_selector_init),
(gst_input_selector_dispose), (gst_segment_set_start),
(gst_input_selector_set_active_pad),
(gst_input_selector_set_property),
(gst_input_selector_get_property),
(gst_input_selector_get_linked_pad),
(gst_input_selector_is_active_sinkpad),
(gst_input_selector_activate_sinkpad),
(gst_input_selector_request_new_pad),
(gst_input_selector_release_pad),
(gst_input_selector_change_state), (gst_input_selector_block),
(gst_input_selector_switch):
* plugins/elements/gstinputselector.h:
Figure out the locking a bit more.
Mark buffers with discont after switching.
Fix initial segment forwarding, make sure to only forward one segment
regardless of what the sequence of buffers/segments is. See #522203.
Improve flushing when blocked.
Return NOT_LINKED when a stream is not selected.
Not API change for the switch signal in the docs.
Fix start/time/accum values of the new segment.
Correctly unlock and flush a blocking selector when going to READY.
2008-03-20 16:48:46 +00:00
|
|
|
|
2008-01-29 07:38:31 +00:00
|
|
|
/* dropped buffers */
|
|
|
|
ignore:
|
|
|
|
{
|
2011-03-17 13:21:17 +00:00
|
|
|
gboolean active_pad_pushed = GST_SELECTOR_PAD_CAST (active_sinkpad)->pushed;
|
|
|
|
|
plugins/elements/gstinputselector.*: Figure out the locking a bit more.
Original commit message from CVS:
* plugins/elements/gstinputselector.c:
(gst_selector_pad_get_running_time), (gst_selector_pad_reset),
(gst_selector_pad_event), (gst_selector_pad_bufferalloc),
(gst_input_selector_wait), (gst_selector_pad_chain),
(gst_input_selector_class_init), (gst_input_selector_init),
(gst_input_selector_dispose), (gst_segment_set_start),
(gst_input_selector_set_active_pad),
(gst_input_selector_set_property),
(gst_input_selector_get_property),
(gst_input_selector_get_linked_pad),
(gst_input_selector_is_active_sinkpad),
(gst_input_selector_activate_sinkpad),
(gst_input_selector_request_new_pad),
(gst_input_selector_release_pad),
(gst_input_selector_change_state), (gst_input_selector_block),
(gst_input_selector_switch):
* plugins/elements/gstinputselector.h:
Figure out the locking a bit more.
Mark buffers with discont after switching.
Fix initial segment forwarding, make sure to only forward one segment
regardless of what the sequence of buffers/segments is. See #522203.
Improve flushing when blocked.
Return NOT_LINKED when a stream is not selected.
Not API change for the switch signal in the docs.
Fix start/time/accum values of the new segment.
Correctly unlock and flush a blocking selector when going to READY.
2008-03-20 16:48:46 +00:00
|
|
|
GST_DEBUG_OBJECT (pad, "Pad not active, discard buffer %p", buf);
|
|
|
|
/* when we drop a buffer, we're creating a discont on this pad */
|
|
|
|
selpad->discont = TRUE;
|
|
|
|
GST_INPUT_SELECTOR_UNLOCK (sel);
|
|
|
|
gst_buffer_unref (buf);
|
plugins/elements/gstinputselector.c: Add pad property to configure behaviour of the unselected pad, it can return OK or N...
Original commit message from CVS:
* plugins/elements/gstinputselector.c: (gst_selector_pad_class_init),
(gst_selector_pad_init), (gst_selector_pad_set_property),
(gst_selector_pad_get_property), (gst_selector_pad_event),
(gst_selector_pad_bufferalloc), (gst_selector_pad_chain),
(gst_input_selector_set_active_pad):
Add pad property to configure behaviour of the unselected pad, it can
return OK or NOT_LINKED, based on the use case.
2008-03-20 17:07:07 +00:00
|
|
|
|
|
|
|
/* figure out what to return upstream */
|
|
|
|
GST_OBJECT_LOCK (selpad);
|
2011-03-17 13:21:17 +00:00
|
|
|
if (selpad->always_ok || !active_pad_pushed)
|
plugins/elements/gstinputselector.c: Add pad property to configure behaviour of the unselected pad, it can return OK or N...
Original commit message from CVS:
* plugins/elements/gstinputselector.c: (gst_selector_pad_class_init),
(gst_selector_pad_init), (gst_selector_pad_set_property),
(gst_selector_pad_get_property), (gst_selector_pad_event),
(gst_selector_pad_bufferalloc), (gst_selector_pad_chain),
(gst_input_selector_set_active_pad):
Add pad property to configure behaviour of the unselected pad, it can
return OK or NOT_LINKED, based on the use case.
2008-03-20 17:07:07 +00:00
|
|
|
res = GST_FLOW_OK;
|
|
|
|
else
|
|
|
|
res = GST_FLOW_NOT_LINKED;
|
|
|
|
GST_OBJECT_UNLOCK (selpad);
|
|
|
|
|
plugins/elements/gstinputselector.*: Figure out the locking a bit more.
Original commit message from CVS:
* plugins/elements/gstinputselector.c:
(gst_selector_pad_get_running_time), (gst_selector_pad_reset),
(gst_selector_pad_event), (gst_selector_pad_bufferalloc),
(gst_input_selector_wait), (gst_selector_pad_chain),
(gst_input_selector_class_init), (gst_input_selector_init),
(gst_input_selector_dispose), (gst_segment_set_start),
(gst_input_selector_set_active_pad),
(gst_input_selector_set_property),
(gst_input_selector_get_property),
(gst_input_selector_get_linked_pad),
(gst_input_selector_is_active_sinkpad),
(gst_input_selector_activate_sinkpad),
(gst_input_selector_request_new_pad),
(gst_input_selector_release_pad),
(gst_input_selector_change_state), (gst_input_selector_block),
(gst_input_selector_switch):
* plugins/elements/gstinputselector.h:
Figure out the locking a bit more.
Mark buffers with discont after switching.
Fix initial segment forwarding, make sure to only forward one segment
regardless of what the sequence of buffers/segments is. See #522203.
Improve flushing when blocked.
Return NOT_LINKED when a stream is not selected.
Not API change for the switch signal in the docs.
Fix start/time/accum values of the new segment.
Correctly unlock and flush a blocking selector when going to READY.
2008-03-20 16:48:46 +00:00
|
|
|
goto done;
|
|
|
|
}
|
|
|
|
flushing:
|
|
|
|
{
|
|
|
|
GST_DEBUG_OBJECT (pad, "We are flushing, discard buffer %p", buf);
|
|
|
|
GST_INPUT_SELECTOR_UNLOCK (sel);
|
2008-01-29 07:38:31 +00:00
|
|
|
gst_buffer_unref (buf);
|
2012-02-08 14:16:46 +00:00
|
|
|
res = GST_FLOW_FLUSHING;
|
2008-01-29 07:38:31 +00:00
|
|
|
goto done;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
plugins/elements/gstinputselector.*: Figure out the locking a bit more.
Original commit message from CVS:
* plugins/elements/gstinputselector.c:
(gst_selector_pad_get_running_time), (gst_selector_pad_reset),
(gst_selector_pad_event), (gst_selector_pad_bufferalloc),
(gst_input_selector_wait), (gst_selector_pad_chain),
(gst_input_selector_class_init), (gst_input_selector_init),
(gst_input_selector_dispose), (gst_segment_set_start),
(gst_input_selector_set_active_pad),
(gst_input_selector_set_property),
(gst_input_selector_get_property),
(gst_input_selector_get_linked_pad),
(gst_input_selector_is_active_sinkpad),
(gst_input_selector_activate_sinkpad),
(gst_input_selector_request_new_pad),
(gst_input_selector_release_pad),
(gst_input_selector_change_state), (gst_input_selector_block),
(gst_input_selector_switch):
* plugins/elements/gstinputselector.h:
Figure out the locking a bit more.
Mark buffers with discont after switching.
Fix initial segment forwarding, make sure to only forward one segment
regardless of what the sequence of buffers/segments is. See #522203.
Improve flushing when blocked.
Return NOT_LINKED when a stream is not selected.
Not API change for the switch signal in the docs.
Fix start/time/accum values of the new segment.
Correctly unlock and flush a blocking selector when going to READY.
2008-03-20 16:48:46 +00:00
|
|
|
static void gst_input_selector_dispose (GObject * object);
|
2012-01-19 08:27:04 +00:00
|
|
|
static void gst_input_selector_finalize (GObject * object);
|
plugins/elements/gstinputselector.*: Figure out the locking a bit more.
Original commit message from CVS:
* plugins/elements/gstinputselector.c:
(gst_selector_pad_get_running_time), (gst_selector_pad_reset),
(gst_selector_pad_event), (gst_selector_pad_bufferalloc),
(gst_input_selector_wait), (gst_selector_pad_chain),
(gst_input_selector_class_init), (gst_input_selector_init),
(gst_input_selector_dispose), (gst_segment_set_start),
(gst_input_selector_set_active_pad),
(gst_input_selector_set_property),
(gst_input_selector_get_property),
(gst_input_selector_get_linked_pad),
(gst_input_selector_is_active_sinkpad),
(gst_input_selector_activate_sinkpad),
(gst_input_selector_request_new_pad),
(gst_input_selector_release_pad),
(gst_input_selector_change_state), (gst_input_selector_block),
(gst_input_selector_switch):
* plugins/elements/gstinputselector.h:
Figure out the locking a bit more.
Mark buffers with discont after switching.
Fix initial segment forwarding, make sure to only forward one segment
regardless of what the sequence of buffers/segments is. See #522203.
Improve flushing when blocked.
Return NOT_LINKED when a stream is not selected.
Not API change for the switch signal in the docs.
Fix start/time/accum values of the new segment.
Correctly unlock and flush a blocking selector when going to READY.
2008-03-20 16:48:46 +00:00
|
|
|
|
2008-01-29 07:38:31 +00:00
|
|
|
static void gst_input_selector_set_property (GObject * object,
|
|
|
|
guint prop_id, const GValue * value, GParamSpec * pspec);
|
|
|
|
static void gst_input_selector_get_property (GObject * object,
|
|
|
|
guint prop_id, GValue * value, GParamSpec * pspec);
|
plugins/elements/gstinputselector.*: Figure out the locking a bit more.
Original commit message from CVS:
* plugins/elements/gstinputselector.c:
(gst_selector_pad_get_running_time), (gst_selector_pad_reset),
(gst_selector_pad_event), (gst_selector_pad_bufferalloc),
(gst_input_selector_wait), (gst_selector_pad_chain),
(gst_input_selector_class_init), (gst_input_selector_init),
(gst_input_selector_dispose), (gst_segment_set_start),
(gst_input_selector_set_active_pad),
(gst_input_selector_set_property),
(gst_input_selector_get_property),
(gst_input_selector_get_linked_pad),
(gst_input_selector_is_active_sinkpad),
(gst_input_selector_activate_sinkpad),
(gst_input_selector_request_new_pad),
(gst_input_selector_release_pad),
(gst_input_selector_change_state), (gst_input_selector_block),
(gst_input_selector_switch):
* plugins/elements/gstinputselector.h:
Figure out the locking a bit more.
Mark buffers with discont after switching.
Fix initial segment forwarding, make sure to only forward one segment
regardless of what the sequence of buffers/segments is. See #522203.
Improve flushing when blocked.
Return NOT_LINKED when a stream is not selected.
Not API change for the switch signal in the docs.
Fix start/time/accum values of the new segment.
Correctly unlock and flush a blocking selector when going to READY.
2008-03-20 16:48:46 +00:00
|
|
|
|
2008-01-29 07:38:31 +00:00
|
|
|
static GstPad *gst_input_selector_request_new_pad (GstElement * element,
|
2011-05-10 14:41:36 +00:00
|
|
|
GstPadTemplate * templ, const gchar * unused, const GstCaps * caps);
|
2008-01-29 07:38:31 +00:00
|
|
|
static void gst_input_selector_release_pad (GstElement * element, GstPad * pad);
|
plugins/elements/gstinputselector.*: Figure out the locking a bit more.
Original commit message from CVS:
* plugins/elements/gstinputselector.c:
(gst_selector_pad_get_running_time), (gst_selector_pad_reset),
(gst_selector_pad_event), (gst_selector_pad_bufferalloc),
(gst_input_selector_wait), (gst_selector_pad_chain),
(gst_input_selector_class_init), (gst_input_selector_init),
(gst_input_selector_dispose), (gst_segment_set_start),
(gst_input_selector_set_active_pad),
(gst_input_selector_set_property),
(gst_input_selector_get_property),
(gst_input_selector_get_linked_pad),
(gst_input_selector_is_active_sinkpad),
(gst_input_selector_activate_sinkpad),
(gst_input_selector_request_new_pad),
(gst_input_selector_release_pad),
(gst_input_selector_change_state), (gst_input_selector_block),
(gst_input_selector_switch):
* plugins/elements/gstinputselector.h:
Figure out the locking a bit more.
Mark buffers with discont after switching.
Fix initial segment forwarding, make sure to only forward one segment
regardless of what the sequence of buffers/segments is. See #522203.
Improve flushing when blocked.
Return NOT_LINKED when a stream is not selected.
Not API change for the switch signal in the docs.
Fix start/time/accum values of the new segment.
Correctly unlock and flush a blocking selector when going to READY.
2008-03-20 16:48:46 +00:00
|
|
|
|
2008-01-29 07:38:31 +00:00
|
|
|
static GstStateChangeReturn gst_input_selector_change_state (GstElement *
|
|
|
|
element, GstStateChange transition);
|
plugins/elements/gstinputselector.*: Figure out the locking a bit more.
Original commit message from CVS:
* plugins/elements/gstinputselector.c:
(gst_selector_pad_get_running_time), (gst_selector_pad_reset),
(gst_selector_pad_event), (gst_selector_pad_bufferalloc),
(gst_input_selector_wait), (gst_selector_pad_chain),
(gst_input_selector_class_init), (gst_input_selector_init),
(gst_input_selector_dispose), (gst_segment_set_start),
(gst_input_selector_set_active_pad),
(gst_input_selector_set_property),
(gst_input_selector_get_property),
(gst_input_selector_get_linked_pad),
(gst_input_selector_is_active_sinkpad),
(gst_input_selector_activate_sinkpad),
(gst_input_selector_request_new_pad),
(gst_input_selector_release_pad),
(gst_input_selector_change_state), (gst_input_selector_block),
(gst_input_selector_switch):
* plugins/elements/gstinputselector.h:
Figure out the locking a bit more.
Mark buffers with discont after switching.
Fix initial segment forwarding, make sure to only forward one segment
regardless of what the sequence of buffers/segments is. See #522203.
Improve flushing when blocked.
Return NOT_LINKED when a stream is not selected.
Not API change for the switch signal in the docs.
Fix start/time/accum values of the new segment.
Correctly unlock and flush a blocking selector when going to READY.
2008-03-20 16:48:46 +00:00
|
|
|
|
2011-11-17 11:40:45 +00:00
|
|
|
static gboolean gst_input_selector_event (GstPad * pad, GstObject * parent,
|
|
|
|
GstEvent * event);
|
2011-11-16 16:22:56 +00:00
|
|
|
static gboolean gst_input_selector_query (GstPad * pad, GstObject * parent,
|
|
|
|
GstQuery * query);
|
2008-01-29 07:38:31 +00:00
|
|
|
static gint64 gst_input_selector_block (GstInputSelector * self);
|
|
|
|
|
2010-12-30 18:57:13 +00:00
|
|
|
/* FIXME: create these marshallers using glib-genmarshal */
|
|
|
|
static void
|
|
|
|
gst_input_selector_marshal_INT64__VOID (GClosure * closure,
|
|
|
|
GValue * return_value G_GNUC_UNUSED,
|
|
|
|
guint n_param_values,
|
|
|
|
const GValue * param_values,
|
|
|
|
gpointer invocation_hint G_GNUC_UNUSED, gpointer marshal_data)
|
|
|
|
{
|
|
|
|
typedef gint64 (*GMarshalFunc_INT64__VOID) (gpointer data1, gpointer data2);
|
|
|
|
register GMarshalFunc_INT64__VOID callback;
|
|
|
|
register GCClosure *cc = (GCClosure *) closure;
|
|
|
|
register gpointer data1, data2;
|
|
|
|
gint64 v_return;
|
|
|
|
|
|
|
|
g_return_if_fail (return_value != NULL);
|
|
|
|
g_return_if_fail (n_param_values == 1);
|
|
|
|
|
|
|
|
if (G_CCLOSURE_SWAP_DATA (closure)) {
|
|
|
|
data1 = closure->data;
|
|
|
|
data2 = g_value_peek_pointer (param_values + 0);
|
|
|
|
} else {
|
|
|
|
data1 = g_value_peek_pointer (param_values + 0);
|
|
|
|
data2 = closure->data;
|
|
|
|
}
|
|
|
|
callback =
|
|
|
|
(GMarshalFunc_INT64__VOID) (marshal_data ? marshal_data : cc->callback);
|
|
|
|
|
|
|
|
v_return = callback (data1, data2);
|
|
|
|
|
|
|
|
g_value_set_int64 (return_value, v_return);
|
|
|
|
}
|
|
|
|
|
2011-04-18 16:07:06 +00:00
|
|
|
#define _do_init \
|
2010-08-24 08:50:09 +00:00
|
|
|
GST_DEBUG_CATEGORY_INIT (input_selector_debug, \
|
2008-01-29 07:38:31 +00:00
|
|
|
"input-selector", 0, "An input stream selector element");
|
2011-04-18 16:07:06 +00:00
|
|
|
#define gst_input_selector_parent_class parent_class
|
|
|
|
G_DEFINE_TYPE_WITH_CODE (GstInputSelector, gst_input_selector, GST_TYPE_ELEMENT,
|
|
|
|
_do_init);
|
2008-01-29 07:38:31 +00:00
|
|
|
|
|
|
|
static void
|
|
|
|
gst_input_selector_class_init (GstInputSelectorClass * klass)
|
|
|
|
{
|
|
|
|
GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
|
|
|
|
GstElementClass *gstelement_class = GST_ELEMENT_CLASS (klass);
|
|
|
|
|
plugins/elements/gstinputselector.*: Various cleanups.
Original commit message from CVS:
* plugins/elements/gstinputselector.c: (gst_selector_pad_class_init),
(gst_selector_pad_finalize), (gst_selector_pad_get_property),
(gst_selector_pad_event), (gst_input_selector_class_init),
(gst_input_selector_init), (gst_input_selector_set_active_pad),
(gst_input_selector_set_property),
(gst_input_selector_get_property),
(gst_input_selector_request_new_pad),
(gst_input_selector_release_pad),
(gst_input_selector_push_pending_stop),
(gst_input_selector_switch):
* plugins/elements/gstinputselector.h:
Various cleanups.
Added tags to the pads.
Select active pad based on the pad object instead of its name.
Fix refcount in set_active_pad.
Add property to get the number of pads.
* plugins/elements/gstoutputselector.c:
(gst_output_selector_class_init),
(gst_output_selector_set_property),
(gst_output_selector_get_property):
Various cleanups.
Select the active pad based on the pad object instead of its name.
Fix locking when setting the active pad.
* plugins/elements/gstselector-marshal.list:
* tests/check/elements/selector.c: (cleanup_pad),
(selector_set_active_pad), (run_input_selector_buffer_count):
Fixes for pad instead of padname for pad selection.
2008-03-13 16:46:04 +00:00
|
|
|
gobject_class->dispose = gst_input_selector_dispose;
|
2012-01-19 08:27:04 +00:00
|
|
|
gobject_class->finalize = gst_input_selector_finalize;
|
plugins/elements/gstinputselector.*: Various cleanups.
Original commit message from CVS:
* plugins/elements/gstinputselector.c: (gst_selector_pad_class_init),
(gst_selector_pad_finalize), (gst_selector_pad_get_property),
(gst_selector_pad_event), (gst_input_selector_class_init),
(gst_input_selector_init), (gst_input_selector_set_active_pad),
(gst_input_selector_set_property),
(gst_input_selector_get_property),
(gst_input_selector_request_new_pad),
(gst_input_selector_release_pad),
(gst_input_selector_push_pending_stop),
(gst_input_selector_switch):
* plugins/elements/gstinputselector.h:
Various cleanups.
Added tags to the pads.
Select active pad based on the pad object instead of its name.
Fix refcount in set_active_pad.
Add property to get the number of pads.
* plugins/elements/gstoutputselector.c:
(gst_output_selector_class_init),
(gst_output_selector_set_property),
(gst_output_selector_get_property):
Various cleanups.
Select the active pad based on the pad object instead of its name.
Fix locking when setting the active pad.
* plugins/elements/gstselector-marshal.list:
* tests/check/elements/selector.c: (cleanup_pad),
(selector_set_active_pad), (run_input_selector_buffer_count):
Fixes for pad instead of padname for pad selection.
2008-03-13 16:46:04 +00:00
|
|
|
|
2009-11-03 17:11:13 +00:00
|
|
|
gobject_class->set_property = gst_input_selector_set_property;
|
|
|
|
gobject_class->get_property = gst_input_selector_get_property;
|
plugins/elements/gstinputselector.*: Various cleanups.
Original commit message from CVS:
* plugins/elements/gstinputselector.c: (gst_selector_pad_class_init),
(gst_selector_pad_finalize), (gst_selector_pad_get_property),
(gst_selector_pad_event), (gst_input_selector_class_init),
(gst_input_selector_init), (gst_input_selector_set_active_pad),
(gst_input_selector_set_property),
(gst_input_selector_get_property),
(gst_input_selector_request_new_pad),
(gst_input_selector_release_pad),
(gst_input_selector_push_pending_stop),
(gst_input_selector_switch):
* plugins/elements/gstinputselector.h:
Various cleanups.
Added tags to the pads.
Select active pad based on the pad object instead of its name.
Fix refcount in set_active_pad.
Add property to get the number of pads.
* plugins/elements/gstoutputselector.c:
(gst_output_selector_class_init),
(gst_output_selector_set_property),
(gst_output_selector_get_property):
Various cleanups.
Select the active pad based on the pad object instead of its name.
Fix locking when setting the active pad.
* plugins/elements/gstselector-marshal.list:
* tests/check/elements/selector.c: (cleanup_pad),
(selector_set_active_pad), (run_input_selector_buffer_count):
Fixes for pad instead of padname for pad selection.
2008-03-13 16:46:04 +00:00
|
|
|
|
|
|
|
g_object_class_install_property (gobject_class, PROP_N_PADS,
|
|
|
|
g_param_spec_uint ("n-pads", "Number of Pads",
|
2010-10-19 10:43:14 +00:00
|
|
|
"The number of sink pads", 0, G_MAXUINT, 0,
|
|
|
|
G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
|
plugins/elements/gstinputselector.*: Various cleanups.
Original commit message from CVS:
* plugins/elements/gstinputselector.c: (gst_selector_pad_class_init),
(gst_selector_pad_finalize), (gst_selector_pad_get_property),
(gst_selector_pad_event), (gst_input_selector_class_init),
(gst_input_selector_init), (gst_input_selector_set_active_pad),
(gst_input_selector_set_property),
(gst_input_selector_get_property),
(gst_input_selector_request_new_pad),
(gst_input_selector_release_pad),
(gst_input_selector_push_pending_stop),
(gst_input_selector_switch):
* plugins/elements/gstinputselector.h:
Various cleanups.
Added tags to the pads.
Select active pad based on the pad object instead of its name.
Fix refcount in set_active_pad.
Add property to get the number of pads.
* plugins/elements/gstoutputselector.c:
(gst_output_selector_class_init),
(gst_output_selector_set_property),
(gst_output_selector_get_property):
Various cleanups.
Select the active pad based on the pad object instead of its name.
Fix locking when setting the active pad.
* plugins/elements/gstselector-marshal.list:
* tests/check/elements/selector.c: (cleanup_pad),
(selector_set_active_pad), (run_input_selector_buffer_count):
Fixes for pad instead of padname for pad selection.
2008-03-13 16:46:04 +00:00
|
|
|
|
2008-01-29 07:38:31 +00:00
|
|
|
g_object_class_install_property (gobject_class, PROP_ACTIVE_PAD,
|
plugins/elements/gstinputselector.*: Various cleanups.
Original commit message from CVS:
* plugins/elements/gstinputselector.c: (gst_selector_pad_class_init),
(gst_selector_pad_finalize), (gst_selector_pad_get_property),
(gst_selector_pad_event), (gst_input_selector_class_init),
(gst_input_selector_init), (gst_input_selector_set_active_pad),
(gst_input_selector_set_property),
(gst_input_selector_get_property),
(gst_input_selector_request_new_pad),
(gst_input_selector_release_pad),
(gst_input_selector_push_pending_stop),
(gst_input_selector_switch):
* plugins/elements/gstinputselector.h:
Various cleanups.
Added tags to the pads.
Select active pad based on the pad object instead of its name.
Fix refcount in set_active_pad.
Add property to get the number of pads.
* plugins/elements/gstoutputselector.c:
(gst_output_selector_class_init),
(gst_output_selector_set_property),
(gst_output_selector_get_property):
Various cleanups.
Select the active pad based on the pad object instead of its name.
Fix locking when setting the active pad.
* plugins/elements/gstselector-marshal.list:
* tests/check/elements/selector.c: (cleanup_pad),
(selector_set_active_pad), (run_input_selector_buffer_count):
Fixes for pad instead of padname for pad selection.
2008-03-13 16:46:04 +00:00
|
|
|
g_param_spec_object ("active-pad", "Active pad",
|
2010-10-19 10:43:14 +00:00
|
|
|
"The currently active sink pad", GST_TYPE_PAD,
|
|
|
|
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
|
plugins/elements/gstinputselector.*: Various cleanups.
Original commit message from CVS:
* plugins/elements/gstinputselector.c: (gst_selector_pad_class_init),
(gst_selector_pad_finalize), (gst_selector_pad_get_property),
(gst_selector_pad_event), (gst_input_selector_class_init),
(gst_input_selector_init), (gst_input_selector_set_active_pad),
(gst_input_selector_set_property),
(gst_input_selector_get_property),
(gst_input_selector_request_new_pad),
(gst_input_selector_release_pad),
(gst_input_selector_push_pending_stop),
(gst_input_selector_switch):
* plugins/elements/gstinputselector.h:
Various cleanups.
Added tags to the pads.
Select active pad based on the pad object instead of its name.
Fix refcount in set_active_pad.
Add property to get the number of pads.
* plugins/elements/gstoutputselector.c:
(gst_output_selector_class_init),
(gst_output_selector_set_property),
(gst_output_selector_get_property):
Various cleanups.
Select the active pad based on the pad object instead of its name.
Fix locking when setting the active pad.
* plugins/elements/gstselector-marshal.list:
* tests/check/elements/selector.c: (cleanup_pad),
(selector_set_active_pad), (run_input_selector_buffer_count):
Fixes for pad instead of padname for pad selection.
2008-03-13 16:46:04 +00:00
|
|
|
|
2011-03-19 09:28:49 +00:00
|
|
|
/**
|
|
|
|
* GstInputSelector:sync-streams
|
|
|
|
*
|
|
|
|
* If set to %TRUE all inactive streams will be synced to the
|
|
|
|
* running time of the active stream. This makes sure that no
|
|
|
|
* buffers are dropped by input-selector that might be needed
|
|
|
|
* when switching the active pad.
|
|
|
|
*
|
2011-11-08 00:32:36 +00:00
|
|
|
* Since: 0.10.36
|
2011-03-19 09:28:49 +00:00
|
|
|
*/
|
|
|
|
g_object_class_install_property (gobject_class, PROP_SYNC_STREAMS,
|
|
|
|
g_param_spec_boolean ("sync-streams", "Sync Streams",
|
|
|
|
"Synchronize inactive streams to the running time of the active stream",
|
|
|
|
DEFAULT_SYNC_STREAMS, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
|
|
|
|
|
2008-01-29 07:38:31 +00:00
|
|
|
/**
|
|
|
|
* GstInputSelector::block:
|
|
|
|
* @inputselector: the #GstInputSelector
|
|
|
|
*
|
|
|
|
* Block all sink pads in preparation for a switch. Returns the stop time of
|
|
|
|
* the current switch segment, as a running time, or 0 if there is no current
|
|
|
|
* active pad or the current active pad never received data.
|
|
|
|
*/
|
|
|
|
gst_input_selector_signals[SIGNAL_BLOCK] =
|
plugins/elements/gstinputselector.*: Various cleanups.
Original commit message from CVS:
* plugins/elements/gstinputselector.c: (gst_selector_pad_class_init),
(gst_selector_pad_finalize), (gst_selector_pad_get_property),
(gst_selector_pad_event), (gst_input_selector_class_init),
(gst_input_selector_init), (gst_input_selector_set_active_pad),
(gst_input_selector_set_property),
(gst_input_selector_get_property),
(gst_input_selector_request_new_pad),
(gst_input_selector_release_pad),
(gst_input_selector_push_pending_stop),
(gst_input_selector_switch):
* plugins/elements/gstinputselector.h:
Various cleanups.
Added tags to the pads.
Select active pad based on the pad object instead of its name.
Fix refcount in set_active_pad.
Add property to get the number of pads.
* plugins/elements/gstoutputselector.c:
(gst_output_selector_class_init),
(gst_output_selector_set_property),
(gst_output_selector_get_property):
Various cleanups.
Select the active pad based on the pad object instead of its name.
Fix locking when setting the active pad.
* plugins/elements/gstselector-marshal.list:
* tests/check/elements/selector.c: (cleanup_pad),
(selector_set_active_pad), (run_input_selector_buffer_count):
Fixes for pad instead of padname for pad selection.
2008-03-13 16:46:04 +00:00
|
|
|
g_signal_new ("block", G_TYPE_FROM_CLASS (klass),
|
|
|
|
G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
|
|
|
|
G_STRUCT_OFFSET (GstInputSelectorClass, block), NULL, NULL,
|
2010-12-30 18:57:13 +00:00
|
|
|
gst_input_selector_marshal_INT64__VOID, G_TYPE_INT64, 0);
|
plugins/elements/gstinputselector.*: Various cleanups.
Original commit message from CVS:
* plugins/elements/gstinputselector.c: (gst_selector_pad_class_init),
(gst_selector_pad_finalize), (gst_selector_pad_get_property),
(gst_selector_pad_event), (gst_input_selector_class_init),
(gst_input_selector_init), (gst_input_selector_set_active_pad),
(gst_input_selector_set_property),
(gst_input_selector_get_property),
(gst_input_selector_request_new_pad),
(gst_input_selector_release_pad),
(gst_input_selector_push_pending_stop),
(gst_input_selector_switch):
* plugins/elements/gstinputselector.h:
Various cleanups.
Added tags to the pads.
Select active pad based on the pad object instead of its name.
Fix refcount in set_active_pad.
Add property to get the number of pads.
* plugins/elements/gstoutputselector.c:
(gst_output_selector_class_init),
(gst_output_selector_set_property),
(gst_output_selector_get_property):
Various cleanups.
Select the active pad based on the pad object instead of its name.
Fix locking when setting the active pad.
* plugins/elements/gstselector-marshal.list:
* tests/check/elements/selector.c: (cleanup_pad),
(selector_set_active_pad), (run_input_selector_buffer_count):
Fixes for pad instead of padname for pad selection.
2008-03-13 16:46:04 +00:00
|
|
|
|
2011-04-18 16:07:06 +00:00
|
|
|
gst_element_class_set_details_simple (gstelement_class, "Input selector",
|
|
|
|
"Generic", "N-to-1 input stream selector",
|
|
|
|
"Julien Moutte <julien@moutte.net>, "
|
|
|
|
"Jan Schmidt <thaytan@mad.scientist.com>, "
|
|
|
|
"Wim Taymans <wim.taymans@gmail.com>");
|
|
|
|
gst_element_class_add_pad_template (gstelement_class,
|
|
|
|
gst_static_pad_template_get (&gst_input_selector_sink_factory));
|
|
|
|
gst_element_class_add_pad_template (gstelement_class,
|
|
|
|
gst_static_pad_template_get (&gst_input_selector_src_factory));
|
|
|
|
|
plugins/elements/gstinputselector.*: Various cleanups.
Original commit message from CVS:
* plugins/elements/gstinputselector.c: (gst_selector_pad_class_init),
(gst_selector_pad_finalize), (gst_selector_pad_get_property),
(gst_selector_pad_event), (gst_input_selector_class_init),
(gst_input_selector_init), (gst_input_selector_set_active_pad),
(gst_input_selector_set_property),
(gst_input_selector_get_property),
(gst_input_selector_request_new_pad),
(gst_input_selector_release_pad),
(gst_input_selector_push_pending_stop),
(gst_input_selector_switch):
* plugins/elements/gstinputselector.h:
Various cleanups.
Added tags to the pads.
Select active pad based on the pad object instead of its name.
Fix refcount in set_active_pad.
Add property to get the number of pads.
* plugins/elements/gstoutputselector.c:
(gst_output_selector_class_init),
(gst_output_selector_set_property),
(gst_output_selector_get_property):
Various cleanups.
Select the active pad based on the pad object instead of its name.
Fix locking when setting the active pad.
* plugins/elements/gstselector-marshal.list:
* tests/check/elements/selector.c: (cleanup_pad),
(selector_set_active_pad), (run_input_selector_buffer_count):
Fixes for pad instead of padname for pad selection.
2008-03-13 16:46:04 +00:00
|
|
|
gstelement_class->request_new_pad = gst_input_selector_request_new_pad;
|
|
|
|
gstelement_class->release_pad = gst_input_selector_release_pad;
|
|
|
|
gstelement_class->change_state = gst_input_selector_change_state;
|
2008-01-29 07:38:31 +00:00
|
|
|
|
|
|
|
klass->block = GST_DEBUG_FUNCPTR (gst_input_selector_block);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2011-04-18 16:07:06 +00:00
|
|
|
gst_input_selector_init (GstInputSelector * sel)
|
2008-01-29 07:38:31 +00:00
|
|
|
{
|
|
|
|
sel->srcpad = gst_pad_new ("src", GST_PAD_SRC);
|
2009-08-19 15:05:32 +00:00
|
|
|
gst_pad_set_iterate_internal_links_function (sel->srcpad,
|
|
|
|
GST_DEBUG_FUNCPTR (gst_selector_pad_iterate_linked_pads));
|
2008-08-27 15:45:16 +00:00
|
|
|
gst_pad_set_query_function (sel->srcpad,
|
|
|
|
GST_DEBUG_FUNCPTR (gst_input_selector_query));
|
2008-09-01 13:23:03 +00:00
|
|
|
gst_pad_set_event_function (sel->srcpad,
|
|
|
|
GST_DEBUG_FUNCPTR (gst_input_selector_event));
|
2011-11-16 11:36:51 +00:00
|
|
|
GST_OBJECT_FLAG_SET (sel->srcpad, GST_PAD_FLAG_PROXY_CAPS);
|
2008-01-29 07:38:31 +00:00
|
|
|
gst_element_add_pad (GST_ELEMENT (sel), sel->srcpad);
|
|
|
|
/* sinkpad management */
|
|
|
|
sel->active_sinkpad = NULL;
|
plugins/elements/gstinputselector.*: Various cleanups.
Original commit message from CVS:
* plugins/elements/gstinputselector.c: (gst_selector_pad_class_init),
(gst_selector_pad_finalize), (gst_selector_pad_get_property),
(gst_selector_pad_event), (gst_input_selector_class_init),
(gst_input_selector_init), (gst_input_selector_set_active_pad),
(gst_input_selector_set_property),
(gst_input_selector_get_property),
(gst_input_selector_request_new_pad),
(gst_input_selector_release_pad),
(gst_input_selector_push_pending_stop),
(gst_input_selector_switch):
* plugins/elements/gstinputselector.h:
Various cleanups.
Added tags to the pads.
Select active pad based on the pad object instead of its name.
Fix refcount in set_active_pad.
Add property to get the number of pads.
* plugins/elements/gstoutputselector.c:
(gst_output_selector_class_init),
(gst_output_selector_set_property),
(gst_output_selector_get_property):
Various cleanups.
Select the active pad based on the pad object instead of its name.
Fix locking when setting the active pad.
* plugins/elements/gstselector-marshal.list:
* tests/check/elements/selector.c: (cleanup_pad),
(selector_set_active_pad), (run_input_selector_buffer_count):
Fixes for pad instead of padname for pad selection.
2008-03-13 16:46:04 +00:00
|
|
|
sel->padcount = 0;
|
2011-03-19 09:28:49 +00:00
|
|
|
sel->sync_streams = DEFAULT_SYNC_STREAMS;
|
2008-01-29 07:38:31 +00:00
|
|
|
|
2012-01-19 08:27:04 +00:00
|
|
|
g_mutex_init (&sel->lock);
|
|
|
|
g_cond_init (&sel->cond);
|
2008-01-29 07:38:31 +00:00
|
|
|
sel->blocked = FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
gst_input_selector_dispose (GObject * object)
|
|
|
|
{
|
|
|
|
GstInputSelector *sel = GST_INPUT_SELECTOR (object);
|
|
|
|
|
|
|
|
if (sel->active_sinkpad) {
|
|
|
|
gst_object_unref (sel->active_sinkpad);
|
|
|
|
sel->active_sinkpad = NULL;
|
|
|
|
}
|
|
|
|
G_OBJECT_CLASS (parent_class)->dispose (object);
|
|
|
|
}
|
|
|
|
|
2012-01-19 08:27:04 +00:00
|
|
|
static void
|
|
|
|
gst_input_selector_finalize (GObject * object)
|
|
|
|
{
|
|
|
|
GstInputSelector *sel = GST_INPUT_SELECTOR (object);
|
|
|
|
|
|
|
|
g_mutex_clear (&sel->lock);
|
|
|
|
g_cond_clear (&sel->cond);
|
|
|
|
|
|
|
|
G_OBJECT_CLASS (parent_class)->finalize (object);
|
|
|
|
}
|
|
|
|
|
2008-03-20 18:10:29 +00:00
|
|
|
/* this function must be called with the SELECTOR_LOCK. It returns TRUE when the
|
|
|
|
* active pad changed. */
|
|
|
|
static gboolean
|
2011-05-19 10:11:43 +00:00
|
|
|
gst_input_selector_set_active_pad (GstInputSelector * self, GstPad * pad)
|
2008-01-29 07:38:31 +00:00
|
|
|
{
|
|
|
|
GstSelectorPad *old, *new;
|
|
|
|
GstPad **active_pad_p;
|
|
|
|
|
|
|
|
if (pad == self->active_sinkpad)
|
2008-03-20 18:10:29 +00:00
|
|
|
return FALSE;
|
2008-01-29 07:38:31 +00:00
|
|
|
|
|
|
|
old = GST_SELECTOR_PAD_CAST (self->active_sinkpad);
|
|
|
|
new = GST_SELECTOR_PAD_CAST (pad);
|
|
|
|
|
plugins/elements/gstinputselector.*: Figure out the locking a bit more.
Original commit message from CVS:
* plugins/elements/gstinputselector.c:
(gst_selector_pad_get_running_time), (gst_selector_pad_reset),
(gst_selector_pad_event), (gst_selector_pad_bufferalloc),
(gst_input_selector_wait), (gst_selector_pad_chain),
(gst_input_selector_class_init), (gst_input_selector_init),
(gst_input_selector_dispose), (gst_segment_set_start),
(gst_input_selector_set_active_pad),
(gst_input_selector_set_property),
(gst_input_selector_get_property),
(gst_input_selector_get_linked_pad),
(gst_input_selector_is_active_sinkpad),
(gst_input_selector_activate_sinkpad),
(gst_input_selector_request_new_pad),
(gst_input_selector_release_pad),
(gst_input_selector_change_state), (gst_input_selector_block),
(gst_input_selector_switch):
* plugins/elements/gstinputselector.h:
Figure out the locking a bit more.
Mark buffers with discont after switching.
Fix initial segment forwarding, make sure to only forward one segment
regardless of what the sequence of buffers/segments is. See #522203.
Improve flushing when blocked.
Return NOT_LINKED when a stream is not selected.
Not API change for the switch signal in the docs.
Fix start/time/accum values of the new segment.
Correctly unlock and flush a blocking selector when going to READY.
2008-03-20 16:48:46 +00:00
|
|
|
GST_DEBUG_OBJECT (self, "setting active pad to %s:%s",
|
|
|
|
GST_DEBUG_PAD_NAME (new));
|
|
|
|
|
2011-03-16 17:19:11 +00:00
|
|
|
if (old)
|
|
|
|
old->pushed = FALSE;
|
|
|
|
if (new)
|
|
|
|
new->pushed = FALSE;
|
2008-01-29 07:38:31 +00:00
|
|
|
|
2011-05-20 10:18:48 +00:00
|
|
|
/* Send a new SEGMENT event on the new pad next */
|
|
|
|
if (old != new && new)
|
|
|
|
new->segment_pending = TRUE;
|
|
|
|
|
2008-01-29 07:38:31 +00:00
|
|
|
active_pad_p = &self->active_sinkpad;
|
|
|
|
gst_object_replace ((GstObject **) active_pad_p, GST_OBJECT_CAST (pad));
|
2011-03-19 09:28:49 +00:00
|
|
|
|
|
|
|
/* Wake up all non-active pads in sync mode, they might be
|
|
|
|
* the active pad now */
|
|
|
|
if (self->sync_streams)
|
|
|
|
GST_INPUT_SELECTOR_BROADCAST (self);
|
|
|
|
|
2008-01-29 07:38:31 +00:00
|
|
|
GST_DEBUG_OBJECT (self, "New active pad is %" GST_PTR_FORMAT,
|
|
|
|
self->active_sinkpad);
|
|
|
|
|
2008-03-20 18:10:29 +00:00
|
|
|
return TRUE;
|
2008-01-29 07:38:31 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
gst_input_selector_set_property (GObject * object, guint prop_id,
|
|
|
|
const GValue * value, GParamSpec * pspec)
|
|
|
|
{
|
|
|
|
GstInputSelector *sel = GST_INPUT_SELECTOR (object);
|
|
|
|
|
|
|
|
switch (prop_id) {
|
|
|
|
case PROP_ACTIVE_PAD:
|
2008-03-14 17:22:21 +00:00
|
|
|
{
|
|
|
|
GstPad *pad;
|
|
|
|
|
|
|
|
pad = g_value_get_object (value);
|
|
|
|
|
plugins/elements/gstinputselector.*: Figure out the locking a bit more.
Original commit message from CVS:
* plugins/elements/gstinputselector.c:
(gst_selector_pad_get_running_time), (gst_selector_pad_reset),
(gst_selector_pad_event), (gst_selector_pad_bufferalloc),
(gst_input_selector_wait), (gst_selector_pad_chain),
(gst_input_selector_class_init), (gst_input_selector_init),
(gst_input_selector_dispose), (gst_segment_set_start),
(gst_input_selector_set_active_pad),
(gst_input_selector_set_property),
(gst_input_selector_get_property),
(gst_input_selector_get_linked_pad),
(gst_input_selector_is_active_sinkpad),
(gst_input_selector_activate_sinkpad),
(gst_input_selector_request_new_pad),
(gst_input_selector_release_pad),
(gst_input_selector_change_state), (gst_input_selector_block),
(gst_input_selector_switch):
* plugins/elements/gstinputselector.h:
Figure out the locking a bit more.
Mark buffers with discont after switching.
Fix initial segment forwarding, make sure to only forward one segment
regardless of what the sequence of buffers/segments is. See #522203.
Improve flushing when blocked.
Return NOT_LINKED when a stream is not selected.
Not API change for the switch signal in the docs.
Fix start/time/accum values of the new segment.
Correctly unlock and flush a blocking selector when going to READY.
2008-03-20 16:48:46 +00:00
|
|
|
GST_INPUT_SELECTOR_LOCK (sel);
|
2011-05-19 10:11:43 +00:00
|
|
|
gst_input_selector_set_active_pad (sel, pad);
|
plugins/elements/gstinputselector.*: Figure out the locking a bit more.
Original commit message from CVS:
* plugins/elements/gstinputselector.c:
(gst_selector_pad_get_running_time), (gst_selector_pad_reset),
(gst_selector_pad_event), (gst_selector_pad_bufferalloc),
(gst_input_selector_wait), (gst_selector_pad_chain),
(gst_input_selector_class_init), (gst_input_selector_init),
(gst_input_selector_dispose), (gst_segment_set_start),
(gst_input_selector_set_active_pad),
(gst_input_selector_set_property),
(gst_input_selector_get_property),
(gst_input_selector_get_linked_pad),
(gst_input_selector_is_active_sinkpad),
(gst_input_selector_activate_sinkpad),
(gst_input_selector_request_new_pad),
(gst_input_selector_release_pad),
(gst_input_selector_change_state), (gst_input_selector_block),
(gst_input_selector_switch):
* plugins/elements/gstinputselector.h:
Figure out the locking a bit more.
Mark buffers with discont after switching.
Fix initial segment forwarding, make sure to only forward one segment
regardless of what the sequence of buffers/segments is. See #522203.
Improve flushing when blocked.
Return NOT_LINKED when a stream is not selected.
Not API change for the switch signal in the docs.
Fix start/time/accum values of the new segment.
Correctly unlock and flush a blocking selector when going to READY.
2008-03-20 16:48:46 +00:00
|
|
|
GST_INPUT_SELECTOR_UNLOCK (sel);
|
2008-01-29 07:38:31 +00:00
|
|
|
break;
|
2008-03-14 17:22:21 +00:00
|
|
|
}
|
2011-03-19 09:28:49 +00:00
|
|
|
case PROP_SYNC_STREAMS:
|
|
|
|
{
|
|
|
|
GST_INPUT_SELECTOR_LOCK (sel);
|
|
|
|
sel->sync_streams = g_value_get_boolean (value);
|
|
|
|
GST_INPUT_SELECTOR_UNLOCK (sel);
|
|
|
|
break;
|
|
|
|
}
|
2008-01-29 07:38:31 +00:00
|
|
|
default:
|
|
|
|
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
gst_input_selector_get_property (GObject * object, guint prop_id,
|
|
|
|
GValue * value, GParamSpec * pspec)
|
|
|
|
{
|
|
|
|
GstInputSelector *sel = GST_INPUT_SELECTOR (object);
|
|
|
|
|
|
|
|
switch (prop_id) {
|
plugins/elements/gstinputselector.*: Various cleanups.
Original commit message from CVS:
* plugins/elements/gstinputselector.c: (gst_selector_pad_class_init),
(gst_selector_pad_finalize), (gst_selector_pad_get_property),
(gst_selector_pad_event), (gst_input_selector_class_init),
(gst_input_selector_init), (gst_input_selector_set_active_pad),
(gst_input_selector_set_property),
(gst_input_selector_get_property),
(gst_input_selector_request_new_pad),
(gst_input_selector_release_pad),
(gst_input_selector_push_pending_stop),
(gst_input_selector_switch):
* plugins/elements/gstinputselector.h:
Various cleanups.
Added tags to the pads.
Select active pad based on the pad object instead of its name.
Fix refcount in set_active_pad.
Add property to get the number of pads.
* plugins/elements/gstoutputselector.c:
(gst_output_selector_class_init),
(gst_output_selector_set_property),
(gst_output_selector_get_property):
Various cleanups.
Select the active pad based on the pad object instead of its name.
Fix locking when setting the active pad.
* plugins/elements/gstselector-marshal.list:
* tests/check/elements/selector.c: (cleanup_pad),
(selector_set_active_pad), (run_input_selector_buffer_count):
Fixes for pad instead of padname for pad selection.
2008-03-13 16:46:04 +00:00
|
|
|
case PROP_N_PADS:
|
plugins/elements/gstinputselector.*: Figure out the locking a bit more.
Original commit message from CVS:
* plugins/elements/gstinputselector.c:
(gst_selector_pad_get_running_time), (gst_selector_pad_reset),
(gst_selector_pad_event), (gst_selector_pad_bufferalloc),
(gst_input_selector_wait), (gst_selector_pad_chain),
(gst_input_selector_class_init), (gst_input_selector_init),
(gst_input_selector_dispose), (gst_segment_set_start),
(gst_input_selector_set_active_pad),
(gst_input_selector_set_property),
(gst_input_selector_get_property),
(gst_input_selector_get_linked_pad),
(gst_input_selector_is_active_sinkpad),
(gst_input_selector_activate_sinkpad),
(gst_input_selector_request_new_pad),
(gst_input_selector_release_pad),
(gst_input_selector_change_state), (gst_input_selector_block),
(gst_input_selector_switch):
* plugins/elements/gstinputselector.h:
Figure out the locking a bit more.
Mark buffers with discont after switching.
Fix initial segment forwarding, make sure to only forward one segment
regardless of what the sequence of buffers/segments is. See #522203.
Improve flushing when blocked.
Return NOT_LINKED when a stream is not selected.
Not API change for the switch signal in the docs.
Fix start/time/accum values of the new segment.
Correctly unlock and flush a blocking selector when going to READY.
2008-03-20 16:48:46 +00:00
|
|
|
GST_INPUT_SELECTOR_LOCK (object);
|
plugins/elements/gstinputselector.*: Various cleanups.
Original commit message from CVS:
* plugins/elements/gstinputselector.c: (gst_selector_pad_class_init),
(gst_selector_pad_finalize), (gst_selector_pad_get_property),
(gst_selector_pad_event), (gst_input_selector_class_init),
(gst_input_selector_init), (gst_input_selector_set_active_pad),
(gst_input_selector_set_property),
(gst_input_selector_get_property),
(gst_input_selector_request_new_pad),
(gst_input_selector_release_pad),
(gst_input_selector_push_pending_stop),
(gst_input_selector_switch):
* plugins/elements/gstinputselector.h:
Various cleanups.
Added tags to the pads.
Select active pad based on the pad object instead of its name.
Fix refcount in set_active_pad.
Add property to get the number of pads.
* plugins/elements/gstoutputselector.c:
(gst_output_selector_class_init),
(gst_output_selector_set_property),
(gst_output_selector_get_property):
Various cleanups.
Select the active pad based on the pad object instead of its name.
Fix locking when setting the active pad.
* plugins/elements/gstselector-marshal.list:
* tests/check/elements/selector.c: (cleanup_pad),
(selector_set_active_pad), (run_input_selector_buffer_count):
Fixes for pad instead of padname for pad selection.
2008-03-13 16:46:04 +00:00
|
|
|
g_value_set_uint (value, sel->n_pads);
|
plugins/elements/gstinputselector.*: Figure out the locking a bit more.
Original commit message from CVS:
* plugins/elements/gstinputselector.c:
(gst_selector_pad_get_running_time), (gst_selector_pad_reset),
(gst_selector_pad_event), (gst_selector_pad_bufferalloc),
(gst_input_selector_wait), (gst_selector_pad_chain),
(gst_input_selector_class_init), (gst_input_selector_init),
(gst_input_selector_dispose), (gst_segment_set_start),
(gst_input_selector_set_active_pad),
(gst_input_selector_set_property),
(gst_input_selector_get_property),
(gst_input_selector_get_linked_pad),
(gst_input_selector_is_active_sinkpad),
(gst_input_selector_activate_sinkpad),
(gst_input_selector_request_new_pad),
(gst_input_selector_release_pad),
(gst_input_selector_change_state), (gst_input_selector_block),
(gst_input_selector_switch):
* plugins/elements/gstinputselector.h:
Figure out the locking a bit more.
Mark buffers with discont after switching.
Fix initial segment forwarding, make sure to only forward one segment
regardless of what the sequence of buffers/segments is. See #522203.
Improve flushing when blocked.
Return NOT_LINKED when a stream is not selected.
Not API change for the switch signal in the docs.
Fix start/time/accum values of the new segment.
Correctly unlock and flush a blocking selector when going to READY.
2008-03-20 16:48:46 +00:00
|
|
|
GST_INPUT_SELECTOR_UNLOCK (object);
|
plugins/elements/gstinputselector.*: Various cleanups.
Original commit message from CVS:
* plugins/elements/gstinputselector.c: (gst_selector_pad_class_init),
(gst_selector_pad_finalize), (gst_selector_pad_get_property),
(gst_selector_pad_event), (gst_input_selector_class_init),
(gst_input_selector_init), (gst_input_selector_set_active_pad),
(gst_input_selector_set_property),
(gst_input_selector_get_property),
(gst_input_selector_request_new_pad),
(gst_input_selector_release_pad),
(gst_input_selector_push_pending_stop),
(gst_input_selector_switch):
* plugins/elements/gstinputselector.h:
Various cleanups.
Added tags to the pads.
Select active pad based on the pad object instead of its name.
Fix refcount in set_active_pad.
Add property to get the number of pads.
* plugins/elements/gstoutputselector.c:
(gst_output_selector_class_init),
(gst_output_selector_set_property),
(gst_output_selector_get_property):
Various cleanups.
Select the active pad based on the pad object instead of its name.
Fix locking when setting the active pad.
* plugins/elements/gstselector-marshal.list:
* tests/check/elements/selector.c: (cleanup_pad),
(selector_set_active_pad), (run_input_selector_buffer_count):
Fixes for pad instead of padname for pad selection.
2008-03-13 16:46:04 +00:00
|
|
|
break;
|
|
|
|
case PROP_ACTIVE_PAD:
|
plugins/elements/gstinputselector.*: Figure out the locking a bit more.
Original commit message from CVS:
* plugins/elements/gstinputselector.c:
(gst_selector_pad_get_running_time), (gst_selector_pad_reset),
(gst_selector_pad_event), (gst_selector_pad_bufferalloc),
(gst_input_selector_wait), (gst_selector_pad_chain),
(gst_input_selector_class_init), (gst_input_selector_init),
(gst_input_selector_dispose), (gst_segment_set_start),
(gst_input_selector_set_active_pad),
(gst_input_selector_set_property),
(gst_input_selector_get_property),
(gst_input_selector_get_linked_pad),
(gst_input_selector_is_active_sinkpad),
(gst_input_selector_activate_sinkpad),
(gst_input_selector_request_new_pad),
(gst_input_selector_release_pad),
(gst_input_selector_change_state), (gst_input_selector_block),
(gst_input_selector_switch):
* plugins/elements/gstinputselector.h:
Figure out the locking a bit more.
Mark buffers with discont after switching.
Fix initial segment forwarding, make sure to only forward one segment
regardless of what the sequence of buffers/segments is. See #522203.
Improve flushing when blocked.
Return NOT_LINKED when a stream is not selected.
Not API change for the switch signal in the docs.
Fix start/time/accum values of the new segment.
Correctly unlock and flush a blocking selector when going to READY.
2008-03-20 16:48:46 +00:00
|
|
|
GST_INPUT_SELECTOR_LOCK (object);
|
plugins/elements/gstinputselector.*: Various cleanups.
Original commit message from CVS:
* plugins/elements/gstinputselector.c: (gst_selector_pad_class_init),
(gst_selector_pad_finalize), (gst_selector_pad_get_property),
(gst_selector_pad_event), (gst_input_selector_class_init),
(gst_input_selector_init), (gst_input_selector_set_active_pad),
(gst_input_selector_set_property),
(gst_input_selector_get_property),
(gst_input_selector_request_new_pad),
(gst_input_selector_release_pad),
(gst_input_selector_push_pending_stop),
(gst_input_selector_switch):
* plugins/elements/gstinputselector.h:
Various cleanups.
Added tags to the pads.
Select active pad based on the pad object instead of its name.
Fix refcount in set_active_pad.
Add property to get the number of pads.
* plugins/elements/gstoutputselector.c:
(gst_output_selector_class_init),
(gst_output_selector_set_property),
(gst_output_selector_get_property):
Various cleanups.
Select the active pad based on the pad object instead of its name.
Fix locking when setting the active pad.
* plugins/elements/gstselector-marshal.list:
* tests/check/elements/selector.c: (cleanup_pad),
(selector_set_active_pad), (run_input_selector_buffer_count):
Fixes for pad instead of padname for pad selection.
2008-03-13 16:46:04 +00:00
|
|
|
g_value_set_object (value, sel->active_sinkpad);
|
plugins/elements/gstinputselector.*: Figure out the locking a bit more.
Original commit message from CVS:
* plugins/elements/gstinputselector.c:
(gst_selector_pad_get_running_time), (gst_selector_pad_reset),
(gst_selector_pad_event), (gst_selector_pad_bufferalloc),
(gst_input_selector_wait), (gst_selector_pad_chain),
(gst_input_selector_class_init), (gst_input_selector_init),
(gst_input_selector_dispose), (gst_segment_set_start),
(gst_input_selector_set_active_pad),
(gst_input_selector_set_property),
(gst_input_selector_get_property),
(gst_input_selector_get_linked_pad),
(gst_input_selector_is_active_sinkpad),
(gst_input_selector_activate_sinkpad),
(gst_input_selector_request_new_pad),
(gst_input_selector_release_pad),
(gst_input_selector_change_state), (gst_input_selector_block),
(gst_input_selector_switch):
* plugins/elements/gstinputselector.h:
Figure out the locking a bit more.
Mark buffers with discont after switching.
Fix initial segment forwarding, make sure to only forward one segment
regardless of what the sequence of buffers/segments is. See #522203.
Improve flushing when blocked.
Return NOT_LINKED when a stream is not selected.
Not API change for the switch signal in the docs.
Fix start/time/accum values of the new segment.
Correctly unlock and flush a blocking selector when going to READY.
2008-03-20 16:48:46 +00:00
|
|
|
GST_INPUT_SELECTOR_UNLOCK (object);
|
2008-01-29 07:38:31 +00:00
|
|
|
break;
|
2011-03-19 09:28:49 +00:00
|
|
|
case PROP_SYNC_STREAMS:
|
|
|
|
GST_INPUT_SELECTOR_LOCK (object);
|
|
|
|
g_value_set_boolean (value, sel->sync_streams);
|
|
|
|
GST_INPUT_SELECTOR_UNLOCK (object);
|
|
|
|
break;
|
2008-01-29 07:38:31 +00:00
|
|
|
default:
|
|
|
|
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static GstPad *
|
2011-04-01 06:46:14 +00:00
|
|
|
gst_input_selector_get_linked_pad (GstInputSelector * sel, GstPad * pad,
|
|
|
|
gboolean strict)
|
2008-01-29 07:38:31 +00:00
|
|
|
{
|
|
|
|
GstPad *otherpad = NULL;
|
|
|
|
|
plugins/elements/gstinputselector.*: Figure out the locking a bit more.
Original commit message from CVS:
* plugins/elements/gstinputselector.c:
(gst_selector_pad_get_running_time), (gst_selector_pad_reset),
(gst_selector_pad_event), (gst_selector_pad_bufferalloc),
(gst_input_selector_wait), (gst_selector_pad_chain),
(gst_input_selector_class_init), (gst_input_selector_init),
(gst_input_selector_dispose), (gst_segment_set_start),
(gst_input_selector_set_active_pad),
(gst_input_selector_set_property),
(gst_input_selector_get_property),
(gst_input_selector_get_linked_pad),
(gst_input_selector_is_active_sinkpad),
(gst_input_selector_activate_sinkpad),
(gst_input_selector_request_new_pad),
(gst_input_selector_release_pad),
(gst_input_selector_change_state), (gst_input_selector_block),
(gst_input_selector_switch):
* plugins/elements/gstinputselector.h:
Figure out the locking a bit more.
Mark buffers with discont after switching.
Fix initial segment forwarding, make sure to only forward one segment
regardless of what the sequence of buffers/segments is. See #522203.
Improve flushing when blocked.
Return NOT_LINKED when a stream is not selected.
Not API change for the switch signal in the docs.
Fix start/time/accum values of the new segment.
Correctly unlock and flush a blocking selector when going to READY.
2008-03-20 16:48:46 +00:00
|
|
|
GST_INPUT_SELECTOR_LOCK (sel);
|
2008-01-29 07:38:31 +00:00
|
|
|
if (pad == sel->srcpad)
|
|
|
|
otherpad = sel->active_sinkpad;
|
|
|
|
else if (pad == sel->active_sinkpad || !strict)
|
|
|
|
otherpad = sel->srcpad;
|
|
|
|
if (otherpad)
|
|
|
|
gst_object_ref (otherpad);
|
plugins/elements/gstinputselector.*: Figure out the locking a bit more.
Original commit message from CVS:
* plugins/elements/gstinputselector.c:
(gst_selector_pad_get_running_time), (gst_selector_pad_reset),
(gst_selector_pad_event), (gst_selector_pad_bufferalloc),
(gst_input_selector_wait), (gst_selector_pad_chain),
(gst_input_selector_class_init), (gst_input_selector_init),
(gst_input_selector_dispose), (gst_segment_set_start),
(gst_input_selector_set_active_pad),
(gst_input_selector_set_property),
(gst_input_selector_get_property),
(gst_input_selector_get_linked_pad),
(gst_input_selector_is_active_sinkpad),
(gst_input_selector_activate_sinkpad),
(gst_input_selector_request_new_pad),
(gst_input_selector_release_pad),
(gst_input_selector_change_state), (gst_input_selector_block),
(gst_input_selector_switch):
* plugins/elements/gstinputselector.h:
Figure out the locking a bit more.
Mark buffers with discont after switching.
Fix initial segment forwarding, make sure to only forward one segment
regardless of what the sequence of buffers/segments is. See #522203.
Improve flushing when blocked.
Return NOT_LINKED when a stream is not selected.
Not API change for the switch signal in the docs.
Fix start/time/accum values of the new segment.
Correctly unlock and flush a blocking selector when going to READY.
2008-03-20 16:48:46 +00:00
|
|
|
GST_INPUT_SELECTOR_UNLOCK (sel);
|
|
|
|
|
2008-01-29 07:38:31 +00:00
|
|
|
return otherpad;
|
|
|
|
}
|
|
|
|
|
2008-09-01 13:23:03 +00:00
|
|
|
static gboolean
|
2011-11-17 11:40:45 +00:00
|
|
|
gst_input_selector_event (GstPad * pad, GstObject * parent, GstEvent * event)
|
2008-09-01 13:23:03 +00:00
|
|
|
{
|
2011-04-01 06:46:14 +00:00
|
|
|
GstInputSelector *sel;
|
2011-05-20 10:00:11 +00:00
|
|
|
gboolean result = FALSE;
|
|
|
|
GstIterator *iter;
|
|
|
|
gboolean done = FALSE;
|
|
|
|
GValue item = { 0, };
|
|
|
|
GstPad *eventpad;
|
|
|
|
GList *pushed_pads = NULL;
|
2008-09-01 13:23:03 +00:00
|
|
|
|
2011-11-17 11:40:45 +00:00
|
|
|
sel = GST_INPUT_SELECTOR (parent);
|
2011-05-20 10:00:11 +00:00
|
|
|
/* Send upstream events to all sinkpads */
|
|
|
|
iter = gst_element_iterate_sink_pads (GST_ELEMENT_CAST (sel));
|
2008-09-01 13:23:03 +00:00
|
|
|
|
2011-05-20 10:00:11 +00:00
|
|
|
/* This is now essentially a copy of gst_pad_event_default_dispatch
|
|
|
|
* with a different iterator */
|
|
|
|
while (!done) {
|
|
|
|
switch (gst_iterator_next (iter, &item)) {
|
|
|
|
case GST_ITERATOR_OK:
|
|
|
|
eventpad = g_value_get_object (&item);
|
2011-04-01 06:46:14 +00:00
|
|
|
|
2011-05-20 10:00:11 +00:00
|
|
|
/* if already pushed, skip */
|
|
|
|
if (g_list_find (pushed_pads, eventpad)) {
|
|
|
|
g_value_reset (&item);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2011-05-20 10:16:59 +00:00
|
|
|
gst_event_ref (event);
|
|
|
|
result |= gst_pad_push_event (eventpad, event);
|
2011-05-20 10:00:11 +00:00
|
|
|
|
|
|
|
g_value_reset (&item);
|
|
|
|
break;
|
|
|
|
case GST_ITERATOR_RESYNC:
|
|
|
|
/* We don't reset the result here because we don't push the event
|
|
|
|
* again on pads that got the event already and because we need
|
|
|
|
* to consider the result of the previous pushes */
|
|
|
|
gst_iterator_resync (iter);
|
|
|
|
break;
|
|
|
|
case GST_ITERATOR_ERROR:
|
2011-05-20 10:16:59 +00:00
|
|
|
GST_ERROR_OBJECT (pad, "Could not iterate over sinkpads");
|
2011-05-20 10:00:11 +00:00
|
|
|
done = TRUE;
|
|
|
|
break;
|
|
|
|
case GST_ITERATOR_DONE:
|
|
|
|
done = TRUE;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
g_value_unset (&item);
|
|
|
|
gst_iterator_free (iter);
|
|
|
|
|
|
|
|
g_list_free (pushed_pads);
|
|
|
|
|
|
|
|
gst_event_unref (event);
|
|
|
|
|
|
|
|
return result;
|
2008-09-01 13:23:03 +00:00
|
|
|
}
|
|
|
|
|
2008-08-27 15:45:16 +00:00
|
|
|
/* query on the srcpad. We override this function because by default it will
|
|
|
|
* only forward the query to one random sinkpad */
|
|
|
|
static gboolean
|
2011-11-16 16:22:56 +00:00
|
|
|
gst_input_selector_query (GstPad * pad, GstObject * parent, GstQuery * query)
|
2008-08-27 15:45:16 +00:00
|
|
|
{
|
2011-11-09 10:22:36 +00:00
|
|
|
gboolean res = FALSE;
|
2008-08-27 15:45:16 +00:00
|
|
|
GstInputSelector *sel;
|
|
|
|
|
2011-11-16 16:22:56 +00:00
|
|
|
sel = GST_INPUT_SELECTOR (parent);
|
2008-08-27 15:45:16 +00:00
|
|
|
|
2011-05-17 09:20:05 +00:00
|
|
|
switch (GST_QUERY_TYPE (query)) {
|
2008-08-27 15:45:16 +00:00
|
|
|
case GST_QUERY_LATENCY:
|
|
|
|
{
|
|
|
|
GList *walk;
|
|
|
|
GstClockTime resmin, resmax;
|
|
|
|
gboolean reslive;
|
|
|
|
|
|
|
|
resmin = 0;
|
|
|
|
resmax = -1;
|
|
|
|
reslive = FALSE;
|
|
|
|
|
|
|
|
/* perform the query on all sinkpads and combine the results. We take the
|
|
|
|
* max of min and the min of max for the result latency. */
|
|
|
|
GST_INPUT_SELECTOR_LOCK (sel);
|
|
|
|
for (walk = GST_ELEMENT_CAST (sel)->sinkpads; walk;
|
|
|
|
walk = g_list_next (walk)) {
|
|
|
|
GstPad *sinkpad = GST_PAD_CAST (walk->data);
|
|
|
|
|
|
|
|
if (gst_pad_peer_query (sinkpad, query)) {
|
|
|
|
GstClockTime min, max;
|
|
|
|
gboolean live;
|
|
|
|
|
|
|
|
/* one query succeeded, we succeed too */
|
|
|
|
res = TRUE;
|
|
|
|
|
2011-05-17 09:20:05 +00:00
|
|
|
gst_query_parse_latency (query, &live, &min, &max);
|
2008-08-27 15:45:16 +00:00
|
|
|
|
|
|
|
GST_DEBUG_OBJECT (sinkpad,
|
|
|
|
"peer latency min %" GST_TIME_FORMAT ", max %" GST_TIME_FORMAT
|
|
|
|
", live %d", GST_TIME_ARGS (min), GST_TIME_ARGS (max), live);
|
|
|
|
|
|
|
|
if (live) {
|
|
|
|
if (min > resmin)
|
|
|
|
resmin = min;
|
|
|
|
if (resmax == -1)
|
|
|
|
resmax = max;
|
|
|
|
else if (max < resmax)
|
|
|
|
resmax = max;
|
|
|
|
if (reslive == FALSE)
|
|
|
|
reslive = live;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
GST_INPUT_SELECTOR_UNLOCK (sel);
|
|
|
|
if (res) {
|
2011-05-17 09:20:05 +00:00
|
|
|
gst_query_set_latency (query, reslive, resmin, resmax);
|
2008-08-27 15:45:16 +00:00
|
|
|
|
|
|
|
GST_DEBUG_OBJECT (sel,
|
|
|
|
"total latency min %" GST_TIME_FORMAT ", max %" GST_TIME_FORMAT
|
|
|
|
", live %d", GST_TIME_ARGS (resmin), GST_TIME_ARGS (resmax),
|
|
|
|
reslive);
|
|
|
|
}
|
|
|
|
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
default:
|
2011-11-16 16:22:56 +00:00
|
|
|
res = gst_pad_query_default (pad, parent, query);
|
2008-08-27 15:45:16 +00:00
|
|
|
break;
|
|
|
|
}
|
2011-11-09 10:22:36 +00:00
|
|
|
|
2008-08-27 15:45:16 +00:00
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
2008-01-29 07:38:31 +00:00
|
|
|
/* check if the pad is the active sinkpad */
|
2009-11-03 17:14:12 +00:00
|
|
|
static inline gboolean
|
2008-01-29 07:38:31 +00:00
|
|
|
gst_input_selector_is_active_sinkpad (GstInputSelector * sel, GstPad * pad)
|
|
|
|
{
|
|
|
|
gboolean res;
|
|
|
|
|
plugins/elements/gstinputselector.*: Figure out the locking a bit more.
Original commit message from CVS:
* plugins/elements/gstinputselector.c:
(gst_selector_pad_get_running_time), (gst_selector_pad_reset),
(gst_selector_pad_event), (gst_selector_pad_bufferalloc),
(gst_input_selector_wait), (gst_selector_pad_chain),
(gst_input_selector_class_init), (gst_input_selector_init),
(gst_input_selector_dispose), (gst_segment_set_start),
(gst_input_selector_set_active_pad),
(gst_input_selector_set_property),
(gst_input_selector_get_property),
(gst_input_selector_get_linked_pad),
(gst_input_selector_is_active_sinkpad),
(gst_input_selector_activate_sinkpad),
(gst_input_selector_request_new_pad),
(gst_input_selector_release_pad),
(gst_input_selector_change_state), (gst_input_selector_block),
(gst_input_selector_switch):
* plugins/elements/gstinputselector.h:
Figure out the locking a bit more.
Mark buffers with discont after switching.
Fix initial segment forwarding, make sure to only forward one segment
regardless of what the sequence of buffers/segments is. See #522203.
Improve flushing when blocked.
Return NOT_LINKED when a stream is not selected.
Not API change for the switch signal in the docs.
Fix start/time/accum values of the new segment.
Correctly unlock and flush a blocking selector when going to READY.
2008-03-20 16:48:46 +00:00
|
|
|
GST_INPUT_SELECTOR_LOCK (sel);
|
2008-01-29 07:38:31 +00:00
|
|
|
res = (pad == sel->active_sinkpad);
|
plugins/elements/gstinputselector.*: Figure out the locking a bit more.
Original commit message from CVS:
* plugins/elements/gstinputselector.c:
(gst_selector_pad_get_running_time), (gst_selector_pad_reset),
(gst_selector_pad_event), (gst_selector_pad_bufferalloc),
(gst_input_selector_wait), (gst_selector_pad_chain),
(gst_input_selector_class_init), (gst_input_selector_init),
(gst_input_selector_dispose), (gst_segment_set_start),
(gst_input_selector_set_active_pad),
(gst_input_selector_set_property),
(gst_input_selector_get_property),
(gst_input_selector_get_linked_pad),
(gst_input_selector_is_active_sinkpad),
(gst_input_selector_activate_sinkpad),
(gst_input_selector_request_new_pad),
(gst_input_selector_release_pad),
(gst_input_selector_change_state), (gst_input_selector_block),
(gst_input_selector_switch):
* plugins/elements/gstinputselector.h:
Figure out the locking a bit more.
Mark buffers with discont after switching.
Fix initial segment forwarding, make sure to only forward one segment
regardless of what the sequence of buffers/segments is. See #522203.
Improve flushing when blocked.
Return NOT_LINKED when a stream is not selected.
Not API change for the switch signal in the docs.
Fix start/time/accum values of the new segment.
Correctly unlock and flush a blocking selector when going to READY.
2008-03-20 16:48:46 +00:00
|
|
|
GST_INPUT_SELECTOR_UNLOCK (sel);
|
2008-01-29 07:38:31 +00:00
|
|
|
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
plugins/elements/gstinputselector.*: Figure out the locking a bit more.
Original commit message from CVS:
* plugins/elements/gstinputselector.c:
(gst_selector_pad_get_running_time), (gst_selector_pad_reset),
(gst_selector_pad_event), (gst_selector_pad_bufferalloc),
(gst_input_selector_wait), (gst_selector_pad_chain),
(gst_input_selector_class_init), (gst_input_selector_init),
(gst_input_selector_dispose), (gst_segment_set_start),
(gst_input_selector_set_active_pad),
(gst_input_selector_set_property),
(gst_input_selector_get_property),
(gst_input_selector_get_linked_pad),
(gst_input_selector_is_active_sinkpad),
(gst_input_selector_activate_sinkpad),
(gst_input_selector_request_new_pad),
(gst_input_selector_release_pad),
(gst_input_selector_change_state), (gst_input_selector_block),
(gst_input_selector_switch):
* plugins/elements/gstinputselector.h:
Figure out the locking a bit more.
Mark buffers with discont after switching.
Fix initial segment forwarding, make sure to only forward one segment
regardless of what the sequence of buffers/segments is. See #522203.
Improve flushing when blocked.
Return NOT_LINKED when a stream is not selected.
Not API change for the switch signal in the docs.
Fix start/time/accum values of the new segment.
Correctly unlock and flush a blocking selector when going to READY.
2008-03-20 16:48:46 +00:00
|
|
|
/* Get or create the active sinkpad, must be called with SELECTOR_LOCK */
|
2008-01-29 07:38:31 +00:00
|
|
|
static GstPad *
|
|
|
|
gst_input_selector_activate_sinkpad (GstInputSelector * sel, GstPad * pad)
|
|
|
|
{
|
|
|
|
GstPad *active_sinkpad;
|
|
|
|
GstSelectorPad *selpad;
|
|
|
|
|
|
|
|
selpad = GST_SELECTOR_PAD_CAST (pad);
|
|
|
|
|
|
|
|
selpad->active = TRUE;
|
|
|
|
active_sinkpad = sel->active_sinkpad;
|
2011-01-05 15:53:28 +00:00
|
|
|
if (active_sinkpad == NULL) {
|
|
|
|
/* first pad we get activity on becomes the activated pad by default */
|
2009-01-31 02:27:03 +00:00
|
|
|
if (sel->active_sinkpad)
|
|
|
|
gst_object_unref (sel->active_sinkpad);
|
2008-01-29 07:38:31 +00:00
|
|
|
active_sinkpad = sel->active_sinkpad = gst_object_ref (pad);
|
|
|
|
GST_DEBUG_OBJECT (sel, "Activating pad %s:%s", GST_DEBUG_PAD_NAME (pad));
|
|
|
|
}
|
|
|
|
|
|
|
|
return active_sinkpad;
|
|
|
|
}
|
|
|
|
|
|
|
|
static GstPad *
|
|
|
|
gst_input_selector_request_new_pad (GstElement * element,
|
2011-05-10 14:41:36 +00:00
|
|
|
GstPadTemplate * templ, const gchar * unused, const GstCaps * caps)
|
2008-01-29 07:38:31 +00:00
|
|
|
{
|
|
|
|
GstInputSelector *sel;
|
|
|
|
gchar *name = NULL;
|
|
|
|
GstPad *sinkpad = NULL;
|
|
|
|
|
|
|
|
g_return_val_if_fail (templ->direction == GST_PAD_SINK, NULL);
|
plugins/elements/gstinputselector.*: Figure out the locking a bit more.
Original commit message from CVS:
* plugins/elements/gstinputselector.c:
(gst_selector_pad_get_running_time), (gst_selector_pad_reset),
(gst_selector_pad_event), (gst_selector_pad_bufferalloc),
(gst_input_selector_wait), (gst_selector_pad_chain),
(gst_input_selector_class_init), (gst_input_selector_init),
(gst_input_selector_dispose), (gst_segment_set_start),
(gst_input_selector_set_active_pad),
(gst_input_selector_set_property),
(gst_input_selector_get_property),
(gst_input_selector_get_linked_pad),
(gst_input_selector_is_active_sinkpad),
(gst_input_selector_activate_sinkpad),
(gst_input_selector_request_new_pad),
(gst_input_selector_release_pad),
(gst_input_selector_change_state), (gst_input_selector_block),
(gst_input_selector_switch):
* plugins/elements/gstinputselector.h:
Figure out the locking a bit more.
Mark buffers with discont after switching.
Fix initial segment forwarding, make sure to only forward one segment
regardless of what the sequence of buffers/segments is. See #522203.
Improve flushing when blocked.
Return NOT_LINKED when a stream is not selected.
Not API change for the switch signal in the docs.
Fix start/time/accum values of the new segment.
Correctly unlock and flush a blocking selector when going to READY.
2008-03-20 16:48:46 +00:00
|
|
|
|
|
|
|
sel = GST_INPUT_SELECTOR (element);
|
|
|
|
|
|
|
|
GST_INPUT_SELECTOR_LOCK (sel);
|
|
|
|
|
plugins/elements/gstinputselector.*: Various cleanups.
Original commit message from CVS:
* plugins/elements/gstinputselector.c: (gst_selector_pad_class_init),
(gst_selector_pad_finalize), (gst_selector_pad_get_property),
(gst_selector_pad_event), (gst_input_selector_class_init),
(gst_input_selector_init), (gst_input_selector_set_active_pad),
(gst_input_selector_set_property),
(gst_input_selector_get_property),
(gst_input_selector_request_new_pad),
(gst_input_selector_release_pad),
(gst_input_selector_push_pending_stop),
(gst_input_selector_switch):
* plugins/elements/gstinputselector.h:
Various cleanups.
Added tags to the pads.
Select active pad based on the pad object instead of its name.
Fix refcount in set_active_pad.
Add property to get the number of pads.
* plugins/elements/gstoutputselector.c:
(gst_output_selector_class_init),
(gst_output_selector_set_property),
(gst_output_selector_get_property):
Various cleanups.
Select the active pad based on the pad object instead of its name.
Fix locking when setting the active pad.
* plugins/elements/gstselector-marshal.list:
* tests/check/elements/selector.c: (cleanup_pad),
(selector_set_active_pad), (run_input_selector_buffer_count):
Fixes for pad instead of padname for pad selection.
2008-03-13 16:46:04 +00:00
|
|
|
GST_LOG_OBJECT (sel, "Creating new pad %d", sel->padcount);
|
2011-11-03 16:49:45 +00:00
|
|
|
name = g_strdup_printf ("sink_%u", sel->padcount++);
|
2008-01-29 07:38:31 +00:00
|
|
|
sinkpad = g_object_new (GST_TYPE_SELECTOR_PAD,
|
|
|
|
"name", name, "direction", templ->direction, "template", templ, NULL);
|
|
|
|
g_free (name);
|
plugins/elements/gstinputselector.*: Figure out the locking a bit more.
Original commit message from CVS:
* plugins/elements/gstinputselector.c:
(gst_selector_pad_get_running_time), (gst_selector_pad_reset),
(gst_selector_pad_event), (gst_selector_pad_bufferalloc),
(gst_input_selector_wait), (gst_selector_pad_chain),
(gst_input_selector_class_init), (gst_input_selector_init),
(gst_input_selector_dispose), (gst_segment_set_start),
(gst_input_selector_set_active_pad),
(gst_input_selector_set_property),
(gst_input_selector_get_property),
(gst_input_selector_get_linked_pad),
(gst_input_selector_is_active_sinkpad),
(gst_input_selector_activate_sinkpad),
(gst_input_selector_request_new_pad),
(gst_input_selector_release_pad),
(gst_input_selector_change_state), (gst_input_selector_block),
(gst_input_selector_switch):
* plugins/elements/gstinputselector.h:
Figure out the locking a bit more.
Mark buffers with discont after switching.
Fix initial segment forwarding, make sure to only forward one segment
regardless of what the sequence of buffers/segments is. See #522203.
Improve flushing when blocked.
Return NOT_LINKED when a stream is not selected.
Not API change for the switch signal in the docs.
Fix start/time/accum values of the new segment.
Correctly unlock and flush a blocking selector when going to READY.
2008-03-20 16:48:46 +00:00
|
|
|
|
plugins/elements/gstinputselector.*: Various cleanups.
Original commit message from CVS:
* plugins/elements/gstinputselector.c: (gst_selector_pad_class_init),
(gst_selector_pad_finalize), (gst_selector_pad_get_property),
(gst_selector_pad_event), (gst_input_selector_class_init),
(gst_input_selector_init), (gst_input_selector_set_active_pad),
(gst_input_selector_set_property),
(gst_input_selector_get_property),
(gst_input_selector_request_new_pad),
(gst_input_selector_release_pad),
(gst_input_selector_push_pending_stop),
(gst_input_selector_switch):
* plugins/elements/gstinputselector.h:
Various cleanups.
Added tags to the pads.
Select active pad based on the pad object instead of its name.
Fix refcount in set_active_pad.
Add property to get the number of pads.
* plugins/elements/gstoutputselector.c:
(gst_output_selector_class_init),
(gst_output_selector_set_property),
(gst_output_selector_get_property):
Various cleanups.
Select the active pad based on the pad object instead of its name.
Fix locking when setting the active pad.
* plugins/elements/gstselector-marshal.list:
* tests/check/elements/selector.c: (cleanup_pad),
(selector_set_active_pad), (run_input_selector_buffer_count):
Fixes for pad instead of padname for pad selection.
2008-03-13 16:46:04 +00:00
|
|
|
sel->n_pads++;
|
2008-01-29 07:38:31 +00:00
|
|
|
|
|
|
|
gst_pad_set_event_function (sinkpad,
|
|
|
|
GST_DEBUG_FUNCPTR (gst_selector_pad_event));
|
2011-11-09 10:22:36 +00:00
|
|
|
gst_pad_set_query_function (sinkpad,
|
|
|
|
GST_DEBUG_FUNCPTR (gst_selector_pad_query));
|
2008-01-29 07:38:31 +00:00
|
|
|
gst_pad_set_chain_function (sinkpad,
|
|
|
|
GST_DEBUG_FUNCPTR (gst_selector_pad_chain));
|
2009-08-19 15:05:32 +00:00
|
|
|
gst_pad_set_iterate_internal_links_function (sinkpad,
|
|
|
|
GST_DEBUG_FUNCPTR (gst_selector_pad_iterate_linked_pads));
|
2008-01-29 07:38:31 +00:00
|
|
|
|
2011-11-16 11:36:51 +00:00
|
|
|
GST_OBJECT_FLAG_SET (sinkpad, GST_PAD_FLAG_PROXY_CAPS);
|
2012-02-02 11:32:07 +00:00
|
|
|
GST_OBJECT_FLAG_SET (sinkpad, GST_PAD_FLAG_PROXY_ALLOCATION);
|
2008-01-29 07:38:31 +00:00
|
|
|
gst_pad_set_active (sinkpad, TRUE);
|
|
|
|
gst_element_add_pad (GST_ELEMENT (sel), sinkpad);
|
plugins/elements/gstinputselector.*: Figure out the locking a bit more.
Original commit message from CVS:
* plugins/elements/gstinputselector.c:
(gst_selector_pad_get_running_time), (gst_selector_pad_reset),
(gst_selector_pad_event), (gst_selector_pad_bufferalloc),
(gst_input_selector_wait), (gst_selector_pad_chain),
(gst_input_selector_class_init), (gst_input_selector_init),
(gst_input_selector_dispose), (gst_segment_set_start),
(gst_input_selector_set_active_pad),
(gst_input_selector_set_property),
(gst_input_selector_get_property),
(gst_input_selector_get_linked_pad),
(gst_input_selector_is_active_sinkpad),
(gst_input_selector_activate_sinkpad),
(gst_input_selector_request_new_pad),
(gst_input_selector_release_pad),
(gst_input_selector_change_state), (gst_input_selector_block),
(gst_input_selector_switch):
* plugins/elements/gstinputselector.h:
Figure out the locking a bit more.
Mark buffers with discont after switching.
Fix initial segment forwarding, make sure to only forward one segment
regardless of what the sequence of buffers/segments is. See #522203.
Improve flushing when blocked.
Return NOT_LINKED when a stream is not selected.
Not API change for the switch signal in the docs.
Fix start/time/accum values of the new segment.
Correctly unlock and flush a blocking selector when going to READY.
2008-03-20 16:48:46 +00:00
|
|
|
GST_INPUT_SELECTOR_UNLOCK (sel);
|
plugins/elements/gstinputselector.*: Various cleanups.
Original commit message from CVS:
* plugins/elements/gstinputselector.c: (gst_selector_pad_class_init),
(gst_selector_pad_finalize), (gst_selector_pad_get_property),
(gst_selector_pad_event), (gst_input_selector_class_init),
(gst_input_selector_init), (gst_input_selector_set_active_pad),
(gst_input_selector_set_property),
(gst_input_selector_get_property),
(gst_input_selector_request_new_pad),
(gst_input_selector_release_pad),
(gst_input_selector_push_pending_stop),
(gst_input_selector_switch):
* plugins/elements/gstinputselector.h:
Various cleanups.
Added tags to the pads.
Select active pad based on the pad object instead of its name.
Fix refcount in set_active_pad.
Add property to get the number of pads.
* plugins/elements/gstoutputselector.c:
(gst_output_selector_class_init),
(gst_output_selector_set_property),
(gst_output_selector_get_property):
Various cleanups.
Select the active pad based on the pad object instead of its name.
Fix locking when setting the active pad.
* plugins/elements/gstselector-marshal.list:
* tests/check/elements/selector.c: (cleanup_pad),
(selector_set_active_pad), (run_input_selector_buffer_count):
Fixes for pad instead of padname for pad selection.
2008-03-13 16:46:04 +00:00
|
|
|
|
2008-01-29 07:38:31 +00:00
|
|
|
return sinkpad;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
gst_input_selector_release_pad (GstElement * element, GstPad * pad)
|
|
|
|
{
|
|
|
|
GstInputSelector *sel;
|
|
|
|
|
|
|
|
sel = GST_INPUT_SELECTOR (element);
|
|
|
|
GST_LOG_OBJECT (sel, "Releasing pad %s:%s", GST_DEBUG_PAD_NAME (pad));
|
|
|
|
|
plugins/elements/gstinputselector.*: Figure out the locking a bit more.
Original commit message from CVS:
* plugins/elements/gstinputselector.c:
(gst_selector_pad_get_running_time), (gst_selector_pad_reset),
(gst_selector_pad_event), (gst_selector_pad_bufferalloc),
(gst_input_selector_wait), (gst_selector_pad_chain),
(gst_input_selector_class_init), (gst_input_selector_init),
(gst_input_selector_dispose), (gst_segment_set_start),
(gst_input_selector_set_active_pad),
(gst_input_selector_set_property),
(gst_input_selector_get_property),
(gst_input_selector_get_linked_pad),
(gst_input_selector_is_active_sinkpad),
(gst_input_selector_activate_sinkpad),
(gst_input_selector_request_new_pad),
(gst_input_selector_release_pad),
(gst_input_selector_change_state), (gst_input_selector_block),
(gst_input_selector_switch):
* plugins/elements/gstinputselector.h:
Figure out the locking a bit more.
Mark buffers with discont after switching.
Fix initial segment forwarding, make sure to only forward one segment
regardless of what the sequence of buffers/segments is. See #522203.
Improve flushing when blocked.
Return NOT_LINKED when a stream is not selected.
Not API change for the switch signal in the docs.
Fix start/time/accum values of the new segment.
Correctly unlock and flush a blocking selector when going to READY.
2008-03-20 16:48:46 +00:00
|
|
|
GST_INPUT_SELECTOR_LOCK (sel);
|
2008-01-29 07:38:31 +00:00
|
|
|
/* if the pad was the active pad, makes us select a new one */
|
|
|
|
if (sel->active_sinkpad == pad) {
|
|
|
|
GST_DEBUG_OBJECT (sel, "Deactivating pad %s:%s", GST_DEBUG_PAD_NAME (pad));
|
2009-01-31 02:27:03 +00:00
|
|
|
gst_object_unref (sel->active_sinkpad);
|
2008-01-29 07:38:31 +00:00
|
|
|
sel->active_sinkpad = NULL;
|
|
|
|
}
|
plugins/elements/gstinputselector.*: Various cleanups.
Original commit message from CVS:
* plugins/elements/gstinputselector.c: (gst_selector_pad_class_init),
(gst_selector_pad_finalize), (gst_selector_pad_get_property),
(gst_selector_pad_event), (gst_input_selector_class_init),
(gst_input_selector_init), (gst_input_selector_set_active_pad),
(gst_input_selector_set_property),
(gst_input_selector_get_property),
(gst_input_selector_request_new_pad),
(gst_input_selector_release_pad),
(gst_input_selector_push_pending_stop),
(gst_input_selector_switch):
* plugins/elements/gstinputselector.h:
Various cleanups.
Added tags to the pads.
Select active pad based on the pad object instead of its name.
Fix refcount in set_active_pad.
Add property to get the number of pads.
* plugins/elements/gstoutputselector.c:
(gst_output_selector_class_init),
(gst_output_selector_set_property),
(gst_output_selector_get_property):
Various cleanups.
Select the active pad based on the pad object instead of its name.
Fix locking when setting the active pad.
* plugins/elements/gstselector-marshal.list:
* tests/check/elements/selector.c: (cleanup_pad),
(selector_set_active_pad), (run_input_selector_buffer_count):
Fixes for pad instead of padname for pad selection.
2008-03-13 16:46:04 +00:00
|
|
|
sel->n_pads--;
|
2008-01-29 07:38:31 +00:00
|
|
|
|
|
|
|
gst_pad_set_active (pad, FALSE);
|
|
|
|
gst_element_remove_pad (GST_ELEMENT (sel), pad);
|
plugins/elements/gstinputselector.*: Figure out the locking a bit more.
Original commit message from CVS:
* plugins/elements/gstinputselector.c:
(gst_selector_pad_get_running_time), (gst_selector_pad_reset),
(gst_selector_pad_event), (gst_selector_pad_bufferalloc),
(gst_input_selector_wait), (gst_selector_pad_chain),
(gst_input_selector_class_init), (gst_input_selector_init),
(gst_input_selector_dispose), (gst_segment_set_start),
(gst_input_selector_set_active_pad),
(gst_input_selector_set_property),
(gst_input_selector_get_property),
(gst_input_selector_get_linked_pad),
(gst_input_selector_is_active_sinkpad),
(gst_input_selector_activate_sinkpad),
(gst_input_selector_request_new_pad),
(gst_input_selector_release_pad),
(gst_input_selector_change_state), (gst_input_selector_block),
(gst_input_selector_switch):
* plugins/elements/gstinputselector.h:
Figure out the locking a bit more.
Mark buffers with discont after switching.
Fix initial segment forwarding, make sure to only forward one segment
regardless of what the sequence of buffers/segments is. See #522203.
Improve flushing when blocked.
Return NOT_LINKED when a stream is not selected.
Not API change for the switch signal in the docs.
Fix start/time/accum values of the new segment.
Correctly unlock and flush a blocking selector when going to READY.
2008-03-20 16:48:46 +00:00
|
|
|
GST_INPUT_SELECTOR_UNLOCK (sel);
|
2008-01-29 07:38:31 +00:00
|
|
|
}
|
|
|
|
|
2008-09-08 20:27:23 +00:00
|
|
|
static void
|
|
|
|
gst_input_selector_reset (GstInputSelector * sel)
|
|
|
|
{
|
|
|
|
GList *walk;
|
|
|
|
|
|
|
|
GST_INPUT_SELECTOR_LOCK (sel);
|
|
|
|
/* clear active pad */
|
|
|
|
if (sel->active_sinkpad) {
|
|
|
|
gst_object_unref (sel->active_sinkpad);
|
|
|
|
sel->active_sinkpad = NULL;
|
|
|
|
}
|
|
|
|
/* reset each of our sinkpads state */
|
|
|
|
for (walk = GST_ELEMENT_CAST (sel)->sinkpads; walk; walk = g_list_next (walk)) {
|
|
|
|
GstSelectorPad *selpad = GST_SELECTOR_PAD_CAST (walk->data);
|
|
|
|
|
|
|
|
gst_selector_pad_reset (selpad);
|
|
|
|
|
|
|
|
if (selpad->tags) {
|
|
|
|
gst_tag_list_free (selpad->tags);
|
|
|
|
selpad->tags = NULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
GST_INPUT_SELECTOR_UNLOCK (sel);
|
|
|
|
}
|
|
|
|
|
2008-01-29 07:38:31 +00:00
|
|
|
static GstStateChangeReturn
|
|
|
|
gst_input_selector_change_state (GstElement * element,
|
|
|
|
GstStateChange transition)
|
|
|
|
{
|
|
|
|
GstInputSelector *self = GST_INPUT_SELECTOR (element);
|
|
|
|
GstStateChangeReturn result;
|
|
|
|
|
plugins/elements/gstinputselector.*: Figure out the locking a bit more.
Original commit message from CVS:
* plugins/elements/gstinputselector.c:
(gst_selector_pad_get_running_time), (gst_selector_pad_reset),
(gst_selector_pad_event), (gst_selector_pad_bufferalloc),
(gst_input_selector_wait), (gst_selector_pad_chain),
(gst_input_selector_class_init), (gst_input_selector_init),
(gst_input_selector_dispose), (gst_segment_set_start),
(gst_input_selector_set_active_pad),
(gst_input_selector_set_property),
(gst_input_selector_get_property),
(gst_input_selector_get_linked_pad),
(gst_input_selector_is_active_sinkpad),
(gst_input_selector_activate_sinkpad),
(gst_input_selector_request_new_pad),
(gst_input_selector_release_pad),
(gst_input_selector_change_state), (gst_input_selector_block),
(gst_input_selector_switch):
* plugins/elements/gstinputselector.h:
Figure out the locking a bit more.
Mark buffers with discont after switching.
Fix initial segment forwarding, make sure to only forward one segment
regardless of what the sequence of buffers/segments is. See #522203.
Improve flushing when blocked.
Return NOT_LINKED when a stream is not selected.
Not API change for the switch signal in the docs.
Fix start/time/accum values of the new segment.
Correctly unlock and flush a blocking selector when going to READY.
2008-03-20 16:48:46 +00:00
|
|
|
switch (transition) {
|
|
|
|
case GST_STATE_CHANGE_READY_TO_PAUSED:
|
|
|
|
GST_INPUT_SELECTOR_LOCK (self);
|
|
|
|
self->blocked = FALSE;
|
|
|
|
self->flushing = FALSE;
|
|
|
|
GST_INPUT_SELECTOR_UNLOCK (self);
|
|
|
|
break;
|
|
|
|
case GST_STATE_CHANGE_PAUSED_TO_READY:
|
|
|
|
/* first unlock before we call the parent state change function, which
|
|
|
|
* tries to acquire the stream lock when going to ready. */
|
|
|
|
GST_INPUT_SELECTOR_LOCK (self);
|
|
|
|
self->blocked = FALSE;
|
|
|
|
self->flushing = TRUE;
|
|
|
|
GST_INPUT_SELECTOR_BROADCAST (self);
|
|
|
|
GST_INPUT_SELECTOR_UNLOCK (self);
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
break;
|
2008-01-29 07:38:31 +00:00
|
|
|
}
|
|
|
|
|
plugins/elements/gstinputselector.*: Figure out the locking a bit more.
Original commit message from CVS:
* plugins/elements/gstinputselector.c:
(gst_selector_pad_get_running_time), (gst_selector_pad_reset),
(gst_selector_pad_event), (gst_selector_pad_bufferalloc),
(gst_input_selector_wait), (gst_selector_pad_chain),
(gst_input_selector_class_init), (gst_input_selector_init),
(gst_input_selector_dispose), (gst_segment_set_start),
(gst_input_selector_set_active_pad),
(gst_input_selector_set_property),
(gst_input_selector_get_property),
(gst_input_selector_get_linked_pad),
(gst_input_selector_is_active_sinkpad),
(gst_input_selector_activate_sinkpad),
(gst_input_selector_request_new_pad),
(gst_input_selector_release_pad),
(gst_input_selector_change_state), (gst_input_selector_block),
(gst_input_selector_switch):
* plugins/elements/gstinputselector.h:
Figure out the locking a bit more.
Mark buffers with discont after switching.
Fix initial segment forwarding, make sure to only forward one segment
regardless of what the sequence of buffers/segments is. See #522203.
Improve flushing when blocked.
Return NOT_LINKED when a stream is not selected.
Not API change for the switch signal in the docs.
Fix start/time/accum values of the new segment.
Correctly unlock and flush a blocking selector when going to READY.
2008-03-20 16:48:46 +00:00
|
|
|
result = GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
|
|
|
|
|
2008-09-08 20:27:23 +00:00
|
|
|
switch (transition) {
|
|
|
|
case GST_STATE_CHANGE_PAUSED_TO_READY:
|
|
|
|
gst_input_selector_reset (self);
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2008-01-29 07:38:31 +00:00
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
static gint64
|
|
|
|
gst_input_selector_block (GstInputSelector * self)
|
|
|
|
{
|
|
|
|
gint64 ret = 0;
|
|
|
|
GstSelectorPad *spad;
|
|
|
|
|
plugins/elements/gstinputselector.*: Figure out the locking a bit more.
Original commit message from CVS:
* plugins/elements/gstinputselector.c:
(gst_selector_pad_get_running_time), (gst_selector_pad_reset),
(gst_selector_pad_event), (gst_selector_pad_bufferalloc),
(gst_input_selector_wait), (gst_selector_pad_chain),
(gst_input_selector_class_init), (gst_input_selector_init),
(gst_input_selector_dispose), (gst_segment_set_start),
(gst_input_selector_set_active_pad),
(gst_input_selector_set_property),
(gst_input_selector_get_property),
(gst_input_selector_get_linked_pad),
(gst_input_selector_is_active_sinkpad),
(gst_input_selector_activate_sinkpad),
(gst_input_selector_request_new_pad),
(gst_input_selector_release_pad),
(gst_input_selector_change_state), (gst_input_selector_block),
(gst_input_selector_switch):
* plugins/elements/gstinputselector.h:
Figure out the locking a bit more.
Mark buffers with discont after switching.
Fix initial segment forwarding, make sure to only forward one segment
regardless of what the sequence of buffers/segments is. See #522203.
Improve flushing when blocked.
Return NOT_LINKED when a stream is not selected.
Not API change for the switch signal in the docs.
Fix start/time/accum values of the new segment.
Correctly unlock and flush a blocking selector when going to READY.
2008-03-20 16:48:46 +00:00
|
|
|
GST_INPUT_SELECTOR_LOCK (self);
|
2008-01-29 07:38:31 +00:00
|
|
|
|
|
|
|
if (self->blocked)
|
|
|
|
GST_WARNING_OBJECT (self, "switch already blocked");
|
|
|
|
|
|
|
|
self->blocked = TRUE;
|
|
|
|
spad = GST_SELECTOR_PAD_CAST (self->active_sinkpad);
|
|
|
|
|
plugins/elements/gstinputselector.*: Figure out the locking a bit more.
Original commit message from CVS:
* plugins/elements/gstinputselector.c:
(gst_selector_pad_get_running_time), (gst_selector_pad_reset),
(gst_selector_pad_event), (gst_selector_pad_bufferalloc),
(gst_input_selector_wait), (gst_selector_pad_chain),
(gst_input_selector_class_init), (gst_input_selector_init),
(gst_input_selector_dispose), (gst_segment_set_start),
(gst_input_selector_set_active_pad),
(gst_input_selector_set_property),
(gst_input_selector_get_property),
(gst_input_selector_get_linked_pad),
(gst_input_selector_is_active_sinkpad),
(gst_input_selector_activate_sinkpad),
(gst_input_selector_request_new_pad),
(gst_input_selector_release_pad),
(gst_input_selector_change_state), (gst_input_selector_block),
(gst_input_selector_switch):
* plugins/elements/gstinputselector.h:
Figure out the locking a bit more.
Mark buffers with discont after switching.
Fix initial segment forwarding, make sure to only forward one segment
regardless of what the sequence of buffers/segments is. See #522203.
Improve flushing when blocked.
Return NOT_LINKED when a stream is not selected.
Not API change for the switch signal in the docs.
Fix start/time/accum values of the new segment.
Correctly unlock and flush a blocking selector when going to READY.
2008-03-20 16:48:46 +00:00
|
|
|
if (spad)
|
2008-01-29 07:38:31 +00:00
|
|
|
ret = gst_selector_pad_get_running_time (spad);
|
|
|
|
else
|
|
|
|
GST_DEBUG_OBJECT (self, "no active pad while blocking");
|
|
|
|
|
plugins/elements/gstinputselector.*: Figure out the locking a bit more.
Original commit message from CVS:
* plugins/elements/gstinputselector.c:
(gst_selector_pad_get_running_time), (gst_selector_pad_reset),
(gst_selector_pad_event), (gst_selector_pad_bufferalloc),
(gst_input_selector_wait), (gst_selector_pad_chain),
(gst_input_selector_class_init), (gst_input_selector_init),
(gst_input_selector_dispose), (gst_segment_set_start),
(gst_input_selector_set_active_pad),
(gst_input_selector_set_property),
(gst_input_selector_get_property),
(gst_input_selector_get_linked_pad),
(gst_input_selector_is_active_sinkpad),
(gst_input_selector_activate_sinkpad),
(gst_input_selector_request_new_pad),
(gst_input_selector_release_pad),
(gst_input_selector_change_state), (gst_input_selector_block),
(gst_input_selector_switch):
* plugins/elements/gstinputselector.h:
Figure out the locking a bit more.
Mark buffers with discont after switching.
Fix initial segment forwarding, make sure to only forward one segment
regardless of what the sequence of buffers/segments is. See #522203.
Improve flushing when blocked.
Return NOT_LINKED when a stream is not selected.
Not API change for the switch signal in the docs.
Fix start/time/accum values of the new segment.
Correctly unlock and flush a blocking selector when going to READY.
2008-03-20 16:48:46 +00:00
|
|
|
GST_INPUT_SELECTOR_UNLOCK (self);
|
2008-01-29 07:38:31 +00:00
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|