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

echo-cancel: Improve webrtc canceller error handling a bit

Browse source
This commit is contained in:
Arun Raghavan 2016-02-17 19:47:09 +05:30
parent 5baecd37c3
commit 222a98846c
1 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -286,7 +286,10 @@ bool pa_webrtc_ec_init(pa_core *c, pa_echo_canceller *ec,
webrtc::StreamConfig(play_ss->rate, play_ss->channels, false), /* reverse input stream */ webrtc::StreamConfig(play_ss->rate, play_ss->channels, false), /* reverse input stream */
webrtc::StreamConfig(play_ss->rate, play_ss->channels, false), /* reverse output stream */ webrtc::StreamConfig(play_ss->rate, play_ss->channels, false), /* reverse output stream */
}; };
apm->Initialize(pconfig); if (apm->Initialize(pconfig) != webrtc::AudioProcessing::kNoError) {
pa_log("Error initialising audio processing module");
goto fail;
}
if (hpf) if (hpf)
apm->high_pass_filter()->Enable(true); apm->high_pass_filter()->Enable(true);
@ -315,7 +318,8 @@ bool pa_webrtc_ec_init(pa_core *c, pa_echo_canceller *ec,
ec->params.webrtc.agc = false; ec->params.webrtc.agc = false;
} else { } else {
apm->gain_control()->set_mode(webrtc::GainControl::kAdaptiveAnalog); apm->gain_control()->set_mode(webrtc::GainControl::kAdaptiveAnalog);
if (apm->gain_control()->set_analog_level_limits(0, WEBRTC_AGC_MAX_VOLUME) != apm->kNoError) { if (apm->gain_control()->set_analog_level_limits(0, WEBRTC_AGC_MAX_VOLUME) !=
webrtc::AudioProcessing::kNoError) {
pa_log("Failed to initialise AGC"); pa_log("Failed to initialise AGC");
goto fail; goto fail;
} }
@ -363,7 +367,7 @@ void pa_webrtc_ec_play(pa_echo_canceller *ec, const uint8_t *play) {
pa_assert(play_frame.samples_per_channel_ <= webrtc::AudioFrame::kMaxDataSizeSamples); pa_assert(play_frame.samples_per_channel_ <= webrtc::AudioFrame::kMaxDataSizeSamples);
memcpy(play_frame.data_, play, ec->params.webrtc.blocksize * pa_frame_size(ss)); memcpy(play_frame.data_, play, ec->params.webrtc.blocksize * pa_frame_size(ss));
apm->ProcessReverseStream(&play_frame); pa_assert_se(apm->ProcessReverseStream(&play_frame) == webrtc::AudioProcessing::kNoError);
/* FIXME: If ProcessReverseStream() makes any changes to the audio, such as /* FIXME: If ProcessReverseStream() makes any changes to the audio, such as
* applying intelligibility enhancement, those changes don't have any * applying intelligibility enhancement, those changes don't have any
@ -395,7 +399,7 @@ void pa_webrtc_ec_record(pa_echo_canceller *ec, const uint8_t *rec, uint8_t *out
} }
apm->set_stream_delay_ms(0); apm->set_stream_delay_ms(0);
apm->ProcessStream(&out_frame); pa_assert_se(apm->ProcessStream(&out_frame) == webrtc::AudioProcessing::kNoError);
if (ec->params.webrtc.agc) { if (ec->params.webrtc.agc) {
if (PA_UNLIKELY(ec->params.webrtc.first)) { if (PA_UNLIKELY(ec->params.webrtc.first)) {