Skip to content
GitLab
Commit 4ab30e55 authored by Thomas Vander Stichele's avatar Thomas Vander Stichele
Browse files

sigh, static pad templates aren't refcounted properly 

Original commit message from CVS:
sigh, static pad templates aren't refcounted properly
parent 41924ca7
Hide whitespace changes
Inline Side-by-side
check/elements/matroskamux.c
View file @ 4ab30e55
...@@ -65,7 +65,6 @@ setup_src_pad (GstElement * element, ...@@ -65,7 +65,6 @@ setup_src_pad (GstElement * element,
/* sending pad */ /* sending pad */
templ = gst_static_pad_template_get (template); templ = gst_static_pad_template_get (template);
srcpad = gst_pad_new_from_template (templ, "src"); srcpad = gst_pad_new_from_template (templ, "src");
gst_object_unref (templ);
fail_if (srcpad == NULL, "Could not create a srcpad"); fail_if (srcpad == NULL, "Could not create a srcpad");
ASSERT_OBJECT_REFCOUNT (srcpad, "srcpad", 1); ASSERT_OBJECT_REFCOUNT (srcpad, "srcpad", 1);
...@@ -117,7 +116,6 @@ setup_sink_pad (GstElement * element, GstStaticPadTemplate * template, ...@@ -117,7 +116,6 @@ setup_sink_pad (GstElement * element, GstStaticPadTemplate * template,
/* receiving pad */ /* receiving pad */
templ = gst_static_pad_template_get (template); templ = gst_static_pad_template_get (template);
sinkpad = gst_pad_new_from_template (templ, "sink"); sinkpad = gst_pad_new_from_template (templ, "sink");
gst_object_unref (templ);
fail_if (sinkpad == NULL, "Could not create a sinkpad"); fail_if (sinkpad == NULL, "Could not create a sinkpad");
...@@ -197,10 +195,12 @@ GST_START_TEST (test_ebml_header) ...@@ -197,10 +195,12 @@ GST_START_TEST (test_ebml_header)
int i; int i;
guint8 data0[12] = guint8 data0[12] =
{ 0x1a, 0x45, 0xdf, 0xa3, 0x01, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, { 0x1a, 0x45, 0xdf, 0xa3, 0x01, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
0xff }; 0xff
};
guint8 data1[12] = guint8 data1[12] =
{ 0x42, 0x82, 0x89, 0x6d, 0x61, 0x74, 0x72, 0x6f, 0x73, 0x6b, 0x61, { 0x42, 0x82, 0x89, 0x6d, 0x61, 0x74, 0x72, 0x6f, 0x73, 0x6b, 0x61,
0x00 }; 0x00
};
guint8 data2[4] = { 0x42, 0x87, 0x81, 0x01 }; guint8 data2[4] = { 0x42, 0x87, 0x81, 0x01 };
guint8 data3[4] = { 0x42, 0x85, 0x81, 0x01 }; guint8 data3[4] = { 0x42, 0x85, 0x81, 0x01 };
guint8 data4[8] = { 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14 }; guint8 data4[8] = { 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14 };
...@@ -264,7 +264,8 @@ GST_START_TEST (test_vorbis_header) ...@@ -264,7 +264,8 @@ GST_START_TEST (test_vorbis_header)
gboolean vorbis_header_found = FALSE; gboolean vorbis_header_found = FALSE;
guint8 data[12] = guint8 data[12] =
{ 0x63, 0xa2, 0x89, 0x02, 0x01, 0x02, 0x10, 0x20, 0x20, 0x30, 0x30, { 0x63, 0xa2, 0x89, 0x02, 0x01, 0x02, 0x10, 0x20, 0x20, 0x30, 0x30,
0x30 }; 0x30
};
matroskamux = setup_matroskamux (&srcvorbistemplate); matroskamux = setup_matroskamux (&srcvorbistemplate);
fail_unless (gst_element_set_state (matroskamux, fail_unless (gst_element_set_state (matroskamux,
......
common @ 959da4a4
Subproject commit a0c6a14dbc3cb62bf513502eaef83d0600a7c1ca Subproject commit 959da4a43c2e6218eb4f43e8c7e29c1db4157db1
tests/check/elements/matroskamux.c
View file @ 4ab30e55
...@@ -65,7 +65,6 @@ setup_src_pad (GstElement * element, ...@@ -65,7 +65,6 @@ setup_src_pad (GstElement * element,
/* sending pad */ /* sending pad */
templ = gst_static_pad_template_get (template); templ = gst_static_pad_template_get (template);
srcpad = gst_pad_new_from_template (templ, "src"); srcpad = gst_pad_new_from_template (templ, "src");
gst_object_unref (templ);
fail_if (srcpad == NULL, "Could not create a srcpad"); fail_if (srcpad == NULL, "Could not create a srcpad");
ASSERT_OBJECT_REFCOUNT (srcpad, "srcpad", 1); ASSERT_OBJECT_REFCOUNT (srcpad, "srcpad", 1);
...@@ -117,7 +116,6 @@ setup_sink_pad (GstElement * element, GstStaticPadTemplate * template, ...@@ -117,7 +116,6 @@ setup_sink_pad (GstElement * element, GstStaticPadTemplate * template,
/* receiving pad */ /* receiving pad */
templ = gst_static_pad_template_get (template); templ = gst_static_pad_template_get (template);
sinkpad = gst_pad_new_from_template (templ, "sink"); sinkpad = gst_pad_new_from_template (templ, "sink");
gst_object_unref (templ);
fail_if (sinkpad == NULL, "Could not create a sinkpad"); fail_if (sinkpad == NULL, "Could not create a sinkpad");
...@@ -197,10 +195,12 @@ GST_START_TEST (test_ebml_header) ...@@ -197,10 +195,12 @@ GST_START_TEST (test_ebml_header)
int i; int i;
guint8 data0[12] = guint8 data0[12] =
{ 0x1a, 0x45, 0xdf, 0xa3, 0x01, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, { 0x1a, 0x45, 0xdf, 0xa3, 0x01, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
0xff }; 0xff
};
guint8 data1[12] = guint8 data1[12] =
{ 0x42, 0x82, 0x89, 0x6d, 0x61, 0x74, 0x72, 0x6f, 0x73, 0x6b, 0x61, { 0x42, 0x82, 0x89, 0x6d, 0x61, 0x74, 0x72, 0x6f, 0x73, 0x6b, 0x61,
0x00 }; 0x00
};
guint8 data2[4] = { 0x42, 0x87, 0x81, 0x01 }; guint8 data2[4] = { 0x42, 0x87, 0x81, 0x01 };
guint8 data3[4] = { 0x42, 0x85, 0x81, 0x01 }; guint8 data3[4] = { 0x42, 0x85, 0x81, 0x01 };
guint8 data4[8] = { 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14 }; guint8 data4[8] = { 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14 };
...@@ -264,7 +264,8 @@ GST_START_TEST (test_vorbis_header) ...@@ -264,7 +264,8 @@ GST_START_TEST (test_vorbis_header)
gboolean vorbis_header_found = FALSE; gboolean vorbis_header_found = FALSE;
guint8 data[12] = guint8 data[12] =
{ 0x63, 0xa2, 0x89, 0x02, 0x01, 0x02, 0x10, 0x20, 0x20, 0x30, 0x30, { 0x63, 0xa2, 0x89, 0x02, 0x01, 0x02, 0x10, 0x20, 0x20, 0x30, 0x30,
0x30 }; 0x30
};
matroskamux = setup_matroskamux (&srcvorbistemplate); matroskamux = setup_matroskamux (&srcvorbistemplate);
fail_unless (gst_element_set_state (matroskamux, fail_unless (gst_element_set_state (matroskamux,
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment