mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-07-04 13:45:52 +00:00
Code Issues 1 Projects Releases Wiki Activity

timeline: Avoid setting duration > max_duration when rippling

Browse source 
We should use the trimming method to set duration to make sure to avoid
going over the max duration.

Also avoid computing when setting duration to the same old value.
This commit is contained in:
Thibault Saunier 2013-09-07 12:59:17 -04:00
parent c4c26f8748
commit c47c115dd1
1 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
ges/ges-timeline.c
View file

@ -1434,6 +1434,12 @@ ges_timeline_trim_object_simple (GESTimeline * timeline,
duration = MAX (0, real_dur);
duration = MIN (duration, max_duration - _INPOINT (track_element));
/* Not moving, avoid overhead */
if (duration == _DURATION (track_element)) {
GST_DEBUG_OBJECT (track_element, "No change in duration");
return FALSE;
}
_set_duration0 (GES_TIMELINE_ELEMENT (track_element), duration);
break;
}
@ -1502,7 +1508,11 @@ timeline_ripple_object (GESTimeline * timeline, GESTrackElement * obj,
duration = _DURATION (obj);
_set_duration0 (GES_TIMELINE_ELEMENT (obj), position - _START (obj));
if (!ges_timeline_trim_object_simple (timeline,
GES_TIMELINE_ELEMENT (obj), NULL, GES_EDGE_END, position,
FALSE)) {
return FALSE;
}
offset = _DURATION (obj) - duration;
for (tmp = mv_ctx->moving_trackelements; tmp; tmp = tmp->next) {
@ -1655,6 +1665,11 @@ timeline_roll_object (GESTimeline * timeline, GESTrackElement * obj,
ret &= ges_timeline_trim_object_simple (timeline,
GES_TIMELINE_ELEMENT (obj), NULL, GES_EDGE_END, position, FALSE);
if (ret == FALSE) {
GST_DEBUG_OBJECT (timeline, "No triming, bailing out");
goto done;
}
/* In the case we reached max_duration we just make sure to roll
* everything to the real new position */
position = _START (obj) + _DURATION (obj);