mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 06:54:49 +00:00
Code Issues 1 Projects Releases Wiki Activity

timeline: Make adding/removing track MT safe

Browse source 
It was almost the case already so make it happen fully
This commit is contained in:
Thibault Saunier 2019-06-21 10:47:34 -04:00
parent 1eb05b0b71
commit a2b0dd3859
1 changed files with 22 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
ges/ges-timeline.c
View file

@ -290,8 +290,10 @@ ges_timeline_dispose (GObject * object)
* objects aren't notified that their nleobjects have been destroyed. * objects aren't notified that their nleobjects have been destroyed.
*/ */
LOCK_DYN (tl);
while (tl->tracks) while (tl->tracks)
ges_timeline_remove_track (GES_TIMELINE (object), tl->tracks->data); ges_timeline_remove_track (GES_TIMELINE (object), tl->tracks->data);
UNLOCK_DYN (tl);
groups = g_list_copy (priv->groups); groups = g_list_copy (priv->groups);
for (tmp = groups; tmp; tmp = tmp->next) { for (tmp = groups; tmp; tmp = tmp->next) {
@ -354,7 +356,9 @@ ges_timeline_handle_message (GstBin * bin, GstMessage * message)
GST_OBJECT_LOCK (timeline); GST_OBJECT_LOCK (timeline);
if (timeline->priv->expected_async_done == 0) { if (timeline->priv->expected_async_done == 0) {
amessage = gst_message_new_async_start (GST_OBJECT_CAST (bin)); amessage = gst_message_new_async_start (GST_OBJECT_CAST (bin));
LOCK_DYN (timeline);
timeline->priv->expected_async_done = g_list_length (timeline->tracks); timeline->priv->expected_async_done = g_list_length (timeline->tracks);
UNLOCK_DYN (timeline);
GST_INFO_OBJECT (timeline, "Posting ASYNC_START %s", GST_INFO_OBJECT (timeline, "Posting ASYNC_START %s",
gst_structure_get_string (mstructure, "reason")); gst_structure_get_string (mstructure, "reason"));
} }
@ -1176,6 +1180,7 @@ select_tracks_for_object_default (GESTimeline * timeline,
result = g_ptr_array_new (); result = g_ptr_array_new ();
LOCK_DYN (timeline);
for (tmp = timeline->tracks; tmp; tmp = tmp->next) { for (tmp = timeline->tracks; tmp; tmp = tmp->next) {
GESTrack *track = GES_TRACK (tmp->data); GESTrack *track = GES_TRACK (tmp->data);
@ -1184,6 +1189,7 @@ select_tracks_for_object_default (GESTimeline * timeline,
g_ptr_array_add (result, track); g_ptr_array_add (result, track);
} }
} }
UNLOCK_DYN (timeline);
return result; return result;
} }
@ -1205,6 +1211,7 @@ add_object_to_tracks (GESTimeline * timeline, GESClip * clip, GESTrack * track)
types = track->type; types = track->type;
} }
LOCK_DYN (timeline);
for (i = 0, tmp = timeline->tracks; tmp; tmp = tmp->next, i++) { for (i = 0, tmp = timeline->tracks; tmp; tmp = tmp->next, i++) {
GESTrack *track = GES_TRACK (tmp->data); GESTrack *track = GES_TRACK (tmp->data);
@ -1214,6 +1221,7 @@ add_object_to_tracks (GESTimeline * timeline, GESClip * clip, GESTrack * track)
list = ges_clip_create_track_elements (clip, track->type); list = ges_clip_create_track_elements (clip, track->type);
g_list_free (list); g_list_free (list);
} }
UNLOCK_DYN (timeline);
} }
static void static void
@ -1653,9 +1661,11 @@ timeline_fill_gaps (GESTimeline * timeline)
{ {
GList *tmp; GList *tmp;
LOCK_DYN (timeline);
for (tmp = timeline->tracks; tmp; tmp = tmp->next) { for (tmp = timeline->tracks; tmp; tmp = tmp->next) {
track_resort_and_fill_gaps (tmp->data); track_resort_and_fill_gaps (tmp->data);
} }
UNLOCK_DYN (timeline);
} }
GNode * GNode *
@ -1988,7 +1998,9 @@ ges_timeline_add_track (GESTimeline * timeline, GESTrack * track)
GST_DEBUG ("timeline:%p, track:%p", timeline, track); GST_DEBUG ("timeline:%p, track:%p", timeline, track);
/* make sure we don't already control it */ /* make sure we don't already control it */
LOCK_DYN (timeline);
if (G_UNLIKELY (g_list_find (timeline->tracks, (gconstpointer) track))) { if (G_UNLIKELY (g_list_find (timeline->tracks, (gconstpointer) track))) {
UNLOCK_DYN (timeline);
GST_WARNING ("Track is already controlled by this timeline"); GST_WARNING ("Track is already controlled by this timeline");
return FALSE; return FALSE;
} }
@ -1996,6 +2008,7 @@ ges_timeline_add_track (GESTimeline * timeline, GESTrack * track)
/* Add the track to ourself (as a GstBin) /* Add the track to ourself (as a GstBin)
* Reference is stolen ! */ * Reference is stolen ! */
if (G_UNLIKELY (!gst_bin_add (GST_BIN (timeline), GST_ELEMENT (track)))) { if (G_UNLIKELY (!gst_bin_add (GST_BIN (timeline), GST_ELEMENT (track)))) {
UNLOCK_DYN (timeline);
GST_WARNING ("Couldn't add track to ourself (GST)"); GST_WARNING ("Couldn't add track to ourself (GST)");
return FALSE; return FALSE;
} }
@ -2009,10 +2022,8 @@ ges_timeline_add_track (GESTimeline * timeline, GESTrack * track)
gst_object_ref (tr_priv->stream)); gst_object_ref (tr_priv->stream));
/* Add the track to the list of tracks we track */ /* Add the track to the list of tracks we track */
LOCK_DYN (timeline);
timeline->priv->priv_tracks = g_list_append (timeline->priv->priv_tracks, timeline->priv->priv_tracks = g_list_append (timeline->priv->priv_tracks,
tr_priv); tr_priv);
UNLOCK_DYN (timeline);
timeline->tracks = g_list_append (timeline->tracks, track); timeline->tracks = g_list_append (timeline->tracks, track);
/* Inform the track that it's currently being used by ourself */ /* Inform the track that it's currently being used by ourself */
@ -2021,6 +2032,7 @@ ges_timeline_add_track (GESTimeline * timeline, GESTrack * track)
GST_DEBUG ("Done adding track, emitting 'track-added' signal"); GST_DEBUG ("Done adding track, emitting 'track-added' signal");
_ghost_track_srcpad (tr_priv); _ghost_track_srcpad (tr_priv);
UNLOCK_DYN (timeline);
/* emit 'track-added' */ /* emit 'track-added' */
g_signal_emit (timeline, ges_timeline_signals[TRACK_ADDED], 0, track); g_signal_emit (timeline, ges_timeline_signals[TRACK_ADDED], 0, track);
@ -2080,7 +2092,6 @@ ges_timeline_remove_track (GESTimeline * timeline, GESTrack * track)
g_return_val_if_fail (GES_IS_TRACK (track), FALSE); g_return_val_if_fail (GES_IS_TRACK (track), FALSE);
g_return_val_if_fail (GES_IS_TIMELINE (timeline), FALSE); g_return_val_if_fail (GES_IS_TIMELINE (timeline), FALSE);
CHECK_THREAD (timeline);
GST_DEBUG ("timeline:%p, track:%p", timeline, track); GST_DEBUG ("timeline:%p, track:%p", timeline, track);
@ -2212,10 +2223,14 @@ ges_timeline_get_pad_for_track (GESTimeline * timeline, GESTrack * track)
GList * GList *
ges_timeline_get_tracks (GESTimeline * timeline) ges_timeline_get_tracks (GESTimeline * timeline)
{ {
GList *res = NULL;
g_return_val_if_fail (GES_IS_TIMELINE (timeline), NULL); g_return_val_if_fail (GES_IS_TIMELINE (timeline), NULL);
CHECK_THREAD (timeline);
return g_list_copy_deep (timeline->tracks, (GCopyFunc) gst_object_ref, NULL); LOCK_DYN (timeline);
res = g_list_copy_deep (timeline->tracks, (GCopyFunc) gst_object_ref, NULL);
UNLOCK_DYN (timeline);
return res;
} }
/** /**
@ -2286,6 +2301,7 @@ ges_timeline_commit_unlocked (GESTimeline * timeline)
} else { } else {
GstStreamCollection *collection = gst_stream_collection_new (NULL); GstStreamCollection *collection = gst_stream_collection_new (NULL);
LOCK_DYN (timeline);
for (tmp = timeline->tracks; tmp; tmp = tmp->next) { for (tmp = timeline->tracks; tmp; tmp = tmp->next) {
TrackPrivate *tr_priv = TrackPrivate *tr_priv =
g_list_find_custom (timeline->priv->priv_tracks, tmp->data, g_list_find_custom (timeline->priv->priv_tracks, tmp->data,
@ -2302,6 +2318,7 @@ ges_timeline_commit_unlocked (GESTimeline * timeline)
gst_object_unref (timeline->priv->stream_collection); gst_object_unref (timeline->priv->stream_collection);
timeline->priv->stream_collection = collection; timeline->priv->stream_collection = collection;
UNLOCK_DYN (timeline);
} }
return res; return res;