mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-08 13:29:59 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions
pulseaudio/src/modules/echo-cancel/adrian.c

121 lines
3.9 KiB
C
Raw Normal View History

echo-cancel: Add alternative echo-cancellation implementation This adds Andre Adrian's AEC implementation from his intercom project (http://andreadrian.de/intercom/) as an alternative to the speex echo cancellation routines. Since the implementation was in C++ and not in the form of a library, I have converted the code to C and made a local copy of the implementation. The implementation actually works on floating point data, so we can tweak it to work with both integer and floating point samples (currently we just use S16LE).
2010-09-07 13:43:58 +05:30
/***
This file is part of PulseAudio.
Copyright 2010 Arun Raghavan <arun.raghavan@collabora.co.uk>
Contributor: Wim Taymans <wim.taymans@gmail.com>
The actual implementation is taken from the sources at
http://andreadrian.de/intercom/ - for the license, look for
adrian-license.txt in the same directory as this file.
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2.1 of the License,
or (at your option) any later version.
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
USA.
***/
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
Remove unnecessary #includes
2011-06-13 15:04:33 +02:00
#include <pulse/xmalloc.h>
echo-cancel: Add alternative echo-cancellation implementation This adds Andre Adrian's AEC implementation from his intercom project (http://andreadrian.de/intercom/) as an alternative to the speex echo cancellation routines. Since the implementation was in C++ and not in the form of a library, I have converted the code to C and made a local copy of the implementation. The implementation actually works on floating point data, so we can tweak it to work with both integer and floating point samples (currently we just use S16LE).
2010-09-07 13:43:58 +05:30
#include <pulsecore/modargs.h>
Remove unnecessary #includes
2011-06-13 15:04:33 +02:00
echo-cancel: Add alternative echo-cancellation implementation This adds Andre Adrian's AEC implementation from his intercom project (http://andreadrian.de/intercom/) as an alternative to the speex echo cancellation routines. Since the implementation was in C++ and not in the form of a library, I have converted the code to C and made a local copy of the implementation. The implementation actually works on floating point data, so we can tweak it to work with both integer and floating point samples (currently we just use S16LE).
2010-09-07 13:43:58 +05:30
#include "echo-cancel.h"
/* should be between 10-20 ms */
#define DEFAULT_FRAME_SIZE_MS 20
static const char* const valid_modargs[] = {
"frame_size_ms",
NULL
};
echo-cancel: Enable different sample specs for rec and out stream Enable advanced AEC methods to use different specs (i.e., number of channels) for rec and out stream. A typical application is beam forming resp. multi-channel AEC, which takes multiple record channels to produce an echo-canceled output stream. This commit alters the EC API as follows: the EC's init() used to get source and sink's sample spec/channel map. The new interface renamed source to rec and sink to play and additionally passes sample spec and channel map of the out stream. The new parameter names of init() {rec,play,out}_{ss,map} are more intuitive and also resemble to the parameter names known from run(). Both rec_{ss,map} and out_{ss,map} are initialized as we knew it from source_{ss,map} before being passed to init(). The previous EC implementations only require trivial changes, i.e., setting rec_{ss,map} to out_{ss,map} at the end of init() in case that out_{ss,map} is modified in init().
2013-02-18 16:31:03 +01:00
static void pa_adrian_ec_fixate_spec(pa_sample_spec *rec_ss, pa_channel_map *rec_map,
pa_sample_spec *play_ss, pa_channel_map *play_map,
Style fix: Remove new lines from opening brackets This patch replaces every occurrence of ')\n{' with ') {'. Command used for this: find . -type d \( -name ffmpeg \) -prune -o \ -regex '\(.*\.[hc]\|.*\.cc\)' \ -a -not -name core-util.c -a -not \ -name adrian-aec.c -a -not -name g711.c \ -exec sed -i -e '/)$/{N;s/)\n{$/) {/}' {} \; The excluded files are mirrored files from external sources.
2013-06-18 22:24:24 +02:00
pa_sample_spec *out_ss, pa_channel_map *out_map) {
echo-cancel: Enable different sample specs for rec and out stream Enable advanced AEC methods to use different specs (i.e., number of channels) for rec and out stream. A typical application is beam forming resp. multi-channel AEC, which takes multiple record channels to produce an echo-canceled output stream. This commit alters the EC API as follows: the EC's init() used to get source and sink's sample spec/channel map. The new interface renamed source to rec and sink to play and additionally passes sample spec and channel map of the out stream. The new parameter names of init() {rec,play,out}_{ss,map} are more intuitive and also resemble to the parameter names known from run(). Both rec_{ss,map} and out_{ss,map} are initialized as we knew it from source_{ss,map} before being passed to init(). The previous EC implementations only require trivial changes, i.e., setting rec_{ss,map} to out_{ss,map} at the end of init() in case that out_{ss,map} is modified in init().
2013-02-18 16:31:03 +01:00
out_ss->format = PA_SAMPLE_S16NE;
out_ss->channels = 1;
pa_channel_map_init_mono(out_map);
*play_ss = *out_ss;
*play_map = *out_map;
*rec_ss = *out_ss;
*rec_map = *out_map;
echo-cancel: Add alternative echo-cancellation implementation This adds Andre Adrian's AEC implementation from his intercom project (http://andreadrian.de/intercom/) as an alternative to the speex echo cancellation routines. Since the implementation was in C++ and not in the form of a library, I have converted the code to C and made a local copy of the implementation. The implementation actually works on floating point data, so we can tweak it to work with both integer and floating point samples (currently we just use S16LE).
2010-09-07 13:43:58 +05:30
}
Remove pa_bool_t and replace it with bool. commands used for this (executed from the pulseaudio/src directory): find . -regex '\(.*\.[hc]\|.*\.cc\|.*\.m4\)' -not -name 'macro.h' \ -a -not -name 'reserve.[ch]' -a -not -name 'reserve-monitor.[ch]' \ -a -not -name 'glib-mainloop.c' -a -not -name 'gkt-test.c' \ -a -not -name 'glib-mainloop.c' -a -not -name 'gkt-test.c' \ -a -not -name 'poll-win32.c' -a -not -name 'thread-win32.c' \ -a -not -name 'dllmain.c' -a -not -name 'gconf-helper.c' \ -exec sed -i -e 's/\bpa_bool_t\b/bool/g' \ -e 's/\bTRUE\b/true/g' -e 's/\bFALSE\b/false/g' {} \; and: sed -i -e '181,194!s/\bpa_bool_t\b/bool/' \ -e '181,194!s/\bTRUE\b/true/' -e \ '181,194!s/\bFALSE\b/false/' pulsecore/macro.h
2013-06-27 19:28:09 +02:00
bool pa_adrian_ec_init(pa_core *c, pa_echo_canceller *ec,
echo-cancel: Enable different sample specs for rec and out stream Enable advanced AEC methods to use different specs (i.e., number of channels) for rec and out stream. A typical application is beam forming resp. multi-channel AEC, which takes multiple record channels to produce an echo-canceled output stream. This commit alters the EC API as follows: the EC's init() used to get source and sink's sample spec/channel map. The new interface renamed source to rec and sink to play and additionally passes sample spec and channel map of the out stream. The new parameter names of init() {rec,play,out}_{ss,map} are more intuitive and also resemble to the parameter names known from run(). Both rec_{ss,map} and out_{ss,map} are initialized as we knew it from source_{ss,map} before being passed to init(). The previous EC implementations only require trivial changes, i.e., setting rec_{ss,map} to out_{ss,map} at the end of init() in case that out_{ss,map} is modified in init().
2013-02-18 16:31:03 +01:00
pa_sample_spec *rec_ss, pa_channel_map *rec_map,
pa_sample_spec *play_ss, pa_channel_map *play_map,
pa_sample_spec *out_ss, pa_channel_map *out_map,
Style fix: Remove new lines from opening brackets This patch replaces every occurrence of ')\n{' with ') {'. Command used for this: find . -type d \( -name ffmpeg \) -prune -o \ -regex '\(.*\.[hc]\|.*\.cc\)' \ -a -not -name core-util.c -a -not \ -name adrian-aec.c -a -not -name g711.c \ -exec sed -i -e '/)$/{N;s/)\n{$/) {/}' {} \; The excluded files are mirrored files from external sources.
2013-06-18 22:24:24 +02:00
uint32_t *nframes, const char *args) {
echo-cancel: Enable different blocksizes for sink and source In order to support different blocksizes for source and sink (e.g, for 4-to-1 beamforming/echo canceling which involves 4 record channels and 1 playback channel) the AEC API is altered: The blocksize for source and sink may differ (due to different sample specs) but the number of frames that are processed in one invokation of the AEC implementation's run() function is the same for the playback and the record stream. Consequently, the AEC implementation's init() function initalizes 'nframes' instead of 'blocksize' and the source's and sink's blocksizes are derived from 'nframes'. The old API also caused code duplication in each AEC implementation's init function for the compution of the blocksize, which is eliminated by the new API. Signed-off-by: Stefan Huber <s.huber@bct-electronic.com> Acked-by: Peter Meerwald <p.meerwald@bct-electronic.com>
2012-12-20 11:33:04 +01:00
int rate, have_vector = 0;
echo-cancel: Add alternative echo-cancellation implementation This adds Andre Adrian's AEC implementation from his intercom project (http://andreadrian.de/intercom/) as an alternative to the speex echo cancellation routines. Since the implementation was in C++ and not in the form of a library, I have converted the code to C and made a local copy of the implementation. The implementation actually works on floating point data, so we can tweak it to work with both integer and floating point samples (currently we just use S16LE).
2010-09-07 13:43:58 +05:30
uint32_t frame_size_ms;
pa_modargs *ma;
if (!(ma = pa_modargs_new(args, valid_modargs))) {
pa_log("Failed to parse submodule arguments.");
goto fail;
}
frame_size_ms = DEFAULT_FRAME_SIZE_MS;
if (pa_modargs_get_value_u32(ma, "frame_size_ms", &frame_size_ms) < 0 || frame_size_ms < 1 || frame_size_ms > 200) {
pa_log("Invalid frame_size_ms specification");
goto fail;
}
echo-cancel: Enable different sample specs for rec and out stream Enable advanced AEC methods to use different specs (i.e., number of channels) for rec and out stream. A typical application is beam forming resp. multi-channel AEC, which takes multiple record channels to produce an echo-canceled output stream. This commit alters the EC API as follows: the EC's init() used to get source and sink's sample spec/channel map. The new interface renamed source to rec and sink to play and additionally passes sample spec and channel map of the out stream. The new parameter names of init() {rec,play,out}_{ss,map} are more intuitive and also resemble to the parameter names known from run(). Both rec_{ss,map} and out_{ss,map} are initialized as we knew it from source_{ss,map} before being passed to init(). The previous EC implementations only require trivial changes, i.e., setting rec_{ss,map} to out_{ss,map} at the end of init() in case that out_{ss,map} is modified in init().
2013-02-18 16:31:03 +01:00
pa_adrian_ec_fixate_spec(rec_ss, rec_map, play_ss, play_map, out_ss, out_map);
echo-cancel: Add alternative echo-cancellation implementation This adds Andre Adrian's AEC implementation from his intercom project (http://andreadrian.de/intercom/) as an alternative to the speex echo cancellation routines. Since the implementation was in C++ and not in the form of a library, I have converted the code to C and made a local copy of the implementation. The implementation actually works on floating point data, so we can tweak it to work with both integer and floating point samples (currently we just use S16LE).
2010-09-07 13:43:58 +05:30
echo-cancel: Enable different sample specs for rec and out stream Enable advanced AEC methods to use different specs (i.e., number of channels) for rec and out stream. A typical application is beam forming resp. multi-channel AEC, which takes multiple record channels to produce an echo-canceled output stream. This commit alters the EC API as follows: the EC's init() used to get source and sink's sample spec/channel map. The new interface renamed source to rec and sink to play and additionally passes sample spec and channel map of the out stream. The new parameter names of init() {rec,play,out}_{ss,map} are more intuitive and also resemble to the parameter names known from run(). Both rec_{ss,map} and out_{ss,map} are initialized as we knew it from source_{ss,map} before being passed to init(). The previous EC implementations only require trivial changes, i.e., setting rec_{ss,map} to out_{ss,map} at the end of init() in case that out_{ss,map} is modified in init().
2013-02-18 16:31:03 +01:00
rate = out_ss->rate;
echo-cancel: Enable different blocksizes for sink and source In order to support different blocksizes for source and sink (e.g, for 4-to-1 beamforming/echo canceling which involves 4 record channels and 1 playback channel) the AEC API is altered: The blocksize for source and sink may differ (due to different sample specs) but the number of frames that are processed in one invokation of the AEC implementation's run() function is the same for the playback and the record stream. Consequently, the AEC implementation's init() function initalizes 'nframes' instead of 'blocksize' and the source's and sink's blocksizes are derived from 'nframes'. The old API also caused code duplication in each AEC implementation's init function for the compution of the blocksize, which is eliminated by the new API. Signed-off-by: Stefan Huber <s.huber@bct-electronic.com> Acked-by: Peter Meerwald <p.meerwald@bct-electronic.com>
2012-12-20 11:33:04 +01:00
*nframes = (rate * frame_size_ms) / 1000;
echo-cancel: Enable different sample specs for rec and out stream Enable advanced AEC methods to use different specs (i.e., number of channels) for rec and out stream. A typical application is beam forming resp. multi-channel AEC, which takes multiple record channels to produce an echo-canceled output stream. This commit alters the EC API as follows: the EC's init() used to get source and sink's sample spec/channel map. The new interface renamed source to rec and sink to play and additionally passes sample spec and channel map of the out stream. The new parameter names of init() {rec,play,out}_{ss,map} are more intuitive and also resemble to the parameter names known from run(). Both rec_{ss,map} and out_{ss,map} are initialized as we knew it from source_{ss,map} before being passed to init(). The previous EC implementations only require trivial changes, i.e., setting rec_{ss,map} to out_{ss,map} at the end of init() in case that out_{ss,map} is modified in init().
2013-02-18 16:31:03 +01:00
ec->params.priv.adrian.blocksize = (*nframes) * pa_frame_size(out_ss);
echo-cancel: Add alternative echo-cancellation implementation This adds Andre Adrian's AEC implementation from his intercom project (http://andreadrian.de/intercom/) as an alternative to the speex echo cancellation routines. Since the implementation was in C++ and not in the form of a library, I have converted the code to C and made a local copy of the implementation. The implementation actually works on floating point data, so we can tweak it to work with both integer and floating point samples (currently we just use S16LE).
2010-09-07 13:43:58 +05:30
echo-cancel: Enable different sample specs for rec and out stream Enable advanced AEC methods to use different specs (i.e., number of channels) for rec and out stream. A typical application is beam forming resp. multi-channel AEC, which takes multiple record channels to produce an echo-canceled output stream. This commit alters the EC API as follows: the EC's init() used to get source and sink's sample spec/channel map. The new interface renamed source to rec and sink to play and additionally passes sample spec and channel map of the out stream. The new parameter names of init() {rec,play,out}_{ss,map} are more intuitive and also resemble to the parameter names known from run(). Both rec_{ss,map} and out_{ss,map} are initialized as we knew it from source_{ss,map} before being passed to init(). The previous EC implementations only require trivial changes, i.e., setting rec_{ss,map} to out_{ss,map} at the end of init() in case that out_{ss,map} is modified in init().
2013-02-18 16:31:03 +01:00
pa_log_debug ("Using nframes %d, blocksize %u, channels %d, rate %d", *nframes, ec->params.priv.adrian.blocksize, out_ss->channels, out_ss->rate);
echo-cancel: Add alternative echo-cancellation implementation This adds Andre Adrian's AEC implementation from his intercom project (http://andreadrian.de/intercom/) as an alternative to the speex echo cancellation routines. Since the implementation was in C++ and not in the form of a library, I have converted the code to C and made a local copy of the implementation. The implementation actually works on floating point data, so we can tweak it to work with both integer and floating point samples (currently we just use S16LE).
2010-09-07 13:43:58 +05:30
echo-cancel: Add SSE optimisation to the adrian module Optimises the core inner-product function, which takes the most CPU. The SSE-optimised bits of the adrian echo canceller only if the CPU that PA is running on actually supports SSE.
2010-09-21 20:42:32 +05:30
/* For now we only support SSE */
if (c->cpu_info.cpu_type == PA_CPU_X86 && (c->cpu_info.flags.x86 & PA_CPU_X86_SSE))
have_vector = 1;
ec->params.priv.adrian.aec = AEC_init(rate, have_vector);
echo-cancel: Add alternative echo-cancellation implementation This adds Andre Adrian's AEC implementation from his intercom project (http://andreadrian.de/intercom/) as an alternative to the speex echo cancellation routines. Since the implementation was in C++ and not in the form of a library, I have converted the code to C and made a local copy of the implementation. The implementation actually works on floating point data, so we can tweak it to work with both integer and floating point samples (currently we just use S16LE).
2010-09-07 13:43:58 +05:30
if (!ec->params.priv.adrian.aec)
Fix up according to Coding Style Only whitespace changes in here
2011-03-02 12:41:26 +01:00
goto fail;
echo-cancel: Add alternative echo-cancellation implementation This adds Andre Adrian's AEC implementation from his intercom project (http://andreadrian.de/intercom/) as an alternative to the speex echo cancellation routines. Since the implementation was in C++ and not in the form of a library, I have converted the code to C and made a local copy of the implementation. The implementation actually works on floating point data, so we can tweak it to work with both integer and floating point samples (currently we just use S16LE).
2010-09-07 13:43:58 +05:30
pa_modargs_free(ma);
Remove pa_bool_t and replace it with bool. commands used for this (executed from the pulseaudio/src directory): find . -regex '\(.*\.[hc]\|.*\.cc\|.*\.m4\)' -not -name 'macro.h' \ -a -not -name 'reserve.[ch]' -a -not -name 'reserve-monitor.[ch]' \ -a -not -name 'glib-mainloop.c' -a -not -name 'gkt-test.c' \ -a -not -name 'glib-mainloop.c' -a -not -name 'gkt-test.c' \ -a -not -name 'poll-win32.c' -a -not -name 'thread-win32.c' \ -a -not -name 'dllmain.c' -a -not -name 'gconf-helper.c' \ -exec sed -i -e 's/\bpa_bool_t\b/bool/g' \ -e 's/\bTRUE\b/true/g' -e 's/\bFALSE\b/false/g' {} \; and: sed -i -e '181,194!s/\bpa_bool_t\b/bool/' \ -e '181,194!s/\bTRUE\b/true/' -e \ '181,194!s/\bFALSE\b/false/' pulsecore/macro.h
2013-06-27 19:28:09 +02:00
return true;
echo-cancel: Add alternative echo-cancellation implementation This adds Andre Adrian's AEC implementation from his intercom project (http://andreadrian.de/intercom/) as an alternative to the speex echo cancellation routines. Since the implementation was in C++ and not in the form of a library, I have converted the code to C and made a local copy of the implementation. The implementation actually works on floating point data, so we can tweak it to work with both integer and floating point samples (currently we just use S16LE).
2010-09-07 13:43:58 +05:30
fail:
if (ma)
Fix up according to Coding Style Only whitespace changes in here
2011-03-02 12:41:26 +01:00
pa_modargs_free(ma);
Remove pa_bool_t and replace it with bool. commands used for this (executed from the pulseaudio/src directory): find . -regex '\(.*\.[hc]\|.*\.cc\|.*\.m4\)' -not -name 'macro.h' \ -a -not -name 'reserve.[ch]' -a -not -name 'reserve-monitor.[ch]' \ -a -not -name 'glib-mainloop.c' -a -not -name 'gkt-test.c' \ -a -not -name 'glib-mainloop.c' -a -not -name 'gkt-test.c' \ -a -not -name 'poll-win32.c' -a -not -name 'thread-win32.c' \ -a -not -name 'dllmain.c' -a -not -name 'gconf-helper.c' \ -exec sed -i -e 's/\bpa_bool_t\b/bool/g' \ -e 's/\bTRUE\b/true/g' -e 's/\bFALSE\b/false/g' {} \; and: sed -i -e '181,194!s/\bpa_bool_t\b/bool/' \ -e '181,194!s/\bTRUE\b/true/' -e \ '181,194!s/\bFALSE\b/false/' pulsecore/macro.h
2013-06-27 19:28:09 +02:00
return false;
echo-cancel: Add alternative echo-cancellation implementation This adds Andre Adrian's AEC implementation from his intercom project (http://andreadrian.de/intercom/) as an alternative to the speex echo cancellation routines. Since the implementation was in C++ and not in the form of a library, I have converted the code to C and made a local copy of the implementation. The implementation actually works on floating point data, so we can tweak it to work with both integer and floating point samples (currently we just use S16LE).
2010-09-07 13:43:58 +05:30
}
Fix up according to Coding Style Only whitespace changes in here
2011-03-02 12:41:26 +01:00
void pa_adrian_ec_run(pa_echo_canceller *ec, const uint8_t *rec, const uint8_t *play, uint8_t *out) {
echo-cancel: Add alternative echo-cancellation implementation This adds Andre Adrian's AEC implementation from his intercom project (http://andreadrian.de/intercom/) as an alternative to the speex echo cancellation routines. Since the implementation was in C++ and not in the form of a library, I have converted the code to C and made a local copy of the implementation. The implementation actually works on floating point data, so we can tweak it to work with both integer and floating point samples (currently we just use S16LE).
2010-09-07 13:43:58 +05:30
unsigned int i;
for (i = 0; i < ec->params.priv.adrian.blocksize; i += 2) {
echo-cancel: Use S16NE for adrian module This forces us to get native-endian samples in the adrian module so that we can rely on the existing endianness conversion mechanisms instead of doing it in the module.
2010-09-27 16:57:01 +05:30
/* We know it's S16NE mono data */
int r = *(int16_t *)(rec + i);
int p = *(int16_t *)(play + i);
*(int16_t *)(out + i) = (int16_t) AEC_doAEC(ec->params.priv.adrian.aec, r, p);
echo-cancel: Add alternative echo-cancellation implementation This adds Andre Adrian's AEC implementation from his intercom project (http://andreadrian.de/intercom/) as an alternative to the speex echo cancellation routines. Since the implementation was in C++ and not in the form of a library, I have converted the code to C and made a local copy of the implementation. The implementation actually works on floating point data, so we can tweak it to work with both integer and floating point samples (currently we just use S16LE).
2010-09-07 13:43:58 +05:30
}
}
Fix up according to Coding Style Only whitespace changes in here
2011-03-02 12:41:26 +01:00
void pa_adrian_ec_done(pa_echo_canceller *ec) {
echo-cancel: Fix memory leak / deinitialization of Adrian AEC was simply absent Signed-off-by: Peter Meerwald <p.meerwald@bct-electronic.com>
2013-02-13 17:26:53 +01:00
if (ec->params.priv.adrian.aec) {
AEC_done(ec->params.priv.adrian.aec);
ec->params.priv.adrian.aec = NULL;
}
echo-cancel: Add alternative echo-cancellation implementation This adds Andre Adrian's AEC implementation from his intercom project (http://andreadrian.de/intercom/) as an alternative to the speex echo cancellation routines. Since the implementation was in C++ and not in the form of a library, I have converted the code to C and made a local copy of the implementation. The implementation actually works on floating point data, so we can tweak it to work with both integer and floating point samples (currently we just use S16LE).
2010-09-07 13:43:58 +05:30
}
Reference in a new issue Copy permalink