e2b1501101
Previously ProbeController was starting probing as soon as SetBitrates() is called. As result these probes would often timeout while connection is being established. Now ProbeController receives notifications about network route changes. This allows to start probing only when transport is connected. This also makes it possible to restart probing whenever transport route changes (will be done in a separate change). BUG=webrtc:6332 R=honghaiz@webrtc.org, philipel@webrtc.org, stefan@webrtc.org Review URL: https://codereview.webrtc.org/2458863002 . Committed: https://crrev.com/5c99c76255ee7bface3c742c25fb5617748ac86e Cr-Original-Commit-Position: refs/heads/master@{#15094} Cr-Commit-Position: refs/heads/master@{#15204}
72 lines
2.3 KiB
C++
72 lines
2.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 WEBRTC_MODULES_CONGESTION_CONTROLLER_PROBE_CONTROLLER_H_
|
|
#define WEBRTC_MODULES_CONGESTION_CONTROLLER_PROBE_CONTROLLER_H_
|
|
|
|
#include <initializer_list>
|
|
|
|
#include "webrtc/base/criticalsection.h"
|
|
#include "webrtc/common_types.h"
|
|
#include "webrtc/modules/pacing/paced_sender.h"
|
|
|
|
namespace webrtc {
|
|
|
|
class Clock;
|
|
|
|
// This class controls initiation of probing to estimate initial channel
|
|
// capacity. There is also support for probing during a session when max
|
|
// bitrate is adjusted by an application.
|
|
class ProbeController {
|
|
public:
|
|
ProbeController(PacedSender* pacer, Clock* clock);
|
|
|
|
void SetBitrates(int min_bitrate_bps,
|
|
int start_bitrate_bps,
|
|
int max_bitrate_bps);
|
|
|
|
void OnNetworkStateChanged(NetworkState state);
|
|
|
|
void SetEstimatedBitrate(int bitrate_bps);
|
|
|
|
private:
|
|
enum class State {
|
|
// Initial state where no probing has been triggered yet.
|
|
kInit,
|
|
// Waiting for probing results to continue further probing.
|
|
kWaitingForProbingResult,
|
|
// Probing is complete.
|
|
kProbingComplete,
|
|
};
|
|
|
|
void InitiateExponentialProbing() EXCLUSIVE_LOCKS_REQUIRED(critsect_);
|
|
void InitiateProbing(std::initializer_list<int> bitrates_to_probe,
|
|
int min_bitrate_to_probe_further_bps)
|
|
EXCLUSIVE_LOCKS_REQUIRED(critsect_);
|
|
|
|
rtc::CriticalSection critsect_;
|
|
PacedSender* const pacer_;
|
|
Clock* const clock_;
|
|
NetworkState network_state_ GUARDED_BY(critsect_);
|
|
State state_ GUARDED_BY(critsect_);
|
|
int min_bitrate_to_probe_further_bps_ GUARDED_BY(critsect_);
|
|
int64_t time_last_probing_initiated_ms_ GUARDED_BY(critsect_);
|
|
int estimated_bitrate_bps_ GUARDED_BY(critsect_);
|
|
int start_bitrate_bps_ GUARDED_BY(critsect_);
|
|
int max_bitrate_bps_ GUARDED_BY(critsect_);
|
|
int64_t last_alr_probing_time_ GUARDED_BY(critsect_);
|
|
|
|
RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(ProbeController);
|
|
};
|
|
|
|
} // namespace webrtc
|
|
|
|
#endif // WEBRTC_MODULES_CONGESTION_CONTROLLER_PROBE_CONTROLLER_H_
|