Commit 5a046c7e authored by Tim-Philipp Müller's avatar Tim-Philipp Müller 🐠
Browse files

gst/interleave/interleave.c: Let's not call every request pad we create...

gst/interleave/interleave.c: Let's not call every request pad we create "sink%d", that'll create problems if there's ...

Original commit message from CVS:
* gst/interleave/interleave.c: (gst_interleave_request_new_pad):
Let's not call every request pad we create "sink%d", that'll
create problems if there's to be more than one pad. Fixes #490682.
* tests/check/Makefile.am:
* tests/check/elements/.cvsignore:
* tests/check/elements/interleave.c:
Add unit test for the above.
parent 94c519ce
......@@ -195,27 +195,30 @@ static GstPad *
gst_interleave_request_new_pad (GstElement * element, GstPadTemplate * templ,
const gchar * name)
{
GstPad *new;
GstInterleave *self = GST_INTERLEAVE (element);
GstPad *new_pad;
gchar *pad_name;
new = g_object_new (GST_TYPE_INTERLEAVE_PAD,
"name", GST_OBJECT_NAME (templ), "direction", templ->direction,
"template", templ, NULL);
GST_INTERLEAVE_PAD (new)->channel = self->channels++;
pad_name = g_strdup_printf ("sink%d", self->channels);
new_pad = g_object_new (GST_TYPE_INTERLEAVE_PAD, "name", pad_name,
"direction", templ->direction, "template", templ, NULL);
g_free (pad_name);
GST_INTERLEAVE_PAD (new_pad)->channel = self->channels;
++self->channels;
gst_pad_set_setcaps_function (new,
gst_pad_set_setcaps_function (new_pad,
GST_DEBUG_FUNCPTR (gst_interleave_sink_setcaps));
gst_pad_set_chain_function (new, GST_DEBUG_FUNCPTR (gst_interleave_chain));
gst_pad_set_activatepush_function (new,
gst_pad_set_chain_function (new_pad,
GST_DEBUG_FUNCPTR (gst_interleave_chain));
gst_pad_set_activatepush_function (new_pad,
GST_DEBUG_FUNCPTR (gst_interleave_sink_activate_push));
self->pending_in++;
GST_PAD_UNSET_FLUSHING (new);
gst_element_add_pad (element, new);
GST_PAD_UNSET_FLUSHING (new_pad);
gst_element_add_pad (element, new_pad);
return new;
return new_pad;
}
static void
......
/* GStreamer unit tests for the interleave element
* Copyright (C) 2007 Tim-Philipp Müller <tim centricular net>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public
* License along with this library; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
#include <gst/check/gstcheck.h>
GST_START_TEST (test_create_and_unref)
{
GstElement *interleave;
interleave = gst_element_factory_make ("interleave", NULL);
fail_unless (interleave != NULL);
gst_element_set_state (interleave, GST_STATE_NULL);
gst_object_unref (interleave);
}
GST_END_TEST;
GST_START_TEST (test_request_pads)
{
GstElement *interleave;
GstPad *pad1, *pad2;
interleave = gst_element_factory_make ("interleave", NULL);
fail_unless (interleave != NULL);
pad1 = gst_element_get_request_pad (interleave, "sink%d");
fail_unless (pad1 != NULL);
fail_unless_equals_string (GST_OBJECT_NAME (pad1), "sink0");
pad2 = gst_element_get_request_pad (interleave, "sink%d");
fail_unless (pad2 != NULL);
fail_unless_equals_string (GST_OBJECT_NAME (pad2), "sink1");
gst_element_release_request_pad (interleave, pad2);
gst_object_unref (pad2);
gst_element_release_request_pad (interleave, pad1);
gst_object_unref (pad1);
gst_element_set_state (interleave, GST_STATE_NULL);
gst_object_unref (interleave);
}
GST_END_TEST;
static Suite *
interleave_suite (void)
{
Suite *s = suite_create ("interleave");
TCase *tc_chain = tcase_create ("general");
suite_add_tcase (s, tc_chain);
tcase_add_test (tc_chain, test_create_and_unref);
tcase_add_test (tc_chain, test_request_pads);
return s;
}
GST_CHECK_MAIN (interleave);
Markdown is supported
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