X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=plugins%2Felements%2Fgstinputselector.c;h=25b4e7f61fcd707a2a7df9fa3e94f5996cabe6fc;hb=abeb5e677f756eb940954d0f0c27285ab97cdd23;hp=62a5aaa16ace06d985dfdccbb1e09a6cbb409d5a;hpb=cd3875857e8f3f4ced1ad598e780a85c9dc81108;p=platform%2Fupstream%2Fgstreamer.git
diff --git a/plugins/elements/gstinputselector.c b/plugins/elements/gstinputselector.c
index 62a5aaa..25b4e7f 100644
--- a/plugins/elements/gstinputselector.c
+++ b/plugins/elements/gstinputselector.c
@@ -19,12 +19,13 @@
*
* 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.
+ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
*/
/**
* SECTION:element-input-selector
+ * @title: input-selector
* @see_also: #GstOutputSelector
*
* Direct one out of N input streams to the output pad.
@@ -32,23 +33,12 @@
* The input pads are from a GstPad subclass and have additional
* properties, which users may find useful, namely:
*
- *
- *
- * "running-time": Running time of stream on pad (#gint64)
- *
- *
- * "tags": The currently active tags on the pad (#GstTagList, boxed type)
- *
- *
- * "active": If the pad is currently active (#gboolean)
- *
- *
- * "always-ok" : Make an inactive pads return #GST_FLOW_OK instead of
+ * * "running-time": Running time of stream on pad (#gint64)
+ * * "tags": The currently active tags on the pad (#GstTagList, boxed type)
+ * * "active": If the pad is currently active (#gboolean)
+ * * "always-ok" : Make an inactive pads return #GST_FLOW_OK instead of
* #GST_FLOW_NOT_LINKED
- *
- *
*
- * Since: 0.10.32
*/
#ifdef HAVE_CONFIG_H
@@ -59,11 +49,38 @@
#include "gstinputselector.h"
-#include "gst/glib-compat-private.h"
+#define DEBUG_CACHED_BUFFERS 0
GST_DEBUG_CATEGORY_STATIC (input_selector_debug);
#define GST_CAT_DEFAULT input_selector_debug
+#define GST_TYPE_INPUT_SELECTOR_SYNC_MODE (gst_input_selector_sync_mode_get_type())
+static GType
+gst_input_selector_sync_mode_get_type (void)
+{
+ static GType type = 0;
+ static const GEnumValue data[] = {
+ {GST_INPUT_SELECTOR_SYNC_MODE_ACTIVE_SEGMENT,
+ "Sync using the current active segment",
+ "active-segment"},
+ {GST_INPUT_SELECTOR_SYNC_MODE_CLOCK, "Sync using the clock", "clock"},
+ {0, NULL, NULL},
+ };
+
+ if (!type) {
+ type = g_enum_register_static ("GstInputSelectorSyncMode", data);
+ }
+ return type;
+}
+
+#define GST_INPUT_SELECTOR_GET_LOCK(sel) (&((GstInputSelector*)(sel))->lock)
+#define GST_INPUT_SELECTOR_GET_COND(sel) (&((GstInputSelector*)(sel))->cond)
+#define GST_INPUT_SELECTOR_LOCK(sel) (g_mutex_lock (GST_INPUT_SELECTOR_GET_LOCK(sel)))
+#define GST_INPUT_SELECTOR_UNLOCK(sel) (g_mutex_unlock (GST_INPUT_SELECTOR_GET_LOCK(sel)))
+#define GST_INPUT_SELECTOR_WAIT(sel) (g_cond_wait (GST_INPUT_SELECTOR_GET_COND(sel), \
+ GST_INPUT_SELECTOR_GET_LOCK(sel)))
+#define GST_INPUT_SELECTOR_BROADCAST(sel) (g_cond_broadcast (GST_INPUT_SELECTOR_GET_COND(sel)))
+
static GstStaticPadTemplate gst_input_selector_sink_factory =
GST_STATIC_PAD_TEMPLATE ("sink_%u",
GST_PAD_SINK,
@@ -81,11 +98,14 @@ enum
PROP_0,
PROP_N_PADS,
PROP_ACTIVE_PAD,
- PROP_SYNC_STREAMS
+ PROP_SYNC_STREAMS,
+ PROP_SYNC_MODE,
+ PROP_CACHE_BUFFERS
};
#define DEFAULT_SYNC_STREAMS TRUE
-
+#define DEFAULT_SYNC_MODE GST_INPUT_SELECTOR_SYNC_MODE_ACTIVE_SEGMENT
+#define DEFAULT_CACHE_BUFFERS FALSE
#define DEFAULT_PAD_ALWAYS_OK TRUE
enum
@@ -97,19 +117,11 @@ enum
PROP_PAD_ALWAYS_OK
};
-enum
-{
- /* methods */
- SIGNAL_BLOCK,
- SIGNAL_SWITCH,
- LAST_SIGNAL
-};
-static guint gst_input_selector_signals[LAST_SIGNAL] = { 0 };
-
+static void gst_input_selector_active_pad_changed (GstInputSelector * sel,
+ GParamSpec * pspec, gpointer user_data);
static inline gboolean gst_input_selector_is_active_sinkpad (GstInputSelector *
sel, GstPad * pad);
-static GstPad *gst_input_selector_activate_sinkpad (GstInputSelector * sel,
- GstPad * pad);
+static GstPad *gst_input_selector_get_active_sinkpad (GstInputSelector * sel);
static GstPad *gst_input_selector_get_linked_pad (GstInputSelector * sel,
GstPad * pad, gboolean strict);
@@ -128,13 +140,16 @@ static GstPad *gst_input_selector_get_linked_pad (GstInputSelector * sel,
typedef struct _GstSelectorPad GstSelectorPad;
typedef struct _GstSelectorPadClass GstSelectorPadClass;
+typedef struct _GstSelectorPadCachedBuffer GstSelectorPadCachedBuffer;
struct _GstSelectorPad
{
GstPad parent;
- gboolean active; /* when buffer have passed the pad */
gboolean pushed; /* when buffer was pushed downstream since activation */
+ guint group_id; /* Group ID from the last stream-start */
+ gboolean group_done; /* when Stream Group Done has been
+ received */
gboolean eos; /* when EOS has been received */
gboolean eos_sent; /* when EOS was sent downstream */
gboolean discont; /* after switching we create a discont */
@@ -142,11 +157,19 @@ struct _GstSelectorPad
gboolean always_ok;
GstTagList *tags; /* last tags received on the pad */
- 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 */
gboolean events_pending; /* TRUE if sticky events need to be updated */
+
+ gboolean sending_cached_buffers;
+ GQueue *cached_buffers;
+};
+
+struct _GstSelectorPadCachedBuffer
+{
+ GstBuffer *buffer;
+ GstSegment segment;
};
struct _GstSelectorPadClass
@@ -171,6 +194,9 @@ static GstIterator *gst_selector_pad_iterate_linked_pads (GstPad * pad,
GstObject * parent);
static GstFlowReturn gst_selector_pad_chain (GstPad * pad, GstObject * parent,
GstBuffer * buf);
+static void gst_selector_pad_cache_buffer (GstSelectorPad * selpad,
+ GstBuffer * buffer);
+static void gst_selector_pad_free_cached_buffers (GstSelectorPad * selpad);
G_DEFINE_TYPE (GstSelectorPad, gst_selector_pad, GST_TYPE_PAD);
@@ -221,6 +247,7 @@ gst_selector_pad_finalize (GObject * object)
if (pad->tags)
gst_tag_list_unref (pad->tags);
+ gst_selector_pad_free_cached_buffers (pad);
G_OBJECT_CLASS (gst_selector_pad_parent_class)->finalize (object);
}
@@ -263,9 +290,13 @@ gst_selector_pad_get_property (GObject * object, guint prop_id,
GstInputSelector *sel;
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);
+ if (sel) {
+ g_value_set_boolean (value, gst_input_selector_is_active_sinkpad (sel,
+ GST_PAD_CAST (spad)));
+ gst_object_unref (sel);
+ } else {
+ g_value_set_boolean (value, FALSE);
+ }
break;
}
case PROP_PAD_ALWAYS_OK:
@@ -285,36 +316,86 @@ gst_selector_pad_get_running_time (GstSelectorPad * pad)
gint64 ret = 0;
GST_OBJECT_LOCK (pad);
- if (pad->active) {
- guint64 position = pad->position;
- GstFormat format = pad->segment.format;
-
- ret = gst_segment_to_running_time (&pad->segment, format, position);
+ if (pad->segment.format == GST_FORMAT_TIME) {
+ ret =
+ gst_segment_to_running_time (&pad->segment, pad->segment.format,
+ pad->segment.position);
}
GST_OBJECT_UNLOCK (pad);
- GST_DEBUG_OBJECT (pad, "running time: %" GST_TIME_FORMAT,
- GST_TIME_ARGS (ret));
+ GST_DEBUG_OBJECT (pad, "running time: %" GST_TIME_FORMAT
+ " segment: %" GST_SEGMENT_FORMAT, GST_TIME_ARGS (ret), &pad->segment);
return ret;
}
+/* must be called with the SELECTOR_LOCK */
static void
gst_selector_pad_reset (GstSelectorPad * pad)
{
GST_OBJECT_LOCK (pad);
- pad->active = FALSE;
pad->pushed = FALSE;
+ pad->group_done = FALSE;
pad->eos = FALSE;
pad->eos_sent = FALSE;
pad->events_pending = FALSE;
pad->discont = FALSE;
pad->flushing = FALSE;
- pad->position = GST_CLOCK_TIME_NONE;
gst_segment_init (&pad->segment, GST_FORMAT_UNDEFINED);
+ pad->sending_cached_buffers = FALSE;
+ gst_selector_pad_free_cached_buffers (pad);
GST_OBJECT_UNLOCK (pad);
}
+static GstSelectorPadCachedBuffer *
+gst_selector_pad_new_cached_buffer (GstSelectorPad * selpad, GstBuffer * buffer)
+{
+ GstSelectorPadCachedBuffer *cached_buffer =
+ g_slice_new (GstSelectorPadCachedBuffer);
+ cached_buffer->buffer = buffer;
+ cached_buffer->segment = selpad->segment;
+ return cached_buffer;
+}
+
+static void
+gst_selector_pad_free_cached_buffer (GstSelectorPadCachedBuffer * cached_buffer)
+{
+ if (cached_buffer->buffer)
+ gst_buffer_unref (cached_buffer->buffer);
+ g_slice_free (GstSelectorPadCachedBuffer, cached_buffer);
+}
+
+/* must be called with the SELECTOR_LOCK */
+static void
+gst_selector_pad_cache_buffer (GstSelectorPad * selpad, GstBuffer * buffer)
+{
+ if (selpad->segment.format != GST_FORMAT_TIME) {
+ GST_DEBUG_OBJECT (selpad, "Buffer %p with segment not in time format, "
+ "not caching", buffer);
+ gst_buffer_unref (buffer);
+ return;
+ }
+
+ GST_DEBUG_OBJECT (selpad, "Caching buffer %p", buffer);
+ if (!selpad->cached_buffers)
+ selpad->cached_buffers = g_queue_new ();
+ g_queue_push_tail (selpad->cached_buffers,
+ gst_selector_pad_new_cached_buffer (selpad, buffer));
+}
+
+/* must be called with the SELECTOR_LOCK */
+static void
+gst_selector_pad_free_cached_buffers (GstSelectorPad * selpad)
+{
+ if (!selpad->cached_buffers)
+ return;
+
+ GST_DEBUG_OBJECT (selpad, "Freeing cached buffers");
+ g_queue_free_full (selpad->cached_buffers,
+ (GDestroyNotify) gst_selector_pad_free_cached_buffer);
+ selpad->cached_buffers = NULL;
+}
+
/* strictly get the linked pad from the sinkpad. If the pad is active we return
* the srcpad else we return NULL */
static GstIterator *
@@ -340,10 +421,97 @@ gst_selector_pad_iterate_linked_pads (GstPad * pad, GstObject * parent)
}
static gboolean
+forward_sticky_events (GstPad * sinkpad, GstEvent ** event, gpointer user_data)
+{
+ GstInputSelector *sel = GST_INPUT_SELECTOR (user_data);
+
+ GST_DEBUG_OBJECT (sinkpad, "forward sticky event %" GST_PTR_FORMAT, *event);
+
+ if (GST_EVENT_TYPE (*event) == GST_EVENT_SEGMENT) {
+ GstSegment *seg = &GST_SELECTOR_PAD (sinkpad)->segment;
+ GstEvent *e;
+
+ e = gst_event_new_segment (seg);
+ gst_event_set_seqnum (e, GST_SELECTOR_PAD_CAST (sinkpad)->segment_seqnum);
+
+ gst_pad_push_event (sel->srcpad, e);
+ } else if (GST_EVENT_TYPE (*event) == GST_EVENT_STREAM_START
+ && !sel->have_group_id) {
+ GstEvent *tmp =
+ gst_pad_get_sticky_event (sel->srcpad, GST_EVENT_STREAM_START, 0);
+
+ /* Only push stream-start once if not all our streams have a stream-id */
+ if (!tmp) {
+ gst_pad_push_event (sel->srcpad, gst_event_ref (*event));
+ } else {
+ gst_event_unref (tmp);
+ }
+ } else {
+ gst_pad_push_event (sel->srcpad, gst_event_ref (*event));
+ }
+
+ return TRUE;
+}
+
+static gboolean
+gst_input_selector_eos_wait (GstInputSelector * self, GstSelectorPad * pad,
+ GstEvent * eos_event)
+{
+ while (!self->eos && !self->flushing && !pad->flushing) {
+ GstPad *active_sinkpad;
+ active_sinkpad = gst_input_selector_get_active_sinkpad (self);
+ if (pad == GST_SELECTOR_PAD_CAST (active_sinkpad) && pad->eos
+ && !pad->eos_sent) {
+ GST_DEBUG_OBJECT (pad, "send EOS event");
+ GST_INPUT_SELECTOR_UNLOCK (self);
+ /* if we have a pending events, push them now */
+ if (pad->events_pending) {
+ gst_pad_sticky_events_foreach (GST_PAD_CAST (pad),
+ forward_sticky_events, self);
+ pad->events_pending = FALSE;
+ }
+
+ gst_pad_push_event (self->srcpad, gst_event_ref (eos_event));
+ GST_INPUT_SELECTOR_LOCK (self);
+ /* Wake up other pads so they can continue when syncing to
+ * running time, as this pad just switched to EOS and
+ * may enable others to progress */
+ GST_INPUT_SELECTOR_BROADCAST (self);
+ pad->eos_sent = TRUE;
+ } else {
+ /* we can be unlocked here when we are shutting down (flushing) or when we
+ * get unblocked */
+ GST_INPUT_SELECTOR_WAIT (self);
+ }
+ }
+
+ return self->flushing;
+}
+
+static gboolean
+gst_input_selector_all_eos (GstInputSelector * sel)
+{
+ GList *walk;
+
+ for (walk = GST_ELEMENT_CAST (sel)->sinkpads; walk; walk = walk->next) {
+ GstSelectorPad *selpad;
+
+ selpad = GST_SELECTOR_PAD_CAST (walk->data);
+ if (!selpad->eos) {
+ return FALSE;
+ }
+
+ }
+
+ return TRUE;
+}
+
+static gboolean
gst_selector_pad_event (GstPad * pad, GstObject * parent, GstEvent * event)
{
gboolean res = TRUE;
gboolean forward;
+ gboolean new_tags = FALSE;
GstInputSelector *sel;
GstSelectorPad *selpad;
GstPad *prev_active_sinkpad;
@@ -351,58 +519,56 @@ gst_selector_pad_event (GstPad * pad, GstObject * parent, GstEvent * event)
sel = GST_INPUT_SELECTOR (parent);
selpad = GST_SELECTOR_PAD_CAST (pad);
+ GST_DEBUG_OBJECT (selpad, "received event %" GST_PTR_FORMAT, event);
GST_INPUT_SELECTOR_LOCK (sel);
- prev_active_sinkpad = sel->active_sinkpad;
- active_sinkpad = gst_input_selector_activate_sinkpad (sel, pad);
-
- /* only forward if we are dealing with the active sinkpad */
- forward = (pad == active_sinkpad);
+ prev_active_sinkpad =
+ sel->active_sinkpad ? gst_object_ref (sel->active_sinkpad) : NULL;
+ active_sinkpad = gst_input_selector_get_active_sinkpad (sel);
+ gst_object_ref (active_sinkpad);
GST_INPUT_SELECTOR_UNLOCK (sel);
- if (prev_active_sinkpad != active_sinkpad && pad == active_sinkpad) {
+ if (prev_active_sinkpad != active_sinkpad) {
+ if (prev_active_sinkpad)
+ g_object_notify (G_OBJECT (prev_active_sinkpad), "active");
+ g_object_notify (G_OBJECT (active_sinkpad), "active");
g_object_notify (G_OBJECT (sel), "active-pad");
}
+ if (prev_active_sinkpad)
+ gst_object_unref (prev_active_sinkpad);
+ gst_object_unref (active_sinkpad);
+
+ GST_INPUT_SELECTOR_LOCK (sel);
+ active_sinkpad = gst_input_selector_get_active_sinkpad (sel);
+
+ /* only forward if we are dealing with the active sinkpad */
+ forward = (pad == active_sinkpad);
switch (GST_EVENT_TYPE (event)) {
+ case GST_EVENT_STREAM_START:{
+ if (!gst_event_parse_group_id (event, &selpad->group_id)) {
+ sel->have_group_id = FALSE;
+ selpad->group_id = 0;
+ }
+ break;
+ }
case GST_EVENT_FLUSH_START:
/* Unblock the pad if it's waiting */
- GST_INPUT_SELECTOR_LOCK (sel);
selpad->flushing = TRUE;
+ sel->eos = FALSE;
+ selpad->group_done = FALSE;
GST_INPUT_SELECTOR_BROADCAST (sel);
- GST_INPUT_SELECTOR_UNLOCK (sel);
break;
case GST_EVENT_FLUSH_STOP:
- GST_INPUT_SELECTOR_LOCK (sel);
gst_selector_pad_reset (selpad);
- GST_INPUT_SELECTOR_UNLOCK (sel);
break;
case GST_EVENT_SEGMENT:
{
- GST_INPUT_SELECTOR_LOCK (sel);
- GST_OBJECT_LOCK (selpad);
gst_event_copy_segment (event, &selpad->segment);
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);
- }
- }
GST_DEBUG_OBJECT (pad, "configured SEGMENT %" GST_SEGMENT_FORMAT,
&selpad->segment);
-
- GST_OBJECT_UNLOCK (selpad);
- GST_INPUT_SELECTOR_UNLOCK (sel);
break;
}
case GST_EVENT_TAG:
@@ -416,40 +582,62 @@ gst_selector_pad_event (GstPad * pad, GstObject * parent, GstEvent * event)
newtags = gst_tag_list_merge (oldtags, tags, GST_TAG_MERGE_REPLACE);
selpad->tags = newtags;
+ GST_OBJECT_UNLOCK (selpad);
+
if (oldtags)
gst_tag_list_unref (oldtags);
GST_DEBUG_OBJECT (pad, "received tags %" GST_PTR_FORMAT, newtags);
- GST_OBJECT_UNLOCK (selpad);
- g_object_notify (G_OBJECT (selpad), "tags");
+ new_tags = TRUE;
break;
}
case GST_EVENT_EOS:
selpad->eos = TRUE;
-
- if (forward) {
- selpad->eos_sent = TRUE;
+ GST_DEBUG_OBJECT (pad, "received EOS");
+ if (gst_input_selector_all_eos (sel)) {
+ GST_DEBUG_OBJECT (pad, "All sink pad received EOS");
+ sel->eos = TRUE;
+ GST_INPUT_SELECTOR_BROADCAST (sel);
} 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);
+ gst_input_selector_eos_wait (sel, selpad, event);
+ forward = FALSE;
}
- GST_DEBUG_OBJECT (pad, "received EOS");
break;
+ case GST_EVENT_GAP:{
+ GstClockTime ts, dur;
+
+ GST_DEBUG_OBJECT (pad, "Received gap event: %" GST_PTR_FORMAT, event);
+
+ gst_event_parse_gap (event, &ts, &dur);
+ if (GST_CLOCK_TIME_IS_VALID (ts)) {
+ if (GST_CLOCK_TIME_IS_VALID (dur))
+ ts += dur;
+
+ /* update the segment position */
+ GST_OBJECT_LOCK (pad);
+ selpad->segment.position = ts;
+ GST_OBJECT_UNLOCK (pad);
+ if (sel->sync_streams && active_sinkpad == pad)
+ GST_INPUT_SELECTOR_BROADCAST (sel);
+ }
+
+ }
+ break;
+ case GST_EVENT_STREAM_GROUP_DONE:{
+ GST_DEBUG_OBJECT (sel, "Stream group-done in inputselector pad %s",
+ GST_OBJECT_NAME (selpad));
+ gst_event_parse_stream_group_done (event, &selpad->group_id);
+ selpad->group_done = TRUE;
+ if (sel->sync_streams && active_sinkpad == pad)
+ GST_INPUT_SELECTOR_BROADCAST (sel);
+ break;
+ }
default:
break;
}
+ GST_INPUT_SELECTOR_UNLOCK (sel);
+ if (new_tags)
+ g_object_notify (G_OBJECT (selpad), "tags");
if (forward) {
GST_DEBUG_OBJECT (pad, "forwarding event");
res = gst_pad_push_event (sel->srcpad, event);
@@ -472,146 +660,326 @@ static gboolean
gst_selector_pad_query (GstPad * pad, GstObject * parent, GstQuery * query)
{
gboolean res = FALSE;
+ GstInputSelector *self = (GstInputSelector *) parent;
switch (GST_QUERY_TYPE (query)) {
+ case GST_QUERY_CAPS:
+ case GST_QUERY_POSITION:
+ case GST_QUERY_DURATION:
+ case GST_QUERY_CONTEXT:
+ /* always proxy caps/position/duration/context queries, regardless of active pad or not
+ * See https://bugzilla.gnome.org/show_bug.cgi?id=775445 */
+ res = gst_pad_peer_query (self->srcpad, query);
+ break;
+ case GST_QUERY_ALLOCATION:{
+ GstPad *active_sinkpad;
+ GstInputSelector *sel = GST_INPUT_SELECTOR (parent);
+
+ /* Only do the allocation query for the active sinkpad,
+ * after switching a reconfigure event is sent and upstream
+ * should reconfigure and do a new allocation query
+ */
+ if (GST_PAD_DIRECTION (pad) == GST_PAD_SINK) {
+ GST_INPUT_SELECTOR_LOCK (sel);
+ active_sinkpad = gst_input_selector_get_active_sinkpad (sel);
+ GST_INPUT_SELECTOR_UNLOCK (sel);
+
+ if (pad != active_sinkpad) {
+ res = FALSE;
+ goto done;
+ }
+ }
+ }
+ /* fall through */
default:
res = gst_pad_query_default (pad, parent, query);
break;
}
+done:
return res;
}
-/* must be called with the SELECTOR_LOCK, will block while the pad is blocked
- * or return TRUE when flushing */
-static gboolean
-gst_input_selector_wait (GstInputSelector * self, GstSelectorPad * pad)
+static GstClockTime
+gst_input_selector_get_clipped_running_time (GstSegment * seg, GstBuffer * buf)
{
- while (self->blocked && !self->flushing && !pad->flushing) {
- /* we can be unlocked here when we are shutting down (flushing) or when we
- * get unblocked */
- GST_INPUT_SELECTOR_WAIT (self);
+ GstClockTime running_time;
+
+ running_time = GST_BUFFER_PTS (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);
+ /* Only use the segment to convert to running time if the segment is
+ * in TIME format, otherwise do our best to try to sync */
+ if (GST_CLOCK_TIME_IS_VALID (seg->stop)) {
+ if (running_time > seg->stop) {
+ running_time = seg->stop;
+ }
}
- return self->flushing;
+ return gst_segment_to_running_time (seg, GST_FORMAT_TIME, running_time);
}
-/* must be called with the SELECTOR_LOCK, will block until the running time
+/* must be called without the SELECTOR_LOCK, will wait 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)
+ GstSelectorPad * selpad, GstBuffer * buf)
{
- GstPad *active_sinkpad;
- GstSelectorPad *active_selpad;
- GstSegment *seg, *active_seg;
- GstClockTime running_time, active_running_time = GST_CLOCK_TIME_NONE;
-
- 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;
+ GstSegment *seg;
- /* If we have no valid timestamp we can't sync this buffer */
- if (!GST_BUFFER_TIMESTAMP_IS_VALID (buf))
- return FALSE;
+ GST_DEBUG_OBJECT (selpad, "entering wait for buffer %p", buf);
- 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)
+ /* If we have no valid timestamp we can't sync this buffer */
+ if (!GST_BUFFER_PTS_IS_VALID (buf)) {
+ GST_DEBUG_OBJECT (selpad, "leaving wait for buffer with "
+ "invalid timestamp");
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,
- active_selpad->position);
+ seg = &selpad->segment;
/* 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
- * f) the active pad changed and has not pushed anything
+ * c) the buffer running time is before the current running time
+ * (either active-seg or clock, depending on sync-mode)
*/
- while (pad != active_selpad && !sel->flushing && !pad->flushing
- && active_selpad->pushed && (sel->blocked || active_running_time == -1
- || 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));
+ GST_INPUT_SELECTOR_LOCK (sel);
+ while (TRUE) {
+ GstPad *active_sinkpad;
+ GstSelectorPad *active_selpad;
+ GstClock *clock;
+ gint64 cur_running_time;
+ GstClockTime running_time;
+
+ active_sinkpad = gst_input_selector_get_active_sinkpad (sel);
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;
+ if (seg->format != GST_FORMAT_TIME) {
+ GST_DEBUG_OBJECT (selpad,
+ "Not waiting because we don't have a TIME segment");
+ GST_INPUT_SELECTOR_UNLOCK (sel);
+ return FALSE;
+ }
- /* 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,
- active_selpad->position);
- else
- active_running_time = -1;
+ running_time = gst_input_selector_get_clipped_running_time (seg, buf);
+ /* If this is outside the segment don't sync */
+ if (running_time == -1) {
+ GST_DEBUG_OBJECT (selpad,
+ "Not waiting because buffer is outside segment");
+ GST_INPUT_SELECTOR_UNLOCK (sel);
+ return FALSE;
+ }
- 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));
+ cur_running_time = GST_CLOCK_TIME_NONE;
+ if (sel->sync_mode == GST_INPUT_SELECTOR_SYNC_MODE_CLOCK) {
+ clock = gst_element_get_clock (GST_ELEMENT_CAST (sel));
+ if (clock) {
+ GstClockTime base_time;
+ cur_running_time = gst_clock_get_time (clock);
+ base_time = gst_element_get_base_time (GST_ELEMENT_CAST (sel));
+ if (base_time <= cur_running_time)
+ cur_running_time -= base_time;
+ else
+ cur_running_time = 0;
+
+ gst_object_unref (clock);
+ }
+ } else {
+ GstSegment *active_seg;
+
+ 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)) {
+ GST_DEBUG_OBJECT (selpad,
+ "Not waiting because active segment isn't in TIME format");
+ GST_INPUT_SELECTOR_UNLOCK (sel);
+ return FALSE;
+ }
+
+ /* Get active pad's running time, if no configured segment yet keep at -1 */
+ if (active_seg->format == GST_FORMAT_TIME)
+ cur_running_time = gst_segment_to_running_time (active_seg,
+ GST_FORMAT_TIME, active_seg->position);
+ }
+
+ /* Don't wait if the group is finished on the active pad,
+ * as the running time won't progress now */
+ if (selpad != active_selpad && active_selpad->group_done &&
+ selpad->group_id == active_selpad->group_id) {
+ GST_DEBUG_OBJECT (selpad, "Active pad received group-done. Unblocking");
+ GST_INPUT_SELECTOR_UNLOCK (sel);
+ break;
+ }
+
+ if (selpad != active_selpad && !sel->eos && !sel->flushing
+ && !selpad->flushing && (cur_running_time == GST_CLOCK_TIME_NONE
+ || running_time >= cur_running_time)) {
+ GST_DEBUG_OBJECT (selpad,
+ "Waiting for active streams to advance. %" GST_TIME_FORMAT " >= %"
+ GST_TIME_FORMAT, GST_TIME_ARGS (running_time),
+ GST_TIME_ARGS (cur_running_time));
+ GST_INPUT_SELECTOR_WAIT (sel);
+ } else {
+ GST_INPUT_SELECTOR_UNLOCK (sel);
+ break;
+ }
}
/* Return TRUE if the selector or the pad is flushing */
- return (sel->flushing || pad->flushing);
+ return (sel->flushing || selpad->flushing);
}
-static gboolean
-forward_sticky_events (GstPad * sinkpad, GstEvent ** event, gpointer user_data)
+#if DEBUG_CACHED_BUFFERS
+static void
+gst_input_selector_debug_cached_buffers (GstInputSelector * sel)
{
- GstInputSelector *sel = GST_INPUT_SELECTOR (user_data);
+ GList *walk;
- if (GST_EVENT_TYPE (*event) == GST_EVENT_SEGMENT) {
- GstSegment *seg = &GST_SELECTOR_PAD (sinkpad)->segment;
- GstEvent *e;
+ if (gst_debug_category_get_threshold (input_selector_debug) < GST_LEVEL_DEBUG)
+ return;
- e = gst_event_new_segment (seg);
- gst_event_set_seqnum (e, GST_SELECTOR_PAD_CAST (sinkpad)->segment_seqnum);
+ for (walk = GST_ELEMENT_CAST (sel)->sinkpads; walk; walk = walk->next) {
+ GstSelectorPad *selpad;
+ GString *timestamps;
+ GList *l;
- gst_pad_push_event (sel->srcpad, e);
+ selpad = GST_SELECTOR_PAD_CAST (walk->data);
+ if (!selpad->cached_buffers) {
+ GST_DEBUG_OBJECT (selpad, "Cached buffers timestamps: ");
+ continue;
+ }
+
+ timestamps = g_string_new ("Cached buffers timestamps:");
+ for (l = selpad->cached_buffers->head; l != NULL; l = l->next) {
+ GstSelectorPadCachedBuffer *cached_buffer = l->data;
+
+ g_string_append_printf (timestamps, " %" GST_TIME_FORMAT,
+ GST_TIME_ARGS (GST_BUFFER_PTS (cached_buffer->buffer)));
+ }
+ GST_DEBUG_OBJECT (selpad, "%s", timestamps->str);
+ g_string_free (timestamps, TRUE);
+ }
+}
+#endif
+
+/* must be called with the SELECTOR_LOCK */
+static void
+gst_input_selector_cleanup_old_cached_buffers (GstInputSelector * sel,
+ GstPad * pad)
+{
+ GstClock *clock;
+ gint64 cur_running_time;
+ GList *walk;
+
+ cur_running_time = GST_CLOCK_TIME_NONE;
+ if (sel->sync_mode == GST_INPUT_SELECTOR_SYNC_MODE_CLOCK) {
+ clock = gst_element_get_clock (GST_ELEMENT_CAST (sel));
+ if (clock) {
+ GstClockTime base_time;
+
+ cur_running_time = gst_clock_get_time (clock);
+ base_time = gst_element_get_base_time (GST_ELEMENT_CAST (sel));
+ if (base_time <= cur_running_time)
+ cur_running_time -= base_time;
+ else
+ cur_running_time = 0;
+
+ gst_object_unref (clock);
+ }
} else {
- gst_pad_push_event (sel->srcpad, gst_event_ref (*event));
+ GstPad *active_sinkpad;
+ GstSelectorPad *active_selpad;
+ GstSegment *active_seg;
+
+ active_sinkpad = gst_input_selector_get_active_sinkpad (sel);
+ active_selpad = GST_SELECTOR_PAD_CAST (active_sinkpad);
+ active_seg = &active_selpad->segment;
+
+ /* Get active pad's running time, if no configured segment yet keep at -1 */
+ if (active_seg->format == GST_FORMAT_TIME)
+ cur_running_time = gst_segment_to_running_time (active_seg,
+ GST_FORMAT_TIME, active_seg->position);
}
- return TRUE;
+ if (!GST_CLOCK_TIME_IS_VALID (cur_running_time))
+ return;
+
+ GST_DEBUG_OBJECT (sel, "Cleaning up old cached buffers");
+ for (walk = GST_ELEMENT_CAST (sel)->sinkpads; walk; walk = g_list_next (walk)) {
+ GstSelectorPad *selpad;
+ GstSegment *seg;
+ GstSelectorPadCachedBuffer *cached_buffer;
+ GSList *maybe_remove;
+ guint queue_position;
+
+ selpad = GST_SELECTOR_PAD_CAST (walk->data);
+ if (!selpad->cached_buffers)
+ continue;
+
+ seg = &selpad->segment;
+
+ maybe_remove = NULL;
+ queue_position = 0;
+ while ((cached_buffer = g_queue_peek_nth (selpad->cached_buffers,
+ queue_position))) {
+ GstBuffer *buffer = cached_buffer->buffer;
+ GstClockTime running_time;
+ GSList *l;
+
+ /* If we have no valid timestamp we can't sync this buffer */
+ if (!GST_BUFFER_PTS_IS_VALID (buffer)) {
+ maybe_remove = g_slist_append (maybe_remove, cached_buffer);
+ queue_position = g_slist_length (maybe_remove);
+ continue;
+ }
+
+ /* the buffer is still valid if its duration is valid and the
+ * timestamp + duration is >= time, or if its duration is invalid
+ * and the timestamp is >= time */
+ running_time = gst_input_selector_get_clipped_running_time (seg, buffer);
+ GST_DEBUG_OBJECT (selpad,
+ "checking if buffer %p running time=%" GST_TIME_FORMAT
+ " >= stream time=%" GST_TIME_FORMAT, buffer,
+ GST_TIME_ARGS (running_time), GST_TIME_ARGS (cur_running_time));
+ if (running_time >= cur_running_time) {
+ break;
+ }
+
+ GST_DEBUG_OBJECT (selpad, "Removing old cached buffer %p", buffer);
+ g_queue_pop_nth (selpad->cached_buffers, queue_position);
+ gst_selector_pad_free_cached_buffer (cached_buffer);
+
+ for (l = maybe_remove; l != NULL; l = g_slist_next (l)) {
+ /* A buffer after some invalid buffers was removed, it means the invalid buffers
+ * are old, lets also remove them */
+ cached_buffer = l->data;
+ g_queue_remove (selpad->cached_buffers, cached_buffer);
+ gst_selector_pad_free_cached_buffer (cached_buffer);
+ }
+
+ g_slist_free (maybe_remove);
+ maybe_remove = NULL;
+ queue_position = 0;
+ }
+
+ g_slist_free (maybe_remove);
+ maybe_remove = NULL;
+
+ if (g_queue_is_empty (selpad->cached_buffers)) {
+ g_queue_free (selpad->cached_buffers);
+ selpad->cached_buffers = NULL;
+ }
+ }
+
+#if DEBUG_CACHED_BUFFERS
+ gst_input_selector_debug_cached_buffers (sel);
+#endif
}
static GstFlowReturn
@@ -620,36 +988,91 @@ gst_selector_pad_chain (GstPad * pad, GstObject * parent, GstBuffer * buf)
GstInputSelector *sel;
GstFlowReturn res;
GstPad *active_sinkpad;
- GstPad *prev_active_sinkpad;
+ GstPad *prev_active_sinkpad = NULL;
GstSelectorPad *selpad;
- GstClockTime start_time;
sel = GST_INPUT_SELECTOR (parent);
selpad = GST_SELECTOR_PAD_CAST (pad);
+ GST_DEBUG_OBJECT (selpad,
+ "entering chain for buf %p with timestamp %" GST_TIME_FORMAT, buf,
+ GST_TIME_ARGS (GST_BUFFER_PTS (buf)));
+
GST_INPUT_SELECTOR_LOCK (sel);
- /* wait or check for flushing */
- if (gst_input_selector_wait (sel, selpad))
+
+ if (sel->flushing) {
+ GST_INPUT_SELECTOR_UNLOCK (sel);
goto flushing;
+ }
GST_LOG_OBJECT (pad, "getting active pad");
- prev_active_sinkpad = sel->active_sinkpad;
- active_sinkpad = gst_input_selector_activate_sinkpad (sel, pad);
+ prev_active_sinkpad =
+ sel->active_sinkpad ? gst_object_ref (sel->active_sinkpad) : NULL;
+ active_sinkpad = gst_input_selector_get_active_sinkpad (sel);
/* 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;
- }
+ if (sel->sync_streams) {
+ /* call chain for each cached buffer if we are not the active pad
+ * or if we are the active pad but didn't push anything yet. */
+ if (active_sinkpad != pad || !selpad->pushed) {
+ /* no need to check for sel->cache_buffers as selpad->cached_buffers
+ * will only be valid if cache_buffers is TRUE */
+ if (selpad->cached_buffers && !selpad->sending_cached_buffers) {
+ GstSelectorPadCachedBuffer *cached_buffer;
+ GstSegment saved_segment;
+
+ saved_segment = selpad->segment;
+
+ selpad->sending_cached_buffers = TRUE;
+ while (!sel->eos && !sel->flushing && !selpad->flushing &&
+ (cached_buffer = g_queue_pop_head (selpad->cached_buffers))) {
+ GST_DEBUG_OBJECT (pad, "Cached buffers found, "
+ "invoking chain for cached buffer %p", cached_buffer->buffer);
+
+ selpad->segment = cached_buffer->segment;
+ selpad->events_pending = TRUE;
+ GST_INPUT_SELECTOR_UNLOCK (sel);
+ gst_selector_pad_chain (pad, parent, cached_buffer->buffer);
+ GST_INPUT_SELECTOR_LOCK (sel);
+
+ /* We just passed the ownership of the buffer to the chain function */
+ cached_buffer->buffer = NULL;
+ gst_selector_pad_free_cached_buffer (cached_buffer);
+
+ /* we may have cleaned up the queue in the meantime because of
+ * old buffers */
+ if (!selpad->cached_buffers) {
+ break;
+ }
+ }
+ selpad->sending_cached_buffers = FALSE;
+
+ /* all cached buffers sent, restore segment for current buffer */
+ selpad->segment = saved_segment;
+ selpad->events_pending = TRUE;
+
+ /* Might have changed while calling chain for cached buffers */
+ active_sinkpad = gst_input_selector_get_active_sinkpad (sel);
+ }
+ }
+
+ if (active_sinkpad != pad) {
+ GST_INPUT_SELECTOR_UNLOCK (sel);
+ if (gst_input_selector_wait_running_time (sel, selpad, buf))
+ goto flushing;
+ GST_INPUT_SELECTOR_LOCK (sel);
+ }
- /* Might have changed while waiting */
- active_sinkpad = gst_input_selector_activate_sinkpad (sel, pad);
+ /* Might have changed while waiting */
+ active_sinkpad = gst_input_selector_get_active_sinkpad (sel);
+ }
/* update the segment on the srcpad */
- start_time = GST_BUFFER_TIMESTAMP (buf);
- if (GST_CLOCK_TIME_IS_VALID (start_time)) {
+ if (GST_BUFFER_PTS_IS_VALID (buf)) {
+ GstClockTime start_time = GST_BUFFER_PTS (buf);
+
GST_LOG_OBJECT (pad, "received start time %" GST_TIME_FORMAT,
GST_TIME_ARGS (start_time));
if (GST_BUFFER_DURATION_IS_VALID (buf))
@@ -657,7 +1080,6 @@ gst_selector_pad_chain (GstPad * pad, GstObject * parent, GstBuffer * buf)
GST_TIME_ARGS (start_time + GST_BUFFER_DURATION (buf)));
GST_OBJECT_LOCK (pad);
- selpad->position = start_time;
selpad->segment.position = start_time;
GST_OBJECT_UNLOCK (pad);
}
@@ -672,7 +1094,10 @@ gst_selector_pad_chain (GstPad * pad, GstObject * parent, GstBuffer * buf)
GST_INPUT_SELECTOR_UNLOCK (sel);
- if (prev_active_sinkpad != active_sinkpad && pad == active_sinkpad) {
+ if (prev_active_sinkpad != active_sinkpad) {
+ if (prev_active_sinkpad)
+ g_object_notify (G_OBJECT (prev_active_sinkpad), "active");
+ g_object_notify (G_OBJECT (active_sinkpad), "active");
g_object_notify (G_OBJECT (sel), "active-pad");
}
@@ -684,6 +1109,11 @@ gst_selector_pad_chain (GstPad * pad, GstObject * parent, GstBuffer * buf)
selpad->events_pending = FALSE;
}
+ if (prev_active_sinkpad) {
+ gst_object_unref (prev_active_sinkpad);
+ prev_active_sinkpad = NULL;
+ }
+
if (selpad->discont) {
buf = gst_buffer_make_writable (buf);
@@ -693,12 +1123,38 @@ gst_selector_pad_chain (GstPad * pad, GstObject * parent, GstBuffer * buf)
}
/* forward */
- GST_LOG_OBJECT (pad, "Forwarding buffer %p", buf);
+ GST_LOG_OBJECT (pad, "Forwarding buffer %p with timestamp %" GST_TIME_FORMAT,
+ buf, GST_TIME_ARGS (GST_BUFFER_PTS (buf)));
+ /* Only make the buffer read-only when necessary */
+ if (sel->sync_streams && sel->cache_buffers)
+ buf = gst_buffer_ref (buf);
res = gst_pad_push (sel->srcpad, buf);
- selpad->pushed = TRUE;
+ GST_LOG_OBJECT (pad, "Buffer %p forwarded result=%d", buf, res);
+
+ GST_INPUT_SELECTOR_LOCK (sel);
+
+ if (sel->sync_streams && sel->cache_buffers) {
+ /* Might have changed while pushing */
+ active_sinkpad = gst_input_selector_get_active_sinkpad (sel);
+ /* only set pad to pushed if we are still the active pad */
+ if (active_sinkpad == pad)
+ selpad->pushed = TRUE;
+
+ /* cache buffer as we may need it again if we change pads */
+ gst_selector_pad_cache_buffer (selpad, buf);
+ gst_input_selector_cleanup_old_cached_buffers (sel, pad);
+ } else {
+ selpad->pushed = TRUE;
+ }
+ GST_INPUT_SELECTOR_UNLOCK (sel);
done:
+
+ if (prev_active_sinkpad)
+ gst_object_unref (prev_active_sinkpad);
+ prev_active_sinkpad = NULL;
+
return res;
/* dropped buffers */
@@ -725,7 +1181,6 @@ ignore:
flushing:
{
GST_DEBUG_OBJECT (pad, "We are flushing, discard buffer %p", buf);
- GST_INPUT_SELECTOR_UNLOCK (sel);
gst_buffer_unref (buf);
res = GST_FLOW_FLUSHING;
goto done;
@@ -751,39 +1206,6 @@ static gboolean gst_input_selector_event (GstPad * pad, GstObject * parent,
GstEvent * event);
static gboolean gst_input_selector_query (GstPad * pad, GstObject * parent,
GstQuery * query);
-static gint64 gst_input_selector_block (GstInputSelector * self);
-
-/* 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);
-}
#define _do_init \
GST_DEBUG_CATEGORY_INIT (input_selector_debug, \
@@ -812,52 +1234,76 @@ gst_input_selector_class_init (GstInputSelectorClass * klass)
g_object_class_install_property (gobject_class, PROP_ACTIVE_PAD,
g_param_spec_object ("active-pad", "Active pad",
"The currently active sink pad", GST_TYPE_PAD,
- G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+ G_PARAM_READWRITE | GST_PARAM_MUTABLE_PLAYING |
+ G_PARAM_STATIC_STRINGS));
/**
* 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.
+ * running time of the active stream or to the current clock.
*
- * Since: 0.10.36
+ * To make sure no buffers are dropped by input-selector
+ * that might be needed when switching the active pad,
+ * sync-mode should be set to "clock" and cache-buffers to TRUE.
*/
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));
+ "Synchronize inactive streams to the running time of the active "
+ "stream or to the current clock",
+ DEFAULT_SYNC_STREAMS,
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS |
+ GST_PARAM_MUTABLE_READY));
+
+ /**
+ * GstInputSelector:sync-mode
+ *
+ * Select how input-selector will sync buffers when in sync-streams mode.
+ *
+ * Note that when using the "active-segment" mode, the "active-segment" may
+ * be ahead of current clock time when switching the active pad, as the current
+ * active pad may have pushed more buffers than what was displayed/consumed,
+ * which may cause delays and some missing buffers.
+ */
+ g_object_class_install_property (gobject_class, PROP_SYNC_MODE,
+ g_param_spec_enum ("sync-mode", "Sync mode",
+ "Behavior in sync-streams mode", GST_TYPE_INPUT_SELECTOR_SYNC_MODE,
+ DEFAULT_SYNC_MODE,
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS |
+ GST_PARAM_MUTABLE_READY));
/**
- * GstInputSelector::block:
- * @inputselector: the #GstInputSelector
+ * GstInputSelector:cache-buffers
+ *
+ * If set to %TRUE and GstInputSelector:sync-streams is also set to %TRUE,
+ * the active pad will cache the buffers still considered valid (after current
+ * running time, see sync-mode) to avoid missing frames if/when the pad is
+ * reactivated.
*
- * 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.
+ * The active pad may push more buffers than what is currently displayed/consumed
+ * and when changing pads those buffers will be discarded and the only way to
+ * reactivate that pad without losing the already consumed buffers is to enable cache.
*/
- gst_input_selector_signals[SIGNAL_BLOCK] =
- g_signal_new ("block", G_TYPE_FROM_CLASS (klass),
- G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
- G_STRUCT_OFFSET (GstInputSelectorClass, block), NULL, NULL,
- gst_input_selector_marshal_INT64__VOID, G_TYPE_INT64, 0);
+ g_object_class_install_property (gobject_class, PROP_CACHE_BUFFERS,
+ g_param_spec_boolean ("cache-buffers", "Cache Buffers",
+ "Cache buffers for active-pad",
+ DEFAULT_CACHE_BUFFERS,
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS |
+ GST_PARAM_MUTABLE_READY));
gst_element_class_set_static_metadata (gstelement_class, "Input selector",
"Generic", "N-to-1 input stream selector",
"Julien Moutte , "
"Jan Schmidt , "
"Wim Taymans ");
- 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));
+ gst_element_class_add_static_pad_template_with_gtype (gstelement_class,
+ &gst_input_selector_sink_factory, GST_TYPE_SELECTOR_PAD);
+ gst_element_class_add_static_pad_template (gstelement_class,
+ &gst_input_selector_src_factory);
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;
-
- klass->block = GST_DEBUG_FUNCPTR (gst_input_selector_block);
}
static void
@@ -866,20 +1312,28 @@ gst_input_selector_init (GstInputSelector * sel)
sel->srcpad = gst_pad_new ("src", GST_PAD_SRC);
gst_pad_set_iterate_internal_links_function (sel->srcpad,
GST_DEBUG_FUNCPTR (gst_selector_pad_iterate_linked_pads));
- gst_pad_set_query_function (sel->srcpad,
- GST_DEBUG_FUNCPTR (gst_input_selector_query));
gst_pad_set_event_function (sel->srcpad,
GST_DEBUG_FUNCPTR (gst_input_selector_event));
+ gst_pad_set_query_function (sel->srcpad,
+ GST_DEBUG_FUNCPTR (gst_input_selector_query));
GST_OBJECT_FLAG_SET (sel->srcpad, GST_PAD_FLAG_PROXY_CAPS);
gst_element_add_pad (GST_ELEMENT (sel), sel->srcpad);
/* sinkpad management */
sel->active_sinkpad = NULL;
sel->padcount = 0;
sel->sync_streams = DEFAULT_SYNC_STREAMS;
+ sel->sync_mode = DEFAULT_SYNC_MODE;
+ sel->have_group_id = TRUE;
g_mutex_init (&sel->lock);
g_cond_init (&sel->cond);
- sel->blocked = FALSE;
+ sel->eos = FALSE;
+
+ /* lets give a change for downstream to do something on
+ * active-pad change before we start pushing new buffers */
+ g_signal_connect_data (sel, "notify::active-pad",
+ (GCallback) gst_input_selector_active_pad_changed, NULL,
+ NULL, G_CONNECT_AFTER);
}
static void
@@ -916,6 +1370,14 @@ gst_input_selector_set_active_pad (GstInputSelector * self, GstPad * pad)
if (pad == self->active_sinkpad)
return FALSE;
+ /* guard against users setting a src pad or foreign pad as active pad */
+ if (pad != NULL) {
+ g_return_val_if_fail (GST_PAD_IS_SINK (pad), FALSE);
+ g_return_val_if_fail (GST_IS_SELECTOR_PAD (pad), FALSE);
+ g_return_val_if_fail (GST_PAD_PARENT (pad) == GST_ELEMENT_CAST (self),
+ FALSE);
+ }
+
old = GST_SELECTOR_PAD_CAST (self->active_sinkpad);
new = GST_SELECTOR_PAD_CAST (pad);
@@ -934,16 +1396,19 @@ gst_input_selector_set_active_pad (GstInputSelector * self, GstPad * pad)
active_pad_p = &self->active_sinkpad;
gst_object_replace ((GstObject **) active_pad_p, GST_OBJECT_CAST (pad));
- gst_pad_push_event (pad, gst_event_new_reconfigure ());
-
- /* 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);
+ if (old && old != new)
+ gst_pad_push_event (GST_PAD_CAST (old), gst_event_new_reconfigure ());
+ if (new)
+ gst_pad_push_event (GST_PAD_CAST (new), gst_event_new_reconfigure ());
GST_DEBUG_OBJECT (self, "New active pad is %" GST_PTR_FORMAT,
self->active_sinkpad);
+ if (old != new && new && new->eos) {
+ new->eos_sent = FALSE;
+ GST_INPUT_SELECTOR_BROADCAST (self);
+ }
+
return TRUE;
}
@@ -961,17 +1426,35 @@ gst_input_selector_set_property (GObject * object, guint prop_id,
pad = g_value_get_object (value);
GST_INPUT_SELECTOR_LOCK (sel);
+
+#if DEBUG_CACHED_BUFFERS
+ gst_input_selector_debug_cached_buffers (sel);
+#endif
+
gst_input_selector_set_active_pad (sel, pad);
+
+#if DEBUG_CACHED_BUFFERS
+ gst_input_selector_debug_cached_buffers (sel);
+#endif
+
GST_INPUT_SELECTOR_UNLOCK (sel);
break;
}
case PROP_SYNC_STREAMS:
- {
GST_INPUT_SELECTOR_LOCK (sel);
sel->sync_streams = g_value_get_boolean (value);
GST_INPUT_SELECTOR_UNLOCK (sel);
break;
- }
+ case PROP_SYNC_MODE:
+ GST_INPUT_SELECTOR_LOCK (sel);
+ sel->sync_mode = g_value_get_enum (value);
+ GST_INPUT_SELECTOR_UNLOCK (sel);
+ break;
+ case PROP_CACHE_BUFFERS:
+ GST_INPUT_SELECTOR_LOCK (object);
+ sel->cache_buffers = g_value_get_boolean (value);
+ GST_INPUT_SELECTOR_UNLOCK (object);
+ break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
@@ -979,6 +1462,16 @@ gst_input_selector_set_property (GObject * object, guint prop_id,
}
static void
+gst_input_selector_active_pad_changed (GstInputSelector * sel,
+ GParamSpec * pspec, gpointer user_data)
+{
+ /* Wake up all non-active pads in sync mode, they might be
+ * the active pad now */
+ if (sel->sync_streams)
+ GST_INPUT_SELECTOR_BROADCAST (sel);
+}
+
+static void
gst_input_selector_get_property (GObject * object, guint prop_id,
GValue * value, GParamSpec * pspec)
{
@@ -1000,6 +1493,16 @@ gst_input_selector_get_property (GObject * object, guint prop_id,
g_value_set_boolean (value, sel->sync_streams);
GST_INPUT_SELECTOR_UNLOCK (object);
break;
+ case PROP_SYNC_MODE:
+ GST_INPUT_SELECTOR_LOCK (object);
+ g_value_set_enum (value, sel->sync_mode);
+ GST_INPUT_SELECTOR_UNLOCK (object);
+ break;
+ case PROP_CACHE_BUFFERS:
+ GST_INPUT_SELECTOR_LOCK (object);
+ g_value_set_boolean (value, sel->cache_buffers);
+ GST_INPUT_SELECTOR_UNLOCK (object);
+ break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
@@ -1082,77 +1585,136 @@ gst_input_selector_event (GstPad * pad, GstObject * parent, GstEvent * event)
return result;
}
-/* query on the srcpad. We override this function because by default it will
- * only forward the query to one random sinkpad */
+typedef struct
+{
+ gboolean live;
+ GstClockTime min, max;
+} LatencyFoldData;
+
static gboolean
-gst_input_selector_query (GstPad * pad, GstObject * parent, GstQuery * query)
+query_latency_default_fold (const GValue * item, GValue * ret,
+ gpointer user_data)
{
+ GstPad *pad = g_value_get_object (item), *peer;
+ LatencyFoldData *fold_data = user_data;
+ GstQuery *query;
gboolean res = FALSE;
- GstInputSelector *sel;
- sel = GST_INPUT_SELECTOR (parent);
+ query = gst_query_new_latency ();
- switch (GST_QUERY_TYPE (query)) {
- case GST_QUERY_LATENCY:
- {
- GList *walk;
- GstClockTime resmin, resmax;
- gboolean reslive;
+ peer = gst_pad_get_peer (pad);
+ if (peer) {
+ res = gst_pad_peer_query (pad, query);
+ } else {
+ GST_LOG_OBJECT (pad, "No peer pad found, ignoring this pad");
+ }
- resmin = 0;
- resmax = -1;
- reslive = FALSE;
+ if (res) {
+ gboolean live;
+ GstClockTime min, max;
- /* 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;
-
- gst_query_parse_latency (query, &live, &min, &max);
-
- 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) {
- gst_query_set_latency (query, reslive, resmin, resmax);
+ gst_query_parse_latency (query, &live, &min, &max);
- 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);
- }
+ GST_LOG_OBJECT (pad, "got latency live:%s min:%" G_GINT64_FORMAT
+ " max:%" G_GINT64_FORMAT, live ? "true" : "false", min, max);
- break;
+ if (live) {
+ if (min > fold_data->min)
+ fold_data->min = min;
+
+ if (fold_data->max == GST_CLOCK_TIME_NONE)
+ fold_data->max = max;
+ else if (max < fold_data->max)
+ fold_data->max = max;
+ fold_data->live = live;
}
+ } else if (peer) {
+ GST_DEBUG_OBJECT (pad, "latency query failed");
+ g_value_set_boolean (ret, FALSE);
+ }
+
+ gst_query_unref (query);
+ if (peer)
+ gst_object_unref (peer);
+
+ return TRUE;
+}
+
+static gboolean
+gst_input_selector_query_latency (GstInputSelector * sel, GstPad * pad,
+ GstQuery * query)
+{
+ GstIterator *it;
+ GstIteratorResult res;
+ GValue ret = G_VALUE_INIT;
+ gboolean query_ret;
+ LatencyFoldData fold_data;
+
+ /* This is basically gst_pad_query_latency_default() but with a different
+ * iterator. We query all sinkpads! */
+ it = gst_element_iterate_sink_pads (GST_ELEMENT_CAST (sel));
+ if (!it) {
+ GST_DEBUG_OBJECT (pad, "Can't iterate internal links");
+ return FALSE;
+ }
+
+ g_value_init (&ret, G_TYPE_BOOLEAN);
+
+retry:
+ fold_data.live = FALSE;
+ fold_data.min = 0;
+ fold_data.max = GST_CLOCK_TIME_NONE;
+
+ g_value_set_boolean (&ret, TRUE);
+ res = gst_iterator_fold (it, query_latency_default_fold, &ret, &fold_data);
+ switch (res) {
+ case GST_ITERATOR_OK:
+ g_assert_not_reached ();
+ break;
+ case GST_ITERATOR_DONE:
+ break;
+ case GST_ITERATOR_ERROR:
+ g_value_set_boolean (&ret, FALSE);
+ break;
+ case GST_ITERATOR_RESYNC:
+ gst_iterator_resync (it);
+ goto retry;
default:
- res = gst_pad_query_default (pad, parent, query);
+ g_assert_not_reached ();
break;
}
+ gst_iterator_free (it);
- return res;
+ query_ret = g_value_get_boolean (&ret);
+ if (query_ret) {
+ GST_LOG_OBJECT (pad, "got latency live:%s min:%" G_GINT64_FORMAT
+ " max:%" G_GINT64_FORMAT, fold_data.live ? "true" : "false",
+ fold_data.min, fold_data.max);
+
+ if (fold_data.min > fold_data.max) {
+ GST_ERROR_OBJECT (pad, "minimum latency bigger than maximum latency");
+ }
+
+ gst_query_set_latency (query, fold_data.live, fold_data.min, fold_data.max);
+ } else {
+ GST_LOG_OBJECT (pad, "latency query failed");
+ }
+
+ return query_ret;
+}
+
+static gboolean
+gst_input_selector_query (GstPad * pad, GstObject * parent, GstQuery * query)
+{
+ GstInputSelector *sel = GST_INPUT_SELECTOR (parent);
+
+ switch (GST_QUERY_TYPE (query)) {
+ case GST_QUERY_LATENCY:
+ /* Query all sink pads for the latency, not just the active one */
+ return gst_input_selector_query_latency (sel, pad, query);
+ default:
+ return gst_pad_query_default (pad, parent, query);
+ }
}
/* check if the pad is the active sinkpad */
@@ -1170,21 +1732,29 @@ gst_input_selector_is_active_sinkpad (GstInputSelector * sel, GstPad * pad)
/* Get or create the active sinkpad, must be called with SELECTOR_LOCK */
static GstPad *
-gst_input_selector_activate_sinkpad (GstInputSelector * sel, GstPad * pad)
+gst_input_selector_get_active_sinkpad (GstInputSelector * sel)
{
GstPad *active_sinkpad;
- GstSelectorPad *selpad;
- selpad = GST_SELECTOR_PAD_CAST (pad);
-
- selpad->active = TRUE;
active_sinkpad = sel->active_sinkpad;
if (active_sinkpad == NULL) {
- /* first pad we get activity on becomes the activated pad by default */
- if (sel->active_sinkpad)
- gst_object_unref (sel->active_sinkpad);
- active_sinkpad = sel->active_sinkpad = gst_object_ref (pad);
- GST_DEBUG_OBJECT (sel, "Activating pad %s:%s", GST_DEBUG_PAD_NAME (pad));
+ GValue item = G_VALUE_INIT;
+ GstIterator *iter = gst_element_iterate_sink_pads (GST_ELEMENT_CAST (sel));
+ GstIteratorResult ires;
+
+ while ((ires = gst_iterator_next (iter, &item)) == GST_ITERATOR_RESYNC)
+ gst_iterator_resync (iter);
+ if (ires == GST_ITERATOR_OK) {
+ /* If no pad is currently selected, we return the first usable pad to
+ * guarantee consistency */
+
+ active_sinkpad = sel->active_sinkpad = g_value_dup_object (&item);
+ g_value_reset (&item);
+ GST_DEBUG_OBJECT (sel, "Activating pad %s:%s",
+ GST_DEBUG_PAD_NAME (active_sinkpad));
+ } else
+ GST_WARNING_OBJECT (sel, "Couldn't find a default sink pad");
+ gst_iterator_free (iter);
}
return active_sinkpad;
@@ -1204,7 +1774,7 @@ gst_input_selector_request_new_pad (GstElement * element,
GST_INPUT_SELECTOR_LOCK (sel);
- GST_LOG_OBJECT (sel, "Creating new pad %d", sel->padcount);
+ GST_LOG_OBJECT (sel, "Creating new pad sink_%u", sel->padcount);
name = g_strdup_printf ("sink_%u", sel->padcount++);
sinkpad = g_object_new (GST_TYPE_SELECTOR_PAD,
"name", name, "direction", templ->direction, "template", templ, NULL);
@@ -1246,10 +1816,10 @@ gst_input_selector_release_pad (GstElement * element, GstPad * pad)
sel->active_sinkpad = NULL;
}
sel->n_pads--;
+ GST_INPUT_SELECTOR_UNLOCK (sel);
gst_pad_set_active (pad, FALSE);
gst_element_remove_pad (GST_ELEMENT (sel), pad);
- GST_INPUT_SELECTOR_UNLOCK (sel);
}
static void
@@ -1263,6 +1833,8 @@ gst_input_selector_reset (GstInputSelector * sel)
gst_object_unref (sel->active_sinkpad);
sel->active_sinkpad = NULL;
}
+ sel->eos_sent = FALSE;
+
/* 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);
@@ -1274,6 +1846,7 @@ gst_input_selector_reset (GstInputSelector * sel)
selpad->tags = NULL;
}
}
+ sel->have_group_id = TRUE;
GST_INPUT_SELECTOR_UNLOCK (sel);
}
@@ -1287,7 +1860,7 @@ gst_input_selector_change_state (GstElement * element,
switch (transition) {
case GST_STATE_CHANGE_READY_TO_PAUSED:
GST_INPUT_SELECTOR_LOCK (self);
- self->blocked = FALSE;
+ self->eos = FALSE;
self->flushing = FALSE;
GST_INPUT_SELECTOR_UNLOCK (self);
break;
@@ -1295,7 +1868,7 @@ gst_input_selector_change_state (GstElement * element,
/* 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->eos = TRUE;
self->flushing = TRUE;
GST_INPUT_SELECTOR_BROADCAST (self);
GST_INPUT_SELECTOR_UNLOCK (self);
@@ -1316,27 +1889,3 @@ gst_input_selector_change_state (GstElement * element,
return result;
}
-
-static gint64
-gst_input_selector_block (GstInputSelector * self)
-{
- gint64 ret = 0;
- GstSelectorPad *spad;
-
- GST_INPUT_SELECTOR_LOCK (self);
-
- if (self->blocked)
- GST_WARNING_OBJECT (self, "switch already blocked");
-
- self->blocked = TRUE;
- spad = GST_SELECTOR_PAD_CAST (self->active_sinkpad);
-
- if (spad)
- ret = gst_selector_pad_get_running_time (spad);
- else
- GST_DEBUG_OBJECT (self, "no active pad while blocking");
-
- GST_INPUT_SELECTOR_UNLOCK (self);
-
- return ret;
-}