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. |
29 ] | 32 ] |
30 | 33 |
31 public_deps = [ | 34 public_deps = [ |
32 "../../api:audio_mixer_api", | 35 "../../api:audio_mixer_api", |
33 ] | 36 ] |
34 | 37 |
35 deps = [ | 38 deps = [ |
36 ":audio_frame_manipulator", | 39 ":audio_frame_manipulator", |
37 "../..:webrtc_common", | 40 "../..:webrtc_common", |
38 "../../audio/utility:audio_frame_operations", | 41 "../../audio/utility:audio_frame_operations", |
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
81 ] | 84 ] |
82 | 85 |
83 # TODO(jschuh): bugs.webrtc.org/1348: fix this warning. | 86 # TODO(jschuh): bugs.webrtc.org/1348: fix this warning. |
84 configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] | 87 configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] |
85 if (!build_with_chromium && is_clang) { | 88 if (!build_with_chromium && is_clang) { |
86 # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). | 89 # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). |
87 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] | 90 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] |
88 } | 91 } |
89 } | 92 } |
90 } | 93 } |
OLD | NEW |