diff options
| author | Stefan Kost <ensonic@users.sf.net> | 2010-07-06 18:20:40 +0300 |
|---|---|---|
| committer | Stefan Kost <ensonic@users.sf.net> | 2010-08-05 10:31:35 +0300 |
| commit | ced3d517ebec9736832432b9de32bb76cc88e74a (patch) | |
| tree | a220ecd5822e081d78ac06d5946cae754da690ec | |
| parent | d3f63b1b8764af72375afc8cbec2f8717979a88d (diff) | |
benchmark: cleanup last change in capsnego benchmark
A pad name is not a factory name.
| -rw-r--r-- | tests/benchmarks/capsnego.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/tests/benchmarks/capsnego.c b/tests/benchmarks/capsnego.c index 8f6df8e5c4..d3df88909b 100644 --- a/tests/benchmarks/capsnego.c +++ b/tests/benchmarks/capsnego.c @@ -43,15 +43,19 @@ enum { ELEM_SRC = 0, ELEM_MIX, - SINKPAD_MIX, ELEM_PROC, ELEM_CONV, NUM_ELEM }; static const gchar *factories[NUM_FLAVOURS][NUM_ELEM] = { - {"audiotestsrc", "adder", "sink%d", "volume", "audioconvert"}, - {"videotestsrc", "videomixer", "sink_%d", "videoscale", "ffmpegcolorspace"} + {"audiotestsrc", "adder", "volume", "audioconvert"}, + {"videotestsrc", "videomixer", "videoscale", "ffmpegcolorspace"} +}; + +static const gchar *sink_pads[NUM_FLAVOURS][NUM_ELEM] = { + {NULL, "sink%d", NULL, NULL}, + {NULL, "sink_%d", NULL, NULL} }; @@ -103,7 +107,7 @@ create_nodes (GstBin * bin, GstElement * sink, gint depth, gint children, for (i = 0; i < children; i++) { if (depth > 0) { - if (!create_node (bin, sink, factories[flavour][SINKPAD_MIX], &new_sink, + if (!create_node (bin, sink, sink_pads[flavour][ELEM_MIX], &new_sink, children, flavour)) { return FALSE; } @@ -118,7 +122,7 @@ create_nodes (GstBin * bin, GstElement * sink, gint depth, gint children, } gst_bin_add (bin, src); if (!gst_element_link_pads_full (src, "src", sink, - factories[flavour][SINKPAD_MIX], GST_PAD_LINK_CHECK_NOTHING)) { + sink_pads[flavour][ELEM_MIX], GST_PAD_LINK_CHECK_NOTHING)) { GST_WARNING ("can't link elements"); return FALSE; } |