Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(350)

Side by Side Diff: webrtc/modules/audio_processing/noise_suppression_impl.cc

Issue 1821443003: Fix normalization of noise estimate in NoiseSuppressor (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 9 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after
170 // TODO(peah): Returning error code as a float! Remove this. 170 // TODO(peah): Returning error code as a float! Remove this.
171 // Currently not available for the fixed point implementation. 171 // Currently not available for the fixed point implementation.
172 return AudioProcessing::kUnsupportedFunctionError; 172 return AudioProcessing::kUnsupportedFunctionError;
173 #endif 173 #endif
174 } 174 }
175 175
176 std::vector<float> NoiseSuppressionImpl::NoiseEstimate() { 176 std::vector<float> NoiseSuppressionImpl::NoiseEstimate() {
177 rtc::CritScope cs(crit_); 177 rtc::CritScope cs(crit_);
178 std::vector<float> noise_estimate; 178 std::vector<float> noise_estimate;
179 #if defined(WEBRTC_NS_FLOAT) 179 #if defined(WEBRTC_NS_FLOAT)
180 const float kNormalizationFactor = 1.f / (1 << 15);
181 noise_estimate.assign(WebRtcNs_num_freq(), 0.f); 180 noise_estimate.assign(WebRtcNs_num_freq(), 0.f);
182 for (auto& suppressor : suppressors_) { 181 for (auto& suppressor : suppressors_) {
183 const float* noise = WebRtcNs_noise_estimate(suppressor->state()); 182 const float* noise = WebRtcNs_noise_estimate(suppressor->state());
184 for (size_t i = 0; i < noise_estimate.size(); ++i) { 183 for (size_t i = 0; i < noise_estimate.size(); ++i) {
185 noise_estimate[i] += 184 noise_estimate[i] += noise[i] / suppressors_.size();
peah-webrtc 2016/03/21 12:25:48 This change basically removes the normalization of
turaj 2016/03/21 13:50:23 My concern is that both forward and reverse stream
aluebs-webrtc 2016/03/29 23:15:16 Exactly, I was testing it in the intelligibility_p
186 kNormalizationFactor * noise[i] / suppressors_.size();
187 } 185 }
188 } 186 }
189 #elif defined(WEBRTC_NS_FIXED) 187 #elif defined(WEBRTC_NS_FIXED)
190 const float kNormalizationFactor = 1.f / (1 << 23); 188 const float kNormalizationFactor = 1.f / (1 << 9);
hlundin-webrtc 2016/03/29 19:19:36 Why change from 23 to 9 (a reduction by 14 shifts)
aluebs-webrtc 2016/03/29 23:15:16 Good catch! I was just checking when the output wa
191 noise_estimate.assign(WebRtcNsx_num_freq(), 0.f); 189 noise_estimate.assign(WebRtcNsx_num_freq(), 0.f);
192 for (auto& suppressor : suppressors_) { 190 for (auto& suppressor : suppressors_) {
193 const uint32_t* noise = WebRtcNsx_noise_estimate(suppressor->state()); 191 const uint32_t* noise = WebRtcNsx_noise_estimate(suppressor->state());
194 for (size_t i = 0; i < noise_estimate.size(); ++i) { 192 for (size_t i = 0; i < noise_estimate.size(); ++i) {
195 noise_estimate[i] += kNormalizationFactor * 193 noise_estimate[i] += kNormalizationFactor *
196 static_cast<float>(noise[i]) / suppressors_.size(); 194 static_cast<float>(noise[i]) / suppressors_.size();
197 } 195 }
198 } 196 }
199 #endif 197 #endif
200 return noise_estimate; 198 return noise_estimate;
201 } 199 }
202 200
203 size_t NoiseSuppressionImpl::num_noise_bins() { 201 size_t NoiseSuppressionImpl::num_noise_bins() {
204 #if defined(WEBRTC_NS_FLOAT) 202 #if defined(WEBRTC_NS_FLOAT)
205 return WebRtcNs_num_freq(); 203 return WebRtcNs_num_freq();
206 #elif defined(WEBRTC_NS_FIXED) 204 #elif defined(WEBRTC_NS_FIXED)
207 return WebRtcNsx_num_freq(); 205 return WebRtcNsx_num_freq();
208 #endif 206 #endif
209 } 207 }
210 208
211 } // namespace webrtc 209 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698