webrtc/modules/audio_processing/beamformer/nonlinear_beamformer.cc - Issue 1235643003: Miscellaneous changes split from https://codereview.webrtc.org/1230503003 .

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: webrtc/modules/audio_processing/beamformer/nonlinear_beamformer.cc

Issue 1235643003: Miscellaneous changes split from https://codereview.webrtc.org/1230503003 . (Closed) Base URL: https://chromium.googlesource.com/external/webrtc@master

Patch Set: Resync Created 5 years, 5 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « webrtc/modules/audio_device/android/audio_device_unittest.cc ('k') | webrtc/modules/audio_processing/intelligibility/intelligibility_enhancer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: webrtc/modules/audio_processing/beamformer/nonlinear_beamformer.cc

diff --git a/webrtc/modules/audio_processing/beamformer/nonlinear_beamformer.cc b/webrtc/modules/audio_processing/beamformer/nonlinear_beamformer.cc

index 66ad6259a3690c31f96668c6d9c206ed1ae9cca7..6925b617624579bcc70804b25ef1456af88757cf 100644

--- a/webrtc/modules/audio_processing/beamformer/nonlinear_beamformer.cc

+++ b/webrtc/modules/audio_processing/beamformer/nonlinear_beamformer.cc

@@ -120,7 +120,7 @@ complex<float> ConjugateDotProduct(const ComplexMatrix<float>& lhs,

// Works for positive numbers only.

int Round(float x) {

- return std::floor(x + 0.5f);

+ return static_cast<int>(std::floor(x + 0.5f));

}

// Calculates the sum of absolute values of a complex matrix.

@@ -464,9 +464,9 @@ void NonlinearBeamformer::ApplyMaskFrequencySmoothing() {

final_mask_[i] = kMaskFrequencySmoothAlpha * final_mask_[i] +

(1 - kMaskFrequencySmoothAlpha) * final_mask_[i - 1];

}

- for (int i = high_mean_end_bin_; i >= 0; --i) {

- final_mask_[i] = kMaskFrequencySmoothAlpha * final_mask_[i] +

- (1 - kMaskFrequencySmoothAlpha) * final_mask_[i + 1];

+ for (int i = high_mean_end_bin_ + 1; i > 0; --i) {

+ final_mask_[i - 1] = kMaskFrequencySmoothAlpha * final_mask_[i - 1] +

+ (1 - kMaskFrequencySmoothAlpha) * final_mask_[i];

}