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 import("../../webrtc.gni") | 9 import("../../webrtc.gni") |
10 | 10 |
11 group("audio_mixer") { | 11 group("audio_mixer") { |
12 public_deps = [ | 12 public_deps = [ |
13 ":audio_frame_manipulator", | 13 ":audio_frame_manipulator", |
14 ":audio_mixer_impl", | 14 ":audio_mixer_impl", |
15 ] | 15 ] |
16 } | 16 } |
17 | 17 |
18 rtc_static_library("audio_mixer_impl") { | 18 rtc_static_library("audio_mixer_impl") { |
19 sources = [ | 19 sources = [ |
20 "audio_mixer_impl.cc", | 20 "audio_mixer_impl.cc", |
21 "audio_mixer_impl.h", | 21 "audio_mixer_impl.h", |
22 "default_output_rate_calculator.cc", | 22 "default_output_rate_calculator.cc", |
23 "default_output_rate_calculator.h", | 23 "default_output_rate_calculator.h", |
| 24 "frame_combiner.cc", |
| 25 "frame_combiner.h", |
24 "output_rate_calculator.h", | 26 "output_rate_calculator.h", |
25 ] | 27 ] |
26 | 28 |
27 public = [ | 29 public = [ |
28 "audio_mixer_impl.h", | 30 "audio_mixer_impl.h", |
| 31 "default_output_rate_calculator.h", # For creating a mixer with limiter dis
abled. |
| 32 "frame_combiner.h", |
29 ] | 33 ] |
30 | 34 |
31 public_deps = [ | 35 public_deps = [ |
32 "../../api:audio_mixer_api", | 36 "../../api:audio_mixer_api", |
33 ] | 37 ] |
34 | 38 |
35 deps = [ | 39 deps = [ |
36 ":audio_frame_manipulator", | 40 ":audio_frame_manipulator", |
37 "../..:webrtc_common", | 41 "../..:webrtc_common", |
38 "../../audio/utility:audio_frame_operations", | 42 "../../audio/utility:audio_frame_operations", |
(...skipping 15 matching lines...) Expand all Loading... |
54 ] | 58 ] |
55 | 59 |
56 deps = [ | 60 deps = [ |
57 "../../audio/utility", | 61 "../../audio/utility", |
58 "../../base:rtc_base_approved", | 62 "../../base:rtc_base_approved", |
59 ] | 63 ] |
60 } | 64 } |
61 | 65 |
62 if (rtc_include_tests) { | 66 if (rtc_include_tests) { |
63 rtc_source_set("audio_mixer_unittests") { | 67 rtc_source_set("audio_mixer_unittests") { |
64 # When enabled, fails with error audio_mixer_impl_unittest.cc includes a | |
65 # private header. Fie default_output_rate_calculator.h is private to the | |
66 # target :audio_mixer_impl | |
67 check_includes = false | |
68 testonly = true | 68 testonly = true |
69 sources = [ | 69 sources = [ |
70 "audio_frame_manipulator_unittest.cc", | 70 "audio_frame_manipulator_unittest.cc", |
71 "audio_mixer_impl_unittest.cc", | 71 "audio_mixer_impl_unittest.cc", |
| 72 "frame_combiner_unittest.cc", |
72 ] | 73 ] |
73 deps = [ | 74 deps = [ |
74 ":audio_frame_manipulator", | 75 ":audio_frame_manipulator", |
75 ":audio_mixer_impl", | 76 ":audio_mixer_impl", |
76 "../../api:audio_mixer_api", | 77 "../../api:audio_mixer_api", |
77 "../../base:rtc_base", | 78 "../../base:rtc_base", |
78 "../../base:rtc_base_approved", | 79 "../../base:rtc_base_approved", |
79 "../../test:test_support", | 80 "../../test:test_support", |
80 "//testing/gmock", | 81 "//testing/gmock", |
81 ] | 82 ] |
82 | |
83 # TODO(jschuh): bugs.webrtc.org/1348: fix this warning. | |
84 configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] | |
85 if (!build_with_chromium && is_clang) { | |
86 # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). | |
87 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] | |
88 } | |
89 } | 83 } |
90 } | 84 } |
OLD | NEW |