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

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

Issue 2668523004: Move AudioDecoder and related stuff to the api/ directory (Closed)
Patch Set: more review fixes Created 3 years, 10 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
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 21 matching lines...) Expand all
32 } 32 }
33 if (!build_with_mozilla && !build_with_chromium) { 33 if (!build_with_mozilla && !build_with_chromium) {
34 audio_codec_deps += [ ":red" ] 34 audio_codec_deps += [ ":red" ]
35 } 35 }
36 audio_coding_deps = audio_codec_deps + [ 36 audio_coding_deps = audio_codec_deps + [
37 "../..:webrtc_common", 37 "../..:webrtc_common",
38 "../../common_audio", 38 "../../common_audio",
39 "../../system_wrappers", 39 "../../system_wrappers",
40 ] 40 ]
41 41
42 rtc_static_library("audio_format") {
43 sources = [
44 "codecs/audio_format.cc",
45 "codecs/audio_format.h",
46 ]
47 deps = [
48 "../..:webrtc_common",
49 ]
50 }
51
52 rtc_static_library("audio_format_conversion") { 42 rtc_static_library("audio_format_conversion") {
53 sources = [ 43 sources = [
54 "codecs/audio_format_conversion.cc", 44 "codecs/audio_format_conversion.cc",
55 "codecs/audio_format_conversion.h", 45 "codecs/audio_format_conversion.h",
56 ] 46 ]
57 deps = [ 47 deps = [
58 ":audio_format",
59 "../..:webrtc_common", 48 "../..:webrtc_common",
49 "../../api/audio_codecs:audio_codecs_api",
60 "../../base:rtc_base_approved", 50 "../../base:rtc_base_approved",
61 ] 51 ]
62 } 52 }
63 53
64 rtc_source_set("audio_decoder_factory_interface") { 54 rtc_static_library("builtin_audio_decoder_factory_internal") {
65 sources = [ 55 sources = [
66 "codecs/audio_decoder_factory.h", 56 "codecs/builtin_audio_decoder_factory_internal.cc",
67 ] 57 "codecs/builtin_audio_decoder_factory_internal.h",
68 deps = [
69 ":audio_decoder_interface",
70 ":audio_format",
71
72 # TODO(charujain): Clean this dependency when downstream projects are
73 # updated to properly depend on audio_format_conversion target.
74 ":audio_format_conversion",
75 "../../base:rtc_base_approved",
76 ]
77 }
78
79 rtc_static_library("builtin_audio_decoder_factory") {
80 sources = [
81 "codecs/builtin_audio_decoder_factory.cc",
82 "codecs/builtin_audio_decoder_factory.h",
83 ] 58 ]
84 deps = [ 59 deps = [
85 "../..:webrtc_common", 60 "../..:webrtc_common",
86 "../../base:rtc_base_approved", 61 "../../base:rtc_base_approved",
87 ":audio_decoder_factory_interface", 62 "../../api/audio_codecs:audio_codecs_api",
88 ] + audio_codec_deps 63 ] + audio_codec_deps
89 defines = audio_codec_defines 64 defines = audio_codec_defines
90 } 65 }
91 66
92 rtc_static_library("rent_a_codec") { 67 rtc_static_library("rent_a_codec") {
93 # TODO(kjellander): Remove (bugs.webrtc.org/6828) 68 # TODO(kjellander): Remove (bugs.webrtc.org/6828)
94 # Gives cyclic dependency with :neteq and :audio_coding if enabled. 69 # Gives cyclic dependency with :neteq and :audio_coding if enabled.
95 check_includes = false 70 check_includes = false
96 71
97 sources = [ 72 sources = [
98 "acm2/acm_codec_database.cc", 73 "acm2/acm_codec_database.cc",
99 "acm2/acm_codec_database.h", 74 "acm2/acm_codec_database.h",
100 "acm2/rent_a_codec.cc", 75 "acm2/rent_a_codec.cc",
101 "acm2/rent_a_codec.h", 76 "acm2/rent_a_codec.h",
102 ] 77 ]
103 deps = [ 78 deps = [
104 ":audio_decoder_interface", 79 "../../api/audio_codecs:audio_codecs_api",
105 "../..:webrtc_common", 80 "../..:webrtc_common",
106 "../../base:rtc_base_approved", 81 "../../base:rtc_base_approved",
107 ] + audio_codec_deps 82 ] + audio_codec_deps
108 defines = audio_codec_defines 83 defines = audio_codec_defines
109 } 84 }
110 85
111 config("audio_coding_config") { 86 config("audio_coding_config") {
112 include_dirs = [ 87 include_dirs = [
113 "include", 88 "include",
114 "../include", 89 "../include",
(...skipping 27 matching lines...) Expand all
142 } 117 }
143 118
144 if (is_win) { 119 if (is_win) {
145 cflags = [ 120 cflags = [
146 # TODO(kjellander): Bug 261: fix this warning. 121 # TODO(kjellander): Bug 261: fix this warning.
147 "/wd4373", # virtual function override. 122 "/wd4373", # virtual function override.
148 ] 123 ]
149 } 124 }
150 125
151 deps = audio_coding_deps + [ 126 deps = audio_coding_deps + [
152 ":audio_decoder_interface", 127 "../../api/audio_codecs:audio_codecs_api",
153 ":audio_decoder_factory_interface", 128 "../../api/audio_codecs:builtin_audio_decoder_factory",
154 ":builtin_audio_decoder_factory",
155 ":neteq", 129 ":neteq",
156 ":rent_a_codec", 130 ":rent_a_codec",
157 "../../base:rtc_base_approved", 131 "../../base:rtc_base_approved",
158 "../../logging:rtc_event_log_api", 132 "../../logging:rtc_event_log_api",
159 ] 133 ]
160 defines = audio_coding_defines 134 defines = audio_coding_defines
161 } 135 }
162 136
163 rtc_static_library("audio_decoder_interface") { 137 rtc_static_library("legacy_encoded_audio_frame") {
164 sources = [ 138 sources = [
165 "codecs/audio_decoder.cc",
166 "codecs/audio_decoder.h",
167 "codecs/legacy_encoded_audio_frame.cc", 139 "codecs/legacy_encoded_audio_frame.cc",
168 "codecs/legacy_encoded_audio_frame.h", 140 "codecs/legacy_encoded_audio_frame.h",
169 ] 141 ]
170 deps = [ 142 deps = [
171 "../..:webrtc_common", 143 "../../api/audio_codecs:audio_codecs_api",
172 "../../base:rtc_base_approved", 144 "../../base:rtc_base_approved",
173 ] 145 ]
174 } 146 }
175 147
176 rtc_static_library("audio_encoder_interface") { 148 rtc_static_library("audio_encoder_interface") {
177 sources = [ 149 sources = [
178 "codecs/audio_encoder.cc", 150 "codecs/audio_encoder.cc",
179 "codecs/audio_encoder.h", 151 "codecs/audio_encoder.h",
180 ] 152 ]
181 deps = [ 153 deps = [
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
239 sources = [ 211 sources = [
240 "codecs/g711/audio_decoder_pcm.cc", 212 "codecs/g711/audio_decoder_pcm.cc",
241 "codecs/g711/audio_decoder_pcm.h", 213 "codecs/g711/audio_decoder_pcm.h",
242 "codecs/g711/audio_encoder_pcm.cc", 214 "codecs/g711/audio_encoder_pcm.cc",
243 "codecs/g711/audio_encoder_pcm.h", 215 "codecs/g711/audio_encoder_pcm.h",
244 ] 216 ]
245 217
246 public_configs = [ ":g711_config" ] 218 public_configs = [ ":g711_config" ]
247 219
248 deps = [ 220 deps = [
249 ":audio_decoder_interface",
250 ":audio_encoder_interface", 221 ":audio_encoder_interface",
222 ":legacy_encoded_audio_frame",
251 "../..:webrtc_common", 223 "../..:webrtc_common",
224 "../../api/audio_codecs:audio_codecs_api",
252 "../../base:rtc_base_approved", 225 "../../base:rtc_base_approved",
253 ] 226 ]
254 public_deps = [ 227 public_deps = [
255 ":g711_c", 228 ":g711_c",
256 ] 229 ]
257 } 230 }
258 231
259 rtc_source_set("g711_c") { 232 rtc_source_set("g711_c") {
260 visibility = [ ":*" ] # Only targets in this file can depend on this. 233 visibility = [ ":*" ] # Only targets in this file can depend on this.
261 sources = [ 234 sources = [
(...skipping 18 matching lines...) Expand all
280 sources = [ 253 sources = [
281 "codecs/g722/audio_decoder_g722.cc", 254 "codecs/g722/audio_decoder_g722.cc",
282 "codecs/g722/audio_decoder_g722.h", 255 "codecs/g722/audio_decoder_g722.h",
283 "codecs/g722/audio_encoder_g722.cc", 256 "codecs/g722/audio_encoder_g722.cc",
284 "codecs/g722/audio_encoder_g722.h", 257 "codecs/g722/audio_encoder_g722.h",
285 ] 258 ]
286 259
287 public_configs = [ ":g722_config" ] 260 public_configs = [ ":g722_config" ]
288 261
289 deps = [ 262 deps = [
290 ":audio_decoder_interface",
291 ":audio_encoder_interface", 263 ":audio_encoder_interface",
264 ":legacy_encoded_audio_frame",
292 "../..:webrtc_common", 265 "../..:webrtc_common",
266 "../../api/audio_codecs:audio_codecs_api",
293 "../../base:rtc_base_approved", 267 "../../base:rtc_base_approved",
294 ] 268 ]
295 public_deps = [ 269 public_deps = [
296 ":g722_c", 270 ":g722_c",
297 ] 271 ]
298 } 272 }
299 273
300 rtc_source_set("g722_c") { 274 rtc_source_set("g722_c") {
301 visibility = [ ":*" ] # Only targets in this file can depend on this. 275 visibility = [ ":*" ] # Only targets in this file can depend on this.
302 sources = [ 276 sources = [
(...skipping 19 matching lines...) Expand all
322 sources = [ 296 sources = [
323 "codecs/ilbc/audio_decoder_ilbc.cc", 297 "codecs/ilbc/audio_decoder_ilbc.cc",
324 "codecs/ilbc/audio_decoder_ilbc.h", 298 "codecs/ilbc/audio_decoder_ilbc.h",
325 "codecs/ilbc/audio_encoder_ilbc.cc", 299 "codecs/ilbc/audio_encoder_ilbc.cc",
326 "codecs/ilbc/audio_encoder_ilbc.h", 300 "codecs/ilbc/audio_encoder_ilbc.h",
327 ] 301 ]
328 302
329 public_configs = [ ":ilbc_config" ] 303 public_configs = [ ":ilbc_config" ]
330 304
331 deps = [ 305 deps = [
332 ":audio_decoder_interface",
333 ":audio_encoder_interface", 306 ":audio_encoder_interface",
307 ":legacy_encoded_audio_frame",
334 "../..:webrtc_common", 308 "../..:webrtc_common",
309 "../../api/audio_codecs:audio_codecs_api",
335 "../../base:rtc_base_approved", 310 "../../base:rtc_base_approved",
336 "../../common_audio", 311 "../../common_audio",
337 ] 312 ]
338 public_deps = [ 313 public_deps = [
339 ":ilbc_c", 314 ":ilbc_c",
340 ] 315 ]
341 } 316 }
342 317
343 rtc_source_set("ilbc_c") { 318 rtc_source_set("ilbc_c") {
344 visibility = [ ":*" ] # Only targets in this file can depend on this. 319 visibility = [ ":*" ] # Only targets in this file can depend on this.
(...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after
480 "codecs/ilbc/vq4.h", 455 "codecs/ilbc/vq4.h",
481 "codecs/ilbc/window32_w32.c", 456 "codecs/ilbc/window32_w32.c",
482 "codecs/ilbc/window32_w32.h", 457 "codecs/ilbc/window32_w32.h",
483 "codecs/ilbc/xcorr_coef.c", 458 "codecs/ilbc/xcorr_coef.c",
484 "codecs/ilbc/xcorr_coef.h", 459 "codecs/ilbc/xcorr_coef.h",
485 ] 460 ]
486 461
487 public_configs = [ ":ilbc_config" ] 462 public_configs = [ ":ilbc_config" ]
488 463
489 deps = [ 464 deps = [
490 ":audio_decoder_interface",
491 ":audio_encoder_interface", 465 ":audio_encoder_interface",
492 "../..:webrtc_common", 466 "../..:webrtc_common",
467 "../../api/audio_codecs:audio_codecs_api",
493 "../../base:rtc_base_approved", 468 "../../base:rtc_base_approved",
494 "../../common_audio", 469 "../../common_audio",
495 ] 470 ]
496 } 471 }
497 472
498 rtc_static_library("isac_common") { 473 rtc_static_library("isac_common") {
499 sources = [ 474 sources = [
500 "codecs/isac/audio_encoder_isac_t.h", 475 "codecs/isac/audio_encoder_isac_t.h",
501 "codecs/isac/audio_encoder_isac_t_impl.h", 476 "codecs/isac/audio_encoder_isac_t_impl.h",
502 "codecs/isac/locked_bandwidth_info.cc", 477 "codecs/isac/locked_bandwidth_info.cc",
(...skipping 15 matching lines...) Expand all
518 493
519 rtc_static_library("isac") { 494 rtc_static_library("isac") {
520 sources = [ 495 sources = [
521 "codecs/isac/main/include/audio_decoder_isac.h", 496 "codecs/isac/main/include/audio_decoder_isac.h",
522 "codecs/isac/main/include/audio_encoder_isac.h", 497 "codecs/isac/main/include/audio_encoder_isac.h",
523 "codecs/isac/main/source/audio_decoder_isac.cc", 498 "codecs/isac/main/source/audio_decoder_isac.cc",
524 "codecs/isac/main/source/audio_encoder_isac.cc", 499 "codecs/isac/main/source/audio_encoder_isac.cc",
525 ] 500 ]
526 501
527 deps = [ 502 deps = [
528 ":audio_decoder_interface",
529 ":audio_encoder_interface", 503 ":audio_encoder_interface",
530 ":isac_common", 504 ":isac_common",
505 "../../api/audio_codecs:audio_codecs_api",
531 ] 506 ]
532 public_deps = [ 507 public_deps = [
533 ":isac_c", 508 ":isac_c",
534 ] 509 ]
535 } 510 }
536 511
537 rtc_static_library("isac_c") { 512 rtc_static_library("isac_c") {
538 visibility = [ ":*" ] # Only targets in this file can depend on this. 513 visibility = [ ":*" ] # Only targets in this file can depend on this.
539 sources = [ 514 sources = [
540 "codecs/isac/main/include/isac.h", 515 "codecs/isac/main/include/isac.h",
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
612 587
613 rtc_static_library("isac_fix") { 588 rtc_static_library("isac_fix") {
614 sources = [ 589 sources = [
615 "codecs/isac/fix/source/audio_decoder_isacfix.cc", 590 "codecs/isac/fix/source/audio_decoder_isacfix.cc",
616 "codecs/isac/fix/source/audio_encoder_isacfix.cc", 591 "codecs/isac/fix/source/audio_encoder_isacfix.cc",
617 ] 592 ]
618 593
619 public_configs = [ ":isac_fix_config" ] 594 public_configs = [ ":isac_fix_config" ]
620 595
621 deps = [ 596 deps = [
622 ":audio_decoder_interface",
623 ":audio_encoder_interface", 597 ":audio_encoder_interface",
624 ":isac_common", 598 ":isac_common",
599 "../../api/audio_codecs:audio_codecs_api",
625 "../../common_audio", 600 "../../common_audio",
626 "../../system_wrappers", 601 "../../system_wrappers",
627 ] 602 ]
628 public_deps = [ 603 public_deps = [
629 ":isac_fix_c", 604 ":isac_fix_c",
630 ] 605 ]
631 606
632 if (rtc_build_with_neon) { 607 if (rtc_build_with_neon) {
633 deps += [ ":isac_neon" ] 608 deps += [ ":isac_neon" ]
634 } 609 }
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
688 "codecs/isac/fix/source/spectrum_ar_model_tables.c", 663 "codecs/isac/fix/source/spectrum_ar_model_tables.c",
689 "codecs/isac/fix/source/spectrum_ar_model_tables.h", 664 "codecs/isac/fix/source/spectrum_ar_model_tables.h",
690 "codecs/isac/fix/source/structs.h", 665 "codecs/isac/fix/source/structs.h",
691 "codecs/isac/fix/source/transform.c", 666 "codecs/isac/fix/source/transform.c",
692 "codecs/isac/fix/source/transform_tables.c", 667 "codecs/isac/fix/source/transform_tables.c",
693 ] 668 ]
694 669
695 public_configs = [ ":isac_fix_config" ] 670 public_configs = [ ":isac_fix_config" ]
696 671
697 deps = [ 672 deps = [
698 ":audio_decoder_interface",
699 ":audio_encoder_interface", 673 ":audio_encoder_interface",
700 ":isac_common", 674 ":isac_common",
701 "../..:webrtc_common", 675 "../..:webrtc_common",
676 "../../api/audio_codecs:audio_codecs_api",
702 "../../base:rtc_base_approved", 677 "../../base:rtc_base_approved",
703 "../../common_audio", 678 "../../common_audio",
704 "../../system_wrappers", 679 "../../system_wrappers",
705 ] 680 ]
706 681
707 public_deps = [ 682 public_deps = [
708 ":isac_fix_common", 683 ":isac_fix_common",
709 ] 684 ]
710 685
711 if (rtc_build_with_neon) { 686 if (rtc_build_with_neon) {
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
792 767
793 rtc_static_library("pcm16b") { 768 rtc_static_library("pcm16b") {
794 sources = [ 769 sources = [
795 "codecs/pcm16b/audio_decoder_pcm16b.cc", 770 "codecs/pcm16b/audio_decoder_pcm16b.cc",
796 "codecs/pcm16b/audio_decoder_pcm16b.h", 771 "codecs/pcm16b/audio_decoder_pcm16b.h",
797 "codecs/pcm16b/audio_encoder_pcm16b.cc", 772 "codecs/pcm16b/audio_encoder_pcm16b.cc",
798 "codecs/pcm16b/audio_encoder_pcm16b.h", 773 "codecs/pcm16b/audio_encoder_pcm16b.h",
799 ] 774 ]
800 775
801 deps = [ 776 deps = [
802 ":audio_decoder_interface",
803 ":audio_encoder_interface", 777 ":audio_encoder_interface",
804 ":g711", 778 ":g711",
779 ":legacy_encoded_audio_frame",
805 "../..:webrtc_common", 780 "../..:webrtc_common",
781 "../../api/audio_codecs:audio_codecs_api",
806 "../../base:rtc_base_approved", 782 "../../base:rtc_base_approved",
807 ] 783 ]
808 public_deps = [ 784 public_deps = [
809 ":pcm16b_c", 785 ":pcm16b_c",
810 ] 786 ]
811 public_configs = [ ":pcm16b_config" ] 787 public_configs = [ ":pcm16b_config" ]
812 } 788 }
813 789
814 rtc_source_set("pcm16b_c") { 790 rtc_source_set("pcm16b_c") {
815 visibility = [ ":*" ] # Only targets in this file can depend on this. 791 visibility = [ ":*" ] # Only targets in this file can depend on this.
(...skipping 14 matching lines...) Expand all
830 806
831 rtc_static_library("webrtc_opus") { 807 rtc_static_library("webrtc_opus") {
832 sources = [ 808 sources = [
833 "codecs/opus/audio_decoder_opus.cc", 809 "codecs/opus/audio_decoder_opus.cc",
834 "codecs/opus/audio_decoder_opus.h", 810 "codecs/opus/audio_decoder_opus.h",
835 "codecs/opus/audio_encoder_opus.cc", 811 "codecs/opus/audio_encoder_opus.cc",
836 "codecs/opus/audio_encoder_opus.h", 812 "codecs/opus/audio_encoder_opus.h",
837 ] 813 ]
838 814
839 deps = [ 815 deps = [
840 ":audio_decoder_interface",
841 ":audio_encoder_interface", 816 ":audio_encoder_interface",
842 ":audio_network_adaptor", 817 ":audio_network_adaptor",
843 "../..:webrtc_common", 818 "../..:webrtc_common",
819 "../../api/audio_codecs:audio_codecs_api",
844 "../../base:rtc_base_approved", 820 "../../base:rtc_base_approved",
845 "../../base:rtc_numerics", 821 "../../base:rtc_numerics",
846 "../../common_audio", 822 "../../common_audio",
847 "../../system_wrappers", 823 "../../system_wrappers",
848 ] 824 ]
849 public_deps = [ 825 public_deps = [
850 ":webrtc_opus_c", 826 ":webrtc_opus_c",
851 ] 827 ]
852 828
853 defines = audio_codec_defines 829 defines = audio_codec_defines
(...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after
1024 "neteq/sync_buffer.h", 1000 "neteq/sync_buffer.h",
1025 "neteq/tick_timer.cc", 1001 "neteq/tick_timer.cc",
1026 "neteq/tick_timer.h", 1002 "neteq/tick_timer.h",
1027 "neteq/time_stretch.cc", 1003 "neteq/time_stretch.cc",
1028 "neteq/time_stretch.h", 1004 "neteq/time_stretch.h",
1029 "neteq/timestamp_scaler.cc", 1005 "neteq/timestamp_scaler.cc",
1030 "neteq/timestamp_scaler.h", 1006 "neteq/timestamp_scaler.h",
1031 ] 1007 ]
1032 1008
1033 deps = [ 1009 deps = [
1034 ":audio_decoder_factory_interface",
1035 ":audio_decoder_interface",
1036 ":audio_format",
1037 ":builtin_audio_decoder_factory",
1038 ":cng", 1010 ":cng",
1039 ":g711", 1011 ":g711",
1040 ":isac_fix", 1012 ":isac_fix",
1041 ":pcm16b", 1013 ":pcm16b",
1042 ":rent_a_codec", 1014 ":rent_a_codec",
1043 "../..:webrtc_common", 1015 "../..:webrtc_common",
1016 "../../api/audio_codecs:audio_codecs_api",
1044 "../../base:gtest_prod", 1017 "../../base:gtest_prod",
1045 "../../base:rtc_base_approved", 1018 "../../base:rtc_base_approved",
1046 "../../common_audio", 1019 "../../common_audio",
1047 "../../system_wrappers", 1020 "../../system_wrappers",
1048 ] 1021 ]
1049 1022
1050 defines = [] 1023 defines = []
1051 1024
1052 if (rtc_include_ilbc) { 1025 if (rtc_include_ilbc) {
1053 defines += [ "WEBRTC_CODEC_ILBC" ] 1026 defines += [ "WEBRTC_CODEC_ILBC" ]
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
1088 "neteq/tools/neteq_test.h", 1061 "neteq/tools/neteq_test.h",
1089 ] 1062 ]
1090 1063
1091 if (!build_with_chromium && is_clang) { 1064 if (!build_with_chromium && is_clang) {
1092 # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). 1065 # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
1093 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] 1066 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
1094 } 1067 }
1095 1068
1096 deps = [ 1069 deps = [
1097 ":audio_encoder_interface", 1070 ":audio_encoder_interface",
1098 ":builtin_audio_decoder_factory",
1099 ":neteq", 1071 ":neteq",
1100 "../..:webrtc_common", 1072 "../..:webrtc_common",
1073 "../../api/audio_codecs:builtin_audio_decoder_factory",
1101 "../../base:rtc_base_approved", 1074 "../../base:rtc_base_approved",
1102 ] 1075 ]
1103 } 1076 }
1104 1077
1105 if (rtc_include_tests) { 1078 if (rtc_include_tests) {
1106 group("audio_coding_tests") { 1079 group("audio_coding_tests") {
1107 testonly = true 1080 testonly = true
1108 public_deps = [ 1081 public_deps = [
1109 ":RTPchange", 1082 ":RTPchange",
1110 ":RTPencode", 1083 ":RTPencode",
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
1154 "test/Tester.cc", 1127 "test/Tester.cc",
1155 "test/TwoWayCommunication.cc", 1128 "test/TwoWayCommunication.cc",
1156 "test/iSACTest.cc", 1129 "test/iSACTest.cc",
1157 "test/opus_test.cc", 1130 "test/opus_test.cc",
1158 "test/target_delay_unittest.cc", 1131 "test/target_delay_unittest.cc",
1159 "test/utility.cc", 1132 "test/utility.cc",
1160 ] 1133 ]
1161 deps = [ 1134 deps = [
1162 ":audio_coding", 1135 ":audio_coding",
1163 ":audio_format_conversion", 1136 ":audio_format_conversion",
1164 ":builtin_audio_decoder_factory",
1165 ":pcm16b_c", 1137 ":pcm16b_c",
1166 "../..:webrtc_common", 1138 "../..:webrtc_common",
1139 "../../api/audio_codecs:builtin_audio_decoder_factory",
1167 "../../base:rtc_base_approved", 1140 "../../base:rtc_base_approved",
1168 "../../system_wrappers:system_wrappers", 1141 "../../system_wrappers:system_wrappers",
1169 "../../test:fileutils", 1142 "../../test:fileutils",
1170 "../../test:test_support", 1143 "../../test:test_support",
1171 ] 1144 ]
1172 defines = audio_coding_defines 1145 defines = audio_coding_defines
1173 if (is_win) { 1146 if (is_win) {
1174 cflags = [ 1147 cflags = [
1175 # TODO(kjellander): bugs.webrtc.org/261: Fix this warning. 1148 # TODO(kjellander): bugs.webrtc.org/261: Fix this warning.
1176 "/wd4373", # virtual function override. 1149 "/wd4373", # virtual function override.
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
1208 sources = [ 1181 sources = [
1209 "acm2/acm_receive_test.cc", 1182 "acm2/acm_receive_test.cc",
1210 "acm2/acm_receive_test.h", 1183 "acm2/acm_receive_test.h",
1211 ] 1184 ]
1212 1185
1213 defines = audio_coding_defines 1186 defines = audio_coding_defines
1214 1187
1215 deps = audio_coding_deps + [ 1188 deps = audio_coding_deps + [
1216 ":audio_coding", 1189 ":audio_coding",
1217 ":audio_format_conversion", 1190 ":audio_format_conversion",
1218 ":audio_decoder_factory_interface", 1191 "../../api/audio_codecs:audio_codecs_api",
1219 ":builtin_audio_decoder_factory", 1192 "../../api/audio_codecs:builtin_audio_decoder_factory",
1220 ":neteq_unittest_tools", 1193 ":neteq_unittest_tools",
1221 "../../base:rtc_base_approved", 1194 "../../base:rtc_base_approved",
1222 "../../test:test_support", 1195 "../../test:test_support",
1223 "//testing/gtest", 1196 "//testing/gtest",
1224 ] 1197 ]
1225 } 1198 }
1226 1199
1227 rtc_source_set("acm_send_test") { 1200 rtc_source_set("acm_send_test") {
1228 testonly = true 1201 testonly = true
1229 sources = [ 1202 sources = [
1230 "acm2/acm_send_test.cc", 1203 "acm2/acm_send_test.cc",
1231 "acm2/acm_send_test.h", 1204 "acm2/acm_send_test.h",
1232 ] 1205 ]
1233 1206
1234 defines = audio_coding_defines 1207 defines = audio_coding_defines
1235 1208
1236 deps = audio_coding_deps + [ 1209 deps = audio_coding_deps + [
1237 ":audio_coding", 1210 ":audio_coding",
1238 ":audio_decoder_interface", 1211 "../../api/audio_codecs:audio_codecs_api",
1239 ":audio_encoder_interface", 1212 ":audio_encoder_interface",
1240 ":neteq_unittest_tools", 1213 ":neteq_unittest_tools",
1241 "../../base:rtc_base_approved", 1214 "../../base:rtc_base_approved",
1242 "../../test:test_support", 1215 "../../test:test_support",
1243 "//testing/gtest", 1216 "//testing/gtest",
1244 ] 1217 ]
1245 } 1218 }
1246 1219
1247 rtc_executable("delay_test") { 1220 rtc_executable("delay_test") {
1248 testonly = true 1221 testonly = true
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
1317 # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). 1290 # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
1318 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] 1291 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
1319 } 1292 }
1320 1293
1321 deps = [] 1294 deps = []
1322 1295
1323 defines = neteq_defines 1296 defines = neteq_defines
1324 1297
1325 deps += audio_coding_deps 1298 deps += audio_coding_deps
1326 deps += [ 1299 deps += [
1327 ":audio_decoder_interface",
1328 ":ilbc", 1300 ":ilbc",
1329 ":isac", 1301 ":isac",
1330 ":isac_fix", 1302 ":isac_fix",
1331 ":neteq", 1303 ":neteq",
1332 ":neteq_unittest_tools", 1304 ":neteq_unittest_tools",
1305 "../../api/audio_codecs:audio_codecs_api",
1333 "../../common_audio", 1306 "../../common_audio",
1334 "../../test:test_main", 1307 "../../test:test_main",
1335 "//testing/gtest", 1308 "//testing/gtest",
1336 ] 1309 ]
1337 1310
1338 data = audio_decoder_unittests_resources 1311 data = audio_decoder_unittests_resources
1339 1312
1340 if (is_android) { 1313 if (is_android) {
1341 deps += [ "//testing/android/native_test:native_test_native_code" ] 1314 deps += [ "//testing/android/native_test:native_test_native_code" ]
1342 shard_timeout = 900 1315 shard_timeout = 900
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
1453 "neteq/tools/neteq_performance_test.cc", 1426 "neteq/tools/neteq_performance_test.cc",
1454 "neteq/tools/neteq_performance_test.h", 1427 "neteq/tools/neteq_performance_test.h",
1455 ] 1428 ]
1456 1429
1457 if (!build_with_chromium && is_clang) { 1430 if (!build_with_chromium && is_clang) {
1458 # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). 1431 # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
1459 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] 1432 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
1460 } 1433 }
1461 1434
1462 deps = [ 1435 deps = [
1463 ":audio_decoder_interface",
1464 ":builtin_audio_decoder_factory",
1465 ":neteq", 1436 ":neteq",
1466 ":neteq_unittest_tools", 1437 ":neteq_unittest_tools",
1467 ":pcm16b", 1438 ":pcm16b",
1468 "../..:webrtc_common", 1439 "../..:webrtc_common",
1440 "../../api/audio_codecs:audio_codecs_api",
1441 "../../api/audio_codecs:builtin_audio_decoder_factory",
1469 "../../base:rtc_base_approved", 1442 "../../base:rtc_base_approved",
1470 "../../system_wrappers", 1443 "../../system_wrappers",
1471 "../../test:test_support", 1444 "../../test:test_support",
1472 "//testing/gtest", 1445 "//testing/gtest",
1473 ] 1446 ]
1474 } 1447 }
1475 1448
1476 rtc_source_set("neteq_quality_test_support") { 1449 rtc_source_set("neteq_quality_test_support") {
1477 testonly = true 1450 testonly = true
1478 sources = [ 1451 sources = [
1479 "neteq/tools/neteq_quality_test.cc", 1452 "neteq/tools/neteq_quality_test.cc",
1480 "neteq/tools/neteq_quality_test.h", 1453 "neteq/tools/neteq_quality_test.h",
1481 ] 1454 ]
1482 1455
1483 if (!build_with_chromium && is_clang) { 1456 if (!build_with_chromium && is_clang) {
1484 # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). 1457 # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
1485 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] 1458 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
1486 } 1459 }
1487 1460
1488 deps = [ 1461 deps = [
1489 ":builtin_audio_decoder_factory",
1490 ":neteq", 1462 ":neteq",
1491 ":neteq_unittest_tools", 1463 ":neteq_unittest_tools",
1492 "../..:webrtc_common", 1464 "../..:webrtc_common",
1465 "../../api/audio_codecs:builtin_audio_decoder_factory",
1493 "../../base:rtc_base_approved", 1466 "../../base:rtc_base_approved",
1494 "../../test:test_support", 1467 "../../test:test_support",
1495 "//testing/gtest", 1468 "//testing/gtest",
1496 "//third_party/gflags", 1469 "//third_party/gflags",
1497 ] 1470 ]
1498 } 1471 }
1499 1472
1500 config("neteq_unittest_tools_config") { 1473 config("neteq_unittest_tools_config") {
1501 include_dirs = [ "tools" ] 1474 include_dirs = [ "tools" ]
1502 } 1475 }
(...skipping 30 matching lines...) Expand all
1533 ] 1506 ]
1534 1507
1535 public_configs = [ ":neteq_unittest_tools_config" ] 1508 public_configs = [ ":neteq_unittest_tools_config" ]
1536 1509
1537 if (!build_with_chromium && is_clang) { 1510 if (!build_with_chromium && is_clang) {
1538 # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). 1511 # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
1539 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] 1512 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
1540 } 1513 }
1541 1514
1542 deps = [ 1515 deps = [
1543 ":audio_decoder_interface",
1544 ":audio_encoder_interface", 1516 ":audio_encoder_interface",
1545 ":pcm16b", 1517 ":pcm16b",
1546 "../..:webrtc_common", 1518 "../..:webrtc_common",
1519 "../../api/audio_codecs:audio_codecs_api",
1547 "../../base:rtc_base_approved", 1520 "../../base:rtc_base_approved",
1548 "../../common_audio", 1521 "../../common_audio",
1549 "../../test:rtp_test_utils", 1522 "../../test:rtp_test_utils",
1550 "../rtp_rtcp", 1523 "../rtp_rtcp",
1551 ] 1524 ]
1552 1525
1553 public_deps = [ 1526 public_deps = [
1554 ":neteq_test_minimal", 1527 ":neteq_test_minimal",
1555 ] 1528 ]
1556 1529
(...skipping 435 matching lines...) Expand 10 before | Expand all | Expand 10 after
1992 "audio_network_adaptor/audio_network_adaptor_impl_unittest.cc", 1965 "audio_network_adaptor/audio_network_adaptor_impl_unittest.cc",
1993 "audio_network_adaptor/bitrate_controller_unittest.cc", 1966 "audio_network_adaptor/bitrate_controller_unittest.cc",
1994 "audio_network_adaptor/channel_controller_unittest.cc", 1967 "audio_network_adaptor/channel_controller_unittest.cc",
1995 "audio_network_adaptor/controller_manager_unittest.cc", 1968 "audio_network_adaptor/controller_manager_unittest.cc",
1996 "audio_network_adaptor/dtx_controller_unittest.cc", 1969 "audio_network_adaptor/dtx_controller_unittest.cc",
1997 "audio_network_adaptor/event_log_writer_unittest.cc", 1970 "audio_network_adaptor/event_log_writer_unittest.cc",
1998 "audio_network_adaptor/fec_controller_unittest.cc", 1971 "audio_network_adaptor/fec_controller_unittest.cc",
1999 "audio_network_adaptor/frame_length_controller_unittest.cc", 1972 "audio_network_adaptor/frame_length_controller_unittest.cc",
2000 "audio_network_adaptor/mock/mock_controller.h", 1973 "audio_network_adaptor/mock/mock_controller.h",
2001 "audio_network_adaptor/mock/mock_controller_manager.h", 1974 "audio_network_adaptor/mock/mock_controller_manager.h",
2002 "codecs/audio_decoder_factory_unittest.cc", 1975 "codecs/builtin_audio_decoder_factory_unittest.cc",
2003 "codecs/cng/audio_encoder_cng_unittest.cc", 1976 "codecs/cng/audio_encoder_cng_unittest.cc",
2004 "codecs/cng/cng_unittest.cc", 1977 "codecs/cng/cng_unittest.cc",
2005 "codecs/ilbc/ilbc_unittest.cc", 1978 "codecs/ilbc/ilbc_unittest.cc",
2006 "codecs/isac/fix/source/filterbanks_unittest.cc", 1979 "codecs/isac/fix/source/filterbanks_unittest.cc",
2007 "codecs/isac/fix/source/filters_unittest.cc", 1980 "codecs/isac/fix/source/filters_unittest.cc",
2008 "codecs/isac/fix/source/lpc_masking_model_unittest.cc", 1981 "codecs/isac/fix/source/lpc_masking_model_unittest.cc",
2009 "codecs/isac/fix/source/transform_unittest.cc", 1982 "codecs/isac/fix/source/transform_unittest.cc",
2010 "codecs/isac/main/source/audio_encoder_isac_unittest.cc", 1983 "codecs/isac/main/source/audio_encoder_isac_unittest.cc",
2011 "codecs/isac/main/source/isac_unittest.cc", 1984 "codecs/isac/main/source/isac_unittest.cc",
2012 "codecs/isac/unittest.cc", 1985 "codecs/isac/unittest.cc",
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
2056 "neteq/time_stretch_unittest.cc", 2029 "neteq/time_stretch_unittest.cc",
2057 "neteq/timestamp_scaler_unittest.cc", 2030 "neteq/timestamp_scaler_unittest.cc",
2058 "neteq/tools/input_audio_file_unittest.cc", 2031 "neteq/tools/input_audio_file_unittest.cc",
2059 "neteq/tools/packet_unittest.cc", 2032 "neteq/tools/packet_unittest.cc",
2060 ] 2033 ]
2061 2034
2062 deps = [ 2035 deps = [
2063 ":acm_receive_test", 2036 ":acm_receive_test",
2064 ":acm_send_test", 2037 ":acm_send_test",
2065 ":audio_coding", 2038 ":audio_coding",
2066 ":audio_decoder_interface",
2067 ":audio_encoder_interface", 2039 ":audio_encoder_interface",
2068 ":audio_format_conversion", 2040 ":audio_format_conversion",
2069 ":audio_network_adaptor", 2041 ":audio_network_adaptor",
2070 ":builtin_audio_decoder_factory",
2071 ":cng", 2042 ":cng",
2072 ":g711", 2043 ":g711",
2073 ":ilbc", 2044 ":ilbc",
2074 ":isac", 2045 ":isac",
2075 ":isac_c", 2046 ":isac_c",
2076 ":isac_fix", 2047 ":isac_fix",
2048 ":legacy_encoded_audio_frame",
2077 ":neteq", 2049 ":neteq",
2078 ":neteq_test_support", 2050 ":neteq_test_support",
2079 ":neteq_unittest_tools", 2051 ":neteq_unittest_tools",
2080 ":pcm16b", 2052 ":pcm16b",
2081 ":red", 2053 ":red",
2082 ":rent_a_codec", 2054 ":rent_a_codec",
2083 ":webrtc_opus", 2055 ":webrtc_opus",
2084 "../..:webrtc_common", 2056 "../..:webrtc_common",
2057 "../../api/audio_codecs:audio_codecs_api",
2058 "../../api/audio_codecs:builtin_audio_decoder_factory",
2085 "../../base:rtc_base", 2059 "../../base:rtc_base",
2086 "../../base:rtc_base_approved", 2060 "../../base:rtc_base_approved",
2087 "../../base:rtc_base_tests_utils", 2061 "../../base:rtc_base_tests_utils",
2088 "../../common_audio", 2062 "../../common_audio",
2089 "../../system_wrappers:system_wrappers", 2063 "../../system_wrappers:system_wrappers",
2090 "../../test:field_trial", 2064 "../../test:field_trial",
2091 "../../test:rtp_test_utils", 2065 "../../test:rtp_test_utils",
2092 "../../test:test_common", 2066 "../../test:test_common",
2093 "../../test:test_support", 2067 "../../test:test_support",
2094 "//testing/gmock", 2068 "//testing/gmock",
(...skipping 13 matching lines...) Expand all
2108 ":neteq_unittest_proto", 2082 ":neteq_unittest_proto",
2109 ] 2083 ]
2110 } 2084 }
2111 2085
2112 if (!build_with_chromium && is_clang) { 2086 if (!build_with_chromium && is_clang) {
2113 # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). 2087 # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
2114 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] 2088 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
2115 } 2089 }
2116 } 2090 }
2117 } 2091 }
2092
2093 # For backwards compatibility only! Use
2094 # webrtc/api/audio_codecs:audio_codecs_api instead.
2095 # TODO(kwiberg): Remove this.
2096 rtc_source_set("audio_decoder_interface") {
2097 sources = [
2098 "codecs/audio_decoder.h",
2099 ]
2100 deps = [
2101 "../../api/audio_codecs:audio_codecs_api",
2102 ]
2103 }
2104
2105 # For backwards compatibility only! Use
2106 # webrtc/api/audio_codecs:builtin_audio_decoder_factory instead.
2107 # TODO(kwiberg): Remove this.
2108 rtc_source_set("builtin_audio_decoder_factory") {
2109 sources = [
2110 "codecs/builtin_audio_decoder_factory.h",
2111 ]
2112 deps = [
2113 "../../api/audio_codecs:builtin_audio_decoder_factory",
2114 ]
2115 }
OLDNEW
« no previous file with comments | « webrtc/media/engine/webrtcvoiceengine_unittest.cc ('k') | webrtc/modules/audio_coding/acm2/acm_receive_test.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698