Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(917)

Unified Diff: webrtc/modules/congestion_controller/probe_controller.h

Issue 2504783002: Revert of Start probes only after network is connected. (Closed)
Patch Set: Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: webrtc/modules/congestion_controller/probe_controller.h
diff --git a/webrtc/modules/congestion_controller/probe_controller.h b/webrtc/modules/congestion_controller/probe_controller.h
index e60a007b9d94402253d1982b27f3649f79bb6f32..efcc2a1d4a39ab27ebdf10e22d91a4484d64ebf3 100644
--- a/webrtc/modules/congestion_controller/probe_controller.h
+++ b/webrtc/modules/congestion_controller/probe_controller.h
@@ -31,12 +31,12 @@
void SetBitrates(int min_bitrate_bps,
int start_bitrate_bps,
int max_bitrate_bps);
-
- void OnNetworkStateChanged(NetworkState state);
-
void SetEstimatedBitrate(int bitrate_bps);
private:
+ void InitiateProbing(std::initializer_list<int> bitrates_to_probe,
+ int min_bitrate_to_probe_further_bps)
+ EXCLUSIVE_LOCKS_REQUIRED(critsect_);
enum class State {
// Initial state where no probing has been triggered yet.
kInit,
@@ -45,21 +45,13 @@
// 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_);

Powered by Google App Engine
This is Rietveld 408576698