2017-04-24 05:53:20 -07:00
|
|
|
/*
|
|
|
|
|
* Copyright (c) 2017 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-09-15 06:47:31 +02:00
|
|
|
#include "call/rtp_transport_controller_send.h"
|
2017-04-24 05:53:20 -07:00
|
|
|
|
|
|
|
|
namespace webrtc {
|
|
|
|
|
|
|
|
|
|
RtpTransportControllerSend::RtpTransportControllerSend(
|
|
|
|
|
Clock* clock,
|
|
|
|
|
webrtc::RtcEventLog* event_log)
|
2017-08-22 16:16:44 +02:00
|
|
|
: pacer_(clock, &packet_router_, event_log),
|
|
|
|
|
send_side_cc_(clock, nullptr /* observer */, event_log, &pacer_) {}
|
2017-04-24 05:53:20 -07:00
|
|
|
|
2017-05-31 02:24:52 -07:00
|
|
|
PacketRouter* RtpTransportControllerSend::packet_router() {
|
|
|
|
|
return &packet_router_;
|
|
|
|
|
}
|
|
|
|
|
|
2017-08-22 16:16:44 +02:00
|
|
|
PacedSender* RtpTransportControllerSend::pacer() {
|
|
|
|
|
return &pacer_;
|
|
|
|
|
}
|
|
|
|
|
|
2017-05-31 02:24:52 -07:00
|
|
|
SendSideCongestionController* RtpTransportControllerSend::send_side_cc() {
|
|
|
|
|
return &send_side_cc_;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
TransportFeedbackObserver*
|
|
|
|
|
RtpTransportControllerSend::transport_feedback_observer() {
|
|
|
|
|
return &send_side_cc_;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
RtpPacketSender* RtpTransportControllerSend::packet_sender() {
|
2017-08-22 16:16:44 +02:00
|
|
|
return &pacer_;
|
2017-05-31 02:24:52 -07:00
|
|
|
}
|
|
|
|
|
|
2017-08-09 06:42:32 -07:00
|
|
|
const RtpKeepAliveConfig& RtpTransportControllerSend::keepalive_config() const {
|
|
|
|
|
return keepalive_;
|
|
|
|
|
}
|
|
|
|
|
|
2017-08-22 16:16:44 +02:00
|
|
|
void RtpTransportControllerSend::SetAllocatedSendBitrateLimits(
|
|
|
|
|
int min_send_bitrate_bps,
|
|
|
|
|
int max_padding_bitrate_bps) {
|
Revert "Revert "Revert "Reland "Moved congestion controller to task queue.""""
This reverts commit 65792c5a5c542201f7b9feefded505842692e6ed.
Reason for revert: <INSERT REASONING HERE>
Original change's description:
> Revert "Revert "Reland "Moved congestion controller to task queue."""
>
> This reverts commit 4e849f6925b2ac44b0957a228d7131fc391fca54.
>
> Reason for revert: <INSERT REASONING HERE>
>
> Original change's description:
> > Revert "Reland "Moved congestion controller to task queue.""
> >
> > This reverts commit 57daeb7ac7f3d80992905b53fea500953fcfd793.
> >
> > Reason for revert: Cause increased congestion and deadlocks in downstream project
> >
> > Original change's description:
> > > Reland "Moved congestion controller to task queue."
> > >
> > > This is a reland of 0cbcba7ea0dced1a7f353c64d6cf91d46ccb29f9.
> > >
> > > Original change's description:
> > > > Moved congestion controller to task queue.
> > > >
> > > > The goal of this work is to make it easier to experiment with the
> > > > bandwidth estimation implementation. For this reason network control
> > > > functionality is moved from SendSideCongestionController(SSCC),
> > > > PacedSender and BitrateController to the newly created
> > > > GoogCcNetworkController which implements the newly created
> > > > NetworkControllerInterface. This allows the implementation to be
> > > > replaced at runtime in the future.
> > > >
> > > > This is the first part of a split of a larger CL, see:
> > > > https://webrtc-review.googlesource.com/c/src/+/39788/8
> > > > For further explanations.
> > > >
> > > > Bug: webrtc:8415
> > > > Change-Id: I770189c04cc31b313bd4e57821acff55fbcb1ad3
> > > > Reviewed-on: https://webrtc-review.googlesource.com/43840
> > > > Commit-Queue: Sebastian Jansson <srte@webrtc.org>
> > > > Reviewed-by: Björn Terelius <terelius@webrtc.org>
> > > > Reviewed-by: Stefan Holmer <stefan@webrtc.org>
> > > > Cr-Commit-Position: refs/heads/master@{#21868}
> > >
> > > Bug: webrtc:8415
> > > Change-Id: I1d1756a30deed5b421b1c91c1918a13b6bb455da
> > > Reviewed-on: https://webrtc-review.googlesource.com/48000
> > > Reviewed-by: Stefan Holmer <stefan@webrtc.org>
> > > Commit-Queue: Sebastian Jansson <srte@webrtc.org>
> > > Cr-Commit-Position: refs/heads/master@{#21899}
> >
> > TBR=terelius@webrtc.org,stefan@webrtc.org,srte@webrtc.org
> >
> > # Not skipping CQ checks because original CL landed > 1 day ago.
> >
> > Bug: webrtc:8415
> > Change-Id: Ida8074dcac2cc28b3629228eb22846d8a8e81b83
> > Reviewed-on: https://webrtc-review.googlesource.com/52980
> > Reviewed-by: Danil Chapovalov <danilchap@webrtc.org>
> > Commit-Queue: Danil Chapovalov <danilchap@webrtc.org>
> > Cr-Commit-Position: refs/heads/master@{#22017}
>
> TBR=danilchap@webrtc.org,terelius@webrtc.org,stefan@webrtc.org,srte@webrtc.org
>
> Change-Id: I3393b74370c4f4d0955f50728005b2b925be169b
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Bug: webrtc:8415
> Reviewed-on: https://webrtc-review.googlesource.com/53262
> Reviewed-by: Sebastian Jansson <srte@webrtc.org>
> Commit-Queue: Sebastian Jansson <srte@webrtc.org>
> Cr-Commit-Position: refs/heads/master@{#22023}
TBR=danilchap@webrtc.org,terelius@webrtc.org,stefan@webrtc.org,srte@webrtc.org
Change-Id: Id68ad986ee51142b7be3381d0793709b4392fe2c
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: webrtc:8415
Reviewed-on: https://webrtc-review.googlesource.com/53360
Reviewed-by: Sebastian Jansson <srte@webrtc.org>
Commit-Queue: Sebastian Jansson <srte@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#22024}
2018-02-14 16:53:38 +00:00
|
|
|
pacer_.SetSendBitrateLimits(min_send_bitrate_bps, max_padding_bitrate_bps);
|
2017-08-22 16:16:44 +02:00
|
|
|
}
|
|
|
|
|
|
2017-08-09 06:42:32 -07:00
|
|
|
void RtpTransportControllerSend::SetKeepAliveConfig(
|
|
|
|
|
const RtpKeepAliveConfig& config) {
|
|
|
|
|
keepalive_ = config;
|
|
|
|
|
}
|
|
|
|
|
|
2017-04-24 05:53:20 -07:00
|
|
|
} // namespace webrtc
|