ttml: build, but don't autoplug unless GST_TTML_AUTOPLUG env var is set

Don't hide build behind --enable-experimental. Our goal is to not
autoplug it for now, so let's just always build it if the dependencies
are there and hide autoplugging enablement behind an env var.

diff --git a/configure.ac b/configure.ac
index f1171dd..6df044c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2496,13 +2496,11 @@ AG_GST_CHECK_FEATURE(DTLS, [DTLS plugin], dtls, [
 dnl *** ttml ***
 translit(dnm, m, l) AM_CONDITIONAL(USE_TTML, true)
 AG_GST_CHECK_FEATURE(TTML, [TTML plugin], ttml, [
-  if test "x$BUILD_EXPERIMENTAL" = "xyes"; then
-    PKG_CHECK_MODULES(TTML, [ libxml-2.0 >= 2.9.2 pango cairo pangocairo ], [
-      HAVE_TTML="yes"
-    ], [
-      HAVE_TTML="no"
-    ])
-  fi
+  PKG_CHECK_MODULES(TTML, [ libxml-2.0 >= 2.9.2 pango cairo pangocairo ], [
+    HAVE_TTML="yes"
+  ], [
+    HAVE_TTML="no"
+  ])
 ])
 
 dnl *** modplug ***

diff --git a/ext/ttml/gstttmlplugin.c b/ext/ttml/gstttmlplugin.c
index cc64bcc..d6d0d1a 100644 (file)
--- a/ext/ttml/gstttmlplugin.c
+++ b/ext/ttml/gstttmlplugin.c
@@ -33,11 +33,20 @@ GST_DEBUG_CATEGORY (ttmlrender_debug);
 static gboolean
 plugin_init (GstPlugin * plugin)
 {
-  if (!gst_element_register (plugin, "ttmlparse", GST_RANK_PRIMARY,
-          GST_TYPE_TTML_PARSE))
+  guint rank = GST_RANK_NONE;
+
+  /* We don't want this autoplugged by default yet for now */
+  if (g_getenv ("GST_TTML_AUTOPLUG")) {
+    GST_INFO_OBJECT (plugin, "Registering ttml elements with primary rank.");
+    rank = GST_RANK_PRIMARY;
+  }
+
+  gst_plugin_add_dependency_simple (plugin, "GST_TTML_AUTOPLUG", NULL, NULL,
+      GST_PLUGIN_DEPENDENCY_FLAG_NONE);
+
+  if (!gst_element_register (plugin, "ttmlparse", rank, GST_TYPE_TTML_PARSE))
     return FALSE;
-  if (!gst_element_register (plugin, "ttmlrender", GST_RANK_PRIMARY,
-          GST_TYPE_TTML_RENDER))
+  if (!gst_element_register (plugin, "ttmlrender", rank, GST_TYPE_TTML_RENDER))
     return FALSE;
 
   GST_DEBUG_CATEGORY_INIT (ttmlparse_debug, "ttmlparse", 0, "TTML parser");