Disabling openmax_dl
Bug: webrtc:9071
Change-Id: I858d78f8121193186828fb75f625d4738d4913eb
Reviewed-on: https://webrtc-review.googlesource.com/69641
Commit-Queue: Alessio Bazzica <alessiob@webrtc.org>
Reviewed-by: Henrik Andreassson <henrika@webrtc.org>
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#23001}diff --git a/common_audio/real_fourier.cc b/common_audio/real_fourier.cc
index cb0a005..f01c8eb 100644
--- a/common_audio/real_fourier.cc
+++ b/common_audio/real_fourier.cc
@@ -14,10 +14,6 @@
#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;
@@ -25,11 +21,7 @@
const size_t RealFourier::kFftBufferAlignment = 32;
std::unique_ptr<RealFourier> RealFourier::Create(int fft_order) {
-#if defined(RTC_USE_OPENMAX_DL)
- return std::unique_ptr<RealFourier>(new RealFourierOpenmax(fft_order));
-#else
return std::unique_ptr<RealFourier>(new RealFourierOoura(fft_order));
-#endif
}
int RealFourier::FftOrder(size_t length) {
diff --git a/common_audio/real_fourier_openmax.cc b/common_audio/real_fourier_openmax.cc
index 6c5c9ce..3c4d0e5a 100644
--- a/common_audio/real_fourier_openmax.cc
+++ b/common_audio/real_fourier_openmax.cc
@@ -8,6 +8,9 @@
* be found in the AUTHORS file in the root of the source tree.
*/
+// TODO(http://bugs.webrtc.org/9071): Required by downstream projects.
+#ifdef RTC_USE_OPENMAX_DL
+
#include "common_audio/real_fourier_openmax.h"
#include <cstdlib>
@@ -67,3 +70,4 @@
} // namespace webrtc
+#endif // 0
diff --git a/common_audio/real_fourier_openmax.h b/common_audio/real_fourier_openmax.h
index af91dde..e1322805 100644
--- a/common_audio/real_fourier_openmax.h
+++ b/common_audio/real_fourier_openmax.h
@@ -11,9 +11,8 @@
#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
+// TODO(http://bugs.webrtc.org/9071): Required by downstream projects.
+#ifdef RTC_USE_OPENMAX_DL
#include <complex>
@@ -44,4 +43,6 @@
} // namespace webrtc
+#endif // RTC_USE_OPENMAX_DL
+
#endif // COMMON_AUDIO_REAL_FOURIER_OPENMAX_H_
diff --git a/common_audio/real_fourier_unittest.cc b/common_audio/real_fourier_unittest.cc
index 5ac39b2..e6ec012 100644
--- a/common_audio/real_fourier_unittest.cc
+++ b/common_audio/real_fourier_unittest.cc
@@ -72,11 +72,7 @@
const RealFourier::fft_cplx_scoper cplx_buffer_;
};
-using FftTypes = ::testing::Types<
-#if defined(RTC_USE_OPENMAX_DL)
- RealFourierOpenmax,
-#endif
- RealFourierOoura>;
+using FftTypes = ::testing::Types<RealFourierOoura>;
TYPED_TEST_CASE(RealFourierTest, FftTypes);
TYPED_TEST(RealFourierTest, SimpleForwardTransform) {
diff --git a/webrtc.gni b/webrtc.gni
index b3f06ae..20a5727 100644
--- a/webrtc.gni
+++ b/webrtc.gni
@@ -167,11 +167,13 @@
rtc_build_libsrtp = !build_with_mozilla
rtc_build_libvpx = !build_with_mozilla
rtc_libvpx_build_vp9 = !build_with_mozilla
- rtc_build_openmax_dl = !build_with_mozilla
rtc_build_opus = !build_with_mozilla
rtc_build_ssl = !build_with_mozilla
rtc_build_usrsctp = !build_with_mozilla
+ # TODO(http://bugs.webrtc.org/9071): Remove flag when openmax_dl is deleted.
+ rtc_build_openmax_dl = false
+
# Enable libevent task queues on platforms that support it.
# rtc_link_task_queue_impl must be set to true for this to
# have an effect.
@@ -183,12 +185,8 @@
rtc_build_libevent = !build_with_mozilla
}
- if (!is_ios && (current_cpu != "arm" || arm_version >= 7) &&
- current_cpu != "mips64el" && !build_with_mozilla) {
- rtc_use_openmax_dl = true
- } else {
- rtc_use_openmax_dl = false
- }
+ # TODO(http://bugs.webrtc.org/9071): Remove flag when openmax_dl is deleted.
+ rtc_use_openmax_dl = false
# Build sources requiring GTK. NOTICE: This is not present in Chrome OS
# build environments, even if available for Chromium builds.
