From: Arun Raghavan <git@arunraghavan.net>
Date: Wed, 17 Feb 2016 14:16:56 +0000 (+0530)
Subject: echo-cancel: Canceller may use different spec for playback and capture
X-Git-Tag: v8.99.1~86
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d777838fbb1a8e1f012e249bb1a0816d9141dd45;p=platform%2Fupstream%2Fpulseaudio.git

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.
---

diff --git a/src/modules/echo-cancel/module-echo-cancel.c b/src/modules/echo-cancel/module-echo-cancel.c
index 18fe5dc..c3a6a1c 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) {