OLD | NEW |
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 config("audio_conference_mixer_config") { | 9 config("audio_conference_mixer_config") { |
10 visibility = [ ":*" ] # Only targets in this file can depend on this. | 10 visibility = [ ":*" ] # Only targets in this file can depend on this. |
11 include_dirs = [ | 11 include_dirs = [ |
12 "include", | 12 "include", |
13 "../include", | 13 "../../modules/include", |
14 ] | 14 ] |
15 } | 15 } |
16 | 16 |
| 17 source_set("audio_mixer") { |
| 18 sources = [ |
| 19 "audio_mixer.cc", |
| 20 "audio_mixer.h", |
| 21 ] |
| 22 deps = [ |
| 23 ":audio_conference_mixer", |
| 24 ] |
| 25 |
| 26 if (is_win) { |
| 27 defines = [ "WEBRTC_DRIFT_COMPENSATION_SUPPORTED" ] |
| 28 |
| 29 cflags = [ |
| 30 # TODO(kjellander): Bug 261: fix this warning. |
| 31 "/wd4373", # virtual function override. |
| 32 ] |
| 33 } |
| 34 |
| 35 configs += [ "../..:common_config" ] |
| 36 public_configs = [ "../..:common_inherited_config" ] |
| 37 |
| 38 if (is_clang) { |
| 39 # Suppress warnings from Chrome's Clang plugins. |
| 40 # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. |
| 41 configs -= [ "//build/config/clang:find_bad_constructs" ] |
| 42 } |
| 43 } |
| 44 |
17 source_set("audio_conference_mixer") { | 45 source_set("audio_conference_mixer") { |
18 sources = [ | 46 sources = [ |
19 "include/audio_conference_mixer.h", | 47 "include/audio_conference_mixer.h", |
20 "include/audio_conference_mixer_defines.h", | 48 "include/audio_conference_mixer_defines.h", |
21 "source/audio_conference_mixer_impl.cc", | 49 "source/audio_conference_mixer_impl.cc", |
22 "source/audio_conference_mixer_impl.h", | 50 "source/audio_conference_mixer_impl.h", |
23 "source/audio_frame_manipulator.cc", | |
24 "source/audio_frame_manipulator.h", | |
25 "source/memory_pool.h", | |
26 "source/memory_pool_posix.h", | |
27 "source/memory_pool_win.h", | |
28 "source/time_scheduler.cc", | |
29 "source/time_scheduler.h", | |
30 ] | 51 ] |
31 | 52 |
32 configs += [ "../..:common_config" ] | 53 configs += [ "../..:common_config" ] |
33 | 54 |
34 public_configs = [ | 55 public_configs = [ |
35 "../..:common_inherited_config", | 56 "../..:common_inherited_config", |
36 ":audio_conference_mixer_config", | 57 ":audio_conference_mixer_config", |
37 ] | 58 ] |
38 | 59 |
39 if (is_clang) { | 60 if (is_clang) { |
40 # Suppress warnings from Chrome's Clang plugins. | 61 # Suppress warnings from Chrome's Clang plugins. |
41 # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. | 62 # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. |
42 configs -= [ "//build/config/clang:find_bad_constructs" ] | 63 configs -= [ "//build/config/clang:find_bad_constructs" ] |
43 } | 64 } |
44 | 65 |
45 deps = [ | 66 deps = [ |
| 67 "../../modules/audio_processing", |
| 68 "../../modules/utility", |
46 "../../system_wrappers", | 69 "../../system_wrappers", |
47 "../audio_processing", | |
48 "../utility", | |
49 ] | 70 ] |
50 } | 71 } |
OLD | NEW |