mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-18 15:51:11 +00:00
Code Issues 1 Projects Releases Wiki Activity

ges: Ref the GES class to avoid later deadlock

Browse source 
This ensure that that all class are initialized from the main thread,
avoid class initialization in random thread, which may cause deadlocks.

https://bugzilla.gnome.org/show_bug.cgi?id=784769
This commit is contained in:
Nicolas Dufresne 2017-07-10 21:42:21 -04:00 committed by Thibault Saunier
parent 4c773e64d8
commit c5eae31cf7
1 changed files with 28 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
ges/ges.c
View file

@ -76,25 +76,22 @@ ges_init_post (GOptionContext * context, GOptionGroup * group, gpointer data,
/* register clip classes with the system */
GES_TYPE_TEST_CLIP;
GES_TYPE_URI_CLIP;
GES_TYPE_TITLE_CLIP;
GES_TYPE_TRANSITION_CLIP;
GES_TYPE_OVERLAY_CLIP;
GES_TYPE_OVERLAY_TEXT_CLIP;
g_type_class_ref (GES_TYPE_TEST_CLIP);
g_type_class_ref (GES_TYPE_URI_CLIP);
g_type_class_ref (GES_TYPE_TITLE_CLIP);
g_type_class_ref (GES_TYPE_TRANSITION_CLIP);
g_type_class_ref (GES_TYPE_OVERLAY_CLIP);
g_type_class_ref (GES_TYPE_OVERLAY_TEXT_CLIP);
GES_TYPE_GROUP;
g_type_class_ref (GES_TYPE_GROUP);
/* register formatter types with the system */
GES_TYPE_PITIVI_FORMATTER;
GES_TYPE_COMMAND_LINE_FORMATTER;
GES_TYPE_XML_FORMATTER;
g_type_class_ref (GES_TYPE_PITIVI_FORMATTER);
g_type_class_ref (GES_TYPE_COMMAND_LINE_FORMATTER);
g_type_class_ref (GES_TYPE_XML_FORMATTER);
/* Register track elements */
GES_TYPE_EFFECT;
/* Register interfaces */
GES_TYPE_META_CONTAINER;
g_type_class_ref (GES_TYPE_EFFECT);
ges_asset_cache_init ();
@ -149,6 +146,23 @@ void
ges_deinit (void)
{
_ges_uri_asset_cleanup ();
g_type_class_unref (g_type_class_peek (GES_TYPE_TEST_CLIP));
g_type_class_unref (g_type_class_peek (GES_TYPE_URI_CLIP));
g_type_class_unref (g_type_class_peek (GES_TYPE_TITLE_CLIP));
g_type_class_unref (g_type_class_peek (GES_TYPE_TRANSITION_CLIP));
g_type_class_unref (g_type_class_peek (GES_TYPE_OVERLAY_CLIP));
g_type_class_unref (g_type_class_peek (GES_TYPE_OVERLAY_TEXT_CLIP));
g_type_class_unref (g_type_class_peek (GES_TYPE_GROUP));
/* register formatter types with the system */
g_type_class_unref (g_type_class_peek (GES_TYPE_PITIVI_FORMATTER));
g_type_class_unref (g_type_class_peek (GES_TYPE_COMMAND_LINE_FORMATTER));
g_type_class_unref (g_type_class_peek (GES_TYPE_XML_FORMATTER));
/* Register track elements */
g_type_class_unref (g_type_class_peek (GES_TYPE_EFFECT));
}
#ifndef GST_DISABLE_OPTION_PARSING