Chromium Code Reviews| Index: webrtc/common_audio/resampler/sinc_resampler.cc |
| diff --git a/webrtc/common_audio/resampler/sinc_resampler.cc b/webrtc/common_audio/resampler/sinc_resampler.cc |
| index 1c259c533706bef30712cf7892d7b4db12ed1d65..81c789d00b73d18bada42bf08af646082c50def7 100644 |
| --- a/webrtc/common_audio/resampler/sinc_resampler.cc |
| +++ b/webrtc/common_audio/resampler/sinc_resampler.cc |
| @@ -86,8 +86,6 @@ |
| #define _USE_MATH_DEFINES |
| #include "webrtc/common_audio/resampler/sinc_resampler.h" |
| -#include "webrtc/system_wrappers/interface/cpu_features_wrapper.h" |
| -#include "webrtc/typedefs.h" |
| #include <assert.h> |
| #include <math.h> |
| @@ -95,9 +93,14 @@ |
| #include <limits> |
| +#include "webrtc/system_wrappers/interface/cpu_features_wrapper.h" |
| +#include "webrtc/typedefs.h" |
| + |
| namespace webrtc { |
|
Andrew MacDonald
2015/06/10 06:23:56
I prefer to drop the vertical line between nested
Peter Kasting
2015/06/11 04:31:41
Done.
|
| -static double SincScaleFactor(double io_ratio) { |
| +namespace { |
| + |
| +double SincScaleFactor(double io_ratio) { |
| // |sinc_scale_factor| is basically the normalized cutoff frequency of the |
| // low-pass filter. |
| double sinc_scale_factor = io_ratio > 1.0 ? 1.0 / io_ratio : 1.0; |
| @@ -113,6 +116,8 @@ static double SincScaleFactor(double io_ratio) { |
| return sinc_scale_factor; |
| } |
| +} // namespace |
| + |
| // If we know the minimum architecture at compile time, avoid CPU detection. |
| #if defined(WEBRTC_ARCH_X86_FAMILY) |
| #if defined(__SSE2__) |