zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Conditionally include real_fourier_openmax.h.

Browse Source 
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}
This commit is contained in:
Mirko Bonadei
2018-02-23 08:51:32 +01:00
committed by Commit Bot
parent c33c0fcbf7
commit a2e3ab1fca
3 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
common_audio/real_fourier.cc
View File

@ -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

5
common_audio/real_fourier_openmax.h
View File

@ -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_

6
common_audio/real_fourier_unittest.cc
View File

@ -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