2015-09-25 13:58:30 +02:00
|
|
|
# Copyright (c) 2015 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.
|
|
|
|
|
|
2017-01-24 06:58:22 -08:00
|
|
|
import("../webrtc.gni")
|
2015-09-25 13:58:30 +02:00
|
|
|
|
2016-12-07 04:52:58 -08:00
|
|
|
rtc_source_set("call_interfaces") {
|
|
|
|
|
sources = [
|
|
|
|
|
"audio_receive_stream.h",
|
|
|
|
|
"audio_send_stream.cc",
|
|
|
|
|
"audio_send_stream.h",
|
|
|
|
|
"audio_state.h",
|
|
|
|
|
"call.h",
|
2017-06-15 12:52:32 -07:00
|
|
|
"callfactoryinterface.h",
|
2016-12-19 01:13:46 -08:00
|
|
|
"flexfec_receive_stream.h",
|
2017-01-31 03:58:40 -08:00
|
|
|
"syncable.cc",
|
|
|
|
|
"syncable.h",
|
2016-12-07 04:52:58 -08:00
|
|
|
]
|
2017-02-27 15:57:45 -08:00
|
|
|
deps = [
|
2017-06-01 04:02:35 -07:00
|
|
|
":rtp_interfaces",
|
2017-08-22 05:43:23 -07:00
|
|
|
":video_stream_api",
|
2017-02-27 15:57:45 -08:00
|
|
|
"..:webrtc_common",
|
2017-12-15 14:40:10 +01:00
|
|
|
"../:typedefs",
|
2017-02-27 15:57:45 -08:00
|
|
|
"../api:audio_mixer_api",
|
Reland of Implemented the GetSources() in native code. (patchset #1 id:1 of https://codereview.webrtc.org/2809613002/ )
Reason for revert:
Re-land, reverting did not fix bug.
https://bugs.chromium.org/p/webrtc/issues/detail?id=7465
Original issue's description:
> Revert of Implemented the GetSources() in native code. (patchset #11 id:510001 of https://codereview.webrtc.org/2770233003/ )
>
> Reason for revert:
> Suspected of WebRtcApprtcBrowserTest.MANUAL_WorksOnApprtc breakage, see
>
> https://bugs.chromium.org/p/webrtc/issues/detail?id=7465
>
> Original issue's description:
> > Added the GetSources() to the RtpReceiverInterface and implemented
> > it for the AudioRtpReceiver.
> >
> > This method returns a vector of RtpSource(both CSRC source and SSRC
> > source) which contains the ID of a source, the timestamp, the source
> > type (SSRC or CSRC) and the audio level.
> >
> > The RtpSource objects are buffered and maintained by the
> > RtpReceiver in webrtc/modules/rtp_rtcp/. When the method is called,
> > the info of the contributing source will be pulled along the object
> > chain:
> > AudioRtpReceiver -> VoiceChannel -> WebRtcVoiceMediaChannel ->
> > AudioReceiveStream -> voe::Channel -> RtpRtcp module
> >
> > Spec:https://w3c.github.io/webrtc-pc/archives/20151006/webrtc.html#widl-RTCRtpReceiver-getContributingSources-sequence-RTCRtpContributingSource
> >
> > BUG=chromium:703122
> > TBR=stefan@webrtc.org, danilchap@webrtc.org
> >
> > Review-Url: https://codereview.webrtc.org/2770233003
> > Cr-Commit-Position: refs/heads/master@{#17591}
> > Committed: https://chromium.googlesource.com/external/webrtc/+/292084c3765d9f3ee406ca2ec86eae206b540053
>
> TBR=deadbeef@webrtc.org,solenberg@webrtc.org,hbos@webrtc.org,philipel@webrtc.org,stefan@webrtc.org,danilchap@webrtc.org,zhihuang@webrtc.org
> # Not skipping CQ checks because original CL landed more than 1 days ago.
> BUG=chromium:703122
>
> Review-Url: https://codereview.webrtc.org/2809613002
> Cr-Commit-Position: refs/heads/master@{#17616}
> Committed: https://chromium.googlesource.com/external/webrtc/+/fbcc5cb3869d1370008e40f24fc03ac8fb69c675
TBR=deadbeef@webrtc.org,solenberg@webrtc.org,philipel@webrtc.org,stefan@webrtc.org,danilchap@webrtc.org,zhihuang@webrtc.org,olka@webrtc.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=chromium:703122
Review-Url: https://codereview.webrtc.org/2810623003
Cr-Commit-Position: refs/heads/master@{#17621}
2017-04-10 07:39:05 -07:00
|
|
|
"../api:libjingle_peerconnection_api",
|
2017-09-05 08:43:13 -07:00
|
|
|
"../api:optional",
|
2017-02-27 15:57:45 -08:00
|
|
|
"../api:transport_api",
|
|
|
|
|
"../api/audio_codecs:audio_codecs_api",
|
2017-11-24 17:29:59 +01:00
|
|
|
"../modules/audio_processing:audio_processing_statistics",
|
2017-07-19 10:40:47 -07:00
|
|
|
"../rtc_base:rtc_base",
|
|
|
|
|
"../rtc_base:rtc_base_approved",
|
2017-02-27 15:57:45 -08:00
|
|
|
]
|
2016-12-07 04:52:58 -08:00
|
|
|
}
|
|
|
|
|
|
2017-06-01 04:02:35 -07:00
|
|
|
# TODO(nisse): These RTP targets should be moved elsewhere
|
2017-07-28 10:05:45 -07:00
|
|
|
# when interfaces have stabilized. See also TODO for |mock_rtp_interfaces|.
|
2017-06-01 04:02:35 -07:00
|
|
|
rtc_source_set("rtp_interfaces") {
|
|
|
|
|
sources = [
|
2017-06-26 11:23:54 -07:00
|
|
|
"rtcp_packet_sink_interface.h",
|
2017-09-01 15:29:28 +02:00
|
|
|
"rtp_config.cc",
|
|
|
|
|
"rtp_config.h",
|
2017-06-01 04:02:35 -07:00
|
|
|
"rtp_packet_sink_interface.h",
|
2017-06-21 01:05:22 -07:00
|
|
|
"rtp_stream_receiver_controller_interface.h",
|
2017-06-01 04:02:35 -07:00
|
|
|
"rtp_transport_controller_send_interface.h",
|
|
|
|
|
]
|
2017-06-26 11:23:54 -07:00
|
|
|
deps = [
|
2017-09-04 05:43:17 -07:00
|
|
|
"../api:array_view",
|
2017-07-19 10:40:47 -07:00
|
|
|
"../rtc_base:rtc_base_approved",
|
2017-06-26 11:23:54 -07:00
|
|
|
]
|
2017-06-01 04:02:35 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
rtc_source_set("rtp_receiver") {
|
2018-01-10 15:54:53 +00:00
|
|
|
visibility = [ "*" ]
|
2017-06-01 04:02:35 -07:00
|
|
|
sources = [
|
2017-06-26 11:23:54 -07:00
|
|
|
"rtcp_demuxer.cc",
|
|
|
|
|
"rtcp_demuxer.h",
|
2017-06-01 04:02:35 -07:00
|
|
|
"rtp_demuxer.cc",
|
|
|
|
|
"rtp_demuxer.h",
|
2017-06-26 11:23:54 -07:00
|
|
|
"rtp_rtcp_demuxer_helper.cc",
|
|
|
|
|
"rtp_rtcp_demuxer_helper.h",
|
2017-06-21 01:05:22 -07:00
|
|
|
"rtp_stream_receiver_controller.cc",
|
|
|
|
|
"rtp_stream_receiver_controller.h",
|
2017-06-01 04:02:35 -07:00
|
|
|
"rtx_receive_stream.cc",
|
|
|
|
|
"rtx_receive_stream.h",
|
2017-08-17 15:23:51 -07:00
|
|
|
"ssrc_binding_observer.h",
|
2017-06-01 04:02:35 -07:00
|
|
|
]
|
|
|
|
|
deps = [
|
|
|
|
|
":rtp_interfaces",
|
2017-06-26 11:23:54 -07:00
|
|
|
"..:webrtc_common",
|
2017-09-04 05:43:17 -07:00
|
|
|
"../api:array_view",
|
2017-12-15 14:40:10 +01:00
|
|
|
"../api:libjingle_peerconnection_api",
|
2017-09-05 08:43:13 -07:00
|
|
|
"../api:optional",
|
2017-06-01 04:02:35 -07:00
|
|
|
"../modules/rtp_rtcp",
|
2017-12-06 07:51:33 +01:00
|
|
|
"../modules/rtp_rtcp:rtp_rtcp_format",
|
2017-12-13 16:05:42 +01:00
|
|
|
"../rtc_base:checks",
|
2017-07-19 10:40:47 -07:00
|
|
|
"../rtc_base:rtc_base_approved",
|
2017-06-01 04:02:35 -07:00
|
|
|
]
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
rtc_source_set("rtp_sender") {
|
|
|
|
|
sources = [
|
|
|
|
|
"rtp_transport_controller_send.cc",
|
|
|
|
|
"rtp_transport_controller_send.h",
|
|
|
|
|
]
|
|
|
|
|
deps = [
|
|
|
|
|
":rtp_interfaces",
|
2017-08-09 06:42:32 -07:00
|
|
|
"..:webrtc_common",
|
2017-06-01 04:02:35 -07:00
|
|
|
"../modules/congestion_controller",
|
2017-10-31 10:19:10 +01:00
|
|
|
"../modules/pacing",
|
2017-07-19 10:40:47 -07:00
|
|
|
"../rtc_base:rtc_base_approved",
|
2017-06-01 04:02:35 -07:00
|
|
|
]
|
|
|
|
|
}
|
|
|
|
|
|
2017-10-10 14:38:11 +02:00
|
|
|
rtc_source_set("bitrate_allocator") {
|
2015-09-25 13:58:30 +02:00
|
|
|
sources = [
|
2015-11-12 21:02:42 -08:00
|
|
|
"bitrate_allocator.cc",
|
2017-10-10 14:38:11 +02:00
|
|
|
"bitrate_allocator.h",
|
|
|
|
|
]
|
|
|
|
|
deps = [
|
|
|
|
|
"../modules/bitrate_controller",
|
2017-12-13 16:05:42 +01:00
|
|
|
"../rtc_base:checks",
|
2017-10-10 14:38:11 +02:00
|
|
|
"../rtc_base:rtc_base_approved",
|
|
|
|
|
"../rtc_base:sequenced_task_checker",
|
|
|
|
|
"../system_wrappers",
|
2017-12-06 09:17:14 +01:00
|
|
|
"../system_wrappers:metrics_api",
|
2017-10-10 14:38:11 +02:00
|
|
|
]
|
|
|
|
|
if (!build_with_chromium && is_clang) {
|
|
|
|
|
# Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
|
|
|
|
|
suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
rtc_static_library("call") {
|
|
|
|
|
sources = [
|
2015-09-25 13:58:30 +02:00
|
|
|
"call.cc",
|
2017-06-15 12:52:32 -07:00
|
|
|
"callfactory.cc",
|
|
|
|
|
"callfactory.h",
|
2016-12-19 01:13:46 -08:00
|
|
|
"flexfec_receive_stream_impl.cc",
|
|
|
|
|
"flexfec_receive_stream_impl.h",
|
2015-09-25 13:58:30 +02:00
|
|
|
]
|
|
|
|
|
|
2016-10-16 23:56:12 -07:00
|
|
|
if (!build_with_chromium && is_clang) {
|
|
|
|
|
# Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
|
2016-09-02 04:10:34 -07:00
|
|
|
suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
|
2015-09-25 13:58:30 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
deps = [
|
2017-10-10 14:38:11 +02:00
|
|
|
":bitrate_allocator",
|
2016-12-07 04:52:58 -08:00
|
|
|
":call_interfaces",
|
2017-06-01 04:02:35 -07:00
|
|
|
":rtp_interfaces",
|
|
|
|
|
":rtp_receiver",
|
|
|
|
|
":rtp_sender",
|
2017-09-01 15:29:28 +02:00
|
|
|
":video_stream_api",
|
2015-09-25 13:58:30 +02:00
|
|
|
"..:webrtc_common",
|
2017-09-05 08:43:13 -07:00
|
|
|
"../api:optional",
|
2016-11-28 07:02:13 -08:00
|
|
|
"../api:transport_api",
|
2016-06-03 13:14:28 -07:00
|
|
|
"../audio",
|
2017-02-27 15:57:45 -08:00
|
|
|
"../logging:rtc_event_log_api",
|
Moved RtcEventLog files from call/ to logging/
The RtcEventLog headers need to be accessible from any place which needs
logging, and the implementation needs access to data structures that are
logged.
After a discussion in the code review, we all agreed to move the RtcEventLog implementation into its own top level directory - which I called "logging/" in expectation that other types of logging may have similar requirements. The directory contains two main build targets - "rtc_event_log_api", which is just rtc_event_log.h, that has no external dependencies and can be used from anywhere, and "rtc_event_log_impl" which contains the rest of the implementation and has many dependencies (more in the future).
The "api" target can be referenced from anywhere, while the "impl" target is only needed at the place of instantiation (currently Call, soon to be moved to PeerConnection by https://codereview.webrtc.org/2353033005/).
This change allows using RtcEventLog in the p2p/ directory, so that we
can log STUN pings and ICE state transitions.
BUG=webrtc:6393
R=kjellander@webrtc.org, kwiberg@webrtc.org, solenberg@webrtc.org, stefan@webrtc.org, terelius@webrtc.org
Review URL: https://codereview.webrtc.org/2380683005 .
Cr-Commit-Position: refs/heads/master@{#14485}
2016-10-03 18:31:22 -07:00
|
|
|
"../logging:rtc_event_log_impl",
|
2017-02-27 15:57:45 -08:00
|
|
|
"../modules/bitrate_controller",
|
2016-02-23 13:30:42 +01:00
|
|
|
"../modules/congestion_controller",
|
2017-02-27 15:57:45 -08:00
|
|
|
"../modules/pacing",
|
2015-09-25 13:58:30 +02:00
|
|
|
"../modules/rtp_rtcp",
|
2017-12-06 07:51:33 +01:00
|
|
|
"../modules/rtp_rtcp:rtp_rtcp_format",
|
2017-02-27 15:57:45 -08:00
|
|
|
"../modules/utility",
|
2017-12-13 16:05:42 +01:00
|
|
|
"../rtc_base:checks",
|
2017-08-27 23:40:10 -07:00
|
|
|
"../rtc_base:rtc_base_approved",
|
2017-07-19 10:40:47 -07:00
|
|
|
"../rtc_base:rtc_task_queue",
|
2017-08-18 02:47:08 -07:00
|
|
|
"../rtc_base:sequenced_task_checker",
|
2015-09-25 13:58:30 +02:00
|
|
|
"../system_wrappers",
|
2017-12-06 09:17:14 +01:00
|
|
|
"../system_wrappers:metrics_api",
|
2016-06-03 13:14:28 -07:00
|
|
|
"../video",
|
2015-09-25 13:58:30 +02:00
|
|
|
]
|
|
|
|
|
}
|
2016-06-14 12:52:54 +02:00
|
|
|
|
2017-08-22 05:43:23 -07:00
|
|
|
rtc_source_set("video_stream_api") {
|
|
|
|
|
sources = [
|
2017-09-01 15:29:28 +02:00
|
|
|
"video_config.cc",
|
|
|
|
|
"video_config.h",
|
2017-08-22 05:43:23 -07:00
|
|
|
"video_receive_stream.cc",
|
|
|
|
|
"video_receive_stream.h",
|
|
|
|
|
"video_send_stream.cc",
|
|
|
|
|
"video_send_stream.h",
|
|
|
|
|
]
|
|
|
|
|
deps = [
|
2017-09-01 15:29:28 +02:00
|
|
|
":rtp_interfaces",
|
2018-01-04 15:58:20 +01:00
|
|
|
"../:typedefs",
|
2017-08-22 05:43:23 -07:00
|
|
|
"../:webrtc_common",
|
2017-09-01 15:29:28 +02:00
|
|
|
"../api:libjingle_peerconnection_api",
|
2017-09-05 08:43:13 -07:00
|
|
|
"../api:optional",
|
2017-08-22 05:43:23 -07:00
|
|
|
"../api:transport_api",
|
2018-01-04 15:58:20 +01:00
|
|
|
"../api:video_frame_api",
|
2017-08-22 05:43:23 -07:00
|
|
|
"../common_video:common_video",
|
2017-12-15 14:40:10 +01:00
|
|
|
"../modules/rtp_rtcp:rtp_rtcp_format",
|
2018-01-04 15:58:20 +01:00
|
|
|
"../rtc_base:checks",
|
2017-08-22 05:43:23 -07:00
|
|
|
"../rtc_base:rtc_base_approved",
|
|
|
|
|
]
|
|
|
|
|
}
|
|
|
|
|
|
2016-06-14 12:52:54 +02:00
|
|
|
if (rtc_include_tests) {
|
2016-09-02 04:10:34 -07:00
|
|
|
rtc_source_set("call_tests") {
|
2016-06-14 12:52:54 +02:00
|
|
|
testonly = true
|
2017-04-25 04:04:50 -07:00
|
|
|
|
2016-06-14 12:52:54 +02:00
|
|
|
sources = [
|
|
|
|
|
"bitrate_allocator_unittest.cc",
|
|
|
|
|
"bitrate_estimator_tests.cc",
|
|
|
|
|
"call_unittest.cc",
|
2016-10-20 04:54:48 -07:00
|
|
|
"flexfec_receive_stream_unittest.cc",
|
2017-06-26 11:23:54 -07:00
|
|
|
"rtcp_demuxer_unittest.cc",
|
2017-05-31 09:12:25 -07:00
|
|
|
"rtp_demuxer_unittest.cc",
|
2017-06-26 11:23:54 -07:00
|
|
|
"rtp_rtcp_demuxer_helper_unittest.cc",
|
2017-05-19 06:15:19 -07:00
|
|
|
"rtx_receive_stream_unittest.cc",
|
2016-06-14 12:52:54 +02:00
|
|
|
]
|
|
|
|
|
deps = [
|
2017-10-10 14:38:11 +02:00
|
|
|
":bitrate_allocator",
|
2016-06-14 12:52:54 +02:00
|
|
|
":call",
|
2017-12-04 10:50:51 +01:00
|
|
|
":call_interfaces",
|
2017-07-28 10:05:45 -07:00
|
|
|
":mock_rtp_interfaces",
|
2017-06-01 04:02:35 -07:00
|
|
|
":rtp_interfaces",
|
|
|
|
|
":rtp_receiver",
|
|
|
|
|
":rtp_sender",
|
2017-06-26 11:23:54 -07:00
|
|
|
"..:webrtc_common",
|
2017-09-04 05:43:17 -07:00
|
|
|
"../api:array_view",
|
2017-12-15 14:40:10 +01:00
|
|
|
"../api:libjingle_peerconnection_api",
|
2017-05-23 06:07:11 -07:00
|
|
|
"../api:mock_audio_mixer",
|
2017-11-02 13:04:41 +01:00
|
|
|
"../api/audio_codecs:builtin_audio_decoder_factory",
|
2017-02-27 15:57:45 -08:00
|
|
|
"../logging:rtc_event_log_api",
|
2016-11-17 06:28:59 -08:00
|
|
|
"../modules/audio_device:mock_audio_device",
|
2016-11-17 06:48:48 -08:00
|
|
|
"../modules/audio_mixer",
|
2017-12-05 15:33:16 +01:00
|
|
|
"../modules/audio_mixer:audio_mixer_impl",
|
2017-12-19 16:44:45 +01:00
|
|
|
"../modules/audio_processing:mocks",
|
2017-02-27 15:57:45 -08:00
|
|
|
"../modules/bitrate_controller",
|
2017-10-10 14:38:11 +02:00
|
|
|
"../modules/congestion_controller",
|
2017-05-08 11:52:38 -07:00
|
|
|
"../modules/congestion_controller:mock_congestion_controller",
|
2017-02-27 15:57:45 -08:00
|
|
|
"../modules/pacing",
|
2017-09-04 04:57:11 -07:00
|
|
|
"../modules/pacing:mock_paced_sender",
|
2017-02-27 15:57:45 -08:00
|
|
|
"../modules/rtp_rtcp",
|
2017-05-10 08:41:13 -07:00
|
|
|
"../modules/rtp_rtcp:mock_rtp_rtcp",
|
2017-12-06 07:51:33 +01:00
|
|
|
"../modules/rtp_rtcp:rtp_rtcp_format",
|
2017-08-03 05:57:11 -07:00
|
|
|
"../modules/utility:mock_process_thread",
|
2017-12-13 16:05:42 +01:00
|
|
|
"../rtc_base:checks",
|
2017-07-19 10:40:47 -07:00
|
|
|
"../rtc_base:rtc_base_approved",
|
2017-02-27 15:57:45 -08:00
|
|
|
"../system_wrappers",
|
2017-04-10 05:15:48 -07:00
|
|
|
"../test:audio_codec_mocks",
|
2017-02-27 15:57:45 -08:00
|
|
|
"../test:direct_transport",
|
2016-11-17 06:48:48 -08:00
|
|
|
"../test:test_common",
|
2017-02-27 15:57:45 -08:00
|
|
|
"../test:test_support",
|
|
|
|
|
"../test:video_test_common",
|
2016-06-14 12:52:54 +02:00
|
|
|
"//testing/gmock",
|
|
|
|
|
"//testing/gtest",
|
|
|
|
|
]
|
2016-10-16 23:56:12 -07:00
|
|
|
if (!build_with_chromium && is_clang) {
|
|
|
|
|
# Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
|
2016-09-02 04:10:34 -07:00
|
|
|
suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
|
2016-06-14 12:52:54 +02:00
|
|
|
}
|
|
|
|
|
}
|
2017-01-05 07:09:50 -08:00
|
|
|
|
|
|
|
|
rtc_source_set("call_perf_tests") {
|
|
|
|
|
testonly = true
|
2017-04-25 04:04:50 -07:00
|
|
|
|
2017-01-05 07:09:50 -08:00
|
|
|
sources = [
|
|
|
|
|
"call_perf_tests.cc",
|
|
|
|
|
"rampup_tests.cc",
|
|
|
|
|
"rampup_tests.h",
|
|
|
|
|
]
|
|
|
|
|
deps = [
|
2017-02-27 15:57:45 -08:00
|
|
|
":call_interfaces",
|
2017-09-01 15:29:28 +02:00
|
|
|
":video_stream_api",
|
2017-02-27 15:57:45 -08:00
|
|
|
"..:webrtc_common",
|
2017-05-02 06:46:30 -07:00
|
|
|
"../api/audio_codecs:builtin_audio_encoder_factory",
|
2017-02-27 15:57:45 -08:00
|
|
|
"../logging:rtc_event_log_api",
|
|
|
|
|
"../modules/audio_coding",
|
|
|
|
|
"../modules/audio_mixer:audio_mixer_impl",
|
|
|
|
|
"../modules/rtp_rtcp",
|
2017-12-13 16:05:42 +01:00
|
|
|
"../rtc_base:checks",
|
2017-07-19 10:40:47 -07:00
|
|
|
"../rtc_base:rtc_base_approved",
|
2017-02-27 15:57:45 -08:00
|
|
|
"../system_wrappers",
|
|
|
|
|
"../system_wrappers:metrics_default",
|
|
|
|
|
"../test:direct_transport",
|
2017-02-28 14:41:05 -08:00
|
|
|
"../test:fake_audio_device",
|
2017-07-11 06:20:45 -07:00
|
|
|
"../test:field_trial",
|
2018-01-05 15:34:09 +01:00
|
|
|
"../test:perf_test",
|
2017-07-11 06:20:45 -07:00
|
|
|
"../test:test_common",
|
2017-02-27 15:57:45 -08:00
|
|
|
"../test:test_support",
|
|
|
|
|
"../test:video_test_common",
|
|
|
|
|
"../video",
|
|
|
|
|
"../voice_engine",
|
2017-01-05 07:09:50 -08:00
|
|
|
"//testing/gtest",
|
|
|
|
|
]
|
|
|
|
|
if (!build_with_chromium && is_clang) {
|
|
|
|
|
# Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
|
|
|
|
|
suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
|
|
|
|
|
}
|
|
|
|
|
}
|
2017-07-28 10:05:45 -07:00
|
|
|
|
|
|
|
|
# TODO(eladalon): This should be moved, as with the TODO for |rtp_interfaces|.
|
|
|
|
|
rtc_source_set("mock_rtp_interfaces") {
|
|
|
|
|
testonly = true
|
|
|
|
|
|
|
|
|
|
sources = [
|
2017-11-13 17:04:05 +01:00
|
|
|
"fake_rtp_transport_controller_send.h",
|
2017-07-28 10:05:45 -07:00
|
|
|
"test/mock_rtp_packet_sink_interface.h",
|
|
|
|
|
]
|
|
|
|
|
deps = [
|
|
|
|
|
":rtp_interfaces",
|
2017-11-13 17:04:05 +01:00
|
|
|
"..:webrtc_common",
|
|
|
|
|
"../modules/congestion_controller:congestion_controller",
|
|
|
|
|
"../modules/pacing:pacing",
|
2017-07-28 10:05:45 -07:00
|
|
|
"../test:test_support",
|
|
|
|
|
"//testing/gmock",
|
|
|
|
|
]
|
|
|
|
|
}
|
Remove voe::TransmitMixer
TransmitMixer's functionality is moved into the AudioTransportProxy
owned by AudioState. This removes the need for an AudioTransport
implementation in VoEBaseImpl, which means that the proxy is no longer
a proxy, hence AudioTransportProxy is renamed to AudioTransportImpl.
In the short term, AudioState needs to know which AudioDeviceModule is
used, so it is added in AudioState::Config. AudioTransportImpl needs
to know which AudioSendStream:s are currently enabled to send, so
AudioState maintains a map of them, which is reduced into a simple
vector for AudioTransportImpl.
To encode and transmit audio,
AudioSendStream::OnAudioData(std::unique_ptr<AudioFrame> audio_frame)
is introduced, which is used in both the Chromium and standalone use
cases. This removes the need for two different instances of
voe::Channel::ProcessAndEncodeAudio(), so there is now only one,
taking an AudioFrame as argument. Callers need to allocate their own
AudioFrame:s, which is wasteful but not a regression since this was
already happening in the voe::Channel functions.
Most of the logic changed resides in
AudioTransportImpl::RecordedDataIsAvailable(), where two strange
things were found:
1. The clock drift parameter was ineffective since
apm->echo_cancellation()->enable_drift_compensation(false) is
called during initialization.
2. The output parameter 'new_mic_volume' was never set - instead it
was returned as a result, causing the ADM to never update the
analog mic gain
(https://cs.chromium.org/chromium/src/third_party/webrtc/voice_engine/voe_base_impl.cc?q=voe_base_impl.cc&dr&l=100).
Besides this, tests are updated, and some dead code is removed which
was found in the process.
Bug: webrtc:4690, webrtc:8591
Change-Id: I789d5296bf5efb7299a5ee05a4f3ce6abf9124b2
Reviewed-on: https://webrtc-review.googlesource.com/26681
Commit-Queue: Fredrik Solenberg <solenberg@webrtc.org>
Reviewed-by: Oskar Sundbom <ossu@webrtc.org>
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#21301}
2017-12-15 16:42:15 +01:00
|
|
|
|
|
|
|
|
rtc_source_set("mock_call_interfaces") {
|
|
|
|
|
testonly = true
|
|
|
|
|
|
|
|
|
|
sources = [
|
|
|
|
|
"test/mock_audio_send_stream.h",
|
|
|
|
|
]
|
|
|
|
|
deps = [
|
|
|
|
|
":call_interfaces",
|
|
|
|
|
"//test:test_support",
|
|
|
|
|
]
|
|
|
|
|
}
|
2016-06-14 12:52:54 +02:00
|
|
|
}
|