[pulseaudio-discuss] [PATCH v2 2/6] tests: modify mix-test to use new 'check' test framework
Deng Zhengrong
dzrongg at gmail.com
Mon Jul 16 23:45:51 PDT 2012
---
src/Makefile.am | 4 +-
src/tests/mix-test.c | 289 +++++++++++++++++++++++++++++++++++++++++++-------
2 files changed, 252 insertions(+), 41 deletions(-)
diff --git a/src/Makefile.am b/src/Makefile.am
index b181264..e1cf6e0 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -465,8 +465,8 @@ resampler_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
mix_test_SOURCES = tests/mix-test.c
mix_test_LDADD = $(AM_LDADD) libpulsecore- at PA_MAJORMINOR@.la libpulse.la libpulsecommon- at PA_MAJORMINOR@.la
-mix_test_CFLAGS = $(AM_CFLAGS)
-mix_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
+mix_test_CFLAGS = $(AM_CFLAGS) $(LIBCHECK_CFLAGS)
+mix_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) $(LIBCHECK_LIBS)
remix_test_SOURCES = tests/remix-test.c
remix_test_LDADD = $(AM_LDADD) libpulsecore- at PA_MAJORMINOR@.la libpulse.la libpulsecommon- at PA_MAJORMINOR@.la
diff --git a/src/tests/mix-test.c b/src/tests/mix-test.c
index 19b5ea5..0c35fd8 100644
--- a/src/tests/mix-test.c
+++ b/src/tests/mix-test.c
@@ -22,6 +22,9 @@
#endif
#include <stdio.h>
+#include <math.h>
+
+#include <check.h>
#include <pulse/sample.h>
#include <pulse/volume.h>
@@ -31,71 +34,266 @@
#include <pulsecore/memblock.h>
#include <pulsecore/sample-util.h>
-static void dump_block(const pa_sample_spec *ss, const pa_memchunk *chunk) {
+
+/* PA_SAMPLE_U8 */
+static const uint8_t u8_result[3][10] = {
+{ 0x00, 0xff, 0x7f, 0x80, 0x9f, 0x3f, 0x01, 0xf0, 0x20, 0x21 },
+{ 0x0c, 0xf2, 0x7f, 0x80, 0x9b, 0x45, 0x0d, 0xe4, 0x29, 0x2a },
+{ 0x00, 0xff, 0x7e, 0x80, 0xba, 0x04, 0x00, 0xff, 0x00, 0x00 },
+};
+
+/* PA_SAMPLE_ALAW */
+static const uint8_t alaw_result[3][10] = {
+{ 0x00, 0xff, 0x7f, 0x80, 0x9f, 0x3f, 0x01, 0xf0, 0x20, 0x21 },
+{ 0x06, 0xf2, 0x72, 0x86, 0x92, 0x32, 0x07, 0xf6, 0x26, 0x27 },
+{ 0x31, 0xec, 0x6d, 0xb1, 0x8c, 0x2d, 0x36, 0xe1, 0x2a, 0x2a },
+};
+
+/* PA_SAMPLE_ULAW */
+static const uint8_t ulaw_result[3][10] = {
+{ 0x00, 0xff, 0x7f, 0x80, 0x9f, 0x3f, 0x01, 0xf0, 0x20, 0x21 },
+{ 0x03, 0xff, 0xff, 0x83, 0xa2, 0x42, 0x04, 0xf2, 0x23, 0x24 },
+{ 0x00, 0xff, 0xff, 0x80, 0x91, 0x31, 0x00, 0xe9, 0x12, 0x13 },
+};
+
+/* PA_SAMPLE_S16LE */
+static const uint16_t s16le_result[3][10] = {
+{ 0x0000, 0xffff, 0x7fff, 0x8000, 0x9fff, 0x3fff, 0x0001, 0xf000, 0x0020, 0x0021 },
+{ 0x0000, 0xffff, 0x7332, 0x8ccd, 0xa998, 0x3998, 0x0000, 0xf199, 0x001c, 0x001d },
+{ 0x0000, 0xfffe, 0x7fff, 0x8000, 0x8000, 0x7997, 0x0001, 0xe199, 0x003c, 0x003e },
+};
+
+/* PA_SAMPLE_S16BE */
+static const uint16_t s16be_result[3][10] = {
+{ 0x0000, 0xffff, 0x7fff, 0x8000, 0x9fff, 0x3fff, 0x0001, 0xf000, 0x0020, 0x0021 },
+{ 0x0000, 0xffff, 0x8bff, 0x7300, 0xa8ff, 0x52ff, 0xe600, 0xd700, 0xcc1c, 0xb31d },
+{ 0x0000, 0xfeff, 0x0aff, 0xf300, 0x47ff, 0x91fe, 0xe601, 0xc701, 0xcc3c, 0xb33e },
+};
+
+/* PA_SAMPLE_FLOAT32LE */
+static const float float32le_result[3][10] = {
+{ 0.000000, -1.000000, 1.000000, 4711.000000, 0.222000, 0.330000, -0.300000, 99.000000, -0.555000, -0.123000 },
+{ 0.000000, -0.899987, 0.899987, 4239.837402, 0.199797, 0.296996, -0.269996, 89.098679, -0.499493, -0.110698 },
+{ 0.000000, -1.899987, 1.899987, 8950.837891, 0.421797, 0.626996, -0.569996, 188.098679, -1.054493, -0.233698 },
+};
+
+/* PA_SAMPLE_FLOAT32BE */
+static const float float32be_result[3][10] = {
+{ 0.000000, -1.000000, 1.000000, 4711.000000, 0.222000, 0.330000, -0.300000, 99.000000, -0.555000, -0.123000 },
+{ 0.000000, -0.899987, 0.899987, 4239.837402, 0.199797, 0.296996, -0.269996, 89.098679, -0.499493, -0.110698 },
+{ 0.000000, -1.899987, 1.899987, 8950.837891, 0.421797, 0.626996, -0.569996, 188.098679, -1.054493, -0.233698 },
+};
+
+/* PA_SAMPLE_S32LE */
+static const uint32_t s32le_result[3][10] = {
+{ 0x00000001, 0xffff0002, 0x7fff0003, 0x80000004, 0x9fff0005, 0x3fff0006, 0x00010007, 0xf0000008, 0x00200009, 0x0021000a },
+{ 0x00000000, 0xffff199b, 0x7332199c, 0x8ccd0003, 0xa998d99e, 0x3998999f, 0x0000e66c, 0xf199a007, 0x001cccc8, 0x001db32e },
+{ 0x00000001, 0xfffe199d, 0x7fffffff, 0x80000000, 0x80000000, 0x799799a5, 0x0001e673, 0xe199a00f, 0x003cccd1, 0x003eb338 },
+};
+
+/* PA_SAMPLE_S32BE */
+static const uint32_t s32be_result[3][10] = {
+{ 0x00000001, 0xffff0002, 0x7fff0003, 0x80000004, 0x9fff0005, 0x3fff0006, 0x00010007, 0xf0000008, 0x00200009, 0x0021000a },
+{ 0x0066e600, 0x65b2cd01, 0xf117b402, 0x73989903, 0x0ee48004, 0xb8496705, 0xe6ca4c06, 0xd7303307, 0xccb21908, 0xb3190009 },
+{ 0x0066e601, 0x64b2ce03, 0x7017b505, 0xf3989907, 0xade38109, 0xf748680b, 0xe6cb4c0d, 0xc731330f, 0xccd21911, 0xb33a0013 },
+};
+
+/* PA_SAMPLE_S24LE */
+static const uint8_t s24le_result[3][30] = {
+{ 0x00, 0x00, 0x01, 0xff, 0xff, 0x02, 0x7f, 0xff, 0x03, 0x80, 0x00, 0x04, 0x9f, 0xff, 0x05, 0x3f, 0xff, 0x06, 0x01, 0x00, 0x07, 0xf0, 0x00, 0x08, 0x20, 0x00, 0x09, 0x21, 0x00, 0x0a },
+{ 0x66, 0xe6, 0x00, 0x31, 0xb3, 0x02, 0x23, 0x99, 0x03, 0x0b, 0x9a, 0x03, 0x0c, 0x66, 0x05, 0x1c, 0x4c, 0x06, 0xca, 0x4c, 0x06, 0x07, 0x34, 0x07, 0xb2, 0x19, 0x08, 0x19, 0x00, 0x09 },
+{ 0x66, 0xe6, 0x01, 0x30, 0xb3, 0x05, 0xa2, 0x98, 0x07, 0x8b, 0x9a, 0x07, 0xab, 0x65, 0x0b, 0x5b, 0x4b, 0x0d, 0xcb, 0x4c, 0x0d, 0xf7, 0x34, 0x0f, 0xd2, 0x19, 0x11, 0x3a, 0x00, 0x13 },
+};
+
+/* PA_SAMPLE_S24BE */
+static const uint8_t s24be_result[3][30] = {
+{ 0x00, 0x00, 0x01, 0xff, 0xff, 0x02, 0x7f, 0xff, 0x03, 0x80, 0x00, 0x04, 0x9f, 0xff, 0x05, 0x3f, 0xff, 0x06, 0x01, 0x00, 0x07, 0xf0, 0x00, 0x08, 0x20, 0x00, 0x09, 0x21, 0x00, 0x0a },
+{ 0x00, 0x00, 0x00, 0xff, 0xff, 0x1b, 0x73, 0x32, 0x1c, 0x8c, 0xcd, 0x03, 0xa9, 0x98, 0xde, 0x39, 0x98, 0x9f, 0x00, 0xe6, 0x6c, 0xf1, 0x99, 0xa7, 0x1c, 0xcc, 0xc8, 0x1d, 0xb3, 0x2e },
+{ 0x00, 0x00, 0x01, 0xff, 0xfe, 0x1d, 0x7f, 0xff, 0xff, 0x80, 0x00, 0x00, 0x80, 0x00, 0x00, 0x79, 0x97, 0xa5, 0x01, 0xe6, 0x73, 0xe1, 0x99, 0xaf, 0x3c, 0xcc, 0xd1, 0x3e, 0xb3, 0x38 },
+};
+
+/* PA_SAMPLE_S24_32LE */
+static const uint32_t s24_32le_result[3][10] = {
+{ 0x00000001, 0xffff0002, 0x7fff0003, 0x80000004, 0x9fff0005, 0x3fff0006, 0x00010007, 0xf0000008, 0x00200009, 0x0021000a },
+{ 0x00000000, 0x00ff199b, 0x00ff199c, 0x00000003, 0x00ff199e, 0x00ff199f, 0x0000e66c, 0x00000007, 0x001cccc8, 0x001db32e },
+{ 0x00000001, 0x00fe199d, 0x00fe199f, 0x00000007, 0x00fe19a3, 0x00fe19a5, 0x0001e673, 0x0000000f, 0x003cccd1, 0x003eb338 },
+};
+
+/* PA_SAMPLE_S24_32BE */
+static const uint32_t s24_32be_result[3][10] = {
+{ 0x00000001, 0xffff0002, 0x7fff0003, 0x80000004, 0x9fff0005, 0x3fff0006, 0x00010007, 0xf0000008, 0x00200009, 0x0021000a },
+{ 0x00000000, 0x65e60000, 0xf1e50000, 0x73000000, 0x0ee60000, 0xb8e50000, 0xe6000000, 0xd7000000, 0xcc1c0000, 0xb31d0000 },
+{ 0x00000000, 0xe5010200, 0x00036400, 0x0470e500, 0xf3000000, 0xe5010500, 0x0006ad00, 0x07f7e400, 0xe6010000, 0x00000800 },
+};
+
+static void compare_block(const pa_sample_spec *ss, const pa_memchunk *chunk, int iter) {
void *d;
unsigned i;
- if (getenv("MAKE_CHECK"))
- return;
-
d = pa_memblock_acquire(chunk->memblock);
switch (ss->format) {
+ case PA_SAMPLE_U8: {
+ const uint8_t *v = u8_result[iter];
+ uint8_t *u = d;
+
+ for (i = 0; i < chunk->length / pa_frame_size(ss); i++) {
+ fail_unless(*u == *v, NULL);
+ ++u;
+ ++v;
+ }
+ break;
+ }
- case PA_SAMPLE_U8:
- case PA_SAMPLE_ULAW:
case PA_SAMPLE_ALAW: {
+ const uint8_t *v = alaw_result[iter];
uint8_t *u = d;
- for (i = 0; i < chunk->length / pa_frame_size(ss); i++)
- printf("0x%02x ", *(u++));
+ for (i = 0; i < chunk->length / pa_frame_size(ss); i++) {
+ fail_unless(*u == *v, NULL);
+ ++u;
+ ++v;
+ }
+ break;
+ }
+
+ case PA_SAMPLE_ULAW: {
+ const uint8_t *v = ulaw_result[iter];
+ uint8_t *u = d;
+ for (i = 0; i < chunk->length / pa_frame_size(ss); i++) {
+ fail_unless(*u == *v, NULL);
+ ++u;
+ ++v;
+ }
break;
}
- case PA_SAMPLE_S16NE:
- case PA_SAMPLE_S16RE: {
+ case PA_SAMPLE_S16LE: {
+ const uint16_t *v = s16le_result[iter];
uint16_t *u = d;
- for (i = 0; i < chunk->length / pa_frame_size(ss); i++)
- printf("0x%04x ", *(u++));
+ for (i = 0; i < chunk->length / pa_frame_size(ss); i++) {
+ fail_unless(*u == *v, NULL);
+ ++u;
+ ++v;
+ }
+ break;
+ }
+ case PA_SAMPLE_S16BE: {
+ const uint16_t *v = s16be_result[iter];
+ uint16_t *u = d;
+
+ for (i = 0; i < chunk->length / pa_frame_size(ss); i++) {
+ fail_unless(*u == *v, NULL);
+ ++u;
+ ++v;
+ }
break;
}
- case PA_SAMPLE_S24_32NE:
- case PA_SAMPLE_S24_32RE:
- case PA_SAMPLE_S32NE:
- case PA_SAMPLE_S32RE: {
+ case PA_SAMPLE_FLOAT32LE: {
+ const float *v = float32le_result[iter];
+ float *u = d;
+
+ for (i = 0; i < chunk->length / pa_frame_size(ss); i++) {
+ float uu = ss->format == PA_SAMPLE_FLOAT32NE ? *u : PA_FLOAT32_SWAP(*u);
+ fail_unless(fabs(uu - *v) <= 1e-6, NULL);
+ ++u;
+ ++v;
+ }
+ break;
+ }
+
+ case PA_SAMPLE_FLOAT32BE: {
+ const float *v = float32be_result[iter];
+ float *u = d;
+
+ for (i = 0; i < chunk->length / pa_frame_size(ss); i++) {
+ float uu = ss->format == PA_SAMPLE_FLOAT32NE ? *u : PA_FLOAT32_SWAP(*u);
+ fail_unless(fabs(uu - *v) <= 1e-6, NULL);
+ ++u;
+ ++v;
+ }
+ break;
+ }
+
+ case PA_SAMPLE_S32LE: {
+ const uint32_t *v = s32le_result[iter];
uint32_t *u = d;
- for (i = 0; i < chunk->length / pa_frame_size(ss); i++)
- printf("0x%08x ", *(u++));
+ for (i = 0; i < chunk->length / pa_frame_size(ss); i++) {
+ fail_unless(*u == *v, NULL);
+ ++u;
+ ++v;
+ }
+ break;
+ }
+ case PA_SAMPLE_S32BE: {
+ const uint32_t *v = s32be_result[iter];
+ uint32_t *u = d;
+
+ for (i = 0; i < chunk->length / pa_frame_size(ss); i++) {
+ fail_unless(*u == *v, NULL);
+ ++u;
+ ++v;
+ }
break;
}
- case PA_SAMPLE_S24NE:
- case PA_SAMPLE_S24RE: {
- uint8_t *u = d;
+ case PA_SAMPLE_S24_32LE: {
+ const uint32_t *v = s24_32le_result[iter];
+ uint32_t *u = d;
for (i = 0; i < chunk->length / pa_frame_size(ss); i++) {
- printf("0x%02x%02x%02xx ", *u, *(u+1), *(u+2));
- u += 3;
+ fail_unless(*u == *v, NULL);
+ ++u;
+ ++v;
}
+ break;
+ }
+
+ case PA_SAMPLE_S24_32BE: {
+ const uint32_t *v = s24_32be_result[iter];
+ uint32_t *u = d;
+ for (i = 0; i < chunk->length / pa_frame_size(ss); i++) {
+ fail_unless(*u == *v, NULL);
+ ++u;
+ ++v;
+ }
break;
}
- case PA_SAMPLE_FLOAT32NE:
- case PA_SAMPLE_FLOAT32RE: {
- float *u = d;
+ case PA_SAMPLE_S24LE: {
+ const uint8_t *v = s24le_result[iter];
+ uint8_t *u = d;
for (i = 0; i < chunk->length / pa_frame_size(ss); i++) {
- printf("%1.5f ", ss->format == PA_SAMPLE_FLOAT32NE ? *u : PA_FLOAT32_SWAP(*u));
- u++;
+ fail_unless(*u == *v, NULL);
+ fail_unless(*(u+1) == *(v+1), NULL);
+ fail_unless(*(u+2) == *(v+2), NULL);
+
+ u += 3;
+ v += 3;
}
+ break;
+ }
+ case PA_SAMPLE_S24BE: {
+ const uint8_t *v = s24be_result[iter];
+ uint8_t *u = d;
+
+ for (i = 0; i < chunk->length / pa_frame_size(ss); i++) {
+ fail_unless(*u == *v, NULL);
+ fail_unless(*(u+1) == *(v+1), NULL);
+ fail_unless(*(u+2) == *(v+2), NULL);
+
+ u += 3;
+ v += 3;
+ }
break;
}
@@ -103,8 +301,6 @@ static void dump_block(const pa_sample_spec *ss, const pa_memchunk *chunk) {
pa_assert_not_reached();
}
- printf("\n");
-
pa_memblock_release(chunk->memblock);
}
@@ -200,15 +396,12 @@ static pa_memblock* generate_block(pa_mempool *pool, const pa_sample_spec *ss) {
return r;
}
-int main(int argc, char *argv[]) {
+START_TEST (mix_test) {
pa_mempool *pool;
pa_sample_spec a;
pa_cvolume v;
- if (!getenv("MAKE_CHECK"))
- pa_log_set_level(PA_LOG_DEBUG);
-
- pa_assert_se(pool = pa_mempool_new(FALSE, 0));
+ fail_unless((pool = pa_mempool_new(FALSE, 0)) != NULL, NULL);
a.channels = 1;
a.rate = 44100;
@@ -228,7 +421,7 @@ int main(int argc, char *argv[]) {
i.length = pa_memblock_get_length(i.memblock);
i.index = 0;
- dump_block(&a, &i);
+ compare_block(&a, &i, 0);
/* Make a copy */
j = i;
@@ -238,7 +431,7 @@ int main(int argc, char *argv[]) {
/* Adjust volume of the copy */
pa_volume_memchunk(&j, &a, &v);
- dump_block(&a, &j);
+ compare_block(&a, &j, 1);
m[0].chunk = i;
m[0].volume.values[0] = PA_VOLUME_NORM;
@@ -255,7 +448,7 @@ int main(int argc, char *argv[]) {
pa_mix(m, 2, ptr, k.length, &a, NULL, FALSE);
pa_memblock_release(k.memblock);
- dump_block(&a, &k);
+ compare_block(&a, &k, 2);
pa_memblock_unref(i.memblock);
pa_memblock_unref(j.memblock);
@@ -263,6 +456,24 @@ int main(int argc, char *argv[]) {
}
pa_mempool_free(pool);
+}
+END_TEST
- return 0;
+int main(int argc, char *argv[]) {
+ int failed = 0;
+ Suite *s;
+ TCase *tc;
+ SRunner *sr;
+
+ s = suite_create("Mix");
+ tc = tcase_create("mix");
+ tcase_add_test(tc, mix_test);
+ suite_add_tcase(s, tc);
+
+ sr = srunner_create(s);
+ srunner_run_all(sr, CK_NORMAL);
+ failed = srunner_ntests_failed(sr);
+ srunner_free(sr);
+
+ return (failed == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
}
--
1.7.7.6
More information about the pulseaudio-discuss
mailing list