admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge OOURA BUILD.gn files.

Browse Source 
No-Tree-Checks: True
No-Try: True
Bug: webrtc:11509
Change-Id: If66483a02085396e231986e39ef0dafcdd3f4bed
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/173740
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Reviewed-by: Per Åhgren <peah@webrtc.org>
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#31114}
This commit is contained in:
Mirko Bonadei 2020-04-21 09:56:16 +02:00 committed by Commit Bot
parent 1f0677d01e
commit 146137adee
10 changed files with 30 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common_audio/BUILD.gn
View File

@ -55,7 +55,7 @@ rtc_library("common_audio") {
"../rtc_base/system:file_wrapper",
"../system_wrappers",
"../system_wrappers:cpu_features_api",
"third_party/ooura/fft_size_256:fft4g",
"third_party/ooura:fft_size_256",
"//third_party/abseil-cpp/absl/types:optional",
]
@ -185,7 +185,7 @@ rtc_library("common_audio_c") {
"../rtc_base/system:arch",
"../system_wrappers",
"../system_wrappers:cpu_features_api",
"third_party/ooura/fft_size_256:fft4g",
"third_party/ooura:fft_size_256",
"third_party/spl_sqrt_floor",
]
}

33
common_audio/third_party/ooura/fft_size_128/BUILD.gn → common_audio/third_party/ooura/BUILD.gn vendored
View File

@ -6,24 +6,24 @@
# in the file PATENTS. All contributing project authors may
# be found in the AUTHORS file in the root of the source tree.
import("../../../../webrtc.gni")
import("../../../webrtc.gni")
rtc_library("ooura_fft") {
rtc_library("fft_size_128") {
sources = [
"ooura_fft.cc",
"ooura_fft.h",
"ooura_fft_tables_common.h",
"fft_size_128/ooura_fft.cc",
"fft_size_128/ooura_fft.h",
"fft_size_128/ooura_fft_tables_common.h",
]
deps = [
"../../../../rtc_base/system:arch",
"../../../../system_wrappers:cpu_features_api",
"../../../rtc_base/system:arch",
"../../../system_wrappers:cpu_features_api",
]
cflags = []
if (current_cpu == "x86" || current_cpu == "x64") {
sources += [
"ooura_fft_sse2.cc",
"ooura_fft_tables_neon_sse2.h",
"fft_size_128/ooura_fft_sse2.cc",
"fft_size_128/ooura_fft_tables_neon_sse2.h",
]
if (is_posix || is_fuchsia) {
cflags += [ "-msse2" ]
@ -32,11 +32,11 @@ rtc_library("ooura_fft") {
if (rtc_build_with_neon) {
sources += [
"ooura_fft_neon.cc",
"ooura_fft_tables_neon_sse2.h",
"fft_size_128/ooura_fft_neon.cc",
"fft_size_128/ooura_fft_tables_neon_sse2.h",
]
deps += [ "../../../../common_audio" ]
deps += [ "../../../common_audio" ]
if (current_cpu != "arm64") {
# Enable compilation for the NEON instruction set.
@ -46,6 +46,13 @@ rtc_library("ooura_fft") {
}
if (current_cpu == "mipsel" && mips_float_abi == "hard") {
sources += [ "ooura_fft_mips.cc" ]
sources += [ "fft_size_128/ooura_fft_mips.cc" ]
}
}
rtc_library("fft_size_256") {
sources = [
"fft_size_256/fft4g.cc",
"fft_size_256/fft4g.h",
]
}

16
common_audio/third_party/ooura/fft_size_256/BUILD.gn vendored
View File

@ -1,16 +0,0 @@
# Copyright (c) 2020 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.
import("../../../../webrtc.gni")
rtc_library("fft4g") {
sources = [
"fft4g.cc",
"fft4g.h",
]
}

2
modules/audio_processing/BUILD.gn
View File

@ -164,7 +164,7 @@ rtc_library("audio_processing") {
"../../api/audio:echo_control",
"../../audio/utility:audio_frame_operations",
"../../common_audio:common_audio_c",
"../../common_audio/third_party/ooura/fft_size_256:fft4g",
"../../common_audio/third_party/ooura:fft_size_256",
"../../rtc_base:checks",
"../../rtc_base:deprecation",
"../../rtc_base:gtest_prod",

2
modules/audio_processing/aec3/BUILD.gn
View File

@ -140,7 +140,7 @@ rtc_library("aec3") {
"../../../api/audio:aec3_config",
"../../../api/audio:echo_control",
"../../../common_audio:common_audio_c",
"../../../common_audio/third_party/ooura/fft_size_128:ooura_fft",
"../../../common_audio/third_party/ooura:fft_size_128",
"../../../rtc_base:checks",
"../../../rtc_base:rtc_base_approved",
"../../../rtc_base:safe_minmax",

2
modules/audio_processing/agc/BUILD.gn
View File

@ -75,7 +75,7 @@ rtc_library("legacy_agc") {
deps = [
"../../../common_audio",
"../../../common_audio:common_audio_c",
"../../../common_audio/third_party/ooura/fft_size_256:fft4g",
"../../../common_audio/third_party/ooura:fft_size_256",
"../../../rtc_base:checks",
"../../../rtc_base:rtc_base_approved",
"../../../system_wrappers:cpu_features_api",

2
modules/audio_processing/agc2/BUILD.gn
View File

@ -150,7 +150,7 @@ rtc_library("noise_level_estimator") {
"..:audio_frame_view",
"../../../api:array_view",
"../../../common_audio",
"../../../common_audio/third_party/ooura/fft_size_128:ooura_fft",
"../../../common_audio/third_party/ooura:fft_size_128",
"../../../rtc_base:checks",
"../../../rtc_base:macromagic",
]

4
modules/audio_processing/ns/BUILD.gn
View File

@ -54,8 +54,8 @@ rtc_static_library("ns") {
"..:high_pass_filter",
"../../../api:array_view",
"../../../common_audio:common_audio_c",
"../../../common_audio/third_party/ooura/fft_size_128:ooura_fft",
"../../../common_audio/third_party/ooura/fft_size_256:fft4g",
"../../../common_audio/third_party/ooura:fft_size_128",
"../../../common_audio/third_party/ooura:fft_size_256",
"../../../rtc_base:checks",
"../../../rtc_base:rtc_base_approved",
"../../../rtc_base:safe_minmax",

2
modules/audio_processing/transient/BUILD.gn
View File

@ -52,7 +52,7 @@ rtc_library("transient_suppressor_impl") {
"../../../common_audio:common_audio_c",
"../../../common_audio:fir_filter",
"../../../common_audio:fir_filter_factory",
"../../../common_audio/third_party/ooura/fft_size_256:fft4g",
"../../../common_audio/third_party/ooura:fft_size_256",
"../../../rtc_base:checks",
"../../../rtc_base:gtest_prod",
"../../../rtc_base:logging",

2
modules/audio_processing/vad/BUILD.gn
View File

@ -38,7 +38,7 @@ rtc_library("vad") {
"../../../audio/utility:audio_frame_operations",
"../../../common_audio",
"../../../common_audio:common_audio_c",
"../../../common_audio/third_party/ooura/fft_size_256:fft4g",
"../../../common_audio/third_party/ooura:fft_size_256",
"../../../rtc_base:checks",
"../../audio_coding:isac_vad",
]