Bump to WebRTC M120 release
Some API deprecation -- ExperimentalAgc and ExperimentalNs are gone. We're continuing to carry iSAC even though it's gone upstream, but maybe we'll want to drop that soon.
This commit is contained in:
Arun Raghavan
@ -8,48 +8,39 @@
|
||||
|
||||
import("../../../webrtc.gni")
|
||||
|
||||
group("agc2") {
|
||||
deps = [
|
||||
":adaptive_digital",
|
||||
":fixed_digital",
|
||||
]
|
||||
}
|
||||
|
||||
rtc_library("level_estimation_agc") {
|
||||
rtc_library("speech_level_estimator") {
|
||||
sources = [
|
||||
"adaptive_mode_level_estimator_agc.cc",
|
||||
"adaptive_mode_level_estimator_agc.h",
|
||||
"speech_level_estimator.cc",
|
||||
"speech_level_estimator.h",
|
||||
]
|
||||
|
||||
visibility = [
|
||||
"..:gain_controller2",
|
||||
"./*",
|
||||
]
|
||||
|
||||
configs += [ "..:apm_debug_dump" ]
|
||||
|
||||
deps = [
|
||||
":adaptive_digital",
|
||||
":common",
|
||||
":gain_applier",
|
||||
":noise_level_estimator",
|
||||
":rnn_vad_with_level",
|
||||
"..:api",
|
||||
"..:apm_logging",
|
||||
"..:audio_frame_view",
|
||||
"../../../api:array_view",
|
||||
"../../../common_audio",
|
||||
"../../../rtc_base:checks",
|
||||
"../../../rtc_base:rtc_base_approved",
|
||||
"../../../rtc_base:logging",
|
||||
"../../../rtc_base:safe_minmax",
|
||||
"../agc:level_estimation",
|
||||
"../vad",
|
||||
]
|
||||
}
|
||||
|
||||
rtc_library("adaptive_digital") {
|
||||
rtc_library("adaptive_digital_gain_controller") {
|
||||
sources = [
|
||||
"adaptive_agc.cc",
|
||||
"adaptive_agc.h",
|
||||
"adaptive_digital_gain_applier.cc",
|
||||
"adaptive_digital_gain_applier.h",
|
||||
"adaptive_mode_level_estimator.cc",
|
||||
"adaptive_mode_level_estimator.h",
|
||||
"saturation_protector.cc",
|
||||
"saturation_protector.h",
|
||||
"adaptive_digital_gain_controller.cc",
|
||||
"adaptive_digital_gain_controller.h",
|
||||
]
|
||||
|
||||
visibility = [
|
||||
"..:gain_controller2",
|
||||
"./*",
|
||||
]
|
||||
|
||||
configs += [ "..:apm_debug_dump" ]
|
||||
@ -57,20 +48,39 @@ rtc_library("adaptive_digital") {
|
||||
deps = [
|
||||
":common",
|
||||
":gain_applier",
|
||||
":noise_level_estimator",
|
||||
":rnn_vad_with_level",
|
||||
"..:api",
|
||||
"..:apm_logging",
|
||||
"..:audio_frame_view",
|
||||
"../../../api:array_view",
|
||||
"../../../common_audio",
|
||||
"../../../rtc_base:checks",
|
||||
"../../../rtc_base:logging",
|
||||
"../../../rtc_base:rtc_base_approved",
|
||||
"../../../rtc_base:safe_compare",
|
||||
"../../../rtc_base:safe_minmax",
|
||||
"../../../system_wrappers:metrics",
|
||||
]
|
||||
}
|
||||
|
||||
rtc_library("saturation_protector") {
|
||||
sources = [
|
||||
"saturation_protector.cc",
|
||||
"saturation_protector.h",
|
||||
"saturation_protector_buffer.cc",
|
||||
"saturation_protector_buffer.h",
|
||||
]
|
||||
|
||||
visibility = [
|
||||
"..:gain_controller2",
|
||||
"./*",
|
||||
]
|
||||
|
||||
configs += [ "..:apm_debug_dump" ]
|
||||
|
||||
deps = [
|
||||
":common",
|
||||
"..:apm_logging",
|
||||
"../../../rtc_base:checks",
|
||||
"../../../rtc_base:safe_compare",
|
||||
"../../../rtc_base:safe_minmax",
|
||||
]
|
||||
|
||||
absl_deps = [ "//third_party/abseil-cpp/absl/types:optional" ]
|
||||
}
|
||||
@ -83,10 +93,36 @@ rtc_library("biquad_filter") {
|
||||
]
|
||||
deps = [
|
||||
"../../../api:array_view",
|
||||
"../../../rtc_base:rtc_base_approved",
|
||||
"../../../rtc_base:macromagic",
|
||||
]
|
||||
}
|
||||
|
||||
rtc_library("clipping_predictor") {
|
||||
visibility = [
|
||||
"../agc:agc",
|
||||
"./*",
|
||||
]
|
||||
|
||||
sources = [
|
||||
"clipping_predictor.cc",
|
||||
"clipping_predictor.h",
|
||||
"clipping_predictor_level_buffer.cc",
|
||||
"clipping_predictor_level_buffer.h",
|
||||
]
|
||||
|
||||
deps = [
|
||||
":gain_map",
|
||||
"..:api",
|
||||
"..:audio_frame_view",
|
||||
"../../../common_audio",
|
||||
"../../../rtc_base:checks",
|
||||
"../../../rtc_base:logging",
|
||||
"../../../rtc_base:safe_minmax",
|
||||
]
|
||||
|
||||
absl_deps = [ "//third_party/abseil-cpp/absl/types:optional" ]
|
||||
}
|
||||
|
||||
rtc_source_set("common") {
|
||||
sources = [ "agc2_common.h" ]
|
||||
}
|
||||
@ -101,6 +137,12 @@ rtc_library("fixed_digital") {
|
||||
"limiter.h",
|
||||
]
|
||||
|
||||
visibility = [
|
||||
"..:gain_controller2",
|
||||
"../../audio_mixer:audio_mixer_impl",
|
||||
"./*",
|
||||
]
|
||||
|
||||
configs += [ "..:apm_debug_dump" ]
|
||||
|
||||
deps = [
|
||||
@ -111,10 +153,12 @@ rtc_library("fixed_digital") {
|
||||
"../../../common_audio",
|
||||
"../../../rtc_base:checks",
|
||||
"../../../rtc_base:gtest_prod",
|
||||
"../../../rtc_base:rtc_base_approved",
|
||||
"../../../rtc_base:safe_conversions",
|
||||
"../../../rtc_base:safe_minmax",
|
||||
"../../../rtc_base:stringutils",
|
||||
"../../../system_wrappers:metrics",
|
||||
]
|
||||
absl_deps = [ "//third_party/abseil-cpp/absl/strings" ]
|
||||
}
|
||||
|
||||
rtc_library("gain_applier") {
|
||||
@ -122,6 +166,12 @@ rtc_library("gain_applier") {
|
||||
"gain_applier.cc",
|
||||
"gain_applier.h",
|
||||
]
|
||||
|
||||
visibility = [
|
||||
"..:gain_controller2",
|
||||
"./*",
|
||||
]
|
||||
|
||||
deps = [
|
||||
":common",
|
||||
"..:audio_frame_view",
|
||||
@ -130,39 +180,94 @@ rtc_library("gain_applier") {
|
||||
]
|
||||
}
|
||||
|
||||
rtc_source_set("gain_map") {
|
||||
visibility = [
|
||||
"..:analog_mic_simulation",
|
||||
"../agc:agc",
|
||||
"./*",
|
||||
]
|
||||
|
||||
sources = [ "gain_map_internal.h" ]
|
||||
}
|
||||
|
||||
rtc_library("input_volume_controller") {
|
||||
sources = [
|
||||
"input_volume_controller.cc",
|
||||
"input_volume_controller.h",
|
||||
"speech_probability_buffer.cc",
|
||||
"speech_probability_buffer.h",
|
||||
]
|
||||
|
||||
visibility = [
|
||||
"..:gain_controller2",
|
||||
"./*",
|
||||
]
|
||||
|
||||
configs += [ "..:apm_debug_dump" ]
|
||||
|
||||
deps = [
|
||||
":clipping_predictor",
|
||||
":gain_map",
|
||||
":input_volume_stats_reporter",
|
||||
"..:api",
|
||||
"..:audio_buffer",
|
||||
"..:audio_frame_view",
|
||||
"../../../api:array_view",
|
||||
"../../../rtc_base:checks",
|
||||
"../../../rtc_base:checks",
|
||||
"../../../rtc_base:gtest_prod",
|
||||
"../../../rtc_base:gtest_prod",
|
||||
"../../../rtc_base:logging",
|
||||
"../../../rtc_base:safe_minmax",
|
||||
"../../../system_wrappers:field_trial",
|
||||
"../../../system_wrappers:metrics",
|
||||
]
|
||||
|
||||
absl_deps = [ "//third_party/abseil-cpp/absl/types:optional" ]
|
||||
}
|
||||
|
||||
rtc_library("noise_level_estimator") {
|
||||
sources = [
|
||||
"down_sampler.cc",
|
||||
"down_sampler.h",
|
||||
"noise_level_estimator.cc",
|
||||
"noise_level_estimator.h",
|
||||
"noise_spectrum_estimator.cc",
|
||||
"noise_spectrum_estimator.h",
|
||||
"signal_classifier.cc",
|
||||
"signal_classifier.h",
|
||||
]
|
||||
deps = [
|
||||
":biquad_filter",
|
||||
"..:apm_logging",
|
||||
"..:audio_frame_view",
|
||||
"../../../api:array_view",
|
||||
"../../../common_audio",
|
||||
"../../../common_audio/third_party/ooura:fft_size_128",
|
||||
"../../../rtc_base:checks",
|
||||
"../../../rtc_base:macromagic",
|
||||
"../../../system_wrappers",
|
||||
]
|
||||
|
||||
visibility = [
|
||||
"..:gain_controller2",
|
||||
"./*",
|
||||
]
|
||||
|
||||
configs += [ "..:apm_debug_dump" ]
|
||||
}
|
||||
|
||||
rtc_library("rnn_vad_with_level") {
|
||||
rtc_library("vad_wrapper") {
|
||||
sources = [
|
||||
"vad_with_level.cc",
|
||||
"vad_with_level.h",
|
||||
"vad_wrapper.cc",
|
||||
"vad_wrapper.h",
|
||||
]
|
||||
|
||||
visibility = [
|
||||
"..:gain_controller2",
|
||||
"./*",
|
||||
]
|
||||
|
||||
defines = []
|
||||
if (rtc_build_with_neon && current_cpu != "arm64") {
|
||||
suppressed_configs += [ "//build/config/compiler:compiler_arm_fpu" ]
|
||||
cflags = [ "-mfpu=neon" ]
|
||||
}
|
||||
|
||||
deps = [
|
||||
":common",
|
||||
":cpu_features",
|
||||
"..:audio_frame_view",
|
||||
"../../../api:array_view",
|
||||
"../../../common_audio",
|
||||
@ -172,28 +277,85 @@ rtc_library("rnn_vad_with_level") {
|
||||
]
|
||||
}
|
||||
|
||||
rtc_library("adaptive_digital_unittests") {
|
||||
rtc_library("cpu_features") {
|
||||
sources = [
|
||||
"cpu_features.cc",
|
||||
"cpu_features.h",
|
||||
]
|
||||
|
||||
visibility = [
|
||||
"..:gain_controller2",
|
||||
"./*",
|
||||
]
|
||||
|
||||
deps = [
|
||||
"../../../rtc_base:stringutils",
|
||||
"../../../rtc_base/system:arch",
|
||||
"../../../system_wrappers",
|
||||
]
|
||||
}
|
||||
|
||||
rtc_library("speech_level_estimator_unittest") {
|
||||
testonly = true
|
||||
configs += [ "..:apm_debug_dump" ]
|
||||
|
||||
sources = [ "speech_level_estimator_unittest.cc" ]
|
||||
deps = [
|
||||
":common",
|
||||
":speech_level_estimator",
|
||||
"..:api",
|
||||
"..:apm_logging",
|
||||
"../../../rtc_base:gunit_helpers",
|
||||
"../../../test:test_support",
|
||||
]
|
||||
}
|
||||
|
||||
rtc_library("adaptive_digital_gain_controller_unittest") {
|
||||
testonly = true
|
||||
configs += [ "..:apm_debug_dump" ]
|
||||
|
||||
sources = [ "adaptive_digital_gain_controller_unittest.cc" ]
|
||||
|
||||
deps = [
|
||||
":adaptive_digital_gain_controller",
|
||||
":common",
|
||||
":test_utils",
|
||||
"..:api",
|
||||
"..:apm_logging",
|
||||
"..:audio_frame_view",
|
||||
"../../../common_audio",
|
||||
"../../../rtc_base:gunit_helpers",
|
||||
"../../../test:test_support",
|
||||
]
|
||||
}
|
||||
|
||||
rtc_library("gain_applier_unittest") {
|
||||
testonly = true
|
||||
configs += [ "..:apm_debug_dump" ]
|
||||
|
||||
sources = [ "gain_applier_unittest.cc" ]
|
||||
deps = [
|
||||
":gain_applier",
|
||||
":test_utils",
|
||||
"..:audio_frame_view",
|
||||
"../../../rtc_base:gunit_helpers",
|
||||
"../../../test:test_support",
|
||||
]
|
||||
}
|
||||
|
||||
rtc_library("saturation_protector_unittest") {
|
||||
testonly = true
|
||||
configs += [ "..:apm_debug_dump" ]
|
||||
|
||||
sources = [
|
||||
"adaptive_digital_gain_applier_unittest.cc",
|
||||
"adaptive_mode_level_estimator_unittest.cc",
|
||||
"gain_applier_unittest.cc",
|
||||
"saturation_protector_buffer_unittest.cc",
|
||||
"saturation_protector_unittest.cc",
|
||||
]
|
||||
deps = [
|
||||
":adaptive_digital",
|
||||
":common",
|
||||
":gain_applier",
|
||||
":test_utils",
|
||||
":saturation_protector",
|
||||
"..:apm_logging",
|
||||
"..:audio_frame_view",
|
||||
"../../../api:array_view",
|
||||
"../../../common_audio",
|
||||
"../../../rtc_base:checks",
|
||||
"../../../rtc_base:gunit_helpers",
|
||||
"../../../rtc_base:rtc_base_approved",
|
||||
"../../../test:test_support",
|
||||
]
|
||||
}
|
||||
@ -232,38 +394,67 @@ rtc_library("fixed_digital_unittests") {
|
||||
"../../../common_audio",
|
||||
"../../../rtc_base:checks",
|
||||
"../../../rtc_base:gunit_helpers",
|
||||
"../../../rtc_base:rtc_base_approved",
|
||||
"../../../system_wrappers:metrics",
|
||||
]
|
||||
}
|
||||
|
||||
rtc_library("input_volume_controller_unittests") {
|
||||
testonly = true
|
||||
sources = [
|
||||
"clipping_predictor_level_buffer_unittest.cc",
|
||||
"clipping_predictor_unittest.cc",
|
||||
"input_volume_controller_unittest.cc",
|
||||
"speech_probability_buffer_unittest.cc",
|
||||
]
|
||||
|
||||
configs += [ "..:apm_debug_dump" ]
|
||||
|
||||
deps = [
|
||||
":clipping_predictor",
|
||||
":gain_map",
|
||||
":input_volume_controller",
|
||||
"..:api",
|
||||
"../../../api:array_view",
|
||||
"../../../rtc_base:checks",
|
||||
"../../../rtc_base:random",
|
||||
"../../../rtc_base:safe_conversions",
|
||||
"../../../rtc_base:safe_minmax",
|
||||
"../../../rtc_base:stringutils",
|
||||
"../../../system_wrappers:metrics",
|
||||
"../../../test:field_trial",
|
||||
"../../../test:fileutils",
|
||||
"../../../test:test_support",
|
||||
"//testing/gtest",
|
||||
]
|
||||
|
||||
absl_deps = [ "//third_party/abseil-cpp/absl/types:optional" ]
|
||||
}
|
||||
|
||||
rtc_library("noise_estimator_unittests") {
|
||||
testonly = true
|
||||
configs += [ "..:apm_debug_dump" ]
|
||||
|
||||
sources = [
|
||||
"noise_level_estimator_unittest.cc",
|
||||
"signal_classifier_unittest.cc",
|
||||
]
|
||||
sources = [ "noise_level_estimator_unittest.cc" ]
|
||||
deps = [
|
||||
":noise_level_estimator",
|
||||
":test_utils",
|
||||
"..:apm_logging",
|
||||
"..:audio_frame_view",
|
||||
"../../../api:array_view",
|
||||
"../../../api:function_view",
|
||||
"../../../rtc_base:checks",
|
||||
"../../../rtc_base:gunit_helpers",
|
||||
"../../../rtc_base:rtc_base_approved",
|
||||
]
|
||||
}
|
||||
|
||||
rtc_library("rnn_vad_with_level_unittests") {
|
||||
rtc_library("vad_wrapper_unittests") {
|
||||
testonly = true
|
||||
sources = [ "vad_with_level_unittest.cc" ]
|
||||
sources = [ "vad_wrapper_unittest.cc" ]
|
||||
deps = [
|
||||
":common",
|
||||
":rnn_vad_with_level",
|
||||
":vad_wrapper",
|
||||
"..:audio_frame_view",
|
||||
"../../../rtc_base:checks",
|
||||
"../../../rtc_base:gunit_helpers",
|
||||
"../../../rtc_base:safe_compare",
|
||||
"../../../test:test_support",
|
||||
@ -285,6 +476,36 @@ rtc_library("test_utils") {
|
||||
deps = [
|
||||
"..:audio_frame_view",
|
||||
"../../../rtc_base:checks",
|
||||
"../../../rtc_base:rtc_base_approved",
|
||||
"../../../rtc_base:random",
|
||||
]
|
||||
}
|
||||
|
||||
rtc_library("input_volume_stats_reporter") {
|
||||
sources = [
|
||||
"input_volume_stats_reporter.cc",
|
||||
"input_volume_stats_reporter.h",
|
||||
]
|
||||
deps = [
|
||||
"../../../rtc_base:gtest_prod",
|
||||
"../../../rtc_base:logging",
|
||||
"../../../rtc_base:safe_minmax",
|
||||
"../../../rtc_base:stringutils",
|
||||
"../../../system_wrappers:metrics",
|
||||
]
|
||||
absl_deps = [
|
||||
"//third_party/abseil-cpp/absl/strings",
|
||||
"//third_party/abseil-cpp/absl/types:optional",
|
||||
]
|
||||
}
|
||||
|
||||
rtc_library("input_volume_stats_reporter_unittests") {
|
||||
testonly = true
|
||||
sources = [ "input_volume_stats_reporter_unittest.cc" ]
|
||||
deps = [
|
||||
":input_volume_stats_reporter",
|
||||
"../../../rtc_base:stringutils",
|
||||
"../../../system_wrappers:metrics",
|
||||
"../../../test:test_support",
|
||||
]
|
||||
absl_deps = [ "//third_party/abseil-cpp/absl/strings" ]
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user