mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-04 13:29:59 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

tests: Use remap function passed in remap struct

Browse source 
Cleanup and add function to setup remap struct

Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net>
This commit is contained in:
Peter Meerwald 2014-04-23 23:22:58 +02:00
parent 173649e4f7
commit 8f4897e162
1 changed files with 44 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

97
src/tests/cpu-remap-test.c
View file

@ -35,9 +35,8 @@
#define TIMES2 100 #define TIMES2 100
static void run_remap_test_mono_stereo_float( static void run_remap_test_mono_stereo_float(
pa_remap_t *remap, pa_remap_t *remap_func,
pa_do_remap_func_t func, pa_remap_t *remap_orig,
pa_do_remap_func_t orig_func,
int align, int align,
bool correct, bool correct,
bool perf) { bool perf) {
@ -59,11 +58,11 @@ static void run_remap_test_mono_stereo_float(
mono[i] = 2.1f * (rand()/(float) RAND_MAX - 0.5f); mono[i] = 2.1f * (rand()/(float) RAND_MAX - 0.5f);
if (correct) { if (correct) {
orig_func(remap, stereo_ref, mono, nsamples); remap_orig->do_remap(remap_orig, stereo_ref, mono, nsamples);
func(remap, stereo, mono, nsamples); remap_func->do_remap(remap_func, stereo, mono, nsamples);
for (i = 0; i < nsamples * 2; i++) { for (i = 0; i < nsamples * 2; i++) {
if (fabsf(stereo[i] - stereo_ref[i]) > 0.0001) { if (fabsf(stereo[i] - stereo_ref[i]) > 0.0001f) {
pa_log_debug("Correctness test failed: align=%d", align); pa_log_debug("Correctness test failed: align=%d", align);
pa_log_debug("%d: %.24f != %.24f (%.24f)\n", i, stereo[i], stereo_ref[i], mono[i]); pa_log_debug("%d: %.24f != %.24f (%.24f)\n", i, stereo[i], stereo_ref[i], mono[i]);
fail(); fail();
@ -75,19 +74,18 @@ static void run_remap_test_mono_stereo_float(
pa_log_debug("Testing remap performance with %d sample alignment", align); pa_log_debug("Testing remap performance with %d sample alignment", align);
PA_RUNTIME_TEST_RUN_START("func", TIMES, TIMES2) { PA_RUNTIME_TEST_RUN_START("func", TIMES, TIMES2) {
func(remap, stereo, mono, nsamples); remap_func->do_remap(remap_func, stereo, mono, nsamples);
} PA_RUNTIME_TEST_RUN_STOP } PA_RUNTIME_TEST_RUN_STOP
PA_RUNTIME_TEST_RUN_START("orig", TIMES, TIMES2) { PA_RUNTIME_TEST_RUN_START("orig", TIMES, TIMES2) {
orig_func(remap, stereo_ref, mono, nsamples); remap_orig->do_remap(remap_orig, stereo_ref, mono, nsamples);
} PA_RUNTIME_TEST_RUN_STOP } PA_RUNTIME_TEST_RUN_STOP
} }
} }
static void run_remap_test_mono_stereo_s16( static void run_remap_test_mono_stereo_s16(
pa_remap_t *remap, pa_remap_t *remap_func,
pa_do_remap_func_t func, pa_remap_t *remap_orig,
pa_do_remap_func_t orig_func,
int align, int align,
bool correct, bool correct,
bool perf) { bool perf) {
@ -108,8 +106,8 @@ static void run_remap_test_mono_stereo_s16(
pa_random(mono, nsamples * sizeof(int16_t)); pa_random(mono, nsamples * sizeof(int16_t));
if (correct) { if (correct) {
orig_func(remap, stereo_ref, mono, nsamples); remap_orig->do_remap(remap_orig, stereo_ref, mono, nsamples);
func(remap, stereo, mono, nsamples); remap_func->do_remap(remap_func, stereo, mono, nsamples);
for (i = 0; i < nsamples * 2; i++) { for (i = 0; i < nsamples * 2; i++) {
if (abs(stereo[i] - stereo_ref[i]) > 1) { if (abs(stereo[i] - stereo_ref[i]) > 1) {
@ -124,81 +122,74 @@ static void run_remap_test_mono_stereo_s16(
pa_log_debug("Testing remap performance with %d sample alignment", align); pa_log_debug("Testing remap performance with %d sample alignment", align);
PA_RUNTIME_TEST_RUN_START("func", TIMES, TIMES2) { PA_RUNTIME_TEST_RUN_START("func", TIMES, TIMES2) {
func(remap, stereo, mono, nsamples); remap_func->do_remap(remap_orig, stereo, mono, nsamples);
} PA_RUNTIME_TEST_RUN_STOP } PA_RUNTIME_TEST_RUN_STOP
PA_RUNTIME_TEST_RUN_START("orig", TIMES, TIMES2) { PA_RUNTIME_TEST_RUN_START("orig", TIMES, TIMES2) {
orig_func(remap, stereo_ref, mono, nsamples); remap_func->do_remap(remap_func, stereo_ref, mono, nsamples);
} PA_RUNTIME_TEST_RUN_STOP } PA_RUNTIME_TEST_RUN_STOP
} }
} }
static void setup_remap_mono_stereo(pa_remap_t *m, pa_sample_format_t f) {
m->format = f;
m->i_ss.channels = 1;
m->o_ss.channels = 2;
m->map_table_f[0][0] = 1.0f;
m->map_table_f[1][0] = 1.0f;
m->map_table_i[0][0] = 0x10000;
m->map_table_i[1][0] = 0x10000;
}
static void remap_test_mono_stereo_float( static void remap_test_mono_stereo_float(
pa_init_remap_func_t init_func, pa_init_remap_func_t init_func,
pa_init_remap_func_t orig_init_func) { pa_init_remap_func_t orig_init_func) {
pa_remap_t remap; pa_remap_t remap_orig, remap_func;
pa_do_remap_func_t orig_func, func;
remap.format = PA_SAMPLE_FLOAT32NE; setup_remap_mono_stereo(&remap_orig, PA_SAMPLE_FLOAT32NE);
remap.i_ss.channels = 1; orig_init_func(&remap_orig);
remap.o_ss.channels = 2; if (!remap_orig.do_remap) {
remap.map_table_f[0][0] = 1.0;
remap.map_table_f[1][0] = 1.0;
remap.map_table_i[0][0] = 0x10000;
remap.map_table_i[1][0] = 0x10000;
orig_init_func(&remap);
orig_func = remap.do_remap;
if (!orig_func) {
pa_log_warn("No reference remapping function, abort test"); pa_log_warn("No reference remapping function, abort test");
return; return;
} }
init_func(&remap); setup_remap_mono_stereo(&remap_func, PA_SAMPLE_FLOAT32NE);
func = remap.do_remap; init_func(&remap_func);
if (!func || func == orig_func) { if (!remap_func.do_remap || remap_func.do_remap == remap_orig.do_remap) {
pa_log_warn("No remapping function, abort test"); pa_log_warn("No remapping function, abort test");
return; return;
} }
run_remap_test_mono_stereo_float(&remap, func, orig_func, 0, true, false); run_remap_test_mono_stereo_float(&remap_func, &remap_orig, 0, true, false);
run_remap_test_mono_stereo_float(&remap, func, orig_func, 1, true, false); run_remap_test_mono_stereo_float(&remap_func, &remap_orig, 1, true, false);
run_remap_test_mono_stereo_float(&remap, func, orig_func, 2, true, false); run_remap_test_mono_stereo_float(&remap_func, &remap_orig, 2, true, false);
run_remap_test_mono_stereo_float(&remap, func, orig_func, 3, true, true); run_remap_test_mono_stereo_float(&remap_func, &remap_orig, 3, true, true);
} }
static void remap_test_mono_stereo_s16( static void remap_test_mono_stereo_s16(
pa_init_remap_func_t init_func, pa_init_remap_func_t init_func,
pa_init_remap_func_t orig_init_func) { pa_init_remap_func_t orig_init_func) {
pa_remap_t remap; pa_remap_t remap_orig, remap_func;
pa_do_remap_func_t orig_func, func;
remap.format = PA_SAMPLE_S16NE; setup_remap_mono_stereo(&remap_orig, PA_SAMPLE_S16NE);
remap.i_ss.channels = 1; orig_init_func(&remap_orig);
remap.o_ss.channels = 2; if (!remap_orig.do_remap) {
remap.map_table_f[0][0] = 1.0;
remap.map_table_f[1][0] = 1.0;
remap.map_table_i[0][0] = 0x10000;
remap.map_table_i[1][0] = 0x10000;
orig_init_func(&remap);
orig_func = remap.do_remap;
if (!orig_func) {
pa_log_warn("No reference remapping function, abort test"); pa_log_warn("No reference remapping function, abort test");
return; return;
} }
init_func(&remap); init_func(&remap_func);
func = remap.do_remap; if (!remap_func.do_remap || remap_func.do_remap == remap_orig.do_remap) {
if (!func || func == orig_func) {
pa_log_warn("No remapping function, abort test"); pa_log_warn("No remapping function, abort test");
return; return;
} }
run_remap_test_mono_stereo_s16(&remap, func, orig_func, 0, true, false); run_remap_test_mono_stereo_s16(&remap_func, &remap_orig, 0, true, false);
run_remap_test_mono_stereo_s16(&remap, func, orig_func, 1, true, false); run_remap_test_mono_stereo_s16(&remap_func, &remap_orig, 1, true, false);
run_remap_test_mono_stereo_s16(&remap, func, orig_func, 2, true, false); run_remap_test_mono_stereo_s16(&remap_func, &remap_orig, 2, true, false);
run_remap_test_mono_stereo_s16(&remap, func, orig_func, 3, true, true); run_remap_test_mono_stereo_s16(&remap_func, &remap_orig, 3, true, true);
} }
#if defined (__i386__) || defined (__amd64__) #if defined (__i386__) || defined (__amd64__)