admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changed target_angle_degrees in audioproc_float to float to avoid integer division when converting to radians

Browse Source 
Change-Id: I1b12d03524c34ed3fc4da89216539fd31a5c703b

Bug: none
Change-Id: I1b12d03524c34ed3fc4da89216539fd31a5c703b
Reviewed-on: https://webrtc-review.googlesource.com/61942
Commit-Queue: Alejandro Luebs <aluebs@webrtc.org>
Reviewed-by: Henrik Lundin <henrik.lundin@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#22462}
This commit is contained in:
Alex Luebs 2018-03-15 11:27:22 -07:00 committed by Commit Bot
parent 895ae9a0cd
commit 24c220c178
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/audio_processing/test/audio_processing_simulator.h
View File

@ -41,7 +41,7 @@ struct SimulationSettings {
rtc::Optional<int> reverse_output_sample_rate_hz; rtc::Optional<int> reverse_output_sample_rate_hz;
rtc::Optional<int> reverse_output_num_channels; rtc::Optional<int> reverse_output_num_channels;
rtc::Optional<std::string> microphone_positions; rtc::Optional<std::string> microphone_positions;
int target_angle_degrees = 90; float target_angle_degrees = 90.f;
rtc::Optional<std::string> output_filename; rtc::Optional<std::string> output_filename;
rtc::Optional<std::string> reverse_output_filename; rtc::Optional<std::string> reverse_output_filename;
rtc::Optional<std::string> input_filename; rtc::Optional<std::string> input_filename;

13
modules/audio_processing/test/audioproc_float_impl.cc
View File

@ -61,10 +61,10 @@ DEFINE_string(mic_positions,
"Space delimited cartesian coordinates of microphones in " "Space delimited cartesian coordinates of microphones in "
"meters. The coordinates of each point are contiguous. For a " "meters. The coordinates of each point are contiguous. For a "
"two element array: \"x1 y1 z1 x2 y2 z2\""); "two element array: \"x1 y1 z1 x2 y2 z2\"");
DEFINE_int(target_angle_degrees, DEFINE_float(target_angle_degrees,
90, 90.f,
"The azimuth of the target in degrees (0-359). Only applies to " "The azimuth of the target in degrees (0-360). Only applies to "
"beamforming."); "beamforming.");
DEFINE_bool(fixed_interface, DEFINE_bool(fixed_interface,
false, false,
"Use the fixed interface when operating on wav files"); "Use the fixed interface when operating on wav files");
@ -357,8 +357,9 @@ void PerformBasicParameterSanityChecks(const SimulationSettings& settings) {
"activated.\n"); "activated.\n");
ReportConditionalErrorAndExit( ReportConditionalErrorAndExit(
settings.target_angle_degrees < 0 || settings.target_angle_degrees > 359, settings.target_angle_degrees < 0.f ||
"Error: -target_angle_degrees must be specified between 0 and 359.\n"); settings.target_angle_degrees >= 360.f,
"Error: -target_angle_degrees must be specified between 0 and 360.\n");
ReportConditionalErrorAndExit( ReportConditionalErrorAndExit(
settings.aec_suppression_level && settings.aec_suppression_level &&