gst/interleave/deinterleave.c: Add another example launch line.

Original commit message from CVS:
* gst/interleave/deinterleave.c:
Add another example launch line.
* gst/interleave/interleave.c: (interleave_24),
(gst_interleave_finalize), (gst_interleave_base_init),
(gst_interleave_class_init), (gst_interleave_init),
(gst_interleave_request_new_pad), (gst_interleave_release_pad),
(gst_interleave_change_state), (__remove_channels),
(__set_channels), (gst_interleave_sink_getcaps),
(gst_interleave_set_process_function),
(gst_interleave_sink_setcaps), (gst_interleave_sink_event),
(gst_interleave_src_query_duration), (gst_interleave_src_query),
(forward_event_func), (forward_event), (gst_interleave_src_event),
(gst_interleave_collected):
* gst/interleave/interleave.h:
Major rewrite of interleave using GstCollectpads. This new version
also supports almost all raw audio formats and has better caps
negotiation. Fixes bug #506594.
Also update docs and add some more examples.
* tests/check/elements/interleave.c: (interleave_chain_func),
(GST_START_TEST), (src_handoff_float32), (sink_handoff_float32),
(interleave_suite):
Add some more extensive unit tests for interleave.
This commit is contained in:
Sebastian Dröge 2008-05-26 10:28:47 +00:00
parent 52bc66555f
commit 22b3fb381c
4 changed files with 1160 additions and 486 deletions

View file

@ -54,6 +54,13 @@
* </programlisting>
* Decodes an MP3 file and encodes the left and right channel into separate Ogg Vorbis files.
* </para>
* <para>
* <programlisting>
* gst-launch-0.10 filesrc location=file.mp3 ! decodebin ! audioconvert ! "audio/x-raw-int,channels=2" ! deinterleave name=d interleave name=i ! audioconvert ! wavenc ! filesink location=test.wav d.src0 ! queue ! audioconvert ! i.sink1 d.src1 ! queue ! audioconvert ! i.sink0
* </programlisting>
* Decodes and deinterleaves a Stereo MP3 file into separate channels and then interleaves the channels
* again to a WAV file with the channel with the channels exchanged.
* </para>
* </refsect2>
*/

File diff suppressed because it is too large Load diff

View file

@ -3,8 +3,9 @@
* 2000 Wim Taymans <wtay@chello.be>
* 2005 Wim Taymans <wim@fluendo.com>
* 2007 Andy Wingo <wingo at pobox.com>
* 2008 Sebastian Dröge <slomo@circular-chaos.org>
*
* interleave.c: interleave samples, based on gstsignalprocessor.c
* interleave.c: interleave samples, mostly based on adder
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
@ -26,6 +27,7 @@
#define __INTERLEAVE_H__
#include <gst/gst.h>
#include <gst/base/gstcollectpads.h>
G_BEGIN_DECLS
@ -40,18 +42,34 @@ G_BEGIN_DECLS
typedef struct _GstInterleave GstInterleave;
typedef struct _GstInterleaveClass GstInterleaveClass;
typedef void (*GstInterleaveFunc) (gpointer out, gpointer in, guint stride, guint nframes);
struct _GstInterleave
{
GstElement element;
/*< private >*/
GstCollectPads *collect;
gint channels;
gint rate;
gint width;
GstCaps *sinkcaps;
guint channels;
GstClockTime timestamp;
guint64 offset;
gboolean segment_pending;
guint64 segment_position;
gdouble segment_rate;
GstSegment segment;
GstPadEventFunction collect_event;
GstInterleaveFunc func;
GstPad *src;
GstActivateMode mode;
guint pending_in;
};
struct _GstInterleaveClass

View file

@ -1,5 +1,6 @@
/* GStreamer unit tests for the interleave element
* Copyright (C) 2007 Tim-Philipp Müller <tim centricular net>
* Copyright (C) 2008 Sebastian Dröge <slomo@circular-chaos.org>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
@ -63,6 +64,442 @@ GST_START_TEST (test_request_pads)
GST_END_TEST;
static GstPad **mysrcpads, *mysinkpad;
static GstBus *bus;
static GstElement *interleave;
static gint have_data;
static gfloat input[2];
static GstStaticPadTemplate sinktemplate = GST_STATIC_PAD_TEMPLATE ("sink",
GST_PAD_SINK,
GST_PAD_ALWAYS,
GST_STATIC_CAPS ("audio/x-raw-float, "
"width = (int) 32, "
"channels = (int) 2, "
"rate = (int) 48000, " "endianness = (int) BYTE_ORDER"));
static GstStaticPadTemplate srctemplate = GST_STATIC_PAD_TEMPLATE ("src",
GST_PAD_SRC,
GST_PAD_ALWAYS,
GST_STATIC_CAPS ("audio/x-raw-float, "
"width = (int) 32, "
"channels = (int) 1, "
"rate = (int) 48000, " "endianness = (int) BYTE_ORDER"));
#define CAPS_48khz \
"audio/x-raw-float, " \
"width = (int) 32, " \
"channels = (int) 1, " \
"rate = (int) 48000, " \
"endianness = (int) BYTE_ORDER"
static GstFlowReturn
interleave_chain_func (GstPad * pad, GstBuffer * buffer)
{
gfloat *outdata;
gint i;
fail_unless (GST_IS_BUFFER (buffer));
fail_unless_equals_int (GST_BUFFER_SIZE (buffer),
48000 * 2 * sizeof (gfloat));
fail_unless (GST_BUFFER_DATA (buffer) != NULL);
outdata = (gfloat *) GST_BUFFER_DATA (buffer);
for (i = 0; i < 48000 * 2; i += 2) {
fail_unless_equals_float (outdata[i], input[0]);
fail_unless_equals_float (outdata[i + 1], input[1]);
}
have_data++;
gst_buffer_unref (buffer);
return GST_FLOW_OK;
}
GST_START_TEST (test_interleave_2ch)
{
GstElement *queue;
GstPad *sink0, *sink1, *src, *tmp;
GstCaps *caps;
gint i;
GstBuffer *inbuf;
gfloat *indata;
mysrcpads = g_new0 (GstPad *, 2);
have_data = 0;
interleave = gst_element_factory_make ("interleave", NULL);
fail_unless (interleave != NULL);
queue = gst_element_factory_make ("queue", "queue");
fail_unless (queue != NULL);
sink0 = gst_element_get_request_pad (interleave, "sink%d");
fail_unless (sink0 != NULL);
fail_unless_equals_string (GST_OBJECT_NAME (sink0), "sink0");
sink1 = gst_element_get_request_pad (interleave, "sink%d");
fail_unless (sink1 != NULL);
fail_unless_equals_string (GST_OBJECT_NAME (sink1), "sink1");
mysrcpads[0] = gst_pad_new_from_static_template (&srctemplate, "src0");
fail_unless (mysrcpads[0] != NULL);
caps = gst_caps_from_string (CAPS_48khz);
fail_unless (gst_pad_set_caps (mysrcpads[0], caps));
gst_pad_use_fixed_caps (mysrcpads[0]);
mysrcpads[1] = gst_pad_new_from_static_template (&srctemplate, "src1");
fail_unless (mysrcpads[1] != NULL);
fail_unless (gst_pad_set_caps (mysrcpads[1], caps));
gst_pad_use_fixed_caps (mysrcpads[1]);
tmp = gst_element_get_static_pad (queue, "sink");
fail_unless (gst_pad_link (mysrcpads[0], tmp) == GST_PAD_LINK_OK);
gst_object_unref (tmp);
tmp = gst_element_get_static_pad (queue, "src");
fail_unless (gst_pad_link (tmp, sink0) == GST_PAD_LINK_OK);
gst_object_unref (tmp);
fail_unless (gst_pad_link (mysrcpads[1], sink1) == GST_PAD_LINK_OK);
mysinkpad = gst_pad_new_from_static_template (&sinktemplate, "sink");
fail_unless (mysinkpad != NULL);
gst_pad_set_chain_function (mysinkpad, interleave_chain_func);
gst_pad_set_active (mysinkpad, TRUE);
src = gst_element_get_static_pad (interleave, "src");
fail_unless (src != NULL);
fail_unless (gst_pad_link (src, mysinkpad) == GST_PAD_LINK_OK);
gst_object_unref (src);
bus = gst_bus_new ();
gst_element_set_bus (interleave, bus);
fail_unless (gst_element_set_state (interleave,
GST_STATE_PLAYING) == GST_STATE_CHANGE_SUCCESS);
fail_unless (gst_element_set_state (queue,
GST_STATE_PLAYING) == GST_STATE_CHANGE_SUCCESS);
input[0] = -1.0;
inbuf = gst_buffer_new_and_alloc (48000 * sizeof (gfloat));
indata = (gfloat *) GST_BUFFER_DATA (inbuf);
for (i = 0; i < 48000; i++)
indata[i] = -1.0;
gst_buffer_set_caps (inbuf, caps);
fail_unless (gst_pad_push (mysrcpads[0], inbuf) == GST_FLOW_OK);
input[1] = 1.0;
inbuf = gst_buffer_new_and_alloc (48000 * sizeof (gfloat));
indata = (gfloat *) GST_BUFFER_DATA (inbuf);
for (i = 0; i < 48000; i++)
indata[i] = 1.0;
gst_buffer_set_caps (inbuf, caps);
fail_unless (gst_pad_push (mysrcpads[1], inbuf) == GST_FLOW_OK);
inbuf = gst_buffer_new_and_alloc (48000 * sizeof (gfloat));
indata = (gfloat *) GST_BUFFER_DATA (inbuf);
for (i = 0; i < 48000; i++)
indata[i] = -1.0;
gst_buffer_set_caps (inbuf, caps);
fail_unless (gst_pad_push (mysrcpads[0], inbuf) == GST_FLOW_OK);
inbuf = gst_buffer_new_and_alloc (48000 * sizeof (gfloat));
indata = (gfloat *) GST_BUFFER_DATA (inbuf);
for (i = 0; i < 48000; i++)
indata[i] = 1.0;
gst_buffer_set_caps (inbuf, caps);
fail_unless (gst_pad_push (mysrcpads[1], inbuf) == GST_FLOW_OK);
fail_unless (have_data == 2);
gst_object_unref (mysrcpads[0]);
gst_object_unref (mysrcpads[1]);
gst_object_unref (mysinkpad);
gst_element_release_request_pad (interleave, sink0);
gst_object_unref (sink0);
gst_element_release_request_pad (interleave, sink1);
gst_object_unref (sink1);
gst_element_set_state (interleave, GST_STATE_NULL);
gst_element_set_state (queue, GST_STATE_NULL);
gst_object_unref (interleave);
gst_object_unref (queue);
gst_object_unref (bus);
gst_caps_unref (caps);
g_free (mysrcpads);
}
GST_END_TEST;
GST_START_TEST (test_interleave_2ch_1eos)
{
GstElement *queue;
GstPad *sink0, *sink1, *src, *tmp;
GstCaps *caps;
gint i;
GstBuffer *inbuf;
gfloat *indata;
mysrcpads = g_new0 (GstPad *, 2);
have_data = 0;
interleave = gst_element_factory_make ("interleave", NULL);
fail_unless (interleave != NULL);
queue = gst_element_factory_make ("queue", "queue");
fail_unless (queue != NULL);
sink0 = gst_element_get_request_pad (interleave, "sink%d");
fail_unless (sink0 != NULL);
fail_unless_equals_string (GST_OBJECT_NAME (sink0), "sink0");
sink1 = gst_element_get_request_pad (interleave, "sink%d");
fail_unless (sink1 != NULL);
fail_unless_equals_string (GST_OBJECT_NAME (sink1), "sink1");
mysrcpads[0] = gst_pad_new_from_static_template (&srctemplate, "src0");
fail_unless (mysrcpads[0] != NULL);
caps = gst_caps_from_string (CAPS_48khz);
fail_unless (gst_pad_set_caps (mysrcpads[0], caps));
gst_pad_use_fixed_caps (mysrcpads[0]);
mysrcpads[1] = gst_pad_new_from_static_template (&srctemplate, "src1");
fail_unless (mysrcpads[1] != NULL);
fail_unless (gst_pad_set_caps (mysrcpads[1], caps));
gst_pad_use_fixed_caps (mysrcpads[1]);
tmp = gst_element_get_static_pad (queue, "sink");
fail_unless (gst_pad_link (mysrcpads[0], tmp) == GST_PAD_LINK_OK);
gst_object_unref (tmp);
tmp = gst_element_get_static_pad (queue, "src");
fail_unless (gst_pad_link (tmp, sink0) == GST_PAD_LINK_OK);
gst_object_unref (tmp);
fail_unless (gst_pad_link (mysrcpads[1], sink1) == GST_PAD_LINK_OK);
mysinkpad = gst_pad_new_from_static_template (&sinktemplate, "sink");
fail_unless (mysinkpad != NULL);
gst_pad_set_chain_function (mysinkpad, interleave_chain_func);
gst_pad_set_active (mysinkpad, TRUE);
src = gst_element_get_static_pad (interleave, "src");
fail_unless (src != NULL);
fail_unless (gst_pad_link (src, mysinkpad) == GST_PAD_LINK_OK);
gst_object_unref (src);
bus = gst_bus_new ();
gst_element_set_bus (interleave, bus);
fail_unless (gst_element_set_state (interleave,
GST_STATE_PLAYING) == GST_STATE_CHANGE_SUCCESS);
fail_unless (gst_element_set_state (queue,
GST_STATE_PLAYING) == GST_STATE_CHANGE_SUCCESS);
input[0] = -1.0;
inbuf = gst_buffer_new_and_alloc (48000 * sizeof (gfloat));
indata = (gfloat *) GST_BUFFER_DATA (inbuf);
for (i = 0; i < 48000; i++)
indata[i] = -1.0;
gst_buffer_set_caps (inbuf, caps);
fail_unless (gst_pad_push (mysrcpads[0], inbuf) == GST_FLOW_OK);
input[1] = 1.0;
inbuf = gst_buffer_new_and_alloc (48000 * sizeof (gfloat));
indata = (gfloat *) GST_BUFFER_DATA (inbuf);
for (i = 0; i < 48000; i++)
indata[i] = 1.0;
gst_buffer_set_caps (inbuf, caps);
fail_unless (gst_pad_push (mysrcpads[1], inbuf) == GST_FLOW_OK);
input[0] = 0.0;
gst_pad_push_event (mysrcpads[0], gst_event_new_eos ());
input[1] = 1.0;
inbuf = gst_buffer_new_and_alloc (48000 * sizeof (gfloat));
indata = (gfloat *) GST_BUFFER_DATA (inbuf);
for (i = 0; i < 48000; i++)
indata[i] = 1.0;
gst_buffer_set_caps (inbuf, caps);
fail_unless (gst_pad_push (mysrcpads[1], inbuf) == GST_FLOW_OK);
fail_unless (have_data == 2);
gst_object_unref (mysrcpads[0]);
gst_object_unref (mysrcpads[1]);
gst_object_unref (mysinkpad);
gst_element_release_request_pad (interleave, sink0);
gst_object_unref (sink0);
gst_element_release_request_pad (interleave, sink1);
gst_object_unref (sink1);
gst_element_set_state (interleave, GST_STATE_NULL);
gst_element_set_state (queue, GST_STATE_NULL);
gst_object_unref (interleave);
gst_object_unref (queue);
gst_object_unref (bus);
gst_caps_unref (caps);
g_free (mysrcpads);
}
GST_END_TEST;
static void
src_handoff_float32 (GstElement * element, GstBuffer * buffer, GstPad * pad,
gpointer user_data)
{
gint n = GPOINTER_TO_INT (user_data);
GstCaps *caps;
gfloat *data;
gint i;
caps = gst_caps_new_simple ("audio/x-raw-float",
"width", G_TYPE_INT, 32,
"channels", G_TYPE_INT, 1,
"rate", G_TYPE_INT, 48000, "endianness", G_TYPE_INT, G_BYTE_ORDER, NULL);
data = g_new (gfloat, 48000);
GST_BUFFER_MALLOCDATA (buffer) = (guint8 *) data;
GST_BUFFER_DATA (buffer) = (guint8 *) data;
GST_BUFFER_SIZE (buffer) = 48000 * sizeof (gfloat);
GST_BUFFER_OFFSET (buffer) = GST_BUFFER_OFFSET_NONE;
GST_BUFFER_TIMESTAMP (buffer) = GST_CLOCK_TIME_NONE;
GST_BUFFER_OFFSET_END (buffer) = GST_BUFFER_OFFSET_NONE;
GST_BUFFER_DURATION (buffer) = GST_SECOND;
gst_buffer_set_caps (buffer, caps);
gst_caps_unref (caps);
for (i = 0; i < 48000; i++)
data[i] = (n == 0) ? -1.0 : 1.0;
}
static void
sink_handoff_float32 (GstElement * element, GstBuffer * buffer, GstPad * pad,
gpointer user_data)
{
gint i;
gfloat *data;
GstCaps *caps;
fail_unless (GST_IS_BUFFER (buffer));
fail_unless_equals_int (GST_BUFFER_SIZE (buffer),
48000 * 2 * sizeof (gfloat));
fail_unless_equals_int (GST_BUFFER_DURATION (buffer), GST_SECOND);
caps = gst_caps_new_simple ("audio/x-raw-float",
"width", G_TYPE_INT, 32,
"channels", G_TYPE_INT, 2,
"rate", G_TYPE_INT, 48000, "endianness", G_TYPE_INT, G_BYTE_ORDER, NULL);
fail_unless (gst_caps_is_equal (caps, GST_BUFFER_CAPS (buffer)));
gst_caps_unref (caps);
data = (gfloat *) GST_BUFFER_DATA (buffer);
for (i = 0; i < 48000 * 2; i += 2) {
fail_unless_equals_float (data[i], -1.0);
fail_unless_equals_float (data[i + 1], 1.0);
}
have_data++;
}
GST_START_TEST (test_interleave_2ch_pipeline)
{
GstElement *pipeline, *queue, *src1, *src2, *interleave, *sink;
GstPad *sinkpad0, *sinkpad1, *tmp, *tmp2;
GstMessage *msg;
have_data = 0;
pipeline = (GstElement *) gst_pipeline_new ("pipeline");
fail_unless (pipeline != NULL);
src1 = gst_element_factory_make ("fakesrc", "src1");
fail_unless (src1 != NULL);
g_object_set (src1, "num-buffers", 4, NULL);
g_object_set (src1, "signal-handoffs", TRUE, NULL);
g_signal_connect (src1, "handoff", G_CALLBACK (src_handoff_float32),
GINT_TO_POINTER (0));
gst_bin_add (GST_BIN (pipeline), src1);
src2 = gst_element_factory_make ("fakesrc", "src2");
fail_unless (src2 != NULL);
g_object_set (src2, "num-buffers", 4, NULL);
g_object_set (src2, "signal-handoffs", TRUE, NULL);
g_signal_connect (src2, "handoff", G_CALLBACK (src_handoff_float32),
GINT_TO_POINTER (1));
gst_bin_add (GST_BIN (pipeline), src2);
queue = gst_element_factory_make ("queue", "queue");
fail_unless (queue != NULL);
gst_bin_add (GST_BIN (pipeline), queue);
interleave = gst_element_factory_make ("interleave", "interleave");
fail_unless (interleave != NULL);
gst_bin_add (GST_BIN (pipeline), gst_object_ref (interleave));
sinkpad0 = gst_element_get_request_pad (interleave, "sink%d");
fail_unless (sinkpad0 != NULL);
tmp = gst_element_get_static_pad (src1, "src");
fail_unless (gst_pad_link (tmp, sinkpad0) == GST_PAD_LINK_OK);
gst_object_unref (tmp);
sinkpad1 = gst_element_get_request_pad (interleave, "sink%d");
fail_unless (sinkpad1 != NULL);
tmp = gst_element_get_static_pad (src2, "src");
tmp2 = gst_element_get_static_pad (queue, "sink");
fail_unless (gst_pad_link (tmp, tmp2) == GST_PAD_LINK_OK);
gst_object_unref (tmp);
gst_object_unref (tmp2);
tmp = gst_element_get_static_pad (queue, "src");
fail_unless (gst_pad_link (tmp, sinkpad1) == GST_PAD_LINK_OK);
gst_object_unref (tmp);
sink = gst_element_factory_make ("fakesink", "sink");
fail_unless (sink != NULL);
g_object_set (sink, "signal-handoffs", TRUE, NULL);
g_signal_connect (sink, "handoff", G_CALLBACK (sink_handoff_float32), NULL);
gst_bin_add (GST_BIN (pipeline), sink);
tmp = gst_element_get_static_pad (interleave, "src");
tmp2 = gst_element_get_static_pad (sink, "sink");
fail_unless (gst_pad_link (tmp, tmp2) == GST_PAD_LINK_OK);
gst_object_unref (tmp);
gst_object_unref (tmp2);
gst_element_set_state (pipeline, GST_STATE_PLAYING);
msg = gst_bus_poll (GST_ELEMENT_BUS (pipeline), GST_MESSAGE_EOS, -1);
gst_message_unref (msg);
fail_unless (have_data == 4);
gst_element_set_state (pipeline, GST_STATE_NULL);
gst_object_unref (pipeline);
gst_element_release_request_pad (interleave, sinkpad0);
gst_object_unref (sinkpad0);
gst_element_release_request_pad (interleave, sinkpad1);
gst_object_unref (sinkpad1);
gst_object_unref (interleave);
}
GST_END_TEST;
static Suite *
interleave_suite (void)
{
@ -72,6 +509,9 @@ interleave_suite (void)
suite_add_tcase (s, tc_chain);
tcase_add_test (tc_chain, test_create_and_unref);
tcase_add_test (tc_chain, test_request_pads);
tcase_add_test (tc_chain, test_interleave_2ch);
tcase_add_test (tc_chain, test_interleave_2ch_1eos);
tcase_add_test (tc_chain, test_interleave_2ch_pipeline);
return s;
}