mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-24 02:31:03 +00:00
Code Issues 1 Projects Releases Wiki Activity

timeline: Make sure we do not move object when only trimming

Browse source 
We were missing a few checks so that we do not move objects when their
duration is equal to the max duration, or 0
This commit is contained in:
Thibault Saunier 2013-09-08 19:19:24 -03:00
parent c47c115dd1
commit 9c77d52f30
1 changed files with 19 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
ges/ges-timeline.c
View file

@ -1344,7 +1344,7 @@ ges_timeline_trim_object_simple (GESTimeline * timeline,
GESTimelineElement * element, GList * layers, GESEdge edge, GESTimelineElement * element, GList * layers, GESEdge edge,
guint64 position, gboolean snapping) guint64 position, gboolean snapping)
{ {
guint64 nstart, start, inpoint, duration, max_duration, *snapped, *cur; guint64 start, inpoint, duration, max_duration, *snapped, *cur;
gboolean ret = TRUE; gboolean ret = TRUE;
gint64 real_dur; gint64 real_dur;
GESTrackElement *track_element; GESTrackElement *track_element;
@ -1372,6 +1372,7 @@ ges_timeline_trim_object_simple (GESTimeline * timeline,
GST_DEBUG_OBJECT (toplevel, "Not trimming %p as not at begining " GST_DEBUG_OBJECT (toplevel, "Not trimming %p as not at begining "
"of the container", element); "of the container", element);
gst_object_unref (toplevel);
return FALSE; return FALSE;
} }
@ -1397,20 +1398,30 @@ ges_timeline_trim_object_simple (GESTimeline * timeline,
position = *snapped; position = *snapped;
} }
nstart = position;
/* Calculate new values */ /* Calculate new values */
position = MAX (start > inpoint ? start - inpoint : 0, position);
position = MIN (position, start + duration); position = MIN (position, start + duration);
inpoint = MAX (0, inpoint + position - start); inpoint =
MAX (0, inpoint + position > start ? inpoint + position - start : 0);
real_dur = start + duration - nstart; real_dur = _END (element) - position;
/* FIXME: Why CLAMP (0, real_dur, max_duration) doesn't work? */ /* FIXME: Why CLAMP (0, real_dur, max_duration) doesn't work? */
duration = MAX (0, real_dur); duration = MAX (0, real_dur);
duration = MIN (duration, max_duration - _INPOINT (track_element)); duration =
MIN (real_dur,
max_duration > inpoint ? max_duration - inpoint : G_MAXUINT64);
/* If we already are at max duration or duration == 0 do no useless work */
if ((duration == _DURATION (track_element) &&
_DURATION (track_element) == _MAXDURATION (track_element)) ||
(duration == 0 && _DURATION (element) == 0)) {
GST_DEBUG_OBJECT (track_element,
"Duration already == max_duration, no triming");
gst_object_unref (toplevel);
return FALSE;
}
timeline->priv->needs_transitions_update = FALSE; timeline->priv->needs_transitions_update = FALSE;
_set_start0 (GES_TIMELINE_ELEMENT (track_element), nstart); _set_start0 (GES_TIMELINE_ELEMENT (track_element), position);
_set_inpoint0 (GES_TIMELINE_ELEMENT (track_element), inpoint); _set_inpoint0 (GES_TIMELINE_ELEMENT (track_element), inpoint);
timeline->priv->needs_transitions_update = TRUE; timeline->priv->needs_transitions_update = TRUE;