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

timeline: No thread checking while disposing

Browse source 
While this is not correct, we can't predict from what thread a
GstElement will be disposed as it might still be referenced by
a GstMessage somewhere which is freed by, any thread.

In this specific case we can assume that GES user will already have
let go his timeline reference and we should not avoid assert in that
specific case as it should be safe to let the timeline be destroyed
at that point.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-editing-services/-/merge_requests/175>
This commit is contained in:
Thibault Saunier 2020-05-13 17:11:24 -04:00 committed by GStreamer Merge Bot
parent 5f420edc69
commit 56544604bc
3 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ges/ges-internal.h
View file

@ -106,6 +106,8 @@ ges_timeline_freeze_auto_transitions (GESTimeline * timeline, gboolean freeze);
G_GNUC_INTERNAL GESAutoTransition *
ges_timeline_get_auto_transition_at_end (GESTimeline * timeline, GESTrackElement * source);
G_GNUC_INTERNAL gboolean ges_timeline_is_disposed (GESTimeline* timeline);
G_GNUC_INTERNAL gboolean
ges_timeline_edit (GESTimeline * timeline, GESTimelineElement * element,
GList * layers, gint64 new_layer_priority, GESEditMode mode, GESEdge edge,

12
ges/ges-timeline.c
View file

@ -169,6 +169,7 @@ struct _GESTimelinePrivate
GCond commited_cond;
GThread *valid_thread;
gboolean disposed;
GstStreamCollection *stream_collection;
};
@ -308,6 +309,12 @@ ges_timeline_set_property (GObject * object, guint property_id,
}
}
gboolean
ges_timeline_is_disposed (GESTimeline * timeline)
{
return timeline->priv->disposed;
}
static void
ges_timeline_dispose (GObject * object)
{
@ -315,6 +322,7 @@ ges_timeline_dispose (GObject * object)
GESTimelinePrivate *priv = tl->priv;
GList *tmp, *groups;
priv->disposed = TRUE;
while (tl->layers) {
GESLayer *layer = (GESLayer *) tl->layers->data;
ges_timeline_remove_layer (GES_TIMELINE (object), layer);
@ -2230,7 +2238,9 @@ ges_timeline_remove_layer (GESTimeline * timeline, GESLayer * layer)
g_return_val_if_fail (GES_IS_TIMELINE (timeline), FALSE);
g_return_val_if_fail (GES_IS_LAYER (layer), FALSE);
CHECK_THREAD (timeline);
if (!timeline->priv->disposed)
CHECK_THREAD (timeline);
GST_DEBUG ("timeline:%p, layer:%p", timeline, layer);

4
ges/ges-track.c
View file

@ -1260,7 +1260,9 @@ ges_track_remove_element (GESTrack * track, GESTrackElement * object)
g_return_val_if_fail (GES_IS_TRACK (track), FALSE);
g_return_val_if_fail (GES_IS_TRACK_ELEMENT (object), FALSE);
CHECK_THREAD (track);
if (!track->priv->timeline
|| !ges_timeline_is_disposed (track->priv->timeline))
CHECK_THREAD (track);
return remove_element_internal (track, object, TRUE);
}