mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 04:01:08 +00:00
Code Issues 1 Projects Releases Wiki Activity

composition: Minor cleanups

Browse source
This commit is contained in:
Thibault Saunier 2014-07-14 17:06:05 +02:00
parent 2660f20cab
commit c81ee05c41
1 changed files with 16 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
gnl/gnlcomposition.c
View file

@ -919,20 +919,20 @@ ghost_event_probe_handler (GstPad * ghostpad G_GNUC_UNUSED,
switch (GST_EVENT_TYPE (event)) { switch (GST_EVENT_TYPE (event)) {
case GST_EVENT_FLUSH_STOP: case GST_EVENT_FLUSH_STOP:
if (gst_event_get_seqnum (event) != comp->priv->flush_seqnum) { if (gst_event_get_seqnum (event) != comp->priv->flush_seqnum) {
GST_ERROR_OBJECT (comp, "Dropping flush stop"); GST_INFO_OBJECT (comp, "Dropping flush stop");
retval = GST_PAD_PROBE_DROP; retval = GST_PAD_PROBE_DROP;
} else { } else {
GST_ERROR_OBJECT (comp, "Forwarding our flush stop with seqnum %i", GST_INFO_OBJECT (comp, "Forwarding our flush stop with seqnum %i",
comp->priv->flush_seqnum); comp->priv->flush_seqnum);
comp->priv->flush_seqnum = 0; comp->priv->flush_seqnum = 0;
} }
break; break;
case GST_EVENT_FLUSH_START: case GST_EVENT_FLUSH_START:
if (gst_event_get_seqnum (event) != comp->priv->flush_seqnum) { if (gst_event_get_seqnum (event) != comp->priv->flush_seqnum) {
GST_ERROR_OBJECT (comp, "Dropping flush start"); GST_INFO_OBJECT (comp, "Dropping flush start");
retval = GST_PAD_PROBE_DROP; retval = GST_PAD_PROBE_DROP;
} else { } else {
GST_ERROR_OBJECT (comp, "Forwarding our flush start with seqnum %i", GST_INFO_OBJECT (comp, "Forwarding our flush start with seqnum %i",
comp->priv->flush_seqnum); comp->priv->flush_seqnum);
} }
break; break;
@ -1066,6 +1066,7 @@ gnl_composition_commit_func (GnlObject * object, gboolean recurse)
{ {
_add_gsource (GNL_COMPOSITION (object), (GSourceFunc) _commit_func, _add_gsource (GNL_COMPOSITION (object), (GSourceFunc) _commit_func,
GNL_COMPOSITION (object), NULL, G_PRIORITY_DEFAULT); GNL_COMPOSITION (object), NULL, G_PRIORITY_DEFAULT);
return TRUE; return TRUE;
} }
@ -1140,7 +1141,7 @@ get_current_position (GnlComposition * comp)
gst_object_unref (peer); gst_object_unref (peer);
if (res) { if (res) {
GST_LOG_OBJECT (comp, GST_DEBUG_OBJECT (comp,
"Successfully got downstream position %" GST_TIME_FORMAT, "Successfully got downstream position %" GST_TIME_FORMAT,
GST_TIME_ARGS ((guint64) value)); GST_TIME_ARGS ((guint64) value));
goto beach; goto beach;
@ -1182,6 +1183,7 @@ beach:
return (guint64) value; return (guint64) value;
} }
/* WITH OBJECTS LOCK TAKEN */
static gboolean static gboolean
update_base_time (GNode * node, GstClockTime * timestamp) update_base_time (GNode * node, GstClockTime * timestamp)
{ {
@ -1206,7 +1208,7 @@ update_operations_base_time (GnlComposition * comp, gboolean reverse)
(GNodeTraverseFunc) update_base_time, &timestamp); (GNodeTraverseFunc) update_base_time, &timestamp);
} }
/* WITH OBJECTS LOCK TAKEN */
static gboolean static gboolean
_seek_current_stack (GnlComposition * comp, GstEvent * event) _seek_current_stack (GnlComposition * comp, GstEvent * event)
{ {
@ -1236,8 +1238,7 @@ _seek_current_stack (GnlComposition * comp, GstEvent * event)
Sends flush events downstream if needed. Sends flush events downstream if needed.
can be called by user_seek or segment_done can be called by user_seek or segment_done
initial : FIXME : ???? Always seems to be TRUE update_stack_reason: The reason for which we need to handle 'seek'
update : TRUE from EOS, FALSE from seek
*/ */
static gboolean static gboolean
@ -1415,11 +1416,14 @@ gnl_composition_ghost_pad_set_target (GnlComposition * comp, GstPad * target)
ptarget = ptarget =
gst_ghost_pad_get_target (GST_GHOST_PAD (GNL_OBJECT (comp)->srcpad)); gst_ghost_pad_get_target (GST_GHOST_PAD (GNL_OBJECT (comp)->srcpad));
if (ptarget && ptarget == target) { if (ptarget) {
GST_DEBUG_OBJECT (comp,
"Target of srcpad is the same as existing one, not changing");
gst_object_unref (ptarget); gst_object_unref (ptarget);
return;
if (ptarget == target) {
GST_DEBUG_OBJECT (comp,
"Target of srcpad is the same as existing one, not changing");
return;
}
} }
/* Actually set the target */ /* Actually set the target */
@ -1433,8 +1437,6 @@ gnl_composition_ghost_pad_set_target (GnlComposition * comp, GstPad * target)
(GstPadProbeCallback) ghost_event_probe_handler, comp, NULL); (GstPadProbeCallback) ghost_event_probe_handler, comp, NULL);
GST_DEBUG_OBJECT (comp, "added event probe %lu", priv->ghosteventprobe); GST_DEBUG_OBJECT (comp, "added event probe %lu", priv->ghosteventprobe);
} }
GST_DEBUG_OBJECT (comp, "END");
} }
static void static void