introduce ges_deinit()

GstDiscoverer objects were leaked by tests making the leaks detector
unusable.
Introduce ges_deinit(), similiar to gst_deinit(), doing some cleanup
before exiting the process.

https://bugzilla.gnome.org/show_bug.cgi?id=776805

diff --git a/docs/libs/ges-sections.txt b/docs/libs/ges-sections.txt
index 5a59846..96bf442 100644 (file)
--- a/docs/libs/ges-sections.txt
+++ b/docs/libs/ges-sections.txt
@@ -5,6 +5,7 @@
 <TITLE>Initialization</TITLE>
 ges_init
 ges_init_check
+ges_deinit
 ges_version
 ges_init_get_option_group
 GES_VERSION_MAJOR

diff --git a/ges/ges-uri-asset.c b/ges/ges-uri-asset.c
index 0a78a3a..170dc8a 100644 (file)
--- a/ges/ges-uri-asset.c
+++ b/ges/ges-uri-asset.c
@@ -37,6 +37,9 @@
 
 static GHashTable *parent_newparent_table = NULL;
 
+static GstDiscoverer *discoverer = NULL;
+static GstDiscoverer *sync_discoverer = NULL;
+
 static void
 initable_iface_init (GInitableIface * initable_iface)
 {
@@ -220,18 +223,37 @@ ges_uri_clip_asset_class_init (GESUriClipAssetClass * klass)
   if (errno)
     timeout = DEFAULT_DISCOVERY_TIMEOUT;
 
-  klass->discoverer = gst_discoverer_new (timeout, &err);
+  if (!discoverer) {
+    discoverer = gst_discoverer_new (timeout, &err);
+    if (!discoverer) {
+      GST_ERROR ("Could not create discoverer: %s", err->message);
+      g_error_free (err);
+      return;
+    }
+  }
+
+  /* The class structure keeps weak pointers on the discoverers so they
+   * can be properly cleaned up in _ges_uri_asset_cleanup(). */
   if (!klass->discoverer) {
-    GST_ERROR ("Could not create discoverer: %s", err->message);
-    g_error_free (err);
-    return;
+    klass->discoverer = discoverer;
+    g_object_add_weak_pointer (G_OBJECT (discoverer),
+        (gpointer *) & klass->discoverer);
+  }
+
+  if (!sync_discoverer) {
+    sync_discoverer = gst_discoverer_new (timeout, &err);
+
+    if (!sync_discoverer) {
+      GST_ERROR ("Could not create discoverer: %s", err->message);
+      g_error_free (err);
+      return;
+    }
   }
 
-  klass->sync_discoverer = gst_discoverer_new (timeout, NULL);
   if (!klass->sync_discoverer) {
-    GST_ERROR ("Could not create discoverer: %s", err->message);
-    g_error_free (err);
-    return;
+    klass->sync_discoverer = sync_discoverer;
+    g_object_add_weak_pointer (G_OBJECT (sync_discoverer),
+        (gpointer *) & klass->sync_discoverer);
   }
 
   g_signal_connect (klass->discoverer, "discovered",
@@ -735,3 +757,10 @@ ges_uri_source_asset_get_filesource_asset (GESUriSourceAsset * asset)
 
   return asset->priv->parent_asset;
 }
+
+void
+_ges_uri_asset_cleanup (void)
+{
+  g_clear_object (&discoverer);
+  g_clear_object (&sync_discoverer);
+}

diff --git a/ges/ges-uri-asset.h b/ges/ges-uri-asset.h
index 8fe053f..b1a0ca4 100644 (file)
--- a/ges/ges-uri-asset.h
+++ b/ges/ges-uri-asset.h
@@ -116,5 +116,7 @@ GstDiscovererStreamInfo * ges_uri_source_asset_get_stream_info     (GESUriSource
 const gchar * ges_uri_source_asset_get_stream_uri                  (GESUriSourceAsset *asset);
 const GESUriClipAsset *ges_uri_source_asset_get_filesource_asset   (GESUriSourceAsset *asset);
 
+void _ges_uri_asset_cleanup (void);
+
 G_END_DECLS
 #endif /* _GES_URI_CLIP_ASSET */

diff --git a/ges/ges.c b/ges/ges.c
index 3f8f645..46ebf1d 100644 (file)
--- a/ges/ges.c
+++ b/ges/ges.c
@@ -134,6 +134,23 @@ ges_init (void)
   return ges_init_post (NULL, NULL, NULL, NULL);
 }
 
+/**
+ * ges_deinit:
+ *
+ * Clean up any resources created by GES in ges_init().
+ *
+ * It is normally not needed to call this function in a normal application as the
+ * resources will automatically be freed when the program terminates.
+ * This function is therefore mostly used by testsuites and other memory profiling tools.
+ *
+ * After this call GES (including this method) should not be used anymore.
+ */
+void
+ges_deinit (void)
+{
+  _ges_uri_asset_cleanup ();
+}
+
 #ifndef GST_DISABLE_OPTION_PARSING
 static gboolean
 parse_goption_arg (const gchar * s_opt,

diff --git a/ges/ges.h b/ges/ges.h
index 0b3141b..670d473 100644 (file)
--- a/ges/ges.h
+++ b/ges/ges.h
@@ -87,6 +87,7 @@ G_BEGIN_DECLS
 
 gboolean ges_init         (void);
 gboolean ges_init_check (int *argc, char **argv[], GError ** err);
+void     ges_deinit       (void);
 void     ges_version      (guint * major, guint * minor, guint * micro,
                            guint * nano);
 GOptionGroup *

diff --git a/tests/check/ges/asset.c b/tests/check/ges/asset.c
index e1fcefb..d15d75a 100644 (file)
--- a/tests/check/ges/asset.c
+++ b/tests/check/ges/asset.c
@@ -201,6 +201,10 @@ ges_suite (void)
   Suite *s = suite_create ("ges");
   TCase *tc_chain = tcase_create ("a");
 
+  if (atexit (ges_deinit) != 0) {
+    GST_ERROR ("failed to set ges_deinit as exit function");
+  }
+
   suite_add_tcase (s, tc_chain);
   ges_init ();
 

diff --git a/tests/check/ges/backgroundsource.c b/tests/check/ges/backgroundsource.c
index 5edb149..d32448d 100644 (file)
--- a/tests/check/ges/backgroundsource.c
+++ b/tests/check/ges/backgroundsource.c
@@ -405,6 +405,10 @@ ges_suite (void)
   Suite *s = suite_create ("ges-backgroundsource");
   TCase *tc_chain = tcase_create ("backgroundsource");
 
+  if (atexit (ges_deinit) != 0) {
+    GST_ERROR ("failed to set ges_deinit as exit function");
+  }
+
   suite_add_tcase (s, tc_chain);
 
   tcase_add_test (tc_chain, test_test_source_basic);

diff --git a/tests/check/ges/basic.c b/tests/check/ges/basic.c
index 039190d..6b8340c 100644 (file)
--- a/tests/check/ges/basic.c
+++ b/tests/check/ges/basic.c
@@ -776,6 +776,10 @@ ges_suite (void)
   Suite *s = suite_create ("ges-basic");
   TCase *tc_chain = tcase_create ("basic");
 
+  if (atexit (ges_deinit) != 0) {
+    GST_ERROR ("failed to set ges_deinit as exit function");
+  }
+
   suite_add_tcase (s, tc_chain);
 
   tcase_add_test (tc_chain, test_ges_init);

diff --git a/tests/check/ges/clip.c b/tests/check/ges/clip.c
index 0be8832..7820e0b 100644 (file)
--- a/tests/check/ges/clip.c
+++ b/tests/check/ges/clip.c
@@ -699,6 +699,10 @@ ges_suite (void)
   Suite *s = suite_create ("ges-clip");
   TCase *tc_chain = tcase_create ("clip");
 
+  if (atexit (ges_deinit) != 0) {
+    GST_ERROR ("failed to set ges_deinit as exit function");
+  }
+
   suite_add_tcase (s, tc_chain);
 
   tcase_add_test (tc_chain, test_object_properties);

diff --git a/tests/check/ges/effects.c b/tests/check/ges/effects.c
index 0a40f55..fc1c10d 100644 (file)
--- a/tests/check/ges/effects.c
+++ b/tests/check/ges/effects.c
@@ -561,6 +561,10 @@ ges_suite (void)
   Suite *s = suite_create ("ges");
   TCase *tc_chain = tcase_create ("effect");
 
+  if (atexit (ges_deinit) != 0) {
+    GST_ERROR ("failed to set ges_deinit as exit function");
+  }
+
   suite_add_tcase (s, tc_chain);
 
   tcase_add_test (tc_chain, test_effect_basic);

diff --git a/tests/check/ges/group.c b/tests/check/ges/group.c
index 3526d02..2884252 100644 (file)
--- a/tests/check/ges/group.c
+++ b/tests/check/ges/group.c
@@ -764,6 +764,10 @@ ges_suite (void)
   Suite *s = suite_create ("ges-group");
   TCase *tc_chain = tcase_create ("group");
 
+  if (atexit (ges_deinit) != 0) {
+    GST_ERROR ("failed to set ges_deinit as exit function");
+  }
+
   suite_add_tcase (s, tc_chain);
 
   tcase_add_test (tc_chain, test_move_group);

diff --git a/tests/check/ges/layer.c b/tests/check/ges/layer.c
index 3b8f19e..dad061f 100644 (file)
--- a/tests/check/ges/layer.c
+++ b/tests/check/ges/layer.c
@@ -1759,6 +1759,10 @@ ges_suite (void)
   Suite *s = suite_create ("ges-layer");
   TCase *tc_chain = tcase_create ("timeline-layer");
 
+  if (atexit (ges_deinit) != 0) {
+    GST_ERROR ("failed to set ges_deinit as exit function");
+  }
+
   suite_add_tcase (s, tc_chain);
 
   tcase_add_test (tc_chain, test_layer_properties);

diff --git a/tests/check/ges/mixers.c b/tests/check/ges/mixers.c
index 167cd32..08b4efb 100644 (file)
--- a/tests/check/ges/mixers.c
+++ b/tests/check/ges/mixers.c
@@ -200,6 +200,10 @@ ges_suite (void)
   Suite *s = suite_create ("Smart mixers");
   TCase *tc_chain = tcase_create ("smart-mixers");
 
+  if (atexit (ges_deinit) != 0) {
+    GST_ERROR ("failed to set ges_deinit as exit function");
+  }
+
   ges_init ();
   suite_add_tcase (s, tc_chain);
 

diff --git a/tests/check/ges/overlays.c b/tests/check/ges/overlays.c
index be44fc9..e83fcdf 100644 (file)
--- a/tests/check/ges/overlays.c
+++ b/tests/check/ges/overlays.c
@@ -207,6 +207,10 @@ ges_suite (void)
   Suite *s = suite_create ("ges-overlays");
   TCase *tc_chain = tcase_create ("overlays");
 
+  if (atexit (ges_deinit) != 0) {
+    GST_ERROR ("failed to set ges_deinit as exit function");
+  }
+
   suite_add_tcase (s, tc_chain);
 
   tcase_add_test (tc_chain, test_overlay_basic);

diff --git a/tests/check/ges/project.c b/tests/check/ges/project.c
index 1e151c8..384733e 100644 (file)
--- a/tests/check/ges/project.c
+++ b/tests/check/ges/project.c
@@ -734,6 +734,10 @@ ges_suite (void)
   Suite *s = suite_create ("ges-project");
   TCase *tc_chain = tcase_create ("project");
 
+  if (atexit (ges_deinit) != 0) {
+    GST_ERROR ("failed to set ges_deinit as exit function");
+  }
+
   suite_add_tcase (s, tc_chain);
   ges_init ();
 

diff --git a/tests/check/ges/tempochange.c b/tests/check/ges/tempochange.c
index 42b48ec..faaee02 100644 (file)
--- a/tests/check/ges/tempochange.c
+++ b/tests/check/ges/tempochange.c
@@ -134,6 +134,10 @@ ges_suite (void)
   GstPluginFeature *pitch = gst_registry_find_feature (gst_registry_get (),
       "pitch", GST_TYPE_ELEMENT_FACTORY);
 
+  if (atexit (ges_deinit) != 0) {
+    GST_ERROR ("failed to set ges_deinit as exit function");
+  }
+
   if (pitch) {
     gst_object_unref (pitch);
 

diff --git a/tests/check/ges/timelineedition.c b/tests/check/ges/timelineedition.c
index 841914e..1861639 100644 (file)
--- a/tests/check/ges/timelineedition.c
+++ b/tests/check/ges/timelineedition.c
@@ -1501,6 +1501,10 @@ ges_suite (void)
   Suite *s = suite_create ("ges-timeline-edition");
   TCase *tc_chain = tcase_create ("timeline-edition");
 
+  if (atexit (ges_deinit) != 0) {
+    GST_ERROR ("failed to set ges_deinit as exit function");
+  }
+
   ges_init ();
 
   suite_add_tcase (s, tc_chain);

diff --git a/tests/check/ges/titles.c b/tests/check/ges/titles.c
index 90467a0..98a4a0a 100644 (file)
--- a/tests/check/ges/titles.c
+++ b/tests/check/ges/titles.c
@@ -211,6 +211,10 @@ ges_suite (void)
   Suite *s = suite_create ("ges-titles");
   TCase *tc_chain = tcase_create ("titles");
 
+  if (atexit (ges_deinit) != 0) {
+    GST_ERROR ("failed to set ges_deinit as exit function");
+  }
+
   suite_add_tcase (s, tc_chain);
 
   tcase_add_test (tc_chain, test_title_source_basic);

diff --git a/tests/check/ges/track.c b/tests/check/ges/track.c
index da8ddb2..96e41e7 100644 (file)
--- a/tests/check/ges/track.c
+++ b/tests/check/ges/track.c
@@ -94,6 +94,10 @@ ges_suite (void)
   Suite *s = suite_create ("ges-track");
   TCase *tc_chain = tcase_create ("track");
 
+  if (atexit (ges_deinit) != 0) {
+    GST_ERROR ("failed to set ges_deinit as exit function");
+  }
+
   suite_add_tcase (s, tc_chain);
 
   tcase_add_test (tc_chain, test_update_restriction_caps);

diff --git a/tests/check/ges/transition.c b/tests/check/ges/transition.c
index b245f23..b6c916a 100644 (file)
--- a/tests/check/ges/transition.c
+++ b/tests/check/ges/transition.c
@@ -178,6 +178,10 @@ ges_suite (void)
   Suite *s = suite_create ("ges-transition");
   TCase *tc_chain = tcase_create ("transition");
 
+  if (atexit (ges_deinit) != 0) {
+    GST_ERROR ("failed to set ges_deinit as exit function");
+  }
+
   suite_add_tcase (s, tc_chain);
 
   tcase_add_test (tc_chain, test_transition_basic);

diff --git a/tests/check/ges/uriclip.c b/tests/check/ges/uriclip.c
index 7531508..c329809 100644 (file)
--- a/tests/check/ges/uriclip.c
+++ b/tests/check/ges/uriclip.c
@@ -290,6 +290,10 @@ main (int argc, char **argv)
 
   gst_check_init (&argc, &argv);
 
+  if (atexit (ges_deinit) != 0) {
+    GST_ERROR ("failed to set ges_deinit as exit function");
+  }
+
   s = ges_suite ();
 
   av_uri = ges_test_get_audio_video_uri ();

diff --git a/tests/check/nle/complex.c b/tests/check/nle/complex.c
index 588dd8b..a5ca7da 100644 (file)
--- a/tests/check/nle/complex.c
+++ b/tests/check/nle/complex.c
@@ -824,6 +824,10 @@ gnonlin_suite (void)
   Suite *s = suite_create ("gnonlin-complex");
   TCase *tc_chain = tcase_create ("complex");
 
+  if (atexit (ges_deinit) != 0) {
+    GST_ERROR ("failed to set ges_deinit as exit function");
+  }
+
   ges_init ();
   suite_add_tcase (s, tc_chain);
 

diff --git a/tests/check/nle/nlecomposition.c b/tests/check/nle/nlecomposition.c
index be727d2..aec78c1 100644 (file)
--- a/tests/check/nle/nlecomposition.c
+++ b/tests/check/nle/nlecomposition.c
@@ -437,6 +437,10 @@ gnonlin_suite (void)
   Suite *s = suite_create ("nlecomposition");
   TCase *tc_chain = tcase_create ("nlecomposition");
 
+  if (atexit (ges_deinit) != 0) {
+    GST_ERROR ("failed to set ges_deinit as exit function");
+  }
+
   ges_init ();
   suite_add_tcase (s, tc_chain);
 

diff --git a/tests/check/nle/nleoperation.c b/tests/check/nle/nleoperation.c
index a1d106c..2825e12 100644 (file)
--- a/tests/check/nle/nleoperation.c
+++ b/tests/check/nle/nleoperation.c
@@ -688,6 +688,10 @@ gnonlin_suite (void)
   Suite *s = suite_create ("nleoperation");
   TCase *tc_chain = tcase_create ("nleoperation");
 
+  if (atexit (ges_deinit) != 0) {
+    GST_ERROR ("failed to set ges_deinit as exit function");
+  }
+
   ges_init ();
   suite_add_tcase (s, tc_chain);
 

diff --git a/tests/check/nle/simple.c b/tests/check/nle/simple.c
index 86ca917..df8d215 100644 (file)
--- a/tests/check/nle/simple.c
+++ b/tests/check/nle/simple.c
@@ -763,6 +763,10 @@ gnonlin_suite (void)
   Suite *s = suite_create ("gnonlin-simple");
   TCase *tc_chain = tcase_create ("general");
 
+  if (atexit (ges_deinit) != 0) {
+    GST_ERROR ("failed to set ges_deinit as exit function");
+  }
+
   suite_add_tcase (s, tc_chain);
 
   ges_init ();

diff --git a/tests/check/nle/tempochange.c b/tests/check/nle/tempochange.c
index a313c90..cd6d714 100644 (file)
--- a/tests/check/nle/tempochange.c
+++ b/tests/check/nle/tempochange.c
@@ -160,6 +160,10 @@ gnonlin_suite (void)
   Suite *s = suite_create ("nle");
   TCase *tc_chain = tcase_create ("tempochange");
 
+  if (atexit (ges_deinit) != 0) {
+    GST_ERROR ("failed to set ges_deinit as exit function");
+  }
+
   ges_init ();
   suite_add_tcase (s, tc_chain);