2015-03-02 09:05:47 +00: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.
|
|
|
|
|
*/
|
|
|
|
|
|
2018-01-26 15:09:41 +01:00
|
|
|
#include "modules/congestion_controller/send_time_history.h"
|
|
|
|
|
|
|
|
|
|
#include <algorithm>
|
|
|
|
|
#include <utility>
|
2015-03-02 09:05:47 +00:00
|
|
|
|
2017-09-15 06:47:31 +02:00
|
|
|
#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h"
|
|
|
|
|
#include "rtc_base/checks.h"
|
|
|
|
|
#include "system_wrappers/include/clock.h"
|
2016-08-01 09:23:19 -07:00
|
|
|
|
2015-03-02 09:05:47 +00:00
|
|
|
namespace webrtc {
|
|
|
|
|
|
2017-03-09 07:09:31 -08:00
|
|
|
SendTimeHistory::SendTimeHistory(const Clock* clock,
|
|
|
|
|
int64_t packet_age_limit_ms)
|
2016-08-01 09:23:19 -07:00
|
|
|
: clock_(clock), packet_age_limit_ms_(packet_age_limit_ms) {}
|
2015-03-02 09:05:47 +00:00
|
|
|
|
2016-08-01 09:23:19 -07:00
|
|
|
SendTimeHistory::~SendTimeHistory() {}
|
2015-03-02 09:05:47 +00:00
|
|
|
|
2017-03-15 12:40:25 +01:00
|
|
|
void SendTimeHistory::AddAndRemoveOld(const PacketFeedback& packet) {
|
2016-08-01 09:23:19 -07:00
|
|
|
int64_t now_ms = clock_->TimeInMilliseconds();
|
|
|
|
|
// Remove old.
|
|
|
|
|
while (!history_.empty() &&
|
|
|
|
|
now_ms - history_.begin()->second.creation_time_ms >
|
|
|
|
|
packet_age_limit_ms_) {
|
|
|
|
|
// TODO(sprang): Warn if erasing (too many) old items?
|
|
|
|
|
history_.erase(history_.begin());
|
|
|
|
|
}
|
2015-03-02 09:05:47 +00:00
|
|
|
|
2016-08-01 09:23:19 -07:00
|
|
|
// Add new.
|
2017-03-15 12:40:25 +01:00
|
|
|
int64_t unwrapped_seq_num = seq_num_unwrapper_.Unwrap(packet.sequence_number);
|
|
|
|
|
history_.insert(std::make_pair(unwrapped_seq_num, packet));
|
2015-09-04 04:43:21 -07:00
|
|
|
}
|
|
|
|
|
|
2015-10-23 02:05:40 -07:00
|
|
|
bool SendTimeHistory::OnSentPacket(uint16_t sequence_number,
|
|
|
|
|
int64_t send_time_ms) {
|
2016-08-01 09:23:19 -07:00
|
|
|
int64_t unwrapped_seq_num = seq_num_unwrapper_.Unwrap(sequence_number);
|
|
|
|
|
auto it = history_.find(unwrapped_seq_num);
|
2015-09-04 04:43:21 -07:00
|
|
|
if (it == history_.end())
|
|
|
|
|
return false;
|
|
|
|
|
it->second.send_time_ms = send_time_ms;
|
|
|
|
|
return true;
|
2015-03-02 09:05:47 +00:00
|
|
|
}
|
|
|
|
|
|
2017-03-06 05:32:21 -08:00
|
|
|
bool SendTimeHistory::GetFeedback(PacketFeedback* packet_feedback,
|
|
|
|
|
bool remove) {
|
|
|
|
|
RTC_DCHECK(packet_feedback);
|
2016-08-01 09:23:19 -07:00
|
|
|
int64_t unwrapped_seq_num =
|
2017-03-06 05:32:21 -08:00
|
|
|
seq_num_unwrapper_.Unwrap(packet_feedback->sequence_number);
|
Reland of Add functionality which limits the number of bytes on the network. (patchset #1 id:1 of https://codereview.webrtc.org/3001653002/ )
Reason for revert:
Reland
Original issue's description:
> Revert of Add functionality which limits the number of bytes on the network. (patchset #26 id:500001 of https://codereview.webrtc.org/2918323002/ )
>
> Reason for revert:
> Speculative revert to see if this caused regressions in android perf tests.
>
> Original issue's description:
> > Add functionality which limits the number of bytes on the network.
> >
> > The limit is based on the bandwidth delay product, but also adds some additional slack to compensate for the sawtooth-like BWE pattern and the slowness of the encoder rate control. The delay is estimated based on the time from sending a packet until an ack is received. Since acks are received in bursts (feedback is only sent periodically), a min filter is used to estimate the rtt.
> >
> > Whenever the in flight bytes reaches the congestion window, the pacer is paused, which in turn will result in send-side queues growing. Eventually the encoders will be paused as the pacer queue grows large (currently 2 seconds).
> >
> > BUG=webrtc:7926
> >
> > Review-Url: https://codereview.webrtc.org/2918323002
> > Cr-Commit-Position: refs/heads/master@{#19289}
> > Committed: https://chromium.googlesource.com/external/webrtc/+/8497fdde43d920ab1f0cc90362534e5493d23abe
>
> TBR=terelius@webrtc.org,philipel@webrtc.org,tschumim@webrtc.org,gnish@webrtc.org
> # Not skipping CQ checks because original CL landed more than 1 days ago.
> BUG=webrtc:7926
>
> Review-Url: https://codereview.webrtc.org/3001653002
> Cr-Commit-Position: refs/heads/master@{#19339}
> Committed: https://chromium.googlesource.com/external/webrtc/+/64136af364d1fecada49e35b1bfa39ef2641d5d0
TBR=terelius@webrtc.org,philipel@webrtc.org,tschumim@webrtc.org,gnish@webrtc.org
# Not skipping CQ checks because original CL landed more than 1 days ago.
BUG=webrtc:7926
Review-Url: https://codereview.webrtc.org/2994343002
Cr-Commit-Position: refs/heads/master@{#19373}
2017-08-16 08:16:25 -07:00
|
|
|
latest_acked_seq_num_.emplace(
|
|
|
|
|
std::max(unwrapped_seq_num, latest_acked_seq_num_.value_or(0)));
|
|
|
|
|
RTC_DCHECK_GE(*latest_acked_seq_num_, 0);
|
2016-08-01 09:23:19 -07:00
|
|
|
auto it = history_.find(unwrapped_seq_num);
|
2015-03-02 09:05:47 +00:00
|
|
|
if (it == history_.end())
|
|
|
|
|
return false;
|
2016-08-01 09:23:19 -07:00
|
|
|
|
|
|
|
|
// Save arrival_time not to overwrite it.
|
2017-03-06 05:32:21 -08:00
|
|
|
int64_t arrival_time_ms = packet_feedback->arrival_time_ms;
|
|
|
|
|
*packet_feedback = it->second;
|
|
|
|
|
packet_feedback->arrival_time_ms = arrival_time_ms;
|
2016-08-01 09:23:19 -07:00
|
|
|
|
|
|
|
|
if (remove)
|
2015-03-02 09:05:47 +00:00
|
|
|
history_.erase(it);
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
|
Reland of Add functionality which limits the number of bytes on the network. (patchset #1 id:1 of https://codereview.webrtc.org/3001653002/ )
Reason for revert:
Reland
Original issue's description:
> Revert of Add functionality which limits the number of bytes on the network. (patchset #26 id:500001 of https://codereview.webrtc.org/2918323002/ )
>
> Reason for revert:
> Speculative revert to see if this caused regressions in android perf tests.
>
> Original issue's description:
> > Add functionality which limits the number of bytes on the network.
> >
> > The limit is based on the bandwidth delay product, but also adds some additional slack to compensate for the sawtooth-like BWE pattern and the slowness of the encoder rate control. The delay is estimated based on the time from sending a packet until an ack is received. Since acks are received in bursts (feedback is only sent periodically), a min filter is used to estimate the rtt.
> >
> > Whenever the in flight bytes reaches the congestion window, the pacer is paused, which in turn will result in send-side queues growing. Eventually the encoders will be paused as the pacer queue grows large (currently 2 seconds).
> >
> > BUG=webrtc:7926
> >
> > Review-Url: https://codereview.webrtc.org/2918323002
> > Cr-Commit-Position: refs/heads/master@{#19289}
> > Committed: https://chromium.googlesource.com/external/webrtc/+/8497fdde43d920ab1f0cc90362534e5493d23abe
>
> TBR=terelius@webrtc.org,philipel@webrtc.org,tschumim@webrtc.org,gnish@webrtc.org
> # Not skipping CQ checks because original CL landed more than 1 days ago.
> BUG=webrtc:7926
>
> Review-Url: https://codereview.webrtc.org/3001653002
> Cr-Commit-Position: refs/heads/master@{#19339}
> Committed: https://chromium.googlesource.com/external/webrtc/+/64136af364d1fecada49e35b1bfa39ef2641d5d0
TBR=terelius@webrtc.org,philipel@webrtc.org,tschumim@webrtc.org,gnish@webrtc.org
# Not skipping CQ checks because original CL landed more than 1 days ago.
BUG=webrtc:7926
Review-Url: https://codereview.webrtc.org/2994343002
Cr-Commit-Position: refs/heads/master@{#19373}
2017-08-16 08:16:25 -07:00
|
|
|
size_t SendTimeHistory::GetOutstandingBytes(uint16_t local_net_id,
|
|
|
|
|
uint16_t remote_net_id) const {
|
|
|
|
|
size_t outstanding_bytes = 0;
|
|
|
|
|
auto unacked_it = history_.begin();
|
|
|
|
|
if (latest_acked_seq_num_) {
|
|
|
|
|
unacked_it = history_.lower_bound(*latest_acked_seq_num_);
|
|
|
|
|
}
|
|
|
|
|
for (; unacked_it != history_.end(); ++unacked_it) {
|
|
|
|
|
if (unacked_it->second.local_net_id == local_net_id &&
|
|
|
|
|
unacked_it->second.remote_net_id == remote_net_id &&
|
|
|
|
|
unacked_it->second.send_time_ms >= 0) {
|
|
|
|
|
outstanding_bytes += unacked_it->second.payload_size;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
return outstanding_bytes;
|
|
|
|
|
}
|
|
|
|
|
|
2015-03-02 09:05:47 +00:00
|
|
|
} // namespace webrtc
|