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

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

Issue 2352223002: Revert of Adding BitrateController to audio network adaptor. (Closed)
Patch Set: rebasing Created 4 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 | « no previous file | webrtc/modules/audio_coding/BUILD.gn » ('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) 2016 The WebRTC project authors. All Rights Reserved. 1 # Copyright (c) 2016 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("../build/webrtc.gni") 9 import("../build/webrtc.gni")
10 import("audio_coding/audio_coding.gni") 10 import("audio_coding/audio_coding.gni")
(...skipping 215 matching lines...) Expand 10 before | Expand all | Expand 10 after
226 if (is_ios) { 226 if (is_ios) {
227 bundle_data("modules_unittests_bundle_data") { 227 bundle_data("modules_unittests_bundle_data") {
228 testonly = true 228 testonly = true
229 sources = modules_unittests_resources 229 sources = modules_unittests_resources
230 outputs = [ 230 outputs = [
231 "{{bundle_resources_dir}}/{{source_file_part}}", 231 "{{bundle_resources_dir}}/{{source_file_part}}",
232 ] 232 ]
233 } 233 }
234 } 234 }
235 235
236 rtc_source_set("audio_network_adaptor_unittests") {
237 # Put sources for unittests of audio network adaptor in a separate
238 # rtc_source_set to solve name collision on bitrate_controller_unittest.cc.
239 testonly = true
240 sources = [
241 "audio_coding/audio_network_adaptor/audio_network_adaptor_impl_unittest.cc ",
242 "audio_coding/audio_network_adaptor/bitrate_controller_unittest.cc",
243 "audio_coding/audio_network_adaptor/channel_controller_unittest.cc",
244 "audio_coding/audio_network_adaptor/controller_manager_unittest.cc",
245 "audio_coding/audio_network_adaptor/dtx_controller_unittest.cc",
246 "audio_coding/audio_network_adaptor/mock/mock_controller.h",
247 "audio_coding/audio_network_adaptor/mock/mock_controller_manager.h",
248 "audio_coding/audio_network_adaptor/smoothing_filter_unittest.cc",
249 ]
250 deps = [
251 "audio_coding:audio_network_adaptor",
252 "//testing/gmock",
253 "//testing/gtest",
254 ]
255 if (is_clang) {
256 # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
257 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
258 }
259 }
260
261 rtc_test("modules_unittests") { 236 rtc_test("modules_unittests") {
262 testonly = true 237 testonly = true
263 238
264 defines = audio_coding_defines 239 defines = audio_coding_defines
265 deps = [] 240 deps = []
266 sources = [ 241 sources = [
267 "audio_coding/acm2/acm_receiver_unittest_oldapi.cc", 242 "audio_coding/acm2/acm_receiver_unittest_oldapi.cc",
268 "audio_coding/acm2/audio_coding_module_unittest_oldapi.cc", 243 "audio_coding/acm2/audio_coding_module_unittest_oldapi.cc",
269 "audio_coding/acm2/call_statistics_unittest.cc", 244 "audio_coding/acm2/call_statistics_unittest.cc",
270 "audio_coding/acm2/codec_manager_unittest.cc", 245 "audio_coding/acm2/codec_manager_unittest.cc",
271 "audio_coding/acm2/initial_delay_manager_unittest.cc", 246 "audio_coding/acm2/initial_delay_manager_unittest.cc",
272 "audio_coding/acm2/rent_a_codec_unittest.cc", 247 "audio_coding/acm2/rent_a_codec_unittest.cc",
248 "audio_coding/audio_network_adaptor/audio_network_adaptor_impl_unittest.cc ",
249 "audio_coding/audio_network_adaptor/channel_controller_unittest.cc",
250 "audio_coding/audio_network_adaptor/controller_manager_unittest.cc",
251 "audio_coding/audio_network_adaptor/dtx_controller_unittest.cc",
252 "audio_coding/audio_network_adaptor/mock/mock_controller.h",
253 "audio_coding/audio_network_adaptor/mock/mock_controller_manager.h",
254 "audio_coding/audio_network_adaptor/smoothing_filter_unittest.cc",
273 "audio_coding/codecs/audio_decoder_factory_unittest.cc", 255 "audio_coding/codecs/audio_decoder_factory_unittest.cc",
274 "audio_coding/codecs/cng/audio_encoder_cng_unittest.cc", 256 "audio_coding/codecs/cng/audio_encoder_cng_unittest.cc",
275 "audio_coding/codecs/cng/cng_unittest.cc", 257 "audio_coding/codecs/cng/cng_unittest.cc",
276 "audio_coding/codecs/ilbc/ilbc_unittest.cc", 258 "audio_coding/codecs/ilbc/ilbc_unittest.cc",
277 "audio_coding/codecs/isac/fix/source/filterbanks_unittest.cc", 259 "audio_coding/codecs/isac/fix/source/filterbanks_unittest.cc",
278 "audio_coding/codecs/isac/fix/source/filters_unittest.cc", 260 "audio_coding/codecs/isac/fix/source/filters_unittest.cc",
279 "audio_coding/codecs/isac/fix/source/lpc_masking_model_unittest.cc", 261 "audio_coding/codecs/isac/fix/source/lpc_masking_model_unittest.cc",
280 "audio_coding/codecs/isac/fix/source/transform_unittest.cc", 262 "audio_coding/codecs/isac/fix/source/transform_unittest.cc",
281 "audio_coding/codecs/isac/main/source/audio_encoder_isac_unittest.cc", 263 "audio_coding/codecs/isac/main/source/audio_encoder_isac_unittest.cc",
282 "audio_coding/codecs/isac/main/source/isac_unittest.cc", 264 "audio_coding/codecs/isac/main/source/isac_unittest.cc",
(...skipping 321 matching lines...) Expand 10 before | Expand all | Expand 10 after
604 } 586 }
605 587
606 if (is_win) { 588 if (is_win) {
607 cflags = [ 589 cflags = [
608 # TODO(kjellander): bugs.webrtc.org/261: Fix this warning. 590 # TODO(kjellander): bugs.webrtc.org/261: Fix this warning.
609 "/wd4373", # virtual function override. 591 "/wd4373", # virtual function override.
610 ] 592 ]
611 } 593 }
612 594
613 deps += [ 595 deps += [
614 ":audio_network_adaptor_unittests",
615 "..:webrtc_common", 596 "..:webrtc_common",
616 "../base:rtc_base", # TODO(kjellander): Cleanup in bugs.webrtc.org/3806. 597 "../base:rtc_base", # TODO(kjellander): Cleanup in bugs.webrtc.org/3806.
617 "../common_audio", 598 "../common_audio",
618 "../common_video", 599 "../common_video",
619 "../system_wrappers:system_wrappers", 600 "../system_wrappers:system_wrappers",
620 "../test:rtp_test_utils", 601 "../test:rtp_test_utils",
621 "../test:test_common", 602 "../test:test_common",
622 "../test:test_support_main", 603 "../test:test_support_main",
623 "../test:test_support_main", 604 "../test:test_support_main",
624 "../test:video_test_common", 605 "../test:video_test_common",
625 "audio_coding", 606 "audio_coding",
626 "audio_coding:acm_receive_test", 607 "audio_coding:acm_receive_test",
627 "audio_coding:acm_send_test", 608 "audio_coding:acm_send_test",
609 "audio_coding:audio_network_adaptor",
628 "audio_coding:builtin_audio_decoder_factory", 610 "audio_coding:builtin_audio_decoder_factory",
629 "audio_coding:cng", 611 "audio_coding:cng",
630 "audio_coding:isac_fix", 612 "audio_coding:isac_fix",
631 "audio_coding:neteq", 613 "audio_coding:neteq",
632 "audio_coding:neteq_test_support", 614 "audio_coding:neteq_test_support",
633 "audio_coding:neteq_unittest_tools", 615 "audio_coding:neteq_unittest_tools",
634 "audio_coding:pcm16b", 616 "audio_coding:pcm16b",
635 "audio_coding:red", 617 "audio_coding:red",
636 "audio_coding:webrtc_opus", 618 "audio_coding:webrtc_opus",
637 "audio_conference_mixer", 619 "audio_conference_mixer",
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
688 sources += [ 670 sources += [
689 "audio_device/ios/audio_device_unittest_ios.cc", 671 "audio_device/ios/audio_device_unittest_ios.cc",
690 "audio_device/ios/objc/RTCAudioSessionTest.mm", 672 "audio_device/ios/objc/RTCAudioSessionTest.mm",
691 "video_coding/codecs/h264/h264_video_toolbox_nalu_unittest.cc", 673 "video_coding/codecs/h264/h264_video_toolbox_nalu_unittest.cc",
692 ] 674 ]
693 675
694 ldflags = [ "-ObjC" ] 676 ldflags = [ "-ObjC" ]
695 } 677 }
696 } 678 }
697 } 679 }
OLDNEW
« no previous file with comments | « no previous file | webrtc/modules/audio_coding/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698