mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-10-31 22:25:33 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

echo-cancel: Extend null implementation to arbitary sample specs

Browse source 
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>
This commit is contained in:
Stefan Huber 2012-12-20 11:33:05 +01:00 • committed by Tanu Kaskinen
parent 3a92be3c5c
commit de73a3ed98
2 changed files with 13 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/modules/echo-cancel/echo-cancel.h
View file

@ -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;

19
src/modules/echo-cancel/null.c
View file

@ -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) {
char strss_source[PA_SAMPLE_SPEC_SNPRINT_MAX];
char strss_sink[PA_SAMPLE_SPEC_SNPRINT_MAX];
*nframes = 256;
ec->params.priv.null.source_ss = *source_ss;
source_ss->format = PA_SAMPLE_S16NE;
source_ss->channels = 1;
*sink_ss = *source_ss;
*sink_map = *source_map;
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) {