mirror of
https://github.com/mollyim/webrtc.git
synced 2025-05-15 23:01:21 +01:00
ea86bb74fc
This reverts commit65792c5a5c. Reason for revert: <INSERT REASONING HERE> Original change's description: > Revert "Revert "Reland "Moved congestion controller to task queue.""" > > This reverts commit4e849f6925. > > Reason for revert: <INSERT REASONING HERE> > > Original change's description: > > Revert "Reland "Moved congestion controller to task queue."" > > > > This reverts commit57daeb7ac7. > > > > 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 of0cbcba7ea0. > > > > > > 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}
90 lines
3 KiB
C++
90 lines
3 KiB
C++
/*
|
|
* Copyright (c) 2016 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.
|
|
*/
|
|
|
|
#ifndef MODULES_CONGESTION_CONTROLLER_DELAY_BASED_BWE_H_
|
|
#define MODULES_CONGESTION_CONTROLLER_DELAY_BASED_BWE_H_
|
|
|
|
#include <memory>
|
|
#include <utility>
|
|
#include <vector>
|
|
|
|
#include "modules/congestion_controller/delay_increase_detector_interface.h"
|
|
#include "modules/congestion_controller/probe_bitrate_estimator.h"
|
|
#include "modules/remote_bitrate_estimator/aimd_rate_control.h"
|
|
#include "modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h"
|
|
#include "modules/remote_bitrate_estimator/inter_arrival.h"
|
|
#include "rtc_base/checks.h"
|
|
#include "rtc_base/constructormagic.h"
|
|
#include "rtc_base/race_checker.h"
|
|
|
|
namespace webrtc {
|
|
|
|
class RtcEventLog;
|
|
|
|
class DelayBasedBwe {
|
|
public:
|
|
static const int64_t kStreamTimeOutMs = 2000;
|
|
|
|
struct Result {
|
|
Result();
|
|
Result(bool probe, uint32_t target_bitrate_bps);
|
|
~Result();
|
|
bool updated;
|
|
bool probe;
|
|
uint32_t target_bitrate_bps;
|
|
bool recovered_from_overuse;
|
|
};
|
|
|
|
DelayBasedBwe(RtcEventLog* event_log, const Clock* clock);
|
|
virtual ~DelayBasedBwe();
|
|
|
|
Result IncomingPacketFeedbackVector(
|
|
const std::vector<PacketFeedback>& packet_feedback_vector,
|
|
rtc::Optional<uint32_t> acked_bitrate_bps);
|
|
void OnRttUpdate(int64_t avg_rtt_ms, int64_t max_rtt_ms);
|
|
bool LatestEstimate(std::vector<uint32_t>* ssrcs,
|
|
uint32_t* bitrate_bps) const;
|
|
void SetStartBitrate(int start_bitrate_bps);
|
|
void SetMinBitrate(int min_bitrate_bps);
|
|
int64_t GetExpectedBwePeriodMs() const;
|
|
|
|
private:
|
|
void IncomingPacketFeedback(const PacketFeedback& packet_feedback);
|
|
Result OnLongFeedbackDelay(int64_t arrival_time_ms);
|
|
Result MaybeUpdateEstimate(rtc::Optional<uint32_t> acked_bitrate_bps,
|
|
bool request_probe);
|
|
// Updates the current remote rate estimate and returns true if a valid
|
|
// estimate exists.
|
|
bool UpdateEstimate(int64_t now_ms,
|
|
rtc::Optional<uint32_t> acked_bitrate_bps,
|
|
uint32_t* target_bitrate_bps);
|
|
|
|
rtc::RaceChecker network_race_;
|
|
RtcEventLog* const event_log_;
|
|
const Clock* const clock_;
|
|
std::unique_ptr<InterArrival> inter_arrival_;
|
|
std::unique_ptr<DelayIncreaseDetectorInterface> delay_detector_;
|
|
int64_t last_seen_packet_ms_;
|
|
bool uma_recorded_;
|
|
AimdRateControl rate_control_;
|
|
ProbeBitrateEstimator probe_bitrate_estimator_;
|
|
size_t trendline_window_size_;
|
|
double trendline_smoothing_coeff_;
|
|
double trendline_threshold_gain_;
|
|
int consecutive_delayed_feedbacks_;
|
|
uint32_t prev_bitrate_;
|
|
BandwidthUsage prev_state_;
|
|
|
|
RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(DelayBasedBwe);
|
|
};
|
|
|
|
} // namespace webrtc
|
|
|
|
#endif // MODULES_CONGESTION_CONTROLLER_DELAY_BASED_BWE_H_
|