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

Side by Side Diff: webrtc/modules/congestion_controller/probe_controller.h

Issue 2574533002: Fix integer overflow in ProbeController. (Closed)
Patch Set: . Created 4 years 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2016 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 10 matching lines...) Expand all
21 21
22 class Clock; 22 class Clock;
23 23
24 // This class controls initiation of probing to estimate initial channel 24 // This class controls initiation of probing to estimate initial channel
25 // capacity. There is also support for probing during a session when max 25 // capacity. There is also support for probing during a session when max
26 // bitrate is adjusted by an application. 26 // bitrate is adjusted by an application.
27 class ProbeController { 27 class ProbeController {
28 public: 28 public:
29 ProbeController(PacedSender* pacer, Clock* clock); 29 ProbeController(PacedSender* pacer, Clock* clock);
30 30
31 void SetBitrates(int min_bitrate_bps, 31 void SetBitrates(int64_t min_bitrate_bps,
32 int start_bitrate_bps, 32 int64_t start_bitrate_bps,
33 int max_bitrate_bps); 33 int64_t max_bitrate_bps);
34 34
35 void OnNetworkStateChanged(NetworkState state); 35 void OnNetworkStateChanged(NetworkState state);
36 36
37 void SetEstimatedBitrate(int bitrate_bps); 37 void SetEstimatedBitrate(int64_t bitrate_bps);
38 38
39 void EnablePeriodicAlrProbing(bool enable); 39 void EnablePeriodicAlrProbing(bool enable);
40 void Process(); 40 void Process();
41 41
42 private: 42 private:
43 enum class State { 43 enum class State {
44 // Initial state where no probing has been triggered yet. 44 // Initial state where no probing has been triggered yet.
45 kInit, 45 kInit,
46 // Waiting for probing results to continue further probing. 46 // Waiting for probing results to continue further probing.
47 kWaitingForProbingResult, 47 kWaitingForProbingResult,
48 // Probing is complete. 48 // Probing is complete.
49 kProbingComplete, 49 kProbingComplete,
50 }; 50 };
51 51
52 void InitiateExponentialProbing() EXCLUSIVE_LOCKS_REQUIRED(critsect_); 52 void InitiateExponentialProbing() EXCLUSIVE_LOCKS_REQUIRED(critsect_);
53 void InitiateProbing(int64_t now_ms, 53 void InitiateProbing(int64_t now_ms,
54 std::initializer_list<int> bitrates_to_probe, 54 std::initializer_list<int64_t> bitrates_to_probe,
55 int min_bitrate_to_probe_further_bps) 55 bool probe_further) EXCLUSIVE_LOCKS_REQUIRED(critsect_);
56 EXCLUSIVE_LOCKS_REQUIRED(critsect_);
57 56
58 rtc::CriticalSection critsect_; 57 rtc::CriticalSection critsect_;
59 PacedSender* const pacer_; 58 PacedSender* const pacer_;
60 Clock* const clock_; 59 Clock* const clock_;
61 NetworkState network_state_ GUARDED_BY(critsect_); 60 NetworkState network_state_ GUARDED_BY(critsect_);
62 State state_ GUARDED_BY(critsect_); 61 State state_ GUARDED_BY(critsect_);
63 int min_bitrate_to_probe_further_bps_ GUARDED_BY(critsect_); 62 int64_t min_bitrate_to_probe_further_bps_ GUARDED_BY(critsect_);
64 int64_t time_last_probing_initiated_ms_ GUARDED_BY(critsect_); 63 int64_t time_last_probing_initiated_ms_ GUARDED_BY(critsect_);
65 int estimated_bitrate_bps_ GUARDED_BY(critsect_); 64 int64_t estimated_bitrate_bps_ GUARDED_BY(critsect_);
66 int start_bitrate_bps_ GUARDED_BY(critsect_); 65 int64_t start_bitrate_bps_ GUARDED_BY(critsect_);
67 int max_bitrate_bps_ GUARDED_BY(critsect_); 66 int64_t max_bitrate_bps_ GUARDED_BY(critsect_);
68 int64_t last_alr_probing_time_ GUARDED_BY(critsect_); 67 int64_t last_alr_probing_time_ GUARDED_BY(critsect_);
69 bool enable_periodic_alr_probing_ GUARDED_BY(critsect_); 68 bool enable_periodic_alr_probing_ GUARDED_BY(critsect_);
70 69
71 RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(ProbeController); 70 RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(ProbeController);
72 }; 71 };
73 72
74 } // namespace webrtc 73 } // namespace webrtc
75 74
76 #endif // WEBRTC_MODULES_CONGESTION_CONTROLLER_PROBE_CONTROLLER_H_ 75 #endif // WEBRTC_MODULES_CONGESTION_CONTROLLER_PROBE_CONTROLLER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698