mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-10-02 08:42:32 +00:00
Code Issues 1 Projects Releases Wiki Activity

track: Make sure that new gaps are filled before removing the old ones

Browse source 
Currently we can end up having gaps in track as the first step of the
gap filling method removes currently set gaps.
This commit is contained in:
Thibault Saunier 2013-07-01 16:19:31 -04:00 committed by Mathieu Duponchelle
parent 534bf481ed
commit ed9dcddef4
1 changed files with 16 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
ges/ges-track.c
View file

@ -172,6 +172,7 @@ static inline void
update_gaps (GESTrack * track)
{
Gap *gap;
GList *gaps;
GSequenceIter *it;
GESTrackElement *trackelement;
@ -185,11 +186,10 @@ update_gaps (GESTrack * track)
return;
}
/* 1- Remove all gaps */
g_list_free_full (priv->gaps, (GDestroyNotify) free_gap);
gaps = priv->gaps;
priv->gaps = NULL;
/* 2- And recalculate gaps */
/* 1- And recalculate gaps */
for (it = g_sequence_get_begin_iter (priv->trackelements_by_start);
g_sequence_iter_is_end (it) == FALSE; it = g_sequence_iter_next (it)) {
trackelement = g_sequence_get (it);
@ -198,7 +198,7 @@ update_gaps (GESTrack * track)
end = start + _DURATION (trackelement);
if (start > duration) {
/* 3- Fill gap */
/* 2- Fill gap */
gap = gap_new (track, duration, start - duration);
if (G_LIKELY (gap != NULL))
@ -208,7 +208,7 @@ update_gaps (GESTrack * track)
duration = MAX (duration, end);
}
/* 3- Add a gap at the end of the timeline if needed */
/* 4- Add a gap at the end of the timeline if needed */
if (priv->timeline) {
g_object_get (priv->timeline, "duration", &timeline_duration, NULL);
@ -221,8 +221,10 @@ update_gaps (GESTrack * track)
priv->duration = timeline_duration;
}
}
/* 4- Remove old gaps */
g_list_free_full (gaps, (GDestroyNotify) free_gap);
}
static inline void
@ -775,16 +777,20 @@ ges_track_remove_element (GESTrack * track, GESTrackElement * object)
GST_DEBUG_OBJECT (track, "Removing %" GST_PTR_FORMAT, object);
if (remove_object_internal (track, object) == TRUE) {
it = g_hash_table_lookup (priv->trackelements_iter, object);
g_sequence_remove (it);
it = g_hash_table_lookup (priv->trackelements_iter, object);
g_sequence_remove (it);
resort_and_fill_gaps (track);
resort_and_fill_gaps (track);
if (remove_object_internal (track, object) == TRUE) {
ges_timeline_element_set_timeline (GES_TIMELINE_ELEMENT (object), NULL);
return TRUE;
}
g_hash_table_insert (track->priv->trackelements_iter, object,
g_sequence_insert_sorted (track->priv->trackelements_by_start, object,
(GCompareDataFunc) element_start_compare, NULL));
return FALSE;
}