summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThibault Saunier <tsaunier@igalia.com>2021-01-15 15:25:12 -0300
committerThibault Saunier <tsaunier@igalia.com>2021-02-10 16:14:47 -0300
commit410fd67045bc6f5d4e1f1c90fd702d858f23313e (patch)
tree021c4b0510fef72a48b2d9671a2be9873616e968
parent74460ec2219e73a9702b597071ae24f948b33d8a (diff)
plugin: Fix `is-ges-timeline` registration
We need to register it for all subclasses. Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-editing-services/-/merge_requests/227>
-rw-r--r--plugins/ges/gesbasebin.c5
-rw-r--r--plugins/ges/gesdemux.c4
2 files changed, 5 insertions, 4 deletions
diff --git a/plugins/ges/gesbasebin.c b/plugins/ges/gesbasebin.c
index 14b402d3..5e1c6ca5 100644
--- a/plugins/ges/gesbasebin.c
+++ b/plugins/ges/gesbasebin.c
@@ -113,6 +113,9 @@ ges_base_bin_class_init (GESBaseBinClass * self_class)
GST_DEBUG_CATEGORY_INIT (gesbasebin, "gesbasebin", 0, "ges bin element");
+ gst_tag_register ("is-ges-timeline", GST_TAG_FLAG_META, G_TYPE_BOOLEAN,
+ "is-ges-timeline", "The stream is a ges timeline.", NULL);
+
gclass->get_property = ges_base_bin_get_property;
gclass->set_property = ges_base_bin_set_property;
gclass->dispose = ges_base_bin_dispose;
@@ -144,6 +147,8 @@ ges_base_bin_init (GESBaseBin * self)
{
GESBaseBinPrivate *priv = ges_base_bin_get_instance_private (self);
+ ges_init ();
+
priv->flow_combiner = gst_flow_combiner_new ();
}
diff --git a/plugins/ges/gesdemux.c b/plugins/ges/gesdemux.c
index 4c413d0b..ed13a067 100644
--- a/plugins/ges/gesdemux.c
+++ b/plugins/ges/gesdemux.c
@@ -204,8 +204,6 @@ ges_demux_class_init (GESDemuxClass * self_class)
sinkpad_caps = ges_demux_get_sinkpad_caps ();
- gst_tag_register ("is-ges-timeline", GST_TAG_FLAG_META, G_TYPE_BOOLEAN,
- "is-ges-timeline", "The stream is a ges timeline.", NULL);
gclass->get_property = ges_demux_get_property;
gclass->set_property = ges_demux_set_property;
@@ -607,8 +605,6 @@ ges_demux_sink_chain (GstPad * pad, GstObject * parent, GstBuffer * buffer)
static void
ges_demux_init (GESDemux * self)
{
- ges_init ();
-
SUPRESS_UNUSED_WARNING (GES_DEMUX);
SUPRESS_UNUSED_WARNING (GES_IS_DEMUX);
#if defined(g_autoptr)