diff options
| author | Fredrik Solenberg <solenberg@webrtc.org> | 2018-05-23 11:49:01 +0200 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2018-05-23 12:07:10 +0000 |
| commit | 500e75b467f482d6490ba55024f544c3c71c1f36 (patch) | |
| tree | a141fed8a32dd2974c4182ceecfb01e1d9976a4b /common_audio | |
| parent | ce532a1c3ce72fa9631b7617259e4e253cc59b39 (diff) | |
| download | webrtc-500e75b467f482d6490ba55024f544c3c71c1f36.tar.gz | |
Remove typedefs.h from webrtc/ root (part 1)
Bug: webrtc:6854
Change-Id: Iadbc73d1913a507c0097ade82b6e406cbfa30a64
Reviewed-on: https://webrtc-review.googlesource.com/78062
Reviewed-by: Niels Moller <nisse@webrtc.org>
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Commit-Queue: Fredrik Solenberg <solenberg@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#23362}
Diffstat (limited to 'common_audio')
| -rw-r--r-- | common_audio/resampler/sinc_resampler.cc | 4 | ||||
| -rw-r--r-- | common_audio/resampler/sinc_resampler.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/common_audio/resampler/sinc_resampler.cc b/common_audio/resampler/sinc_resampler.cc index c8577550c9..2ea91963e8 100644 --- a/common_audio/resampler/sinc_resampler.cc +++ b/common_audio/resampler/sinc_resampler.cc @@ -160,12 +160,12 @@ SincResampler::SincResampler(double io_sample_rate_ratio, AlignedMalloc(sizeof(float) * kKernelStorageSize, 16))), input_buffer_(static_cast<float*>( AlignedMalloc(sizeof(float) * input_buffer_size_, 16))), -#if defined(WEBRTC_CPU_DETECTION) +#if defined(WEBRTC_ARCH_X86_FAMILY) && !defined(__SSE2__) convolve_proc_(nullptr), #endif r1_(input_buffer_.get()), r2_(input_buffer_.get() + kKernelSize / 2) { -#if defined(WEBRTC_CPU_DETECTION) +#if defined(WEBRTC_ARCH_X86_FAMILY) && !defined(__SSE2__) InitializeCPUSpecificFeatures(); RTC_DCHECK(convolve_proc_); #endif diff --git a/common_audio/resampler/sinc_resampler.h b/common_audio/resampler/sinc_resampler.h index 774a9b74f0..deef7f63e4 100644 --- a/common_audio/resampler/sinc_resampler.h +++ b/common_audio/resampler/sinc_resampler.h @@ -149,7 +149,7 @@ class SincResampler { // TODO(ajm): Move to using a global static which must only be initialized // once by the user. We're not doing this initially, because we don't have // e.g. a LazyInstance helper in webrtc. -#if defined(WEBRTC_CPU_DETECTION) +#if defined(WEBRTC_ARCH_X86_FAMILY) && !defined(__SSE2__) typedef float (*ConvolveProc)(const float*, const float*, const float*, double); ConvolveProc convolve_proc_; |