3e113438b1
One reason for the circular deps is that common_types.h is a historical dumping ground for various structs and defines that are believed to be generally useful. I tried moving things out that did not appear to be used downstream (StreamCounters, RtpCounters etc) and moved the things that seemed used (RtpHeader + supporting structs) to a new file api/rtp_headers.h. This makes their place in the api more clear while moving out the things that don't belong in the API in the first place. I had to extract out typedefs.h from webrtc_common to resolve another circular dependency. I believe checks includes typedefs, but common depends on checks. Bug: webrtc:7745 Change-Id: I725d49616b1ec0cdc8b74be7c078f7a4d46f084b Reviewed-on: https://webrtc-review.googlesource.com/33001 Commit-Queue: Patrik Höglund <phoglund@webrtc.org> Reviewed-by: Karl Wiberg <kwiberg@webrtc.org> Cr-Commit-Position: refs/heads/master@{#21295}
97 lines
2.4 KiB
Plaintext
97 lines
2.4 KiB
Plaintext
# Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
|
|
#
|
|
# Use of this source code is governed by a BSD-style license
|
|
# that can be found in the LICENSE file in the root of the source
|
|
# tree. An additional intellectual property rights grant can be found
|
|
# in the file PATENTS. All contributing project authors may
|
|
# be found in the AUTHORS file in the root of the source tree.
|
|
|
|
import("../../webrtc.gni")
|
|
|
|
group("audio_mixer") {
|
|
deps = [
|
|
":audio_frame_manipulator",
|
|
":audio_mixer_impl",
|
|
]
|
|
}
|
|
|
|
rtc_static_library("audio_mixer_impl") {
|
|
sources = [
|
|
"audio_mixer_impl.cc",
|
|
"audio_mixer_impl.h",
|
|
"default_output_rate_calculator.cc",
|
|
"default_output_rate_calculator.h",
|
|
"frame_combiner.cc",
|
|
"frame_combiner.h",
|
|
"output_rate_calculator.h",
|
|
]
|
|
|
|
public = [
|
|
"audio_mixer_impl.h",
|
|
"default_output_rate_calculator.h", # For creating a mixer with limiter disabled.
|
|
"frame_combiner.h",
|
|
]
|
|
|
|
deps = [
|
|
":audio_frame_manipulator",
|
|
"..:module_api",
|
|
"../..:webrtc_common",
|
|
"../../:typedefs",
|
|
"../../api:array_view",
|
|
"../../api:audio_mixer_api",
|
|
"../../audio/utility:audio_frame_operations",
|
|
"../../rtc_base:checks",
|
|
"../../rtc_base:rtc_base_approved",
|
|
"../../system_wrappers",
|
|
"../audio_processing",
|
|
]
|
|
}
|
|
|
|
rtc_static_library("audio_frame_manipulator") {
|
|
visibility = [
|
|
":*",
|
|
"../../modules:*",
|
|
]
|
|
|
|
sources = [
|
|
"audio_frame_manipulator.cc",
|
|
"audio_frame_manipulator.h",
|
|
]
|
|
|
|
deps = [
|
|
"..:module_api",
|
|
"../../audio/utility:audio_frame_operations",
|
|
"../../rtc_base:checks",
|
|
"../../rtc_base:rtc_base_approved",
|
|
]
|
|
}
|
|
|
|
if (rtc_include_tests) {
|
|
rtc_source_set("audio_mixer_unittests") {
|
|
testonly = true
|
|
|
|
sources = [
|
|
"audio_frame_manipulator_unittest.cc",
|
|
"audio_mixer_impl_unittest.cc",
|
|
"frame_combiner_unittest.cc",
|
|
"gain_change_calculator.cc",
|
|
"gain_change_calculator.h",
|
|
"sine_wave_generator.cc",
|
|
"sine_wave_generator.h",
|
|
]
|
|
deps = [
|
|
":audio_frame_manipulator",
|
|
":audio_mixer_impl",
|
|
"..:module_api",
|
|
"../../api:array_view",
|
|
"../../api:audio_mixer_api",
|
|
"../../audio/utility:audio_frame_operations",
|
|
"../../rtc_base:checks",
|
|
"../../rtc_base:rtc_base_approved",
|
|
"../../rtc_base:rtc_task_queue",
|
|
"../../test:test_support",
|
|
"//testing/gmock",
|
|
]
|
|
}
|
|
}
|