mirror of
https://github.com/mollyim/webrtc.git
synced 2025-05-15 06:40:43 +01:00
317a1f09ed
WebRTC is now using C++14 so there is no need to use the Abseil version of std::make_unique. This CL has been created with the following steps: git grep -l absl::make_unique | sort | uniq > /tmp/make_unique.txt git grep -l absl::WrapUnique | sort | uniq > /tmp/wrap_unique.txt git grep -l "#include <memory>" | sort | uniq > /tmp/memory.txt diff --new-line-format="" --unchanged-line-format="" \ /tmp/make_unique.txt /tmp/wrap_unique.txt | sort | \ uniq > /tmp/only_make_unique.txt diff --new-line-format="" --unchanged-line-format="" \ /tmp/only_make_unique.txt /tmp/memory.txt | \ xargs grep -l "absl/memory" > /tmp/add-memory.txt git grep -l "\babsl::make_unique\b" | \ xargs sed -i "s/\babsl::make_unique\b/std::make_unique/g" git checkout PRESUBMIT.py abseil-in-webrtc.md cat /tmp/add-memory.txt | \ xargs sed -i \ 's/#include "absl\/memory\/memory.h"/#include <memory>/g' git cl format # Manual fix order of the new inserted #include <memory> cat /tmp/only_make_unique | xargs grep -l "#include <memory>" | \ xargs sed -i '/#include "absl\/memory\/memory.h"/d' git ls-files | grep BUILD.gn | \ xargs sed -i '/\/\/third_party\/abseil-cpp\/absl\/memory/d' python tools_webrtc/gn_check_autofix.py \ -m tryserver.webrtc -b linux_rel # Repead the gn_check_autofix step for other platforms git ls-files | grep BUILD.gn | \ xargs sed -i 's/absl\/memory:memory/absl\/memory/g' git cl format Bug: webrtc:10945 Change-Id: I3fe28ea80f4dd3ba3cf28effd151d5e1f19aff89 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/153221 Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org> Reviewed-by: Alessio Bazzica <alessiob@webrtc.org> Reviewed-by: Karl Wiberg <kwiberg@webrtc.org> Cr-Commit-Position: refs/heads/master@{#29209}
70 lines
2.4 KiB
C++
70 lines
2.4 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 <memory>
|
|
#include <utility>
|
|
|
|
#include "rtc_base/checks.h"
|
|
#include "rtc_base/numerics/safe_conversions.h"
|
|
|
|
namespace webrtc {
|
|
|
|
AcknowledgedBitrateEstimator::AcknowledgedBitrateEstimator(
|
|
const WebRtcKeyValueConfig* key_value_config)
|
|
: AcknowledgedBitrateEstimator(
|
|
key_value_config,
|
|
std::make_unique<BitrateEstimator>(key_value_config)) {}
|
|
|
|
AcknowledgedBitrateEstimator::~AcknowledgedBitrateEstimator() {}
|
|
|
|
AcknowledgedBitrateEstimator::AcknowledgedBitrateEstimator(
|
|
const WebRtcKeyValueConfig* key_value_config,
|
|
std::unique_ptr<BitrateEstimator> bitrate_estimator)
|
|
: in_alr_(false), bitrate_estimator_(std::move(bitrate_estimator)) {}
|
|
|
|
void AcknowledgedBitrateEstimator::IncomingPacketFeedbackVector(
|
|
const std::vector<PacketResult>& packet_feedback_vector) {
|
|
RTC_DCHECK(std::is_sorted(packet_feedback_vector.begin(),
|
|
packet_feedback_vector.end(),
|
|
PacketResult::ReceiveTimeOrder()));
|
|
for (const auto& packet : packet_feedback_vector) {
|
|
if (alr_ended_time_ && packet.sent_packet.send_time > *alr_ended_time_) {
|
|
bitrate_estimator_->ExpectFastRateChange();
|
|
alr_ended_time_.reset();
|
|
}
|
|
DataSize acknowledged_estimate = packet.sent_packet.size;
|
|
acknowledged_estimate += packet.sent_packet.prior_unacked_data;
|
|
bitrate_estimator_->Update(packet.receive_time, acknowledged_estimate,
|
|
in_alr_);
|
|
}
|
|
}
|
|
|
|
absl::optional<DataRate> AcknowledgedBitrateEstimator::bitrate() const {
|
|
return bitrate_estimator_->bitrate();
|
|
}
|
|
|
|
absl::optional<DataRate> AcknowledgedBitrateEstimator::PeekRate() const {
|
|
return bitrate_estimator_->PeekRate();
|
|
}
|
|
|
|
void AcknowledgedBitrateEstimator::SetAlrEndedTime(Timestamp alr_ended_time) {
|
|
alr_ended_time_.emplace(alr_ended_time);
|
|
}
|
|
|
|
void AcknowledgedBitrateEstimator::SetAlr(bool in_alr) {
|
|
in_alr_ = in_alr;
|
|
}
|
|
|
|
} // namespace webrtc
|