echo-cancel: Extend null implementation to arbitary sample specs

The new null implementation works with arbitrary sample specs for source
and sink. In particular, it handles a different number of channels for
source and sink.

Signed-off-by: Stefan Huber <s.huber@bct-electronic.com>
Acked-by: Peter Meerwald <p.meerwald@bct-electronic.com>

diff --git a/src/modules/echo-cancel/echo-cancel.h b/src/modules/echo-cancel/echo-cancel.h
index 9f14adeac65b6de8ea070017b46a71ae850a607d..e7eed30258571b6de58764bebdf6ca6ba4f3b361 100644 (file)
--- a/src/modules/echo-cancel/echo-cancel.h
+++ b/src/modules/echo-cancel/echo-cancel.h
@@ -46,6 +46,9 @@ typedef struct pa_echo_canceller_params pa_echo_canceller_params;
 
 struct pa_echo_canceller_params {
     union {
+        struct {
+            pa_sample_spec source_ss;
+        } null;
 #ifdef HAVE_SPEEX
         struct {
             SpeexEchoState *state;

diff --git a/src/modules/echo-cancel/null.c b/src/modules/echo-cancel/null.c
index bfd6c30ae6fdaad7b8bbe21a843496646cb2bc19..6d9531a1b29eb00ec6643015bd855f0dc40b6fb6 100644 (file)
--- a/src/modules/echo-cancel/null.c
+++ b/src/modules/echo-cancel/null.c
@@ -29,22 +29,23 @@ pa_bool_t pa_null_ec_init(pa_core *c, pa_echo_canceller *ec,
                            pa_sample_spec *source_ss, pa_channel_map *source_map,
                            pa_sample_spec *sink_ss, pa_channel_map *sink_map,
                            uint32_t *nframes, const char *args) {
-    *nframes = 256;
-
-    source_ss->format = PA_SAMPLE_S16NE;
-    source_ss->channels = 1;
+    char strss_source[PA_SAMPLE_SPEC_SNPRINT_MAX];
+    char strss_sink[PA_SAMPLE_SPEC_SNPRINT_MAX];
 
-    *sink_ss = *source_ss;
-    *sink_map = *source_map;
+    *nframes = 256;
+    ec->params.priv.null.source_ss = *source_ss;
 
-    pa_log_debug("null AEC: nframes %u, channels %d, rate %d", *nframes, source_ss->channels, source_ss->rate);
+    pa_log_debug("null AEC: nframes=%u, sample spec source=%s, sample spec sink=%s", *nframes,
+            pa_sample_spec_snprint(strss_source, sizeof(strss_source), source_ss),
+            pa_sample_spec_snprint(strss_sink, sizeof(strss_sink), sink_ss));
 
     return TRUE;
 }
 
 void pa_null_ec_run(pa_echo_canceller *ec, const uint8_t *rec, const uint8_t *play, uint8_t *out) {
-    // blocksize is nframes * frame-size
-    memcpy(out, rec, 256 * 2);
+    /* The null implementation simply copies the recorded buffer to the output
+       buffer and ignores the play buffer. */
+    memcpy(out, rec, 256 * pa_frame_size(&ec->params.priv.null.source_ss));
 }
 
 void pa_null_ec_done(pa_echo_canceller *ec) {