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

RNN VAD build file refactoring: split into separate (private) targets

Browse Source 
First step to only expose the relevant RNN VAD API to AGC2.

Bug: webrtc:7494
Change-Id: I7f11f6eebded124c30cabd64963c8e3ccc35e58f
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/185124
Commit-Queue: Alessio Bazzica <alessiob@webrtc.org>
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#32185}
This commit is contained in:
Alessio Bazzica 2020-09-24 15:50:15 +02:00 committed by Commit Bot
parent 26df6e696b
commit 9e81182f8e
2 changed files with 113 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -173,6 +173,7 @@ rtc_library("rnn_vad_with_level") {
"../../../common_audio",
"../../../rtc_base:checks",
"rnn_vad",
"rnn_vad:rnn_vad_common",
]
}

133
modules/audio_processing/agc2/rnn_vad/BUILD.gn
View File

@ -11,46 +11,127 @@ import("../../../../webrtc.gni")
rtc_library("rnn_vad") {
visibility = [ "../*" ]
sources = [
"auto_correlation.cc",
"auto_correlation.h",
"common.cc",
"common.h",
"features_extraction.cc",
"features_extraction.h",
"lp_residual.cc",
"lp_residual.h",
"pitch_info.h",
"pitch_search.cc",
"pitch_search.h",
"pitch_search_internal.cc",
"pitch_search_internal.h",
"ring_buffer.h",
"rnn.cc",
"rnn.h",
"sequence_buffer.h",
"spectral_features.cc",
"spectral_features.h",
"spectral_features_internal.cc",
"spectral_features_internal.h",
"symmetric_matrix_buffer.h",
]
defines = []
if (rtc_build_with_neon && current_cpu != "arm64") {
suppressed_configs += [ "//build/config/compiler:compiler_arm_fpu" ]
cflags = [ "-mfpu=neon" ]
}
deps = [
":rnn_vad_common",
":rnn_vad_lp_residual",
":rnn_vad_pitch",
":rnn_vad_sequence_buffer",
":rnn_vad_spectral_features",
"..:biquad_filter",
"../../../../api:array_view",
"../../../../api:function_view",
"../../../../rtc_base:checks",
"../../../../rtc_base:rtc_base_approved",
"../../../../rtc_base:logging",
"../../../../rtc_base/system:arch",
"//third_party/rnnoise:rnn_vad",
]
}
rtc_library("rnn_vad_auto_correlation") {
sources = [
"auto_correlation.cc",
"auto_correlation.h",
]
deps = [
":rnn_vad_common",
"../../../../api:array_view",
"../../../../rtc_base:checks",
"../../utility:pffft_wrapper",
]
}
rtc_library("rnn_vad_common") {
# TODO(alessiob): Make this target visibility private.
visibility = [
":*",
"..:rnn_vad_with_level",
]
sources = [
"common.cc",
"common.h",
]
deps = [
"../../../../rtc_base/system:arch",
"../../../../system_wrappers",
]
}
rtc_library("rnn_vad_lp_residual") {
sources = [
"lp_residual.cc",
"lp_residual.h",
]
deps = [
"../../../../api:array_view",
"../../../../rtc_base:checks",
]
}
rtc_library("rnn_vad_pitch") {
sources = [
"pitch_info.h",
"pitch_search.cc",
"pitch_search.h",
"pitch_search_internal.cc",
"pitch_search_internal.h",
]
deps = [
":rnn_vad_auto_correlation",
":rnn_vad_common",
"../../../../api:array_view",
"../../../../rtc_base:checks",
]
}
rtc_source_set("rnn_vad_ring_buffer") {
sources = [ "ring_buffer.h" ]
deps = [
"../../../../api:array_view",
"../../../../rtc_base:checks",
]
}
rtc_source_set("rnn_vad_sequence_buffer") {
sources = [ "sequence_buffer.h" ]
deps = [
"../../../../api:array_view",
"../../../../rtc_base:checks",
]
}
rtc_library("rnn_vad_spectral_features") {
sources = [
"spectral_features.cc",
"spectral_features.h",
"spectral_features_internal.cc",
"spectral_features_internal.h",
]
deps = [
":rnn_vad_common",
":rnn_vad_ring_buffer",
":rnn_vad_symmetric_matrix_buffer",
"../../../../api:array_view",
"../../../../rtc_base:checks",
"../../utility:pffft_wrapper",
"//third_party/rnnoise:rnn_vad",
]
}
rtc_source_set("rnn_vad_symmetric_matrix_buffer") {
sources = [ "symmetric_matrix_buffer.h" ]
deps = [
"../../../../api:array_view",
"../../../../rtc_base:checks",
]
}
@ -63,6 +144,7 @@ if (rtc_include_tests) {
]
deps = [
":rnn_vad",
":rnn_vad_common",
"../../../../api:array_view",
"../../../../api:scoped_refptr",
"../../../../rtc_base:checks",
@ -108,6 +190,14 @@ if (rtc_include_tests) {
]
deps = [
":rnn_vad",
":rnn_vad_auto_correlation",
":rnn_vad_common",
":rnn_vad_lp_residual",
":rnn_vad_pitch",
":rnn_vad_ring_buffer",
":rnn_vad_sequence_buffer",
":rnn_vad_spectral_features",
":rnn_vad_symmetric_matrix_buffer",
":test_utils",
"../..:audioproc_test_utils",
"../../../../api:array_view",
@ -131,6 +221,7 @@ if (rtc_include_tests) {
sources = [ "rnn_vad_tool.cc" ]
deps = [
":rnn_vad",
":rnn_vad_common",
"../../../../api:array_view",
"../../../../common_audio",
"../../../../rtc_base:rtc_base_approved",