zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Correcting the reading of the AEC3 options in audioproc_f

Browse Source 
This CL corrects some errors that were included in the CL for reading
the AEC3 options in the audioproc_f tool

Bug: webrtc:8671
Change-Id: Iecaee0ebf08f8a8f75aba1d395dd467a41b876f3
Reviewed-on: https://webrtc-review.googlesource.com/60870
Reviewed-by: Gustaf Ullberg <gustaf@webrtc.org>
Commit-Queue: Per Åhgren <peah@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#22384}
This commit is contained in:
Per Åhgren
2018-03-09 19:53:28 +01:00
committed by Commit Bot
parent d6fbf2a4b1
commit 0dd7435abc
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
modules/audio_processing/test/audio_processing_simulator.cc
View File

@ -156,8 +156,8 @@ EchoCanceller3Config ParseAec3Parameters(const std::string& filename) {
while (std::getline(f, s)) {
json_string += s;
}
bool failed = Json::Reader().parse(json_string, root);
if (failed) {
bool success = Json::Reader().parse(json_string, root);
if (!success) {
std::cout << "Incorrect JSON format:" << std::endl;
std::cout << json_string << std::endl;
RTC_CHECK(false);
@ -179,6 +179,8 @@ EchoCanceller3Config ParseAec3Parameters(const std::string& filename) {
&cfg.delay.hysteresis_limit_1_blocks);
ReadParam(section, "hysteresis_limit_2_blocks",
&cfg.delay.hysteresis_limit_2_blocks);
ReadParam(section, "skew_hysteresis_blocks",
&cfg.delay.skew_hysteresis_blocks);
}
if (rtc::GetValueFromJsonObject(root, "filter", &section)) {
@ -235,11 +237,11 @@ EchoCanceller3Config ParseAec3Parameters(const std::string& filename) {
if (rtc::GetValueFromJsonObject(root, "echo_removal_control", &section)) {
Json::Value subsection;
if (rtc::GetValueFromJsonObject(section, "gain_rampup", &subsection)) {
ReadParam(section, "first_non_zero_gain",
ReadParam(subsection, "first_non_zero_gain",
&cfg.echo_removal_control.gain_rampup.first_non_zero_gain);
ReadParam(section, "non_zero_gain_blocks",
ReadParam(subsection, "non_zero_gain_blocks",
&cfg.echo_removal_control.gain_rampup.non_zero_gain_blocks);
ReadParam(section, "full_gain_blocks",
ReadParam(subsection, "full_gain_blocks",
&cfg.echo_removal_control.gain_rampup.full_gain_blocks);
}
ReadParam(section, "has_clock_drift",