mirror of
https://github.com/mollyim/webrtc.git
synced 2025-05-16 15:20:42 +01:00
79f0d4d0c7
By enabling this trial, we can also remove reporting of packet feedback status from send streams that was used before. Bug: webrtc:9718 Change-Id: I3e7c4656b0ac6592a834617e044f23a072454181 Reviewed-on: https://webrtc-review.googlesource.com/c/118281 Reviewed-by: Oskar Sundbom <ossu@webrtc.org> Reviewed-by: Erik Språng <sprang@webrtc.org> Reviewed-by: Christoffer Rodbro <crodbro@webrtc.org> Cr-Commit-Position: refs/heads/master@{#26363}
91 lines
3 KiB
C++
91 lines
3 KiB
C++
/*
|
|
* 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.
|
|
*/
|
|
|
|
#include "modules/congestion_controller/goog_cc/acknowledged_bitrate_estimator.h"
|
|
|
|
#include <stddef.h>
|
|
#include <algorithm>
|
|
#include <utility>
|
|
|
|
#include "absl/memory/memory.h"
|
|
#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h"
|
|
#include "rtc_base/checks.h"
|
|
#include "rtc_base/numerics/safe_conversions.h"
|
|
|
|
namespace webrtc {
|
|
|
|
namespace {
|
|
bool IsInSendTimeHistory(const PacketFeedback& packet) {
|
|
return packet.send_time_ms != PacketFeedback::kNoSendTime;
|
|
}
|
|
} // namespace
|
|
|
|
AcknowledgedBitrateEstimator::AcknowledgedBitrateEstimator(
|
|
const WebRtcKeyValueConfig* key_value_config)
|
|
: AcknowledgedBitrateEstimator(
|
|
key_value_config,
|
|
absl::make_unique<BitrateEstimator>(key_value_config)) {}
|
|
|
|
AcknowledgedBitrateEstimator::~AcknowledgedBitrateEstimator() {}
|
|
|
|
AcknowledgedBitrateEstimator::AcknowledgedBitrateEstimator(
|
|
const WebRtcKeyValueConfig* key_value_config,
|
|
std::unique_ptr<BitrateEstimator> bitrate_estimator)
|
|
: bitrate_estimator_(std::move(bitrate_estimator)) {}
|
|
|
|
void AcknowledgedBitrateEstimator::IncomingPacketFeedbackVector(
|
|
const std::vector<PacketFeedback>& packet_feedback_vector) {
|
|
RTC_DCHECK(std::is_sorted(packet_feedback_vector.begin(),
|
|
packet_feedback_vector.end(),
|
|
PacketFeedbackComparator()));
|
|
for (const auto& packet : packet_feedback_vector) {
|
|
if (IsInSendTimeHistory(packet)) {
|
|
MaybeExpectFastRateChange(packet.send_time_ms);
|
|
int acknowledged_estimate = rtc::dchecked_cast<int>(packet.payload_size);
|
|
acknowledged_estimate += packet.unacknowledged_data;
|
|
bitrate_estimator_->Update(packet.arrival_time_ms, acknowledged_estimate);
|
|
}
|
|
}
|
|
}
|
|
|
|
absl::optional<uint32_t> AcknowledgedBitrateEstimator::bitrate_bps() const {
|
|
return bitrate_estimator_->bitrate_bps();
|
|
}
|
|
|
|
absl::optional<uint32_t> AcknowledgedBitrateEstimator::PeekBps() const {
|
|
return bitrate_estimator_->PeekBps();
|
|
}
|
|
|
|
absl::optional<DataRate> AcknowledgedBitrateEstimator::bitrate() const {
|
|
if (bitrate_bps())
|
|
return DataRate::bps(*bitrate_bps());
|
|
return absl::nullopt;
|
|
}
|
|
|
|
absl::optional<DataRate> AcknowledgedBitrateEstimator::PeekRate() const {
|
|
if (PeekBps())
|
|
return DataRate::bps(*PeekBps());
|
|
return absl::nullopt;
|
|
}
|
|
|
|
void AcknowledgedBitrateEstimator::SetAlrEndedTimeMs(
|
|
int64_t alr_ended_time_ms) {
|
|
alr_ended_time_ms_.emplace(alr_ended_time_ms);
|
|
}
|
|
|
|
void AcknowledgedBitrateEstimator::MaybeExpectFastRateChange(
|
|
int64_t packet_send_time_ms) {
|
|
if (alr_ended_time_ms_ && packet_send_time_ms > *alr_ended_time_ms_) {
|
|
bitrate_estimator_->ExpectFastRateChange();
|
|
alr_ended_time_ms_.reset();
|
|
}
|
|
}
|
|
|
|
} // namespace webrtc
|