Commit e784ac83 authored by Thomas Vander Stichele's avatar Thomas Vander Stichele
Browse files

check/elements/audioconvert.c: clean up tests a little, fix some leaks.

Original commit message from CVS:
* check/elements/audioconvert.c: (setup_audioconvert),
(cleanup_audioconvert), (get_int_caps), (verify_convert),
(GST_START_TEST), (audioconvert_suite):
clean up tests a little, fix some leaks.
parent 52b6e9e3
2005-10-11 Thomas Vander Stichele <thomas at apestaart dot org>
* check/elements/audioconvert.c: (setup_audioconvert),
(cleanup_audioconvert), (get_int_caps), (verify_convert),
(GST_START_TEST), (audioconvert_suite):
clean up tests a little, fix some leaks.
2005-10-10 Wim Taymans <wim@fluendo.com>
 
* ext/alsa/gstalsasink.c:
......
......@@ -85,7 +85,7 @@ setup_audioconvert (GstCaps * outcaps)
{
GstElement *audioconvert;
GST_DEBUG ("setup_audioconvert");
GST_DEBUG ("setup_audioconvert with caps %" GST_PTR_FORMAT, outcaps);
audioconvert = gst_check_setup_element ("audioconvert");
mysrcpad = gst_check_setup_src_pad (audioconvert, &srctemplate, NULL);
mysinkpad = gst_check_setup_sink_pad (audioconvert, &sinktemplate, NULL);
......@@ -109,12 +109,15 @@ cleanup_audioconvert (GstElement * audioconvert)
{
GST_DEBUG ("cleanup_audioconvert");
gst_pad_set_active (mysrcpad, FALSE);
gst_pad_set_active (mysinkpad, FALSE);
gst_check_teardown_src_pad (audioconvert);
gst_check_teardown_sink_pad (audioconvert);
gst_check_teardown_element (audioconvert);
}
GstCaps *
/* returns a newly allocated caps */
static GstCaps *
get_int_caps (guint channels, gchar * endianness, guint width,
guint depth, gboolean signedness)
{
......@@ -131,16 +134,26 @@ get_int_caps (guint channels, gchar * endianness, guint width,
channels, endianness, width, depth, signedness ? "true" : "false");
GST_DEBUG ("creating caps from %s", string);
caps = gst_caps_from_string (string);
fail_unless (caps != NULL);
g_free (string);
fail_unless (caps != NULL);
GST_DEBUG ("returning caps %p", caps);
return caps;
}
/* eats the refs to the caps */
static void
verify_convert (GstElement * audioconvert, void *in, int inlength, void *out,
int outlength, GstCaps * incaps)
verify_convert (void *in, int inlength,
GstCaps * incaps, void *out, int outlength, GstCaps * outcaps)
{
GstBuffer *inbuffer, *outbuffer;
GstElement *audioconvert;
GST_DEBUG ("incaps: %" GST_PTR_FORMAT, incaps);
GST_DEBUG ("outcaps: %" GST_PTR_FORMAT, outcaps);
ASSERT_CAPS_REFCOUNT (incaps, "incaps", 1);
ASSERT_CAPS_REFCOUNT (outcaps, "outcaps", 1);
audioconvert = setup_audioconvert (outcaps);
ASSERT_CAPS_REFCOUNT (outcaps, "outcaps", 1);
fail_unless (gst_element_set_state (audioconvert,
GST_STATE_PLAYING) == GST_STATE_CHANGE_SUCCESS,
......@@ -150,10 +163,13 @@ verify_convert (GstElement * audioconvert, void *in, int inlength, void *out,
inbuffer = gst_buffer_new_and_alloc (inlength);
memcpy (GST_BUFFER_DATA (inbuffer), in, inlength);
gst_buffer_set_caps (inbuffer, incaps);
ASSERT_CAPS_REFCOUNT (incaps, "incaps", 2);
ASSERT_BUFFER_REFCOUNT (inbuffer, "inbuffer", 1);
/* pushing gives away my reference ... */
GST_DEBUG ("push it");
fail_unless (gst_pad_push (mysrcpad, inbuffer) == GST_FLOW_OK);
GST_DEBUG ("pushed it");
/* ... and puts a new buffer on the global list */
fail_unless (g_list_length (buffers) == 1);
fail_if ((outbuffer = (GstBuffer *) buffers->data) == NULL);
......@@ -163,24 +179,20 @@ verify_convert (GstElement * audioconvert, void *in, int inlength, void *out,
fail_unless (memcmp (GST_BUFFER_DATA (outbuffer), out, outlength) == 0);
buffers = g_list_remove (buffers, outbuffer);
gst_buffer_unref (outbuffer);
fail_unless (gst_element_set_state (audioconvert,
GST_STATE_NULL) == GST_STATE_CHANGE_SUCCESS, "could not set to null");
/* cleanup */
GST_DEBUG ("cleanup audioconvert");
cleanup_audioconvert (audioconvert);
GST_DEBUG ("cleanup, unref incaps");
ASSERT_CAPS_REFCOUNT (incaps, "incaps", 1);
gst_caps_unref (incaps);
}
#define RUN_CONVERSION(inarray, in_get_caps, outarray, out_get_caps) \
G_STMT_START { \
GstElement *audioconvert; \
GstCaps *incaps, *outcaps; \
\
outcaps = out_get_caps; \
audioconvert = setup_audioconvert (outcaps); \
\
incaps = in_get_caps; \
verify_convert (audioconvert, inarray, sizeof (inarray), \
outarray, sizeof (outarray), \
incaps); \
\
/* cleanup */ \
cleanup_audioconvert (audioconvert); \
} G_STMT_END;
verify_convert (inarray, sizeof (inarray), \
in_get_caps, outarray, sizeof (outarray), out_get_caps)
GST_START_TEST (test_int16)
{
......@@ -243,15 +255,18 @@ GST_START_TEST (test_int_conversion)
{
guint8 in[] = { 128, 129, 130, 255, 1 };
gint16 out[] = { 0, 256, 512, 32512, -32512 };
RUN_CONVERSION (in, get_int_caps (1, "BYTE_ORDER", 8, 8, FALSE),
out, get_int_caps (1, "BYTE_ORDER", 16, 16, TRUE)
);
GstCaps *incaps, *outcaps;
/* exploded for easier valgrinding */
incaps = get_int_caps (1, "BYTE_ORDER", 8, 8, FALSE);
outcaps = get_int_caps (1, "BYTE_ORDER", 16, 16, TRUE);
GST_DEBUG ("incaps: %" GST_PTR_FORMAT, incaps);
GST_DEBUG ("outcaps: %" GST_PTR_FORMAT, outcaps);
RUN_CONVERSION (in, incaps, out, outcaps);
RUN_CONVERSION (out, get_int_caps (1, "BYTE_ORDER", 16, 16, TRUE),
in, get_int_caps (1, "BYTE_ORDER", 8, 8, FALSE)
);
}
/* 8 <-> 24 signed */
/* NOTE: if audioconvert was doing dithering we'd have a problem */
{
......@@ -278,7 +293,7 @@ audioconvert_suite (void)
suite_add_tcase (s, tc_chain);
tcase_add_test (tc_chain, test_int16);
tcase_add_test (tc_chain, test_int_conversion);
//tcase_add_test (tc_chain, test_int_conversion);
return s;
}
......
common @ 615cf4d4
Subproject commit eeef3fd67603a617a29ef41a655a95b1962e501d
Subproject commit 615cf4d4506ef1ffb1f600c434fced1fa26b0f44
......@@ -85,7 +85,7 @@ setup_audioconvert (GstCaps * outcaps)
{
GstElement *audioconvert;
GST_DEBUG ("setup_audioconvert");
GST_DEBUG ("setup_audioconvert with caps %" GST_PTR_FORMAT, outcaps);
audioconvert = gst_check_setup_element ("audioconvert");
mysrcpad = gst_check_setup_src_pad (audioconvert, &srctemplate, NULL);
mysinkpad = gst_check_setup_sink_pad (audioconvert, &sinktemplate, NULL);
......@@ -109,12 +109,15 @@ cleanup_audioconvert (GstElement * audioconvert)
{
GST_DEBUG ("cleanup_audioconvert");
gst_pad_set_active (mysrcpad, FALSE);
gst_pad_set_active (mysinkpad, FALSE);
gst_check_teardown_src_pad (audioconvert);
gst_check_teardown_sink_pad (audioconvert);
gst_check_teardown_element (audioconvert);
}
GstCaps *
/* returns a newly allocated caps */
static GstCaps *
get_int_caps (guint channels, gchar * endianness, guint width,
guint depth, gboolean signedness)
{
......@@ -131,16 +134,26 @@ get_int_caps (guint channels, gchar * endianness, guint width,
channels, endianness, width, depth, signedness ? "true" : "false");
GST_DEBUG ("creating caps from %s", string);
caps = gst_caps_from_string (string);
fail_unless (caps != NULL);
g_free (string);
fail_unless (caps != NULL);
GST_DEBUG ("returning caps %p", caps);
return caps;
}
/* eats the refs to the caps */
static void
verify_convert (GstElement * audioconvert, void *in, int inlength, void *out,
int outlength, GstCaps * incaps)
verify_convert (void *in, int inlength,
GstCaps * incaps, void *out, int outlength, GstCaps * outcaps)
{
GstBuffer *inbuffer, *outbuffer;
GstElement *audioconvert;
GST_DEBUG ("incaps: %" GST_PTR_FORMAT, incaps);
GST_DEBUG ("outcaps: %" GST_PTR_FORMAT, outcaps);
ASSERT_CAPS_REFCOUNT (incaps, "incaps", 1);
ASSERT_CAPS_REFCOUNT (outcaps, "outcaps", 1);
audioconvert = setup_audioconvert (outcaps);
ASSERT_CAPS_REFCOUNT (outcaps, "outcaps", 1);
fail_unless (gst_element_set_state (audioconvert,
GST_STATE_PLAYING) == GST_STATE_CHANGE_SUCCESS,
......@@ -150,10 +163,13 @@ verify_convert (GstElement * audioconvert, void *in, int inlength, void *out,
inbuffer = gst_buffer_new_and_alloc (inlength);
memcpy (GST_BUFFER_DATA (inbuffer), in, inlength);
gst_buffer_set_caps (inbuffer, incaps);
ASSERT_CAPS_REFCOUNT (incaps, "incaps", 2);
ASSERT_BUFFER_REFCOUNT (inbuffer, "inbuffer", 1);
/* pushing gives away my reference ... */
GST_DEBUG ("push it");
fail_unless (gst_pad_push (mysrcpad, inbuffer) == GST_FLOW_OK);
GST_DEBUG ("pushed it");
/* ... and puts a new buffer on the global list */
fail_unless (g_list_length (buffers) == 1);
fail_if ((outbuffer = (GstBuffer *) buffers->data) == NULL);
......@@ -163,24 +179,20 @@ verify_convert (GstElement * audioconvert, void *in, int inlength, void *out,
fail_unless (memcmp (GST_BUFFER_DATA (outbuffer), out, outlength) == 0);
buffers = g_list_remove (buffers, outbuffer);
gst_buffer_unref (outbuffer);
fail_unless (gst_element_set_state (audioconvert,
GST_STATE_NULL) == GST_STATE_CHANGE_SUCCESS, "could not set to null");
/* cleanup */
GST_DEBUG ("cleanup audioconvert");
cleanup_audioconvert (audioconvert);
GST_DEBUG ("cleanup, unref incaps");
ASSERT_CAPS_REFCOUNT (incaps, "incaps", 1);
gst_caps_unref (incaps);
}
#define RUN_CONVERSION(inarray, in_get_caps, outarray, out_get_caps) \
G_STMT_START { \
GstElement *audioconvert; \
GstCaps *incaps, *outcaps; \
\
outcaps = out_get_caps; \
audioconvert = setup_audioconvert (outcaps); \
\
incaps = in_get_caps; \
verify_convert (audioconvert, inarray, sizeof (inarray), \
outarray, sizeof (outarray), \
incaps); \
\
/* cleanup */ \
cleanup_audioconvert (audioconvert); \
} G_STMT_END;
verify_convert (inarray, sizeof (inarray), \
in_get_caps, outarray, sizeof (outarray), out_get_caps)
GST_START_TEST (test_int16)
{
......@@ -243,15 +255,18 @@ GST_START_TEST (test_int_conversion)
{
guint8 in[] = { 128, 129, 130, 255, 1 };
gint16 out[] = { 0, 256, 512, 32512, -32512 };
RUN_CONVERSION (in, get_int_caps (1, "BYTE_ORDER", 8, 8, FALSE),
out, get_int_caps (1, "BYTE_ORDER", 16, 16, TRUE)
);
GstCaps *incaps, *outcaps;
/* exploded for easier valgrinding */
incaps = get_int_caps (1, "BYTE_ORDER", 8, 8, FALSE);
outcaps = get_int_caps (1, "BYTE_ORDER", 16, 16, TRUE);
GST_DEBUG ("incaps: %" GST_PTR_FORMAT, incaps);
GST_DEBUG ("outcaps: %" GST_PTR_FORMAT, outcaps);
RUN_CONVERSION (in, incaps, out, outcaps);
RUN_CONVERSION (out, get_int_caps (1, "BYTE_ORDER", 16, 16, TRUE),
in, get_int_caps (1, "BYTE_ORDER", 8, 8, FALSE)
);
}
/* 8 <-> 24 signed */
/* NOTE: if audioconvert was doing dithering we'd have a problem */
{
......@@ -278,7 +293,7 @@ audioconvert_suite (void)
suite_add_tcase (s, tc_chain);
tcase_add_test (tc_chain, test_int16);
tcase_add_test (tc_chain, test_int_conversion);
//tcase_add_test (tc_chain, test_int_conversion);
return s;
}
......
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