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

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

Issue 2580843002: Change return type of CongestionController::pacer() method.
Patch Set: Revert addition of CongestionController::pacer_thread_. Created 3 years, 11 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
« no previous file with comments | « no previous file | webrtc/video/rtp_stream_receiver.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2012 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 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 virtual void ResetBweAndBitrates(int bitrate_bps, 80 virtual void ResetBweAndBitrates(int bitrate_bps,
81 int min_bitrate_bps, 81 int min_bitrate_bps,
82 int max_bitrate_bps); 82 int max_bitrate_bps);
83 virtual void SignalNetworkState(NetworkState state); 83 virtual void SignalNetworkState(NetworkState state);
84 virtual void SetTransportOverhead(size_t transport_overhead_bytes_per_packet); 84 virtual void SetTransportOverhead(size_t transport_overhead_bytes_per_packet);
85 85
86 virtual BitrateController* GetBitrateController() const; 86 virtual BitrateController* GetBitrateController() const;
87 virtual RemoteBitrateEstimator* GetRemoteBitrateEstimator( 87 virtual RemoteBitrateEstimator* GetRemoteBitrateEstimator(
88 bool send_side_bwe); 88 bool send_side_bwe);
89 virtual int64_t GetPacerQueuingDelayMs() const; 89 virtual int64_t GetPacerQueuingDelayMs() const;
90 // TODO(nisse): Delete this accessor function. The pacer should be 90 // TODO(nisse): Rename or delete this accessor function. The pacer
91 // internal to the congestion controller. 91 // should be internal to the congestion controller.
92 virtual PacedSender* pacer() { return pacer_.get(); } 92 virtual RtpPacketSender* pacer() { return pacer_.get(); }
93 virtual TransportFeedbackObserver* GetTransportFeedbackObserver(); 93 virtual TransportFeedbackObserver* GetTransportFeedbackObserver();
94 RateLimiter* GetRetransmissionRateLimiter(); 94 RateLimiter* GetRetransmissionRateLimiter();
95 void EnablePeriodicAlrProbing(bool enable); 95 void EnablePeriodicAlrProbing(bool enable);
96 96
97 // SetAllocatedSendBitrateLimits sets bitrates limits imposed by send codec 97 // SetAllocatedSendBitrateLimits sets bitrates limits imposed by send codec
98 // settings. 98 // settings.
99 // |min_send_bitrate_bps| is the total minimum send bitrate required by all 99 // |min_send_bitrate_bps| is the total minimum send bitrate required by all
100 // sending streams. This is the minimum bitrate the PacedSender will use. 100 // sending streams. This is the minimum bitrate the PacedSender will use.
101 // Note that CongestionController::OnNetworkChanged can still be called with 101 // Note that CongestionController::OnNetworkChanged can still be called with
102 // a lower bitrate estimate. 102 // a lower bitrate estimate.
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
141 uint8_t last_reported_fraction_loss_ GUARDED_BY(critsect_); 141 uint8_t last_reported_fraction_loss_ GUARDED_BY(critsect_);
142 int64_t last_reported_rtt_ GUARDED_BY(critsect_); 142 int64_t last_reported_rtt_ GUARDED_BY(critsect_);
143 NetworkState network_state_ GUARDED_BY(critsect_); 143 NetworkState network_state_ GUARDED_BY(critsect_);
144 144
145 RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(CongestionController); 145 RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(CongestionController);
146 }; 146 };
147 147
148 } // namespace webrtc 148 } // namespace webrtc
149 149
150 #endif // WEBRTC_MODULES_CONGESTION_CONTROLLER_INCLUDE_CONGESTION_CONTROLLER_H_ 150 #endif // WEBRTC_MODULES_CONGESTION_CONTROLLER_INCLUDE_CONGESTION_CONTROLLER_H_
OLDNEW
« no previous file with comments | « no previous file | webrtc/video/rtp_stream_receiver.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698