Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(124)

Side by Side Diff: webrtc/modules/audio_coding/BUILD.gn

Issue 3011943002: Move optional.h to webrtc/api/ (Closed)
Patch Set: Created 3 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « webrtc/modules/BUILD.gn ('k') | webrtc/modules/audio_coding/acm2/acm_receiver.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2014 The WebRTC project authors. All Rights Reserved. 1 # Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
2 # 2 #
3 # Use of this source code is governed by a BSD-style license 3 # Use of this source code is governed by a BSD-style license
4 # that can be found in the LICENSE file in the root of the source 4 # that can be found in the LICENSE file in the root of the source
5 # tree. An additional intellectual property rights grant can be found 5 # tree. An additional intellectual property rights grant can be found
6 # in the file PATENTS. All contributing project authors may 6 # in the file PATENTS. All contributing project authors may
7 # be found in the AUTHORS file in the root of the source tree. 7 # be found in the AUTHORS file in the root of the source tree.
8 8
9 import("../../webrtc.gni") 9 import("../../webrtc.gni")
10 import("audio_coding.gni") 10 import("audio_coding.gni")
(...skipping 29 matching lines...) Expand all
40 ] 40 ]
41 41
42 rtc_static_library("audio_format_conversion") { 42 rtc_static_library("audio_format_conversion") {
43 sources = [ 43 sources = [
44 "codecs/audio_format_conversion.cc", 44 "codecs/audio_format_conversion.cc",
45 "codecs/audio_format_conversion.h", 45 "codecs/audio_format_conversion.h",
46 ] 46 ]
47 deps = [ 47 deps = [
48 "../..:webrtc_common", 48 "../..:webrtc_common",
49 "../../api:array_view", 49 "../../api:array_view",
50 "../../api:optional",
50 "../../api/audio_codecs:audio_codecs_api", 51 "../../api/audio_codecs:audio_codecs_api",
51 "../../rtc_base:rtc_base_approved", 52 "../../rtc_base:rtc_base_approved",
52 ] 53 ]
53 } 54 }
54 55
55 rtc_static_library("rent_a_codec") { 56 rtc_static_library("rent_a_codec") {
56 sources = [ 57 sources = [
57 "acm2/acm_codec_database.cc", 58 "acm2/acm_codec_database.cc",
58 "acm2/acm_codec_database.h", 59 "acm2/acm_codec_database.h",
59 "acm2/rent_a_codec.cc", 60 "acm2/rent_a_codec.cc",
60 "acm2/rent_a_codec.h", 61 "acm2/rent_a_codec.h",
61 ] 62 ]
62 deps = [ 63 deps = [
63 "../../api:array_view", 64 "../../api:array_view",
65 "../../api:optional",
64 "../../api/audio_codecs:audio_codecs_api", 66 "../../api/audio_codecs:audio_codecs_api",
65 "../..:webrtc_common", 67 "../..:webrtc_common",
66 "../../rtc_base:protobuf_utils", 68 "../../rtc_base:protobuf_utils",
67 "../../rtc_base:rtc_base_approved", 69 "../../rtc_base:rtc_base_approved",
68 "../../system_wrappers", 70 "../../system_wrappers",
69 ":audio_coding_module_typedefs", 71 ":audio_coding_module_typedefs",
70 ":isac_common", 72 ":isac_common",
71 ":isac_fix_c", 73 ":isac_fix_c",
72 ":neteq_decoder_enum", 74 ":neteq_decoder_enum",
73 ] + audio_codec_deps 75 ] + audio_codec_deps
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
125 127
126 deps = audio_coding_deps + [ 128 deps = audio_coding_deps + [
127 "..:module_api", 129 "..:module_api",
128 "../../api:array_view", 130 "../../api:array_view",
129 "../../api/audio_codecs:audio_codecs_api", 131 "../../api/audio_codecs:audio_codecs_api",
130 "../../api/audio_codecs:builtin_audio_decoder_factory", 132 "../../api/audio_codecs:builtin_audio_decoder_factory",
131 ":audio_coding_module_typedefs", 133 ":audio_coding_module_typedefs",
132 ":neteq", 134 ":neteq",
133 ":rent_a_codec", 135 ":rent_a_codec",
134 "../../rtc_base:rtc_base_approved", 136 "../../rtc_base:rtc_base_approved",
137 "../../api:optional",
135 "../../logging:rtc_event_log_api", 138 "../../logging:rtc_event_log_api",
136 ] 139 ]
137 defines = audio_coding_defines 140 defines = audio_coding_defines
138 } 141 }
139 142
140 rtc_static_library("legacy_encoded_audio_frame") { 143 rtc_static_library("legacy_encoded_audio_frame") {
141 sources = [ 144 sources = [
142 "codecs/legacy_encoded_audio_frame.cc", 145 "codecs/legacy_encoded_audio_frame.cc",
143 "codecs/legacy_encoded_audio_frame.h", 146 "codecs/legacy_encoded_audio_frame.h",
144 ] 147 ]
(...skipping 662 matching lines...) Expand 10 before | Expand all | Expand 10 after
807 sources = [ 810 sources = [
808 "codecs/opus/audio_decoder_opus.cc", 811 "codecs/opus/audio_decoder_opus.cc",
809 "codecs/opus/audio_decoder_opus.h", 812 "codecs/opus/audio_decoder_opus.h",
810 "codecs/opus/audio_encoder_opus.cc", 813 "codecs/opus/audio_encoder_opus.cc",
811 "codecs/opus/audio_encoder_opus.h", 814 "codecs/opus/audio_encoder_opus.h",
812 ] 815 ]
813 816
814 deps = [ 817 deps = [
815 ":audio_network_adaptor", 818 ":audio_network_adaptor",
816 "../..:webrtc_common", 819 "../..:webrtc_common",
820 "../../api:optional",
817 "../../api/audio_codecs:audio_codecs_api", 821 "../../api/audio_codecs:audio_codecs_api",
818 "../../api/audio_codecs/opus:audio_encoder_opus_config", 822 "../../api/audio_codecs/opus:audio_encoder_opus_config",
819 "../../common_audio", 823 "../../common_audio",
820 "../../rtc_base:rtc_base_approved", 824 "../../rtc_base:rtc_base_approved",
821 "../../rtc_base:rtc_numerics", 825 "../../rtc_base:rtc_numerics",
822 "../../system_wrappers", 826 "../../system_wrappers",
823 ] 827 ]
824 public_deps = [ 828 public_deps = [
825 ":webrtc_opus_c", 829 ":webrtc_opus_c",
826 "../../rtc_base:protobuf_utils", 830 "../../rtc_base:protobuf_utils",
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
901 "audio_network_adaptor/fec_controller_rplr_based.cc", 905 "audio_network_adaptor/fec_controller_rplr_based.cc",
902 "audio_network_adaptor/fec_controller_rplr_based.h", 906 "audio_network_adaptor/fec_controller_rplr_based.h",
903 "audio_network_adaptor/frame_length_controller.cc", 907 "audio_network_adaptor/frame_length_controller.cc",
904 "audio_network_adaptor/frame_length_controller.h", 908 "audio_network_adaptor/frame_length_controller.h",
905 "audio_network_adaptor/include/audio_network_adaptor.h", 909 "audio_network_adaptor/include/audio_network_adaptor.h",
906 "audio_network_adaptor/util/threshold_curve.h", 910 "audio_network_adaptor/util/threshold_curve.h",
907 ] 911 ]
908 912
909 deps = [ 913 deps = [
910 "../..:webrtc_common", 914 "../..:webrtc_common",
915 "../../api:optional",
911 "../../common_audio", 916 "../../common_audio",
912 "../../logging:rtc_event_log_api", 917 "../../logging:rtc_event_log_api",
913 "../../rtc_base:protobuf_utils", 918 "../../rtc_base:protobuf_utils",
914 "../../rtc_base:rtc_base_approved", 919 "../../rtc_base:rtc_base_approved",
915 "../../system_wrappers", 920 "../../system_wrappers",
916 ] 921 ]
917 922
918 if (rtc_enable_protobuf) { 923 if (rtc_enable_protobuf) {
919 deps += [ 924 deps += [
920 ":ana_config_proto", 925 ":ana_config_proto",
921 ":ana_debug_dump_proto", 926 ":ana_debug_dump_proto",
922 ] 927 ]
923 } 928 }
924 929
925 if (!build_with_chromium && is_clang) { 930 if (!build_with_chromium && is_clang) {
926 # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). 931 # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
927 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] 932 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
928 } 933 }
929 } 934 }
930 935
931 rtc_source_set("neteq_decoder_enum") { 936 rtc_source_set("neteq_decoder_enum") {
932 sources = [ 937 sources = [
933 "neteq/neteq_decoder_enum.cc", 938 "neteq/neteq_decoder_enum.cc",
934 "neteq/neteq_decoder_enum.h", 939 "neteq/neteq_decoder_enum.h",
935 ] 940 ]
936 deps = [ 941 deps = [
942 "../../api:optional",
937 "../../api/audio_codecs:audio_codecs_api", 943 "../../api/audio_codecs:audio_codecs_api",
938 "../../rtc_base:rtc_base_approved", 944 "../../rtc_base:rtc_base_approved",
939 ] 945 ]
940 } 946 }
941 947
942 rtc_static_library("neteq") { 948 rtc_static_library("neteq") {
943 sources = [ 949 sources = [
944 "neteq/accelerate.cc", 950 "neteq/accelerate.cc",
945 "neteq/accelerate.h", 951 "neteq/accelerate.h",
946 "neteq/audio_decoder_impl.cc", 952 "neteq/audio_decoder_impl.cc",
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
1016 1022
1017 deps = [ 1023 deps = [
1018 ":audio_coding_module_typedefs", 1024 ":audio_coding_module_typedefs",
1019 ":cng", 1025 ":cng",
1020 ":g711", 1026 ":g711",
1021 ":isac_fix", 1027 ":isac_fix",
1022 ":neteq_decoder_enum", 1028 ":neteq_decoder_enum",
1023 ":pcm16b", 1029 ":pcm16b",
1024 "..:module_api", 1030 "..:module_api",
1025 "../..:webrtc_common", 1031 "../..:webrtc_common",
1032 "../../api:optional",
1026 "../../api/audio_codecs:audio_codecs_api", 1033 "../../api/audio_codecs:audio_codecs_api",
1027 "../../common_audio", 1034 "../../common_audio",
1028 "../../rtc_base:gtest_prod", 1035 "../../rtc_base:gtest_prod",
1029 "../../rtc_base:rtc_base_approved", 1036 "../../rtc_base:rtc_base_approved",
1030 "../../system_wrappers", 1037 "../../system_wrappers",
1031 ] 1038 ]
1032 1039
1033 defines = [] 1040 defines = []
1034 1041
1035 if (rtc_include_ilbc) { 1042 if (rtc_include_ilbc) {
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
1075 1082
1076 if (!build_with_chromium && is_clang) { 1083 if (!build_with_chromium && is_clang) {
1077 # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). 1084 # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
1078 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] 1085 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
1079 } 1086 }
1080 1087
1081 deps = [ 1088 deps = [
1082 ":neteq", 1089 ":neteq",
1083 "..:module_api", 1090 "..:module_api",
1084 "../..:webrtc_common", 1091 "../..:webrtc_common",
1092 "../../api:optional",
1085 "../../api/audio_codecs:audio_codecs_api", 1093 "../../api/audio_codecs:audio_codecs_api",
1086 "../../api/audio_codecs:builtin_audio_decoder_factory", 1094 "../../api/audio_codecs:builtin_audio_decoder_factory",
1087 "../../rtc_base:rtc_base_approved", 1095 "../../rtc_base:rtc_base_approved",
1088 "../rtp_rtcp", 1096 "../rtp_rtcp",
1089 ] 1097 ]
1090 } 1098 }
1091 1099
1092 rtc_source_set("neteq_test_tools") { 1100 rtc_source_set("neteq_test_tools") {
1093 testonly = true 1101 testonly = true
1094 sources = [ 1102 sources = [
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
1159 public_configs = [ ":neteq_tools_config" ] 1167 public_configs = [ ":neteq_tools_config" ]
1160 1168
1161 if (!build_with_chromium && is_clang) { 1169 if (!build_with_chromium && is_clang) {
1162 # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). 1170 # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
1163 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] 1171 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
1164 } 1172 }
1165 1173
1166 deps = [ 1174 deps = [
1167 "../..:webrtc_common", 1175 "../..:webrtc_common",
1168 "../../api:array_view", 1176 "../../api:array_view",
1177 "../../api:optional",
1169 "../../api/audio_codecs:audio_codecs_api", 1178 "../../api/audio_codecs:audio_codecs_api",
1170 "../../common_audio", 1179 "../../common_audio",
1171 "../../rtc_base:rtc_base_approved", 1180 "../../rtc_base:rtc_base_approved",
1172 "../rtp_rtcp", 1181 "../rtp_rtcp",
1173 ] 1182 ]
1174 1183
1175 public_deps = [ 1184 public_deps = [
1176 ":neteq_tools_minimal", 1185 ":neteq_tools_minimal",
1177 ] 1186 ]
1178 } 1187 }
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
1283 "test/utility.cc", 1292 "test/utility.cc",
1284 "test/utility.h", 1293 "test/utility.h",
1285 ] 1294 ]
1286 deps = [ 1295 deps = [
1287 ":audio_coding", 1296 ":audio_coding",
1288 ":audio_coding_module_typedefs", 1297 ":audio_coding_module_typedefs",
1289 ":audio_format_conversion", 1298 ":audio_format_conversion",
1290 ":pcm16b_c", 1299 ":pcm16b_c",
1291 "..:module_api", 1300 "..:module_api",
1292 "../..:webrtc_common", 1301 "../..:webrtc_common",
1302 "../../api:optional",
1293 "../../api/audio_codecs:builtin_audio_decoder_factory", 1303 "../../api/audio_codecs:builtin_audio_decoder_factory",
1294 "../../rtc_base:rtc_base_approved", 1304 "../../rtc_base:rtc_base_approved",
1295 "../../system_wrappers:system_wrappers", 1305 "../../system_wrappers:system_wrappers",
1296 "../../test:test_support", 1306 "../../test:test_support",
1297 ] 1307 ]
1298 defines = audio_coding_defines 1308 defines = audio_coding_defines
1299 if (is_win) { 1309 if (is_win) {
1300 cflags = [ 1310 cflags = [
1301 # TODO(kjellander): bugs.webrtc.org/261: Fix this warning. 1311 # TODO(kjellander): bugs.webrtc.org/261: Fix this warning.
1302 "/wd4373", # virtual function override. 1312 "/wd4373", # virtual function override.
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
1389 "test/utility.cc", 1399 "test/utility.cc",
1390 "test/utility.h", 1400 "test/utility.h",
1391 ] 1401 ]
1392 1402
1393 deps = [ 1403 deps = [
1394 ":audio_coding", 1404 ":audio_coding",
1395 ":audio_coding_module_typedefs", 1405 ":audio_coding_module_typedefs",
1396 ":audio_format_conversion", 1406 ":audio_format_conversion",
1397 "..:module_api", 1407 "..:module_api",
1398 "../../:webrtc_common", 1408 "../../:webrtc_common",
1409 "../../api:optional",
1399 "../../rtc_base:rtc_base_approved", 1410 "../../rtc_base:rtc_base_approved",
1400 "../../system_wrappers", 1411 "../../system_wrappers",
1401 "../../system_wrappers:system_wrappers_default", 1412 "../../system_wrappers:system_wrappers_default",
1402 "../../test:test_support", 1413 "../../test:test_support",
1403 "../rtp_rtcp", 1414 "../rtp_rtcp",
1404 "//testing/gtest", 1415 "//testing/gtest",
1405 ] 1416 ]
1406 } # delay_test 1417 } # delay_test
1407 1418
1408 rtc_executable("insert_packet_with_timing") { 1419 rtc_executable("insert_packet_with_timing") {
1409 testonly = true 1420 testonly = true
1410 sources = [ 1421 sources = [
1411 "test/Channel.cc", 1422 "test/Channel.cc",
1412 "test/Channel.h", 1423 "test/Channel.h",
1413 "test/PCMFile.cc", 1424 "test/PCMFile.cc",
1414 "test/PCMFile.h", 1425 "test/PCMFile.h",
1415 "test/insert_packet_with_timing.cc", 1426 "test/insert_packet_with_timing.cc",
1416 ] 1427 ]
1417 1428
1418 if (!build_with_chromium && is_clang) { 1429 if (!build_with_chromium && is_clang) {
1419 # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). 1430 # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
1420 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] 1431 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
1421 } 1432 }
1422 1433
1423 deps = [ 1434 deps = [
1424 ":audio_coding", 1435 ":audio_coding",
1425 ":audio_format_conversion", 1436 ":audio_format_conversion",
1426 "..:module_api", 1437 "..:module_api",
1427 "../../:webrtc_common", 1438 "../../:webrtc_common",
1439 "../../api:optional",
1428 "../../rtc_base:rtc_base_approved", 1440 "../../rtc_base:rtc_base_approved",
1429 "../../system_wrappers", 1441 "../../system_wrappers",
1430 "../../system_wrappers:system_wrappers_default", 1442 "../../system_wrappers:system_wrappers_default",
1431 "../../test:test_support", 1443 "../../test:test_support",
1432 "../rtp_rtcp", 1444 "../rtp_rtcp",
1433 "//testing/gtest", 1445 "//testing/gtest",
1434 ] 1446 ]
1435 } # insert_packet_with_timing 1447 } # insert_packet_with_timing
1436 1448
1437 audio_decoder_unittests_resources = 1449 audio_decoder_unittests_resources =
(...skipping 805 matching lines...) Expand 10 before | Expand all | Expand 10 after
2243 # webrtc/api/audio_codecs:builtin_audio_decoder_factory instead. 2255 # webrtc/api/audio_codecs:builtin_audio_decoder_factory instead.
2244 # TODO(ossu): Remove this. 2256 # TODO(ossu): Remove this.
2245 rtc_source_set("builtin_audio_encoder_factory") { 2257 rtc_source_set("builtin_audio_encoder_factory") {
2246 sources = [ 2258 sources = [
2247 "codecs/builtin_audio_encoder_factory.h", 2259 "codecs/builtin_audio_encoder_factory.h",
2248 ] 2260 ]
2249 deps = [ 2261 deps = [
2250 "../../api/audio_codecs:builtin_audio_encoder_factory", 2262 "../../api/audio_codecs:builtin_audio_encoder_factory",
2251 ] 2263 ]
2252 } 2264 }
OLDNEW
« no previous file with comments | « webrtc/modules/BUILD.gn ('k') | webrtc/modules/audio_coding/acm2/acm_receiver.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698