Removing openmax_dl

Follow-up CL of https://webrtc-review.googlesource.com/c/src/+/69641
in which the 3pp lib openmax_dl had been disabled (but not removed).

Bug: webrtc:9071
Change-Id: Id766e4a48ab255a86e13f5f5f1480aee88c428a5
Reviewed-on: https://webrtc-review.googlesource.com/74482
Commit-Queue: Alessio Bazzica <alessiob@webrtc.org>
Reviewed-by: Patrik Höglund <phoglund@webrtc.org>
Reviewed-by: Henrik Lundin <henrik.lundin@webrtc.org>
Reviewed-by: Henrik Andreassson <henrika@webrtc.org>
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#23140}

6 files changed, 0 insertions, 141 deletions

diff --git a/common_audio/BUILD.gn b/common_audio/BUILD.gn
index 057b11cc42..32cca43f3c 100644
--- a/common_audio/BUILD.gn
+++ b/common_audio/BUILD.gn
@@ -75,16 +75,6 @@ rtc_static_library("common_audio") {
   ]
 
   defines = []
-  if (rtc_use_openmax_dl) {
-    sources += [
-      "real_fourier_openmax.cc",
-      "real_fourier_openmax.h",
-    ]
-    defines += [ "RTC_USE_OPENMAX_DL" ]
-    if (rtc_build_openmax_dl) {
-      deps += [ "//third_party/openmax_dl/dl" ]
-    }
-  }
 
   if (rtc_build_with_neon) {
     deps += [ ":common_audio_neon" ]
@@ -438,10 +428,6 @@ if (rtc_include_tests) {
       sources += [ "resampler/sinc_resampler_unittest.cc" ]
     }
 
-    if (rtc_use_openmax_dl) {
-      defines = [ "RTC_USE_OPENMAX_DL" ]
-    }
-
     if (!build_with_chromium && is_clang) {
       # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
       suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
diff --git a/common_audio/DEPS b/common_audio/DEPS
index 47ce4c32b6..8a9adf19f9 100644
--- a/common_audio/DEPS
+++ b/common_audio/DEPS
@@ -1,4 +1,3 @@
 include_rules = [
-  "+dl/sp/api",  # For openmax_dl.
   "+system_wrappers",
 ]
diff --git a/common_audio/real_fourier_openmax.cc b/common_audio/real_fourier_openmax.cc
deleted file mode 100644
index 3c4d0e5aa3..0000000000
--- a/common_audio/real_fourier_openmax.cc
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- *  Copyright (c) 2015 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  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>
-
-#include "dl/sp/api/omxSP.h"
-#include "rtc_base/checks.h"
-
-namespace webrtc {
-
-using std::complex;
-
-namespace {
-
-// Creates and initializes the Openmax state. Transfers ownership to caller.
-OMXFFTSpec_R_F32* CreateOpenmaxState(int order) {
-  RTC_CHECK_GE(order, 1);
-  // The omx implementation uses this macro to check order validity.
-  RTC_CHECK_LE(order, TWIDDLE_TABLE_ORDER);
-
-  OMX_INT buffer_size;
-  OMXResult r = omxSP_FFTGetBufSize_R_F32(order, &buffer_size);
-  RTC_CHECK_EQ(r, OMX_Sts_NoErr);
-
-  OMXFFTSpec_R_F32* omx_spec = malloc(buffer_size);
-  RTC_DCHECK(omx_spec);
-
-  r = omxSP_FFTInit_R_F32(omx_spec, order);
-  RTC_CHECK_EQ(r, OMX_Sts_NoErr);
-  return omx_spec;
-}
-
-}  // namespace
-
-RealFourierOpenmax::RealFourierOpenmax(int fft_order)
-    : order_(fft_order),
-      omx_spec_(CreateOpenmaxState(order_)) {
-}
-
-RealFourierOpenmax::~RealFourierOpenmax() {
-  free(omx_spec_);
-}
-
-void RealFourierOpenmax::Forward(const float* src, complex<float>* dest) const {
-  // This cast is well-defined since C++11. See "Non-static data members" at:
-  // http://en.cppreference.com/w/cpp/numeric/complex
-  OMXResult r =
-      omxSP_FFTFwd_RToCCS_F32(src, reinterpret_cast<OMX_F32*>(dest), omx_spec_);
-  RTC_CHECK_EQ(r, OMX_Sts_NoErr);
-}
-
-void RealFourierOpenmax::Inverse(const complex<float>* src, float* dest) const {
-  OMXResult r =
-      omxSP_FFTInv_CCSToR_F32(reinterpret_cast<const OMX_F32*>(src), dest,
-                              omx_spec_);
-  RTC_CHECK_EQ(r, OMX_Sts_NoErr);
-}
-
-}  // namespace webrtc
-
-#endif  // 0
diff --git a/common_audio/real_fourier_openmax.h b/common_audio/real_fourier_openmax.h
deleted file mode 100644
index e1322805f9..0000000000
--- a/common_audio/real_fourier_openmax.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- *  Copyright (c) 2015 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef COMMON_AUDIO_REAL_FOURIER_OPENMAX_H_
-#define COMMON_AUDIO_REAL_FOURIER_OPENMAX_H_
-
-// TODO(http://bugs.webrtc.org/9071): Required by downstream projects.
-#ifdef RTC_USE_OPENMAX_DL
-
-#include <complex>
-
-#include "common_audio/real_fourier.h"
-
-namespace webrtc {
-
-class RealFourierOpenmax : public RealFourier {
- public:
-  explicit RealFourierOpenmax(int fft_order);
-  ~RealFourierOpenmax() override;
-
-  void Forward(const float* src, std::complex<float>* dest) const override;
-  void Inverse(const std::complex<float>* src, float* dest) const override;
-
-  int order() const override {
-    return order_;
-  }
-
- private:
-  // Basically a forward declare of OMXFFTSpec_R_F32. To get rid of the
-  // dependency on openmax.
-  typedef void OMXFFTSpec_R_F32_;
-  const int order_;
-
-  OMXFFTSpec_R_F32_* const omx_spec_;
-};
-
-}  // 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 e6ec012038..d5b6942fc5 100644
--- a/common_audio/real_fourier_unittest.cc
+++ b/common_audio/real_fourier_unittest.cc
@@ -15,10 +15,6 @@
 #include "common_audio/real_fourier_ooura.h"
 #include "test/gtest.h"
 
-#ifdef RTC_USE_OPENMAX_DL
-#include "common_audio/real_fourier_openmax.h"
-#endif
-
 namespace webrtc {
 
 using std::complex;
diff --git a/common_audio/signal_processing/include/real_fft.h b/common_audio/signal_processing/include/real_fft.h
index 7d21072bc7..00d18caeb5 100644
--- a/common_audio/signal_processing/include/real_fft.h
+++ b/common_audio/signal_processing/include/real_fft.h
@@ -14,7 +14,6 @@
 #include "typedefs.h"  // NOLINT(build/include)
 
 // For ComplexFFT(), the maximum fft order is 10;
-// for OpenMax FFT in ARM, it is 12;
 // WebRTC APM uses orders of only 7 and 8.
 enum {kMaxFFTOrder = 10};