mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-06 07:28:53 +00:00
Code Issues 1 Projects Releases Wiki Activity

closedcaption: fix leak in line21 decoder

Browse source 
Destroy old decoder instance when shutting down the
element, and also in case the input format changes.

Fix harness/pipeline leak in unit test.
This commit is contained in:
Tim-Philipp Müller 2019-03-06 18:32:38 +00:00
parent 2ab238a4d0
commit 6dad8b7c78
2 changed files with 17 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
ext/closedcaption/gstline21dec.c
View file

@ -53,6 +53,7 @@ G_DEFINE_TYPE (GstLine21Decoder, gst_line_21_decoder, GST_TYPE_VIDEO_FILTER);
#define parent_class gst_line_21_decoder_parent_class #define parent_class gst_line_21_decoder_parent_class
static void gst_line_21_decoder_finalize (GObject * self); static void gst_line_21_decoder_finalize (GObject * self);
static gboolean gst_line_21_decoder_stop (GstBaseTransform * btrans);
static gboolean gst_line_21_decoder_set_info (GstVideoFilter * filter, static gboolean gst_line_21_decoder_set_info (GstVideoFilter * filter,
GstCaps * incaps, GstVideoInfo * in_info, GstCaps * incaps, GstVideoInfo * in_info,
GstCaps * outcaps, GstVideoInfo * out_info); GstCaps * outcaps, GstVideoInfo * out_info);
@ -85,6 +86,7 @@ gst_line_21_decoder_class_init (GstLine21DecoderClass * klass)
gst_element_class_add_static_pad_template (gstelement_class, &sinktemplate); gst_element_class_add_static_pad_template (gstelement_class, &sinktemplate);
gst_element_class_add_static_pad_template (gstelement_class, &srctemplate); gst_element_class_add_static_pad_template (gstelement_class, &srctemplate);
transform_class->stop = gst_line_21_decoder_stop;
transform_class->prepare_output_buffer = transform_class->prepare_output_buffer =
gst_line_21_decoder_prepare_output_buffer; gst_line_21_decoder_prepare_output_buffer;
@ -202,6 +204,9 @@ gst_line_21_decoder_set_info (GstVideoFilter * filter,
self->info = gst_video_info_copy (in_info); self->info = gst_video_info_copy (in_info);
/* initialize the decoder */ /* initialize the decoder */
if (self->zvbi_decoder.pattern != NULL)
vbi_raw_decoder_reset (&self->zvbi_decoder);
else
vbi_raw_decoder_init (&self->zvbi_decoder); vbi_raw_decoder_init (&self->zvbi_decoder);
/* /*
* Set up blank / black / white levels fit for NTSC, no actual relation * Set up blank / black / white levels fit for NTSC, no actual relation
@ -415,6 +420,16 @@ gst_line_21_decoder_transform_ip (GstVideoFilter * filter,
return GST_FLOW_OK; return GST_FLOW_OK;
} }
static gboolean
gst_line_21_decoder_stop (GstBaseTransform * btrans)
{
GstLine21Decoder *self = (GstLine21Decoder *) btrans;
vbi_raw_decoder_destroy (&self->zvbi_decoder);
return TRUE;
}
static void static void
gst_line_21_decoder_finalize (GObject * object) gst_line_21_decoder_finalize (GObject * object)
{ {

1
tests/check/elements/line21.c
View file

@ -83,6 +83,7 @@ GST_START_TEST (basic)
fail_unless (out_cc_meta->data[i] == full_data[i]); fail_unless (out_cc_meta->data[i] == full_data[i]);
gst_buffer_unref (outbuf); gst_buffer_unref (outbuf);
gst_harness_teardown (h);
} }
GST_END_TEST; GST_END_TEST;