From b6b8a7b7a7f4f8badd39ebb4ee2be1c11ff1a204 Mon Sep 17 00:00:00 2001 From: Arun Raghavan Date: Tue, 7 Sep 2010 14:55:38 +0530 Subject: echo-cancel: Make blocksize a module-wide parameter Since all algorithms will need to specify a block size (the amount of data to be processed together), we make this a common parameter and have the implementation set it at initialisation time. --- src/modules/echo-cancel/adrian.c | 11 +++------ src/modules/echo-cancel/echo-cancel.h | 9 +++---- src/modules/echo-cancel/module-echo-cancel.c | 37 ++++++++++++---------------- src/modules/echo-cancel/speex.c | 11 +++------ 4 files changed, 25 insertions(+), 43 deletions(-) diff --git a/src/modules/echo-cancel/adrian.c b/src/modules/echo-cancel/adrian.c index 86c22cb3..1b913737 100644 --- a/src/modules/echo-cancel/adrian.c +++ b/src/modules/echo-cancel/adrian.c @@ -54,7 +54,7 @@ static void pa_adrian_ec_fixate_spec(pa_sample_spec *source_ss, pa_channel_map * pa_bool_t pa_adrian_ec_init(pa_echo_canceller *ec, pa_sample_spec *source_ss, pa_channel_map *source_map, pa_sample_spec *sink_ss, pa_channel_map *sink_map, - const char *args) + uint32_t *blocksize, const char *args) { int framelen, rate; uint32_t frame_size_ms; @@ -76,9 +76,9 @@ pa_bool_t pa_adrian_ec_init(pa_echo_canceller *ec, rate = source_ss->rate; framelen = (rate * frame_size_ms) / 1000; - ec->params.priv.adrian.blocksize = framelen * pa_frame_size (source_ss); + *blocksize = ec->params.priv.adrian.blocksize = framelen * pa_frame_size (source_ss); - pa_log_debug ("Using framelen %d, blocksize %lld, channels %d, rate %d", framelen, (long long) ec->params.priv.adrian.blocksize, source_ss->channels, source_ss->rate); + pa_log_debug ("Using framelen %d, blocksize %u, channels %d, rate %d", framelen, ec->params.priv.adrian.blocksize, source_ss->channels, source_ss->rate); ec->params.priv.adrian.aec = AEC_init(rate); if (!ec->params.priv.adrian.aec) @@ -114,8 +114,3 @@ void pa_adrian_ec_done(pa_echo_canceller *ec) pa_xfree(ec->params.priv.adrian.aec); ec->params.priv.adrian.aec = NULL; } - -uint32_t pa_adrian_ec_get_block_size(pa_echo_canceller *ec) -{ - return ec->params.priv.adrian.blocksize; -} diff --git a/src/modules/echo-cancel/echo-cancel.h b/src/modules/echo-cancel/echo-cancel.h index 65e0e240..bf81b1de 100644 --- a/src/modules/echo-cancel/echo-cancel.h +++ b/src/modules/echo-cancel/echo-cancel.h @@ -37,7 +37,6 @@ typedef struct pa_echo_canceller_params pa_echo_canceller_params; struct pa_echo_canceller_params { union { struct { - uint32_t blocksize; SpeexEchoState *state; } speex; struct { @@ -56,10 +55,10 @@ struct pa_echo_canceller { pa_channel_map *source_map, pa_sample_spec *sink_ss, pa_channel_map *sink_map, + uint32_t *blocksize, const char *args); void (*run) (pa_echo_canceller *ec, uint8_t *rec, uint8_t *play, uint8_t *out); void (*done) (pa_echo_canceller *ec); - uint32_t (*get_block_size) (pa_echo_canceller *ec); pa_echo_canceller_params params; }; @@ -68,16 +67,14 @@ struct pa_echo_canceller { pa_bool_t pa_speex_ec_init(pa_echo_canceller *ec, pa_sample_spec *source_ss, pa_channel_map *source_map, pa_sample_spec *sink_ss, pa_channel_map *sink_map, - const char *args); + uint32_t *blocksize, const char *args); void pa_speex_ec_run(pa_echo_canceller *ec, uint8_t *rec, uint8_t *play, uint8_t *out); void pa_speex_ec_done(pa_echo_canceller *ec); -uint32_t pa_speex_ec_get_block_size(pa_echo_canceller *ec); /* Adrian Andre's echo canceller */ pa_bool_t pa_adrian_ec_init(pa_echo_canceller *ec, pa_sample_spec *source_ss, pa_channel_map *source_map, pa_sample_spec *sink_ss, pa_channel_map *sink_map, - const char *args); + uint32_t *blocksize, const char *args); void pa_adrian_ec_run(pa_echo_canceller *ec, uint8_t *rec, uint8_t *play, uint8_t *out); void pa_adrian_ec_done(pa_echo_canceller *ec); -uint32_t pa_adrian_ec_get_block_size(pa_echo_canceller *ec); diff --git a/src/modules/echo-cancel/module-echo-cancel.c b/src/modules/echo-cancel/module-echo-cancel.c index 57e60c56..06583f4e 100644 --- a/src/modules/echo-cancel/module-echo-cancel.c +++ b/src/modules/echo-cancel/module-echo-cancel.c @@ -95,14 +95,12 @@ static const pa_echo_canceller ec_table[] = { .init = pa_speex_ec_init, .run = pa_speex_ec_run, .done = pa_speex_ec_done, - .get_block_size = pa_speex_ec_get_block_size, }, { /* Adrian Andre's NLMS implementation */ .init = pa_adrian_ec_init, .run = pa_adrian_ec_run, .done = pa_adrian_ec_done, - .get_block_size = pa_adrian_ec_get_block_size, }, }; @@ -161,6 +159,7 @@ struct userdata { uint32_t save_aec; pa_echo_canceller *ec; + uint32_t blocksize; pa_bool_t need_realign; @@ -345,7 +344,7 @@ static int source_process_msg_cb(pa_msgobject *o, int code, void *data, int64_t /* Add the latency internal to our source output on top */ pa_bytes_to_usec(pa_memblockq_get_length(u->source_output->thread_info.delay_memblockq), &u->source_output->source->sample_spec) + /* and the buffering we do on the source */ - pa_bytes_to_usec(u->ec->get_block_size(u->ec), &u->source_output->source->sample_spec); + pa_bytes_to_usec(u->blocksize, &u->source_output->source->sample_spec); return 0; @@ -632,7 +631,6 @@ static void do_resync(struct userdata *u) { static void source_output_push_cb(pa_source_output *o, const pa_memchunk *chunk) { struct userdata *u; size_t rlen, plen; - uint32_t blocksize; pa_source_output_assert_ref(o); pa_source_output_assert_io_context(o); @@ -658,20 +656,18 @@ static void source_output_push_cb(pa_source_output *o, const pa_memchunk *chunk) rlen = pa_memblockq_get_length(u->source_memblockq); plen = pa_memblockq_get_length(u->sink_memblockq); - blocksize = u->ec->get_block_size(u->ec); - - while (rlen >= blocksize) { + while (rlen >= u->blocksize) { pa_memchunk rchunk, pchunk; /* take fixed block from recorded samples */ - pa_memblockq_peek_fixed_size(u->source_memblockq, blocksize, &rchunk); + pa_memblockq_peek_fixed_size(u->source_memblockq, u->blocksize, &rchunk); - if (plen > blocksize) { + if (plen > u->blocksize) { uint8_t *rdata, *pdata, *cdata; pa_memchunk cchunk; /* take fixed block from played samples */ - pa_memblockq_peek_fixed_size(u->sink_memblockq, blocksize, &pchunk); + pa_memblockq_peek_fixed_size(u->sink_memblockq, u->blocksize, &pchunk); rdata = pa_memblock_acquire(rchunk.memblock); rdata += rchunk.index; @@ -679,7 +675,7 @@ static void source_output_push_cb(pa_source_output *o, const pa_memchunk *chunk) pdata += pchunk.index; cchunk.index = 0; - cchunk.length = blocksize; + cchunk.length = u->blocksize; cchunk.memblock = pa_memblock_new(u->source->core->mempool, cchunk.length); cdata = pa_memblock_acquire(cchunk.memblock); @@ -688,11 +684,11 @@ static void source_output_push_cb(pa_source_output *o, const pa_memchunk *chunk) if (u->save_aec) { if (u->captured_file) - fwrite(rdata, 1, blocksize, u->captured_file); + fwrite(rdata, 1, u->blocksize, u->captured_file); if (u->played_file) - fwrite(pdata, 1, blocksize, u->played_file); + fwrite(pdata, 1, u->blocksize, u->played_file); if (u->canceled_file) - fwrite(cdata, 1, blocksize, u->canceled_file); + fwrite(cdata, 1, u->blocksize, u->canceled_file); pa_log_debug("AEC frame saved."); } @@ -701,7 +697,7 @@ static void source_output_push_cb(pa_source_output *o, const pa_memchunk *chunk) pa_memblock_release(rchunk.memblock); /* drop consumed sink samples */ - pa_memblockq_drop(u->sink_memblockq, blocksize); + pa_memblockq_drop(u->sink_memblockq, u->blocksize); pa_memblock_unref(pchunk.memblock); pa_memblock_unref(rchunk.memblock); @@ -709,11 +705,11 @@ static void source_output_push_cb(pa_source_output *o, const pa_memchunk *chunk) * source */ rchunk = cchunk; - plen -= blocksize; + plen -= u->blocksize; } else { /* not enough played samples to perform echo cancelation, * drop what we have */ - pa_memblockq_drop(u->sink_memblockq, blocksize - plen); + pa_memblockq_drop(u->sink_memblockq, u->blocksize - plen); plen = 0; } @@ -721,9 +717,9 @@ static void source_output_push_cb(pa_source_output *o, const pa_memchunk *chunk) pa_source_post(u->source, &rchunk); pa_memblock_unref(rchunk.memblock); - pa_memblockq_drop(u->source_memblockq, blocksize); + pa_memblockq_drop(u->source_memblockq, u->blocksize); - rlen -= blocksize; + rlen -= u->blocksize; } } @@ -1354,7 +1350,6 @@ int pa__init(pa_module*m) { u->ec->init = ec_table[ec_method].init; u->ec->run = ec_table[ec_method].run; u->ec->done = ec_table[ec_method].done; - u->ec->get_block_size = ec_table[ec_method].get_block_size; adjust_time_sec = DEFAULT_ADJUST_TIME_USEC / PA_USEC_PER_SEC; if (pa_modargs_get_value_u32(ma, "adjust_time", &adjust_time_sec) < 0) { @@ -1376,7 +1371,7 @@ int pa__init(pa_module*m) { u->asyncmsgq = pa_asyncmsgq_new(0); u->need_realign = TRUE; if (u->ec->init) { - if (!u->ec->init(u->ec, &source_ss, &source_map, &sink_ss, &sink_map, pa_modargs_get_value(ma, "aec_args", NULL))) { + if (!u->ec->init(u->ec, &source_ss, &source_map, &sink_ss, &sink_map, &u->blocksize, pa_modargs_get_value(ma, "aec_args", NULL))) { pa_log("Failed to init AEC engine"); goto fail; } diff --git a/src/modules/echo-cancel/speex.c b/src/modules/echo-cancel/speex.c index cb8212e1..0d4d1236 100644 --- a/src/modules/echo-cancel/speex.c +++ b/src/modules/echo-cancel/speex.c @@ -51,7 +51,7 @@ static void pa_speex_ec_fixate_spec(pa_sample_spec *source_ss, pa_channel_map *s pa_bool_t pa_speex_ec_init(pa_echo_canceller *ec, pa_sample_spec *source_ss, pa_channel_map *source_map, pa_sample_spec *sink_ss, pa_channel_map *sink_map, - const char *args) + uint32_t *blocksize, const char *args) { int framelen, y, rate; uint32_t frame_size_ms, filter_size_ms; @@ -84,9 +84,9 @@ pa_bool_t pa_speex_ec_init(pa_echo_canceller *ec, y >>= 1; framelen = y; - ec->params.priv.speex.blocksize = framelen * pa_frame_size (source_ss); + *blocksize = framelen * pa_frame_size (source_ss); - pa_log_debug ("Using framelen %d, blocksize %lld, channels %d, rate %d", framelen, (long long) ec->params.priv.speex.blocksize, source_ss->channels, source_ss->rate); + pa_log_debug ("Using framelen %d, blocksize %u, channels %d, rate %d", framelen, *blocksize, source_ss->channels, source_ss->rate); ec->params.priv.speex.state = speex_echo_state_init_mc (framelen, (rate * filter_size_ms) / 1000, source_ss->channels, source_ss->channels); @@ -114,8 +114,3 @@ void pa_speex_ec_done(pa_echo_canceller *ec) speex_echo_state_destroy (ec->params.priv.speex.state); ec->params.priv.speex.state = NULL; } - -uint32_t pa_speex_ec_get_block_size(pa_echo_canceller *ec) -{ - return ec->params.priv.speex.blocksize; -} -- cgit