diff options
| author | Mirko Bonadei <mbonadei@webrtc.org> | 2018-02-23 08:51:32 +0100 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2018-02-23 09:02:36 +0000 |
| commit | a2e3ab1fcaee7d0ffb1b7d1aab484c4b4d2c5ba7 (patch) | |
| tree | 27a8bf9d43f4be715b4f27c6c3126a8ade66fa34 /common_audio | |
| parent | c33c0fcbf7ca125671f3a9d68f4e57168ea13a54 (diff) | |
| download | webrtc-a2e3ab1fcaee7d0ffb1b7d1aab484c4b4d2c5ba7.tar.gz | |
Conditionally include real_fourier_openmax.h.
The real_fourier_openmax.h header should only be included when
RTC_USE_OPENMAX_DL is defined.
Bug: None
Change-Id: I70a9c7745e2c24d15c7bb510d432638a2c70eef9
Reviewed-on: https://webrtc-review.googlesource.com/56841
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#22167}
Diffstat (limited to 'common_audio')
| -rw-r--r-- | common_audio/real_fourier.cc | 6 | ||||
| -rw-r--r-- | common_audio/real_fourier_openmax.h | 5 | ||||
| -rw-r--r-- | common_audio/real_fourier_unittest.cc | 6 |
3 files changed, 12 insertions, 5 deletions
diff --git a/common_audio/real_fourier.cc b/common_audio/real_fourier.cc index f759778a35..cb0a005de3 100644 --- a/common_audio/real_fourier.cc +++ b/common_audio/real_fourier.cc @@ -11,10 +11,13 @@ #include "common_audio/real_fourier.h" #include "common_audio/real_fourier_ooura.h" -#include "common_audio/real_fourier_openmax.h" #include "common_audio/signal_processing/include/signal_processing_library.h" #include "rtc_base/checks.h" +#ifdef RTC_USE_OPENMAX_DL +#include "common_audio/real_fourier_openmax.h" +#endif + namespace webrtc { using std::complex; @@ -54,4 +57,3 @@ RealFourier::fft_cplx_scoper RealFourier::AllocCplxBuffer(int count) { } } // namespace webrtc - diff --git a/common_audio/real_fourier_openmax.h b/common_audio/real_fourier_openmax.h index 7b4299aa3c..af91dde3b7 100644 --- a/common_audio/real_fourier_openmax.h +++ b/common_audio/real_fourier_openmax.h @@ -11,6 +11,10 @@ #ifndef COMMON_AUDIO_REAL_FOURIER_OPENMAX_H_ #define COMMON_AUDIO_REAL_FOURIER_OPENMAX_H_ +#ifndef RTC_USE_OPENMAX_DL +#error "Only include this header if RTC_USE_OPENMAX_DL is defined." +#endif + #include <complex> #include "common_audio/real_fourier.h" @@ -41,4 +45,3 @@ class RealFourierOpenmax : public RealFourier { } // namespace webrtc #endif // COMMON_AUDIO_REAL_FOURIER_OPENMAX_H_ - diff --git a/common_audio/real_fourier_unittest.cc b/common_audio/real_fourier_unittest.cc index 97849b965b..5ac39b2c98 100644 --- a/common_audio/real_fourier_unittest.cc +++ b/common_audio/real_fourier_unittest.cc @@ -13,9 +13,12 @@ #include <stdlib.h> #include "common_audio/real_fourier_ooura.h" -#include "common_audio/real_fourier_openmax.h" #include "test/gtest.h" +#ifdef RTC_USE_OPENMAX_DL +#include "common_audio/real_fourier_openmax.h" +#endif + namespace webrtc { using std::complex; @@ -106,4 +109,3 @@ TYPED_TEST(RealFourierTest, SimpleBackwardTransform) { } } // namespace webrtc - |