Remove dependencies on modules:module_api from AudioProcessing.

- Directly include api/audio/audio_frame.h everywhere AudioFrame is used.
- This *will* remove transient dependencies on libjpeg and a bunch of other things from the e.g. APM.
- audio_frame.h still included from module_common_types.h for backwards compatibility with clients.

Bug: webrtc:9139, webrtc:7504
Change-Id: Id96f9268c01667fbcc29a01f5c1dd25a37836897
Reviewed-on: https://webrtc-review.googlesource.com/62464
Commit-Queue: Fredrik Solenberg <solenberg@webrtc.org>
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#22845}
This commit is contained in:
Fredrik Solenberg
2018-04-12 22:44:09 +02:00
committed by Commit Bot
parent 0ab56511f1
commit bbf21a3fd6
101 changed files with 220 additions and 214 deletions

View File

@ -97,7 +97,6 @@ rtc_source_set("audio_coding_module_typedefs") {
"include/audio_coding_module_typedefs.h",
]
deps = [
"..:module_api",
"../..:typedefs",
"../..:webrtc_common",
]
@ -136,12 +135,13 @@ rtc_static_library("audio_coding") {
}
deps = audio_coding_deps + [
"../../api/audio:audio_frame_api",
"..:module_api",
"../../common_audio:common_audio_c",
"../..:typedefs",
"../../rtc_base:deprecation",
"../../rtc_base:checks",
"../../system_wrappers:metrics_api",
"..:module_api",
"../../api:array_view",
"../../api/audio_codecs:audio_codecs_api",
":audio_coding_module_typedefs",
@ -1086,6 +1086,7 @@ rtc_static_library("neteq") {
"../..:webrtc_common",
"../../api:libjingle_peerconnection_api",
"../../api:optional",
"../../api/audio:audio_frame_api",
"../../api/audio_codecs:audio_codecs_api",
"../../common_audio",
"../../common_audio:common_audio_c",
@ -1129,11 +1130,11 @@ rtc_source_set("neteq_tools_minimal") {
deps = [
":neteq",
"..:module_api",
"../..:typedefs",
"../..:webrtc_common",
"../../api:libjingle_peerconnection_api",
"../../api:optional",
"../../api/audio:audio_frame_api",
"../../api/audio_codecs:audio_codecs_api",
"../../api/audio_codecs:builtin_audio_decoder_factory",
"../../rtc_base:checks",
@ -1168,7 +1169,6 @@ rtc_source_set("neteq_test_tools") {
deps = [
":pcm16b",
"..:module_api",
"../..:typedefs",
"../..:webrtc_common",
"../../api:array_view",
@ -1220,6 +1220,7 @@ rtc_source_set("neteq_tools") {
}
deps = [
"..:module_api",
"../..:typedefs",
"../..:webrtc_common",
"../../api:array_view",
@ -1379,6 +1380,7 @@ if (rtc_include_tests) {
"../..:typedefs",
"../..:webrtc_common",
"../../api:optional",
"../../api/audio:audio_frame_api",
"../../api/audio_codecs:builtin_audio_decoder_factory",
"../../rtc_base:rtc_base_approved",
"../../rtc_base/synchronization:rw_lock_wrapper",
@ -1438,6 +1440,7 @@ if (rtc_include_tests) {
defines = audio_coding_defines
deps = audio_coding_deps + [
"..:module_api",
":audio_coding",
":audio_format_conversion",
"../../api/audio_codecs:audio_codecs_api",
@ -1459,6 +1462,7 @@ if (rtc_include_tests) {
defines = audio_coding_defines
deps = audio_coding_deps + [
"../../api/audio:audio_frame_api",
"../../rtc_base:checks",
":audio_coding",
":neteq_tools",
@ -1490,6 +1494,7 @@ if (rtc_include_tests) {
"../..:typedefs",
"../../:webrtc_common",
"../../api:optional",
"../../api/audio:audio_frame_api",
"../../api/audio_codecs:builtin_audio_decoder_factory",
"../../rtc_base:rtc_base_approved",
"../../system_wrappers",
@ -1523,6 +1528,7 @@ if (rtc_include_tests) {
"../..:typedefs",
"../../:webrtc_common",
"../../api:optional",
"../../api/audio:audio_frame_api",
"../../api/audio_codecs:builtin_audio_decoder_factory",
"../../rtc_base:rtc_base_approved",
"../../system_wrappers",
@ -1602,7 +1608,6 @@ if (rtc_include_tests) {
testonly = true
defines = []
deps = [
"..:module_api",
"../..:typedefs",
"../../rtc_base:checks",
"../../test:fileutils",
@ -1713,9 +1718,9 @@ if (rtc_include_tests) {
":neteq",
":neteq_test_tools",
":pcm16b",
"..:module_api",
"../..:typedefs",
"../..:webrtc_common",
"../../api/audio:audio_frame_api",
"../../api/audio_codecs:audio_codecs_api",
"../../api/audio_codecs:builtin_audio_decoder_factory",
"../../rtc_base:checks",
@ -1742,7 +1747,6 @@ if (rtc_include_tests) {
deps = [
":neteq",
":neteq_test_tools",
"..:module_api",
"../..:typedefs",
"../..:webrtc_common",
"../../api/audio_codecs:builtin_audio_decoder_factory",
@ -1761,6 +1765,7 @@ if (rtc_include_tests) {
"../..:typedefs",
":audio_coding",
":neteq_input_audio_tools",
"../../api/audio:audio_frame_api",
"../../api/audio_codecs/g711:audio_encoder_g711",
"../../api/audio_codecs/L16:audio_encoder_L16",
"../../api/audio_codecs/g722:audio_encoder_g722",
@ -2222,6 +2227,7 @@ if (rtc_include_tests) {
"..:module_api",
"../..:typedefs",
"../..:webrtc_common",
"../../api/audio:audio_frame_api",
"../../api/audio_codecs:audio_codecs_api",
"../../api/audio_codecs:builtin_audio_decoder_factory",
"../../api/audio_codecs:builtin_audio_encoder_factory",