gst/selector/gstinputselector.*: Added "select-all" property to make it work like aggregator in 0.8.

Original commit message from CVS:
* gst/selector/gstinputselector.c:
* gst/selector/gstinputselector.h:
Added "select-all" property to make it work like aggregator in 0.8.
* gst/selector/gstoutputselector.c:
Fix resend-latest behavoiur.
* tests/check/Makefile.am:
* tests/check/elements/.cvsignore:
* tests/check/elements/selector.c:
Add unit tests for selector.
This commit is contained in:
Stefan Kost 2008-02-25 08:53:51 +00:00
parent a49e89d514
commit 188190e0e8
7 changed files with 476 additions and 9 deletions

View file

@ -1,3 +1,17 @@
2008-02-25 Stefan Kost <ensonic@users.sf.net>
* gst/selector/gstinputselector.c:
* gst/selector/gstinputselector.h:
Added "select-all" property to make it work like aggregator in 0.8.
* gst/selector/gstoutputselector.c:
Fix resend-latest behavoiur.
* tests/check/Makefile.am:
* tests/check/elements/.cvsignore:
* tests/check/elements/selector.c:
Add unit tests for selector.
2008-02-25 Sebastian Dröge <slomo@circular-chaos.org>
* configure.ac:

View file

@ -65,7 +65,8 @@ GST_STATIC_PAD_TEMPLATE ("src",
enum
{
PROP_ACTIVE_PAD = 1
PROP_ACTIVE_PAD = 1,
PROP_SELECT_ALL
};
enum
@ -89,6 +90,7 @@ static GstPad *gst_input_selector_activate_sinkpad (GstInputSelector * sel,
static GstPad *gst_input_selector_get_linked_pad (GstPad * pad,
gboolean strict);
static void gst_input_selector_push_pending_stop (GstInputSelector * self);
static gboolean gst_input_selector_check_eos (GstElement * selector);
#define GST_TYPE_SELECTOR_PAD \
(gst_selector_pad_get_type())
@ -276,6 +278,11 @@ gst_selector_pad_event (GstPad * pad, GstEvent * event)
/* only forward if we are dealing with the active sinkpad */
forward = gst_input_selector_is_active_sinkpad (sel, pad);
/* forward all events in select_all mode by default */
if (sel->select_all) {
forward = TRUE;
}
switch (GST_EVENT_TYPE (event)) {
case GST_EVENT_FLUSH_STOP:
gst_selector_pad_reset (selpad);
@ -306,6 +313,10 @@ gst_selector_pad_event (GstPad * pad, GstEvent * event)
}
case GST_EVENT_EOS:
selpad->eos = TRUE;
/* don't forward eos in select_all mode until all sink pads have eos */
if (sel->select_all && !gst_input_selector_check_eos (GST_ELEMENT (sel))) {
forward = FALSE;
}
break;
default:
break;
@ -351,7 +362,7 @@ gst_selector_pad_bufferalloc (GstPad * pad, guint64 offset,
active_sinkpad = gst_input_selector_activate_sinkpad (sel, pad);
/* Fallback allocation for buffers from pads except the selected one */
if (pad != active_sinkpad) {
if (pad != active_sinkpad && !sel->select_all) {
GST_DEBUG_OBJECT (sel,
"Pad %s:%s is not selected. Performing fallback allocation",
GST_DEBUG_PAD_NAME (pad));
@ -429,7 +440,7 @@ gst_selector_pad_chain (GstPad * pad, GstBuffer * buf)
}
/* Ignore buffers from pads except the selected one */
if (pad != active_sinkpad)
if (pad != active_sinkpad && !sel->select_all)
goto ignore;
gst_input_selector_push_pending_stop (sel);
@ -535,6 +546,9 @@ gst_input_selector_class_init (GstInputSelectorClass * klass)
g_object_class_install_property (gobject_class, PROP_ACTIVE_PAD,
g_param_spec_string ("active-pad", "Active pad",
"Name of the currently" " active sink pad", NULL, G_PARAM_READWRITE));
g_object_class_install_property (gobject_class, PROP_SELECT_ALL,
g_param_spec_boolean ("select-all", "Select all mode",
"Forwards data from all input pads", FALSE, G_PARAM_READWRITE));
gobject_class->dispose = gst_input_selector_dispose;
gstelement_class->request_new_pad = gst_input_selector_request_new_pad;
gstelement_class->release_pad = gst_input_selector_release_pad;
@ -618,6 +632,8 @@ gst_input_selector_init (GstInputSelector * sel)
sel->blocked_cond = g_cond_new ();
sel->blocked = FALSE;
sel->select_all = FALSE;
}
static void
@ -721,6 +737,9 @@ gst_input_selector_set_property (GObject * object, guint prop_id,
gst_input_selector_set_active_pad (sel,
g_value_get_string (value), GST_CLOCK_TIME_NONE, GST_CLOCK_TIME_NONE);
break;
case PROP_SELECT_ALL:
sel->select_all = g_value_get_boolean (value);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
@ -744,6 +763,9 @@ gst_input_selector_get_property (GObject * object, guint prop_id,
GST_OBJECT_UNLOCK (object);
break;
}
case PROP_SELECT_ALL:
g_value_set_boolean (value, sel->select_all);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
@ -776,8 +798,13 @@ gst_input_selector_getcaps (GstPad * pad)
GstObject *parent;
GstCaps *caps;
otherpad = gst_input_selector_get_linked_pad (pad, FALSE);
parent = gst_object_get_parent (GST_OBJECT (pad));
if (GST_INPUT_SELECTOR (parent)->select_all) {
caps = gst_pad_proxy_getcaps (pad);
goto done;
}
otherpad = gst_input_selector_get_linked_pad (pad, FALSE);
if (!otherpad) {
GST_DEBUG_OBJECT (parent,
"Pad %s:%s not linked, returning ANY", GST_DEBUG_PAD_NAME (pad));
@ -793,6 +820,7 @@ gst_input_selector_getcaps (GstPad * pad)
gst_object_unref (otherpad);
}
done:
gst_object_unref (parent);
return caps;
}
@ -981,3 +1009,39 @@ gst_input_selector_switch (GstInputSelector * self, const gchar * pad_name,
g_cond_broadcast (self->blocked_cond);
GST_OBJECT_UNLOCK (self);
}
static gboolean
gst_input_selector_check_eos (GstElement * selector)
{
GstIterator *it = gst_element_iterate_sink_pads (selector);
GstIteratorResult ires;
gpointer item;
gboolean done = FALSE, is_eos = FALSE;
GstSelectorPad *pad;
while (!done) {
ires = gst_iterator_next (it, &item);
switch (ires) {
case GST_ITERATOR_DONE:
GST_INFO_OBJECT (selector, "all sink pads have eos");
done = TRUE;
is_eos = TRUE;
break;
case GST_ITERATOR_OK:
pad = GST_SELECTOR_PAD_CAST (item);
if (!pad->eos) {
done = TRUE;
}
break;
case GST_ITERATOR_RESYNC:
gst_iterator_resync (it);
break;
default:
done = TRUE;
break;
}
}
gst_iterator_free (it);
return is_eos;
}

View file

@ -54,6 +54,9 @@ struct _GstInputSelector {
gboolean blocked;
gboolean pending_stop;
GstSegment pending_stop_segment;
/* select all mode, send data from all input pads forward */
gboolean select_all;
};
struct _GstInputSelectorClass {

View file

@ -367,11 +367,9 @@ gst_output_selector_chain (GstPad * pad, GstBuffer * buf)
}
/* Keep reference to latest buffer to resend it after switch */
if (osel->resend_latest) {
if (osel->latest_buffer)
gst_buffer_unref (osel->latest_buffer);
osel->latest_buffer = gst_buffer_ref (buf);
}
if (osel->latest_buffer)
gst_buffer_unref (osel->latest_buffer);
osel->latest_buffer = gst_buffer_ref (buf);
/* Keep track of last stop and use it in NEWSEGMENT start after
switching to a new src pad */

View file

@ -71,6 +71,7 @@ check_PROGRAMS = \
elements/rganalysis \
elements/rglimiter \
elements/rgvolume \
elements/selector \
elements/y4menc
noinst_HEADERS =

View file

@ -9,6 +9,7 @@ souphttpsrc
rganalysis
rglimiter
rgvolume
selector
spectrum
timidity
videocrop

View file

@ -0,0 +1,386 @@
/* GStreamer
*
* Unit test for selector plugin
* Copyright (C) 2008 Nokia Corporation. (contact <stefan.kost@nokia.com>)
*
* 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.
*/
#include <gst/check/gstcheck.h>
#define NUM_SELECTOR_PADS 4
#define NUM_INPUT_BUFFERS 4 // buffers to send per each selector pad
static GstStaticPadTemplate sinktemplate = GST_STATIC_PAD_TEMPLATE ("sink",
GST_PAD_SINK,
GST_PAD_ALWAYS,
GST_STATIC_CAPS_ANY);
static GstStaticPadTemplate srctemplate = GST_STATIC_PAD_TEMPLATE ("src",
GST_PAD_SRC,
GST_PAD_ALWAYS,
GST_STATIC_CAPS_ANY);
/* Data probe cb to drop everything but count buffers and events */
gboolean
probe_cb (GstPad * pad, GstMiniObject * obj, gpointer user_data)
{
gint count = 0;
gchar *count_type = NULL;
GST_LOG_OBJECT (pad, "got data");
if (GST_IS_BUFFER (obj)) {
count_type = "buffer_count";
} else if (GST_IS_EVENT (obj)) {
count_type = "event_count";
} else {
g_assert_not_reached ();
}
/* increment and store count */
count = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (pad), count_type));
count++;
g_object_set_data (G_OBJECT (pad), count_type, GINT_TO_POINTER (count));
/* drop everything */
return FALSE;
}
/* Create and link output pad: selector:src%d ! output_pad */
GstPad *
setup_output_pad (GstElement * element)
{
GstPad *srcpad = NULL, *output_pad = NULL;
gulong probe_id = 0;
/* create output_pad */
output_pad = gst_pad_new_from_static_template (&sinktemplate, "sink");
fail_if (output_pad == NULL, "Could not create a output_pad");
/* add probe */
probe_id = gst_pad_add_data_probe (output_pad, G_CALLBACK (probe_cb), NULL);
g_object_set_data (G_OBJECT (output_pad), "probe_id",
GINT_TO_POINTER (probe_id));
/* request src pad */
srcpad = gst_element_get_request_pad (element, "src%d");
fail_if (srcpad == NULL, "Could not get source pad from %s",
GST_ELEMENT_NAME (element));
/* link pads and activate */
fail_unless (gst_pad_link (srcpad, output_pad) == GST_PAD_LINK_OK,
"Could not link %s source and output pad", GST_ELEMENT_NAME (element));
gst_pad_set_active (output_pad, TRUE);
GST_DEBUG_OBJECT (output_pad, "set up %" GST_PTR_FORMAT " ! %" GST_PTR_FORMAT,
srcpad, output_pad);
gst_object_unref (srcpad);
ASSERT_OBJECT_REFCOUNT (srcpad, "srcpad", 1);
return output_pad;
}
/* Clean up output/input pad and respective selector request pad */
void
cleanup_pad (GstPad * pad, GstElement * element)
{
GstPad *selpad = NULL;
guint probe_id = 0;
fail_if (pad == NULL, "pad doesn't exist");
/* remove probe if necessary */
probe_id = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (pad), "probe_id"));
if (probe_id)
gst_pad_remove_data_probe (pad, probe_id);
/* unlink */
selpad = gst_pad_get_peer (pad);
if (GST_PAD_DIRECTION (selpad) == GST_PAD_SRC) {
gst_pad_unlink (selpad, pad);
} else {
gst_pad_unlink (pad, selpad);
}
/* caps could have been set, make sure they get unset */
gst_pad_set_caps (pad, NULL);
GST_DEBUG_OBJECT (pad, "clean up %" GST_PTR_FORMAT " and %" GST_PTR_FORMAT,
selpad, pad);
/* cleanup the pad */
gst_pad_set_active (pad, FALSE);
ASSERT_OBJECT_REFCOUNT (pad, "pad", 1);
gst_object_unref (pad);
/* cleanup selector pad, reffed by this function (_get_peer) and creator */
gst_object_unref (selpad);
gst_element_release_request_pad (element, selpad);
}
/* Duplicate and push given buffer many times to all input_pads */
void
push_input_buffers (GList * input_pads, GstBuffer * buf, gint num_buffers)
{
GstBuffer *buf_in = NULL;
GList *l = input_pads;
GstPad *input_pad;
gint i = 0;
while (l != NULL) {
input_pad = l->data;
GST_DEBUG_OBJECT (input_pad, "pushing %d buffers to %" GST_PTR_FORMAT,
num_buffers, input_pad);
for (i = 0; i < num_buffers; i++) {
buf_in = gst_buffer_copy (buf);
fail_unless (gst_pad_push (input_pad, buf_in) == GST_FLOW_OK,
"pushing buffer failed");
}
l = g_list_next (l);
}
}
/* Check that received buffers count match to expected buffers */
void
count_output_buffers (GList * output_pads, gint expected_buffers)
{
gint count = 0;
GList *l = output_pads;
GstPad *output_pad = NULL;
while (l != NULL) {
output_pad = l->data;
count =
GPOINTER_TO_INT (g_object_get_data (G_OBJECT (output_pad),
"buffer_count"));
GST_DEBUG_OBJECT (output_pad, "received %d buffers", count);
fail_unless (count == expected_buffers,
"received/expected buffer count doesn't match %d/%d", count,
expected_buffers);
count =
GPOINTER_TO_INT (g_object_get_data (G_OBJECT (output_pad),
"event_count"));
GST_DEBUG_OBJECT (output_pad, "received %d events", count);
l = g_list_next (l);
}
}
/* Set selector active pad */
void
selector_set_active_pad (GstElement * elem, GstPad * selpad)
{
gchar *padname = "";
if (selpad) {
padname = gst_pad_get_name (selpad);
}
g_object_set (G_OBJECT (elem), "active-pad", padname, NULL);
GST_DEBUG_OBJECT (elem, "activated selector pad: %s", padname);
if (selpad) {
g_free (padname);
}
}
/* Push buffers and switch for each selector pad */
void
push_switched_buffers (GList * input_pads,
GstElement * elem, GList * peer_pads, gint num_buffers)
{
GstBuffer *buf = NULL;
GstCaps *caps = NULL;
GList *l = peer_pads;
GstPad *selpad = NULL;
/* setup dummy buffer */
caps = gst_caps_from_string ("application/x-unknown");
buf = gst_buffer_new_and_alloc (1);
gst_buffer_set_caps (buf, caps);
gst_caps_unref (caps);
while (l != NULL) {
/* set selector pad */
selpad = gst_pad_get_peer (GST_PAD (l->data));
selector_set_active_pad (elem, selpad);
if (selpad) {
gst_object_unref (selpad);
}
/* push buffers */
push_input_buffers (input_pads, buf, num_buffers);
/* switch to next selector pad */
l = g_list_next (l);
}
/* cleanup buffer */
gst_buffer_unref (buf);
}
/* Create output-selector with given number of src pads and switch
given number of input buffers to each src pad.
*/
void
run_output_selector_buffer_count (gint num_output_pads,
gint num_buffers_per_output)
{
/* setup input_pad ! selector ! output_pads */
gint i = 0;
GList *output_pads = NULL, *input_pads = NULL;
GstElement *sel = gst_check_setup_element ("output-selector");
GstPad *input_pad = gst_check_setup_src_pad (sel, &srctemplate, NULL);
input_pads = g_list_append (input_pads, input_pad);
gst_pad_set_active (input_pad, TRUE);
for (i = 0; i < num_output_pads; i++) {
output_pads = g_list_append (output_pads, setup_output_pad (sel));
}
/* run the test */
fail_unless (gst_element_set_state (sel,
GST_STATE_PLAYING) == GST_STATE_CHANGE_SUCCESS,
"could not set to playing");
push_switched_buffers (input_pads, sel, output_pads, num_buffers_per_output);
count_output_buffers (output_pads, num_buffers_per_output);
fail_unless (gst_element_set_state (sel,
GST_STATE_NULL) == GST_STATE_CHANGE_SUCCESS, "could not set to null");
/* cleanup input_pad, selector and output_pads */
gst_pad_set_active (input_pad, FALSE);
gst_check_teardown_src_pad (sel);
g_list_foreach (output_pads, (GFunc) cleanup_pad, sel);
g_list_free (output_pads);
g_list_free (input_pads);
gst_check_teardown_element (sel);
}
/* Create and link input pad: input_pad ! selector:sink%d */
GstPad *
setup_input_pad (GstElement * element)
{
GstPad *sinkpad = NULL, *input_pad = NULL;
/* create input_pad */
input_pad = gst_pad_new_from_static_template (&srctemplate, "src");
fail_if (input_pad == NULL, "Could not create a input_pad");
/* request sink pad */
sinkpad = gst_element_get_request_pad (element, "sink%d");
fail_if (sinkpad == NULL, "Could not get sink pad from %s",
GST_ELEMENT_NAME (element));
/* link pads and activate */
fail_unless (gst_pad_link (input_pad, sinkpad) == GST_PAD_LINK_OK,
"Could not link input_pad and %s sink", GST_ELEMENT_NAME (element));
gst_pad_set_active (input_pad, TRUE);
GST_DEBUG_OBJECT (input_pad, "set up %" GST_PTR_FORMAT " ! %" GST_PTR_FORMAT,
input_pad, sinkpad);
gst_object_unref (sinkpad);
ASSERT_OBJECT_REFCOUNT (sinkpad, "sinkpad", 1);
return input_pad;
}
/* Create input-selector with given number of sink pads and switch
given number of input buffers to each sink pad.
*/
void
run_input_selector_buffer_count (gint num_input_pads,
gint num_buffers_per_input)
{
/* set up input_pads ! selector ! output_pad */
gint i = 0, probe_id = 0;
GList *input_pads = NULL, *output_pads = NULL;
GstElement *sel = gst_check_setup_element ("input-selector");
GstPad *output_pad = gst_check_setup_sink_pad (sel, &sinktemplate, NULL);
output_pads = g_list_append (output_pads, output_pad);
gst_pad_set_active (output_pad, TRUE);
for (i = 0; i < num_input_pads; i++) {
input_pads = g_list_append (input_pads, setup_input_pad (sel));
}
/* add probe */
probe_id = gst_pad_add_data_probe (output_pad, G_CALLBACK (probe_cb), NULL);
g_object_set_data (G_OBJECT (output_pad), "probe_id",
GINT_TO_POINTER (probe_id));
/* run the test */
fail_unless (gst_element_set_state (sel,
GST_STATE_PLAYING) == GST_STATE_CHANGE_SUCCESS,
"could not set to playing");
push_switched_buffers (input_pads, sel, input_pads, num_buffers_per_input);
count_output_buffers (output_pads, (num_input_pads * num_buffers_per_input));
fail_unless (gst_element_set_state (sel,
GST_STATE_NULL) == GST_STATE_CHANGE_SUCCESS, "could not set to null");
/* clean up */
gst_pad_remove_data_probe (output_pad, probe_id);
gst_pad_set_active (output_pad, FALSE);
gst_check_teardown_sink_pad (sel);
selector_set_active_pad (sel, NULL); // unref input-selector active pad
g_list_foreach (input_pads, (GFunc) cleanup_pad, sel);
g_list_free (input_pads);
g_list_free (output_pads);
gst_check_teardown_element (sel);
}
/* Push buffers to input pad and check the
amount of buffers arrived to output pads */
GST_START_TEST (test_output_selector_buffer_count);
{
gint i, j;
for (i = 0; i < NUM_SELECTOR_PADS; i++) {
for (j = 0; j < NUM_INPUT_BUFFERS; j++) {
run_output_selector_buffer_count (i, j);
}
}
}
GST_END_TEST;
/* Push buffers to input pads and check the
amount of buffers arrived to output pad */
GST_START_TEST (test_input_selector_buffer_count);
{
gint i, j;
for (i = 0; i < NUM_SELECTOR_PADS; i++) {
for (j = 0; j < NUM_INPUT_BUFFERS; j++) {
run_input_selector_buffer_count (i, j);
}
}
}
GST_END_TEST;
Suite *
selector_suite (void)
{
Suite *s = suite_create ("selector");
TCase *tc_chain = tcase_create ("general");
suite_add_tcase (s, tc_chain);
tcase_add_test (tc_chain, test_output_selector_buffer_count);
tcase_add_test (tc_chain, test_input_selector_buffer_count);
return s;
}
GST_CHECK_MAIN (selector);