]> code.delx.au - pulseaudio/commitdiff
echo-cancel: Fix missing setup of sink_ss in echo-cancel-test.
authorStefan Huber <s.huber@bct-electronic.com>
Tue, 18 Dec 2012 12:52:31 +0000 (13:52 +0100)
committerTanu Kaskinen <tanuk@iki.fi>
Thu, 20 Dec 2012 08:16:13 +0000 (10:16 +0200)
In main() of echo-cancel-test it is wrongly assumed that the EC
implementation's init() function properly initializes sink_ss. In
contrast, pa__init() sets sink_ss by default to
sink_master->sample_spec. Fix this by setting sink_ss to default
parameters and let EC implementation's init() override these settings.

Signed-off-by: Stefan Huber <s.huber@bct-electronic.com>
Acked-by: Peter Meerwald <p.meerwald@bct-electronic.com>
src/modules/echo-cancel/module-echo-cancel.c

index f7c72763abc590a09793ef85e962f94c5c561e6c..5c639ae0b5b45b6c1e17e091a6a4014d4c36c4bf 100644 (file)
@@ -2104,6 +2104,11 @@ int main(int argc, char* argv[]) {
     source_ss.channels = DEFAULT_CHANNELS;
     pa_channel_map_init_auto(&source_map, source_ss.channels, PA_CHANNEL_MAP_DEFAULT);
 
+    sink_ss.format = PA_SAMPLE_S16LE;
+    sink_ss.rate = DEFAULT_RATE;
+    sink_ss.channels = DEFAULT_CHANNELS;
+    pa_channel_map_init_auto(&sink_map, sink_ss.channels, PA_CHANNEL_MAP_DEFAULT);
+
     if (init_common(ma, &u, &source_ss, &source_map) < 0)
         goto fail;