mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-10-31 22:25:33 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

echo-cancel: Allow selection of AEC method using modargs

Browse source 
This adds an "aec_method" module argument to allow us to select the AEC
implementation to use.
This commit is contained in:
Arun Raghavan 2010-09-07 14:02:32 +05:30
parent 526277c97c
commit 33a3bc34c8
1 changed files with 27 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

35
src/modules/echo-cancel/module-echo-cancel.c
View file

@ -75,17 +75,19 @@ PA_MODULE_USAGE(
"rate=<sample rate> " "rate=<sample rate> "
"channels=<number of channels> " "channels=<number of channels> "
"channel_map=<channel map> " "channel_map=<channel map> "
"aec_method=<implementation to use> "
"aec_args=<parameters for the AEC engine> " "aec_args=<parameters for the AEC engine> "
"save_aec=<save AEC data in /tmp> " "save_aec=<save AEC data in /tmp> "
)); ));
/* NOTE: Make sure the enum and ec_table are maintained in the correct order */ /* NOTE: Make sure the enum and ec_table are maintained in the correct order */
enum { typedef enum {
PA_ECHO_CANCELLER_SPEEX, PA_ECHO_CANCELLER_INVALID = -1,
PA_ECHO_CANCELLER_SPEEX = 0,
PA_ECHO_CANCELLER_ADRIAN, PA_ECHO_CANCELLER_ADRIAN,
}; } pa_echo_canceller_method_t;
#define DEFAULT_ECHO_CANCELLER PA_ECHO_CANCELLER_SPEEX #define DEFAULT_ECHO_CANCELLER "speex"
static const pa_echo_canceller ec_table[] = { static const pa_echo_canceller ec_table[] = {
{ {
@ -205,6 +207,7 @@ static const char* const valid_modargs[] = {
"rate", "rate",
"channels", "channels",
"channel_map", "channel_map",
"aec_method",
"aec_args", "aec_args",
"save_aec", "save_aec",
NULL NULL
@ -1274,6 +1277,15 @@ static void sink_input_mute_changed_cb(pa_sink_input *i) {
pa_sink_mute_changed(u->sink, i->muted); pa_sink_mute_changed(u->sink, i->muted);
} }
static pa_echo_canceller_method_t get_ec_method_from_string(const char *method)
{
if (strcmp(method, "speex") == 0)
return PA_ECHO_CANCELLER_SPEEX;
else if (strcmp(method, "adrian") == 0)
return PA_ECHO_CANCELLER_ADRIAN;
else
return PA_ECHO_CANCELLER_INVALID;
}
int pa__init(pa_module*m) { int pa__init(pa_module*m) {
struct userdata *u; struct userdata *u;
@ -1287,6 +1299,7 @@ int pa__init(pa_module*m) {
pa_source_new_data source_data; pa_source_new_data source_data;
pa_sink_new_data sink_data; pa_sink_new_data sink_data;
pa_memchunk silence; pa_memchunk silence;
pa_echo_canceller_method_t ec_method;
uint32_t adjust_time_sec; uint32_t adjust_time_sec;
pa_assert(m); pa_assert(m);
@ -1332,10 +1345,16 @@ int pa__init(pa_module*m) {
pa_log("Failed to alloc echo canceller"); pa_log("Failed to alloc echo canceller");
goto fail; goto fail;
} }
u->ec->init = ec_table[DEFAULT_ECHO_CANCELLER].init;
u->ec->run = ec_table[DEFAULT_ECHO_CANCELLER].run; if ((ec_method = get_ec_method_from_string(pa_modargs_get_value(ma, "aec_method", DEFAULT_ECHO_CANCELLER))) < 0) {
u->ec->done = ec_table[DEFAULT_ECHO_CANCELLER].done; pa_log("Invalid echo canceller implementation");
u->ec->get_block_size = ec_table[DEFAULT_ECHO_CANCELLER].get_block_size; goto fail;
}
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; adjust_time_sec = DEFAULT_ADJUST_TIME_USEC / PA_USEC_PER_SEC;
if (pa_modargs_get_value_u32(ma, "adjust_time", &adjust_time_sec) < 0) { if (pa_modargs_get_value_u32(ma, "adjust_time", &adjust_time_sec) < 0) {