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

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

Issue 2422063002: Use bayesian estimate of acked bitrate. (Closed)
Patch Set: Tests for both with and w/o experiment. 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 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
11 #ifndef WEBRTC_MODULES_CONGESTION_CONTROLLER_DELAY_BASED_BWE_H_ 11 #ifndef WEBRTC_MODULES_CONGESTION_CONTROLLER_DELAY_BASED_BWE_H_
12 #define WEBRTC_MODULES_CONGESTION_CONTROLLER_DELAY_BASED_BWE_H_ 12 #define WEBRTC_MODULES_CONGESTION_CONTROLLER_DELAY_BASED_BWE_H_
13 13
14 #include <list>
15 #include <map>
16 #include <memory> 14 #include <memory>
15 #include <utility>
17 #include <vector> 16 #include <vector>
18 17
19 #include "webrtc/base/checks.h" 18 #include "webrtc/base/checks.h"
20 #include "webrtc/base/constructormagic.h" 19 #include "webrtc/base/constructormagic.h"
21 #include "webrtc/base/rate_statistics.h" 20 #include "webrtc/base/rate_statistics.h"
22 #include "webrtc/base/thread_checker.h" 21 #include "webrtc/base/thread_checker.h"
23 #include "webrtc/modules/congestion_controller/probe_bitrate_estimator.h" 22 #include "webrtc/modules/congestion_controller/probe_bitrate_estimator.h"
24 #include "webrtc/modules/remote_bitrate_estimator/aimd_rate_control.h" 23 #include "webrtc/modules/remote_bitrate_estimator/aimd_rate_control.h"
25 #include "webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimat or.h" 24 #include "webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimat or.h"
26 #include "webrtc/modules/remote_bitrate_estimator/inter_arrival.h" 25 #include "webrtc/modules/remote_bitrate_estimator/inter_arrival.h"
(...skipping 19 matching lines...) Expand all
46 virtual ~DelayBasedBwe() {} 45 virtual ~DelayBasedBwe() {}
47 46
48 Result IncomingPacketFeedbackVector( 47 Result IncomingPacketFeedbackVector(
49 const std::vector<PacketInfo>& packet_feedback_vector); 48 const std::vector<PacketInfo>& packet_feedback_vector);
50 void OnRttUpdate(int64_t avg_rtt_ms, int64_t max_rtt_ms); 49 void OnRttUpdate(int64_t avg_rtt_ms, int64_t max_rtt_ms);
51 bool LatestEstimate(std::vector<uint32_t>* ssrcs, 50 bool LatestEstimate(std::vector<uint32_t>* ssrcs,
52 uint32_t* bitrate_bps) const; 51 uint32_t* bitrate_bps) const;
53 void SetMinBitrate(int min_bitrate_bps); 52 void SetMinBitrate(int min_bitrate_bps);
54 53
55 private: 54 private:
55 // Computes a bayesian estimate of the throughput given acks containing
56 // the arrival time and payload size. Samples which are far from the current
57 // estimate or are based on few packets are given a smaller weight, as they
58 // are considered to be more likely to have been caused by, e.g., delay spikes
59 // unrelated to congestion.
60 class BitrateEstimator {
61 public:
62 BitrateEstimator();
63 void Update(int64_t now_ms, int bytes);
64 rtc::Optional<uint32_t> bitrate_bps() const;
65
66 private:
67 float UpdateWindow(int64_t now_ms, int bytes, int rate_window_ms);
68 int sum_;
69 int64_t current_win_ms_;
70 int64_t prev_time_ms_;
71 float bitrate_estimate_;
72 float bitrate_estimate_var_;
73 RateStatistics old_estimator_;
74 const bool in_experiment_;
75 };
76
56 Result IncomingPacketInfo(const PacketInfo& info); 77 Result IncomingPacketInfo(const PacketInfo& info);
57 // Updates the current remote rate estimate and returns true if a valid 78 // Updates the current remote rate estimate and returns true if a valid
58 // estimate exists. 79 // estimate exists.
59 bool UpdateEstimate(int64_t packet_arrival_time_ms, 80 bool UpdateEstimate(int64_t packet_arrival_time_ms,
60 int64_t now_ms, 81 int64_t now_ms,
82 rtc::Optional<uint32_t> acked_bitrate_bps,
61 uint32_t* target_bitrate_bps); 83 uint32_t* target_bitrate_bps);
62 84
63 rtc::ThreadChecker network_thread_; 85 rtc::ThreadChecker network_thread_;
64 Clock* const clock_; 86 Clock* const clock_;
65 std::unique_ptr<InterArrival> inter_arrival_; 87 std::unique_ptr<InterArrival> inter_arrival_;
66 std::unique_ptr<OveruseEstimator> estimator_; 88 std::unique_ptr<OveruseEstimator> estimator_;
67 OveruseDetector detector_; 89 OveruseDetector detector_;
68 RateStatistics receiver_incoming_bitrate_; 90 BitrateEstimator receiver_incoming_bitrate_;
69 int64_t last_update_ms_; 91 int64_t last_update_ms_;
70 int64_t last_seen_packet_ms_; 92 int64_t last_seen_packet_ms_;
71 bool uma_recorded_; 93 bool uma_recorded_;
72 AimdRateControl rate_control_; 94 AimdRateControl rate_control_;
73 ProbeBitrateEstimator probe_bitrate_estimator_; 95 ProbeBitrateEstimator probe_bitrate_estimator_;
74 96
75 RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(DelayBasedBwe); 97 RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(DelayBasedBwe);
76 }; 98 };
77 99
78 } // namespace webrtc 100 } // namespace webrtc
79 101
80 #endif // WEBRTC_MODULES_CONGESTION_CONTROLLER_DELAY_BASED_BWE_H_ 102 #endif // WEBRTC_MODULES_CONGESTION_CONTROLLER_DELAY_BASED_BWE_H_
OLDNEW
« no previous file with comments | « webrtc/modules/bitrate_controller/bitrate_controller_impl.cc ('k') | webrtc/modules/congestion_controller/delay_based_bwe.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698