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}
121 lines
4.8 KiB
C++
121 lines
4.8 KiB
C++
/*
|
|
* Copyright (c) 2018 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 "call/receive_time_calculator.h"
|
|
|
|
#include <memory>
|
|
#include <string>
|
|
#include <type_traits>
|
|
|
|
#include "rtc_base/experiments/field_trial_parser.h"
|
|
#include "rtc_base/numerics/safe_minmax.h"
|
|
#include "system_wrappers/include/field_trial.h"
|
|
|
|
namespace webrtc {
|
|
namespace {
|
|
using ::webrtc::field_trial::IsEnabled;
|
|
|
|
const char kBweReceiveTimeCorrection[] = "WebRTC-Bwe-ReceiveTimeFix";
|
|
} // namespace
|
|
|
|
ReceiveTimeCalculatorConfig::ReceiveTimeCalculatorConfig()
|
|
: max_packet_time_repair("maxrep", TimeDelta::ms(2000)),
|
|
stall_threshold("stall", TimeDelta::ms(5)),
|
|
tolerance("tol", TimeDelta::ms(1)),
|
|
max_stall("maxstall", TimeDelta::seconds(5)) {
|
|
std::string trial_string =
|
|
field_trial::FindFullName(kBweReceiveTimeCorrection);
|
|
ParseFieldTrial(
|
|
{&max_packet_time_repair, &stall_threshold, &tolerance, &max_stall},
|
|
trial_string);
|
|
}
|
|
ReceiveTimeCalculatorConfig::ReceiveTimeCalculatorConfig(
|
|
const ReceiveTimeCalculatorConfig&) = default;
|
|
ReceiveTimeCalculatorConfig::~ReceiveTimeCalculatorConfig() = default;
|
|
|
|
ReceiveTimeCalculator::ReceiveTimeCalculator()
|
|
: config_(ReceiveTimeCalculatorConfig()) {}
|
|
|
|
std::unique_ptr<ReceiveTimeCalculator>
|
|
ReceiveTimeCalculator::CreateFromFieldTrial() {
|
|
if (!IsEnabled(kBweReceiveTimeCorrection))
|
|
return nullptr;
|
|
return std::make_unique<ReceiveTimeCalculator>();
|
|
}
|
|
|
|
int64_t ReceiveTimeCalculator::ReconcileReceiveTimes(int64_t packet_time_us,
|
|
int64_t system_time_us,
|
|
int64_t safe_time_us) {
|
|
int64_t stall_time_us = system_time_us - packet_time_us;
|
|
if (total_system_time_passed_us_ < config_.stall_threshold->us()) {
|
|
stall_time_us = rtc::SafeMin(stall_time_us, config_.max_stall->us());
|
|
}
|
|
int64_t corrected_time_us = safe_time_us - stall_time_us;
|
|
|
|
if (last_packet_time_us_ == -1 && stall_time_us < 0) {
|
|
static_clock_offset_us_ = stall_time_us;
|
|
corrected_time_us += static_clock_offset_us_;
|
|
} else if (last_packet_time_us_ > 0) {
|
|
// All repairs depend on variables being intialized
|
|
int64_t packet_time_delta_us = packet_time_us - last_packet_time_us_;
|
|
int64_t system_time_delta_us = system_time_us - last_system_time_us_;
|
|
int64_t safe_time_delta_us = safe_time_us - last_safe_time_us_;
|
|
|
|
// Repair backwards clock resets during initial stall. In this case, the
|
|
// reset is observed only in packet time but never in system time.
|
|
if (system_time_delta_us < 0)
|
|
total_system_time_passed_us_ += config_.stall_threshold->us();
|
|
else
|
|
total_system_time_passed_us_ += system_time_delta_us;
|
|
if (packet_time_delta_us < 0 &&
|
|
total_system_time_passed_us_ < config_.stall_threshold->us()) {
|
|
static_clock_offset_us_ -= packet_time_delta_us;
|
|
}
|
|
corrected_time_us += static_clock_offset_us_;
|
|
|
|
// Detect resets inbetween clock readings in socket and app.
|
|
bool forward_clock_reset =
|
|
corrected_time_us + config_.tolerance->us() < last_corrected_time_us_;
|
|
bool obvious_backward_clock_reset = system_time_us < packet_time_us;
|
|
|
|
// Harder case with backward clock reset during stall, the reset being
|
|
// smaller than the stall. Compensate throughout the stall.
|
|
bool small_backward_clock_reset =
|
|
!obvious_backward_clock_reset &&
|
|
safe_time_delta_us > system_time_delta_us + config_.tolerance->us();
|
|
bool stall_start =
|
|
packet_time_delta_us >= 0 &&
|
|
system_time_delta_us > packet_time_delta_us + config_.tolerance->us();
|
|
bool stall_is_over = safe_time_delta_us > config_.stall_threshold->us();
|
|
bool packet_time_caught_up =
|
|
packet_time_delta_us < 0 && system_time_delta_us >= 0;
|
|
if (stall_start && small_backward_clock_reset)
|
|
small_reset_during_stall_ = true;
|
|
else if (stall_is_over || packet_time_caught_up)
|
|
small_reset_during_stall_ = false;
|
|
|
|
// If resets are detected, advance time by (capped) packet time increase.
|
|
if (forward_clock_reset || obvious_backward_clock_reset ||
|
|
small_reset_during_stall_) {
|
|
corrected_time_us = last_corrected_time_us_ +
|
|
rtc::SafeClamp(packet_time_delta_us, 0,
|
|
config_.max_packet_time_repair->us());
|
|
}
|
|
}
|
|
|
|
last_corrected_time_us_ = corrected_time_us;
|
|
last_packet_time_us_ = packet_time_us;
|
|
last_system_time_us_ = system_time_us;
|
|
last_safe_time_us_ = safe_time_us;
|
|
return corrected_time_us;
|
|
}
|
|
|
|
} // namespace webrtc
|