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

tweak gstl recalculate: cur track object sets priority for next transition

Browse source
This commit is contained in:
Brandon Lewis 2010-07-14 13:14:54 +02:00 committed by Edward Hervey
parent 286c5f78db
commit eb3be94578
1 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
ges/ges-simple-timeline-layer.c
View file

@ -119,7 +119,7 @@ gstl_recalculate (GESSimpleTimelineLayer * self)
GESTimelineObject *prev_object = NULL; GESTimelineObject *prev_object = NULL;
GESTimelineObject *prev_transition = NULL; GESTimelineObject *prev_transition = NULL;
priority = GES_TIMELINE_LAYER (self)->min_gnl_priority; priority = GES_TIMELINE_LAYER (self)->min_gnl_priority + 2;
GST_DEBUG ("recalculating values"); GST_DEBUG ("recalculating values");
@ -132,11 +132,9 @@ gstl_recalculate (GESSimpleTimelineLayer * self)
dur = GES_TIMELINE_OBJECT_DURATION (obj); dur = GES_TIMELINE_OBJECT_DURATION (obj);
height = GES_TIMELINE_OBJECT_HEIGHT (obj); height = GES_TIMELINE_OBJECT_HEIGHT (obj);
GST_DEBUG ("obj: %p, %ld, height: %d", obj, pos, height);
if (GES_IS_TIMELINE_SOURCE (obj)) { if (GES_IS_TIMELINE_SOURCE (obj)) {
priority += height; GST_LOG ("%p obj: height: %d: priority %d", obj, height, priority);
if (G_UNLIKELY (GES_TIMELINE_OBJECT_START (obj) != pos)) { if (G_UNLIKELY (GES_TIMELINE_OBJECT_START (obj) != pos)) {
ges_timeline_object_set_start (obj, pos); ges_timeline_object_set_start (obj, pos);
@ -146,15 +144,18 @@ gstl_recalculate (GESSimpleTimelineLayer * self)
ges_timeline_object_set_priority (obj, priority); ges_timeline_object_set_priority (obj, priority);
} }
transition_priority = MAX (0, priority - 1);
priority += height;
pos += dur; pos += dur;
g_assert (priority != -1); g_assert (priority != -1);
} else if (GES_IS_TIMELINE_TRANSITION (obj)) { } else if (GES_IS_TIMELINE_TRANSITION (obj)) {
GST_LOG ("%p is transition\n", obj);
pos -= dur; pos -= dur;
transition_priority = MAX (0, priority - 1);
GST_LOG ("%p obj: height: %d: trans_priority %d", obj, height,
transition_priority);
g_assert (transition_priority != -1); g_assert (transition_priority != -1);
@ -194,9 +195,6 @@ gstl_recalculate (GESSimpleTimelineLayer * self)
prev_transition = obj; prev_transition = obj;
} }
GST_LOG ("obj: %p, start: " GST_TIME_FORMAT " pri: %ld",
obj, GST_TIME_ARGS (pos), priority);
prev_object = obj; prev_object = obj;
} }