From d777838fbb1a8e1f012e249bb1a0816d9141dd45 Mon Sep 17 00:00:00 2001 From: Arun Raghavan Date: Wed, 17 Feb 2016 19:46:56 +0530 Subject: [PATCH] echo-cancel: Canceller may use different spec for playback and capture The original intention was to configure low enough parameters to keep CPU consumption down. Prior to this change, we assumed that the EC backend would override the sink parameters based on the source parameters to achieve this goal, and with this change we remove that assumption by forcing the default parameters for the sink to be low enough. --- src/modules/echo-cancel/module-echo-cancel.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/modules/echo-cancel/module-echo-cancel.c b/src/modules/echo-cancel/module-echo-cancel.c index 18fe5dce4..c3a6a1c9a 100644 --- a/src/modules/echo-cancel/module-echo-cancel.c +++ b/src/modules/echo-cancel/module-echo-cancel.c @@ -1690,7 +1690,9 @@ int pa__init(pa_module*m) { pa_channel_map_init_auto(&source_map, source_ss.channels, PA_CHANNEL_MAP_DEFAULT); sink_ss = sink_master->sample_spec; - sink_map = sink_master->channel_map; + sink_ss.rate = DEFAULT_RATE; + sink_ss.channels = DEFAULT_CHANNELS; + pa_channel_map_init_auto(&sink_map, sink_ss.channels, PA_CHANNEL_MAP_DEFAULT); u = pa_xnew0(struct userdata, 1); if (!u) {