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

Side by Side Diff: webrtc/modules/pacing/bitrate_prober.h

Issue 2235373004: Probing: Add support for exponential startup probing (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@fix_probing2
Patch Set: Addressed comments Created 4 years, 3 months 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) 2014 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2014 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 13 matching lines...) Expand all
24 public: 24 public:
25 BitrateProber(); 25 BitrateProber();
26 26
27 void SetEnabled(bool enable); 27 void SetEnabled(bool enable);
28 28
29 // Returns true if the prober is in a probing session, i.e., it currently 29 // Returns true if the prober is in a probing session, i.e., it currently
30 // wants packets to be sent out according to the time returned by 30 // wants packets to be sent out according to the time returned by
31 // TimeUntilNextProbe(). 31 // TimeUntilNextProbe().
32 bool IsProbing() const; 32 bool IsProbing() const;
33 33
34 bool IsExpectingProbingResults() const;
35
36 void SetEstimatedBitrate(int bitrate_bps);
37
34 // Initializes a new probing session if the prober is allowed to probe. Does 38 // Initializes a new probing session if the prober is allowed to probe. Does
35 // not initialize the prober unless the packet size is large enough to probe 39 // not initialize the prober unless the packet size is large enough to probe
36 // with. 40 // with.
37 void OnIncomingPacket(size_t packet_size); 41 void OnIncomingPacket(int64_t now_ms, size_t packet_size);
38 42
39 // Create a cluster used to probe for |bitrate_bps| with |num_packets| number 43 // Create a cluster used to probe for |bitrate_bps| with |num_packets| number
40 // of packets. 44 // of packets.
41 void CreateProbeCluster(int bitrate_bps, int num_packets); 45 void CreateProbeCluster(int bitrate_bps, int num_packets);
42 46
43 // Returns the number of milliseconds until the next packet should be sent to 47 // Returns the number of milliseconds until the next packet should be sent to
44 // get accurate probing. 48 // get accurate probing.
45 int TimeUntilNextProbe(int64_t now_ms); 49 int TimeUntilNextProbe(int64_t now_ms);
46 50
47 // Which cluster that is currently being used for probing. 51 // Which cluster that is currently being used for probing.
48 int CurrentClusterId() const; 52 int CurrentClusterId() const;
49 53
50 // Returns the number of bytes that the prober recommends for the next probe 54 // Returns the number of bytes that the prober recommends for the next probe
51 // packet. 55 // packet.
52 size_t RecommendedPacketSize() const; 56 size_t RecommendedPacketSize() const;
53 57
54 // Called to report to the prober that a packet has been sent, which helps the 58 // Notifies the prober that a probe packet has been sent, which helps the
55 // prober know when to move to the next packet in a probe. 59 // prober move to the next packet in a probe.
56 void PacketSent(int64_t now_ms, size_t packet_size); 60 void PacketSent(int64_t now_ms, size_t packet_size);
57 61
58 private: 62 private:
59 enum class ProbingState {
60 // Probing will not be triggered in this state at all times.
61 kDisabled,
62 // Probing is enabled and ready to trigger on the first packet arrival.
63 kInactive,
64 // Probe cluster is filled with the set of data rates to be probed and
65 // probes are being sent.
66 kActive,
67 // Probing is enabled, but currently suspended until an explicit trigger
68 // to start probing again.
69 kSuspended,
70 };
71
72 struct ProbeCluster { 63 struct ProbeCluster {
73 int max_probe_packets = 0; 64 int max_probe_packets = 0;
74 int sent_probe_packets = 0; 65 int sent_probe_packets = 0;
75 int probe_bitrate_bps = 0; 66 int probe_bitrate_bps = 0;
76 int id = -1; 67 int id = -1;
77 }; 68 };
78 69
70 enum class State {
71 // Initial state. No probe clusters have been set up yet for probing.
72 kInit,
73 // Probe clusters have been set up and probes are being sent.
74 kSending,
75 // Probes have been sent, waiting on probing results.
76 kWaitForResult,
77 // Probing is complete. No active probing until an explicit
78 // request for probing.
79 kComplete,
80 // Probing disabled. No probing until explicitly enabled again.
81 kDisabled,
82 };
83
79 // Resets the state of the prober and clears any cluster/timing data tracked. 84 // Resets the state of the prober and clears any cluster/timing data tracked.
80 void ResetState(); 85 void ResetState();
81 86
82 ProbingState probing_state_; 87 State probing_state_;
83 // Probe bitrate per packet. These are used to compute the delta relative to 88 // Probe bitrate per packet. These are used to compute the delta relative to
84 // the previous probe packet based on the size and time when that packet was 89 // the previous probe packet based on the size and time when that packet was
85 // sent. 90 // sent.
86 std::queue<ProbeCluster> clusters_; 91 std::queue<ProbeCluster> clusters_;
87 size_t packet_size_last_sent_; 92 size_t packet_size_last_sent_;
88 // The last time a probe was sent. 93 // The last time a probe was sent.
89 int64_t time_last_probe_sent_ms_; 94 int64_t time_last_probe_sent_ms_;
90 int next_cluster_id_; 95 int next_cluster_id_;
96 int min_bitrate_to_probe_further_;
97 int estimated_bitrate_bps_;
91 }; 98 };
92 } // namespace webrtc 99 } // namespace webrtc
93 #endif // WEBRTC_MODULES_PACING_BITRATE_PROBER_H_ 100 #endif // WEBRTC_MODULES_PACING_BITRATE_PROBER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698