mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 05:16:13 +00:00
Code Issues 1 Projects Releases Wiki Activity

Merge branch 'master' into 0.11

Browse source
This commit is contained in:
Wim Taymans 2011-04-07 16:13:56 +02:00
commit 5077630a99
2 changed files with 38 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
docs/random/draft-missing-plugins.txt
View file

@ -1,7 +0,0 @@
This document has moved to gstreamer/docs/design/draft-missing-plugins.txt.
It can be found online at
http://webcvs.freedesktop.org/gstreamer/gstreamer/docs/design/draft-missing-plugins.txt?view=markup
Also see:
http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gst-plugins-base-libs/html/gst-plugins-base-libs-gstbaseutilsinstallplugins.html

62
libs/gst/base/gstbasesrc.c
View file

@ -238,9 +238,10 @@ struct _GstBaseSrcPrivate
/* stream sequence number */ /* stream sequence number */
guint32 seqnum; guint32 seqnum;
/* pending tags to be pushed in the data stream */ /* pending events (TAG, CUSTOM_BOTH, CUSTOM_DOWNSTREAM) to be
GList *pending_tags; * pushed in the data stream */
volatile gint have_tags; GList *pending_events;
volatile gint have_events;
/* QoS *//* with LOCK */ /* QoS *//* with LOCK */
gboolean qos_enabled; gboolean qos_enabled;
@ -438,7 +439,7 @@ gst_base_src_init (GstBaseSrc * basesrc, gpointer g_class)
gst_base_src_set_format (basesrc, GST_FORMAT_BYTES); gst_base_src_set_format (basesrc, GST_FORMAT_BYTES);
basesrc->typefind = DEFAULT_TYPEFIND; basesrc->typefind = DEFAULT_TYPEFIND;
basesrc->priv->do_timestamp = DEFAULT_DO_TIMESTAMP; basesrc->priv->do_timestamp = DEFAULT_DO_TIMESTAMP;
g_atomic_int_set (&basesrc->priv->have_tags, FALSE); g_atomic_int_set (&basesrc->priv->have_events, FALSE);
GST_OBJECT_FLAG_UNSET (basesrc, GST_BASE_SRC_STARTED); GST_OBJECT_FLAG_UNSET (basesrc, GST_BASE_SRC_STARTED);
GST_OBJECT_FLAG_SET (basesrc, GST_ELEMENT_IS_SOURCE); GST_OBJECT_FLAG_SET (basesrc, GST_ELEMENT_IS_SOURCE);
@ -460,9 +461,10 @@ gst_base_src_finalize (GObject * object)
event_p = &basesrc->pending_seek; event_p = &basesrc->pending_seek;
gst_event_replace (event_p, NULL); gst_event_replace (event_p, NULL);
if (basesrc->priv->pending_tags) { if (basesrc->priv->pending_events) {
g_list_foreach (basesrc->priv->pending_tags, (GFunc) gst_event_unref, NULL); g_list_foreach (basesrc->priv->pending_events, (GFunc) gst_event_unref,
g_list_free (basesrc->priv->pending_tags); NULL);
g_list_free (basesrc->priv->pending_events);
} }
G_OBJECT_CLASS (parent_class)->finalize (object); G_OBJECT_CLASS (parent_class)->finalize (object);
@ -1586,10 +1588,13 @@ gst_base_src_send_event (GstElement * element, GstEvent * event)
/* sending random NEWSEGMENT downstream can break sync. */ /* sending random NEWSEGMENT downstream can break sync. */
break; break;
case GST_EVENT_TAG: case GST_EVENT_TAG:
/* Insert tag in the dataflow */ case GST_EVENT_CUSTOM_DOWNSTREAM:
case GST_EVENT_CUSTOM_BOTH:
/* Insert TAG, CUSTOM_DOWNSTREAM, CUSTOM_BOTH in the dataflow */
GST_OBJECT_LOCK (src); GST_OBJECT_LOCK (src);
src->priv->pending_tags = g_list_append (src->priv->pending_tags, event); src->priv->pending_events =
g_atomic_int_set (&src->priv->have_tags, TRUE); g_list_append (src->priv->pending_events, event);
g_atomic_int_set (&src->priv->have_events, TRUE);
GST_OBJECT_UNLOCK (src); GST_OBJECT_UNLOCK (src);
event = NULL; event = NULL;
result = TRUE; result = TRUE;
@ -1644,10 +1649,6 @@ gst_base_src_send_event (GstElement * element, GstEvent * event)
case GST_EVENT_CUSTOM_UPSTREAM: case GST_EVENT_CUSTOM_UPSTREAM:
/* override send_event if you want this */ /* override send_event if you want this */
break; break;
case GST_EVENT_CUSTOM_DOWNSTREAM:
case GST_EVENT_CUSTOM_BOTH:
/* FIXME, insert event in the dataflow */
break;
case GST_EVENT_CUSTOM_DOWNSTREAM_OOB: case GST_EVENT_CUSTOM_DOWNSTREAM_OOB:
case GST_EVENT_CUSTOM_BOTH_OOB: case GST_EVENT_CUSTOM_BOTH_OOB:
/* insert a random custom event into the pipeline */ /* insert a random custom event into the pipeline */
@ -2356,7 +2357,7 @@ gst_base_src_loop (GstPad * pad)
gint64 position; gint64 position;
gboolean eos; gboolean eos;
gulong blocksize; gulong blocksize;
GList *tags = NULL, *tmp; GList *pending_events = NULL, *tmp;
eos = FALSE; eos = FALSE;
@ -2413,22 +2414,22 @@ gst_base_src_loop (GstPad * pad)
} }
src->priv->newsegment_pending = FALSE; src->priv->newsegment_pending = FALSE;
if (g_atomic_int_get (&src->priv->have_tags)) { if (g_atomic_int_get (&src->priv->have_events)) {
GST_OBJECT_LOCK (src); GST_OBJECT_LOCK (src);
/* take the tags */ /* take the events */
tags = src->priv->pending_tags; pending_events = src->priv->pending_events;
src->priv->pending_tags = NULL; src->priv->pending_events = NULL;
g_atomic_int_set (&src->priv->have_tags, FALSE); g_atomic_int_set (&src->priv->have_events, FALSE);
GST_OBJECT_UNLOCK (src); GST_OBJECT_UNLOCK (src);
} }
/* Push out pending tags if any */ /* Push out pending events if any */
if (G_UNLIKELY (tags != NULL)) { if (G_UNLIKELY (pending_events != NULL)) {
for (tmp = tags; tmp; tmp = g_list_next (tmp)) { for (tmp = pending_events; tmp; tmp = g_list_next (tmp)) {
GstEvent *ev = (GstEvent *) tmp->data; GstEvent *ev = (GstEvent *) tmp->data;
gst_pad_push_event (pad, ev); gst_pad_push_event (pad, ev);
} }
g_list_free (tags); g_list_free (pending_events);
} }
/* figure out the new position */ /* figure out the new position */
@ -2853,6 +2854,19 @@ gst_base_src_set_flushing (GstBaseSrc * basesrc,
} else { } else {
/* signal the live source that it can start playing */ /* signal the live source that it can start playing */
basesrc->live_running = live_play; basesrc->live_running = live_play;
/* When unlocking drop all delayed events */
if (unlock) {
GST_OBJECT_LOCK (basesrc);
if (basesrc->priv->pending_events) {
g_list_foreach (basesrc->priv->pending_events, (GFunc) gst_event_unref,
NULL);
g_list_free (basesrc->priv->pending_events);
basesrc->priv->pending_events = NULL;
g_atomic_int_set (&basesrc->priv->have_events, FALSE);
}
GST_OBJECT_UNLOCK (basesrc);
}
} }
GST_LIVE_SIGNAL (basesrc); GST_LIVE_SIGNAL (basesrc);
GST_LIVE_UNLOCK (basesrc); GST_LIVE_UNLOCK (basesrc);