summaryrefslogtreecommitdiff
path: root/gst/inter
diff options
context:
space:
mode:
authorSebastian Dröge <sebastian@centricular.com>2014-06-29 20:58:40 +0200
committerSebastian Dröge <sebastian@centricular.com>2014-06-29 20:58:40 +0200
commitc15458b8cb6e932b351ec4bcacced506bfff80a5 (patch)
tree6ac2676a5539e297139a998c98319d98963fc46a /gst/inter
parentb02cbcfa4201e43adecf4bbc41bbe6bb7d7dfdb3 (diff)
downloadgstreamer-plugins-bad-c15458b8cb6e932b351ec4bcacced506bfff80a5.tar.gz
intersubsink/src: Free channel string when finalizing the instance
Diffstat (limited to 'gst/inter')
-rw-r--r--gst/inter/gstintersubsink.c17
-rw-r--r--gst/inter/gstintersubsrc.c15
2 files changed, 28 insertions, 4 deletions
diff --git a/gst/inter/gstintersubsink.c b/gst/inter/gstintersubsink.c
index f2f83974b..eaa12f75a 100644
--- a/gst/inter/gstintersubsink.c
+++ b/gst/inter/gstintersubsink.c
@@ -53,6 +53,7 @@ static void gst_inter_sub_sink_set_property (GObject * object,
guint property_id, const GValue * value, GParamSpec * pspec);
static void gst_inter_sub_sink_get_property (GObject * object,
guint property_id, GValue * value, GParamSpec * pspec);
+static void gst_inter_sub_sink_finalize (GObject * object);
static void gst_inter_sub_sink_get_times (GstBaseSink * sink,
GstBuffer * buffer, GstClockTime * start, GstClockTime * end);
@@ -78,7 +79,7 @@ GST_STATIC_PAD_TEMPLATE ("sink",
/* class initialization */
-
+#define parent_class gst_inter_sub_sink_parent_class
G_DEFINE_TYPE (GstInterSubSink, gst_inter_sub_sink, GST_TYPE_BASE_SINK);
static void
@@ -102,6 +103,7 @@ gst_inter_sub_sink_class_init (GstInterSubSinkClass * klass)
gobject_class->set_property = gst_inter_sub_sink_set_property;
gobject_class->get_property = gst_inter_sub_sink_get_property;
+ gobject_class->finalize = gst_inter_sub_sink_finalize;
base_sink_class->get_times = GST_DEBUG_FUNCPTR (gst_inter_sub_sink_get_times);
base_sink_class->start = GST_DEBUG_FUNCPTR (gst_inter_sub_sink_start);
base_sink_class->stop = GST_DEBUG_FUNCPTR (gst_inter_sub_sink_stop);
@@ -117,7 +119,6 @@ gst_inter_sub_sink_class_init (GstInterSubSinkClass * klass)
static void
gst_inter_sub_sink_init (GstInterSubSink * intersubsink)
{
-
intersubsink->channel = g_strdup ("default");
intersubsink->fps_n = 1;
@@ -158,6 +159,18 @@ gst_inter_sub_sink_get_property (GObject * object, guint property_id,
}
static void
+gst_inter_sub_sink_finalize (GObject * object)
+{
+ GstInterSubSink *intersubsink = GST_INTER_SUB_SINK (object);
+
+ g_free (intersubsink->channel);
+ intersubsink->channel = NULL;
+
+ G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+
+static void
gst_inter_sub_sink_get_times (GstBaseSink * sink, GstBuffer * buffer,
GstClockTime * start, GstClockTime * end)
{
diff --git a/gst/inter/gstintersubsrc.c b/gst/inter/gstintersubsrc.c
index e84147d8b..68fc8d596 100644
--- a/gst/inter/gstintersubsrc.c
+++ b/gst/inter/gstintersubsrc.c
@@ -54,6 +54,7 @@ static void gst_inter_sub_src_set_property (GObject * object,
guint property_id, const GValue * value, GParamSpec * pspec);
static void gst_inter_sub_src_get_property (GObject * object,
guint property_id, GValue * value, GParamSpec * pspec);
+static void gst_inter_sub_src_finalize (GObject * object);
static gboolean gst_inter_sub_src_start (GstBaseSrc * src);
static gboolean gst_inter_sub_src_stop (GstBaseSrc * src);
@@ -79,9 +80,8 @@ GST_STATIC_PAD_TEMPLATE ("src",
GST_STATIC_CAPS ("application/unknown")
);
-
/* class initialization */
-
+#define parent_class gst_inter_sub_src_parent_class
G_DEFINE_TYPE (GstInterSubSrc, gst_inter_sub_src, GST_TYPE_BASE_SRC);
static void
@@ -105,6 +105,7 @@ gst_inter_sub_src_class_init (GstInterSubSrcClass * klass)
gobject_class->set_property = gst_inter_sub_src_set_property;
gobject_class->get_property = gst_inter_sub_src_get_property;
+ gobject_class->finalize = gst_inter_sub_src_finalize;
base_src_class->start = GST_DEBUG_FUNCPTR (gst_inter_sub_src_start);
base_src_class->stop = GST_DEBUG_FUNCPTR (gst_inter_sub_src_stop);
base_src_class->get_times = GST_DEBUG_FUNCPTR (gst_inter_sub_src_get_times);
@@ -162,6 +163,16 @@ gst_inter_sub_src_get_property (GObject * object, guint property_id,
}
}
+static void
+gst_inter_sub_src_finalize (GObject * object)
+{
+ GstInterSubSrc *intersubsrc = GST_INTER_SUB_SRC (object);
+
+ g_free (intersubsrc->channel);
+ intersubsrc->channel = NULL;
+
+ G_OBJECT_CLASS (parent_class)->finalize (object);
+}
static gboolean
gst_inter_sub_src_start (GstBaseSrc * src)