mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-02 09:01:46 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

echo-cancel: Start capture at a sane volume if we're doing webrtc AGC

Browse source 
This is required to make sure the capture output has sufficient energy
for the AGC to do its job.
This commit is contained in:
Arun Raghavan 2016-02-17 19:47:02 +05:30
parent a84d65d748
commit 19fb2481ea
2 changed files with 14 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -68,6 +68,7 @@ struct pa_echo_canceller_params {
pa_sample_spec sample_spec;
void *trace_callback;
bool agc;
bool first;
} webrtc;
#endif
/* each canceller-specific structure goes here */

14
src/modules/echo-cancel/webrtc.cc
View file

@ -52,6 +52,7 @@ PA_C_DECL_END
#define DEFAULT_TRACE false
#define WEBRTC_AGC_MAX_VOLUME 255
#define WEBRTC_AGC_START_VOLUME 85
static const char* const valid_modargs[] = {
"high_pass_filter",
@ -299,6 +300,7 @@ bool pa_webrtc_ec_init(pa_core *c, pa_echo_canceller *ec,
ec->params.priv.webrtc.sample_spec = *out_ss;
ec->params.priv.webrtc.blocksize = (uint64_t)pa_bytes_per_second(out_ss) * BLOCK_SIZE_US / PA_USEC_PER_SEC;
*nframes = ec->params.priv.webrtc.blocksize / pa_frame_size(out_ss);
ec->params.priv.webrtc.first = true;
pa_modargs_free(ma);
return true;
@ -363,7 +365,17 @@ void pa_webrtc_ec_record(pa_echo_canceller *ec, const uint8_t *rec, uint8_t *out
apm->ProcessStream(&out_frame);
if (ec->params.priv.webrtc.agc) {
new_volume = apm->gain_control()->stream_analog_level();
if (PA_UNLIKELY(ec->params.priv.webrtc.first)) {
/* We start at a sane default volume (taken from the Chromium
* condition on the experimental AGC in audio_processing.h). This is
* needed to make sure that there's enough energy in the capture
* signal for the AGC to work */
ec->params.priv.webrtc.first = false;
new_volume = WEBRTC_AGC_START_VOLUME;
} else {
new_volume = apm->gain_control()->stream_analog_level();
}
if (old_volume != new_volume) {
pa_cvolume_set(&v, ss->channels, webrtc_volume_to_pa(new_volume));
pa_echo_canceller_set_capture_volume(ec, &v);