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

Side by Side Diff: webrtc/modules/congestion_controller/send_side_congestion_controller.cc

Issue 2827333005: Moving overhead counting to bitrate estimators.
Patch Set: Created 3 years, 8 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) 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 214 matching lines...) Expand 10 before | Expand all | Expand 10 after
225 225
226 void SendSideCongestionController::Process() { 226 void SendSideCongestionController::Process() {
227 bitrate_controller_->Process(); 227 bitrate_controller_->Process();
228 probe_controller_->Process(); 228 probe_controller_->Process();
229 MaybeTriggerOnNetworkChanged(); 229 MaybeTriggerOnNetworkChanged();
230 } 230 }
231 231
232 void SendSideCongestionController::AddPacket( 232 void SendSideCongestionController::AddPacket(
233 uint32_t ssrc, 233 uint32_t ssrc,
234 uint16_t sequence_number, 234 uint16_t sequence_number,
235 size_t length, 235 size_t payload_size,
236 size_t rtp_headers_size,
236 const PacedPacketInfo& pacing_info) { 237 const PacedPacketInfo& pacing_info) {
237 transport_feedback_adapter_.AddPacket(ssrc, sequence_number, length, 238 transport_feedback_adapter_.AddPacket(ssrc, sequence_number, payload_size,
238 pacing_info); 239 rtp_headers_size, pacing_info);
239 } 240 }
240 241
241 void SendSideCongestionController::OnTransportFeedback( 242 void SendSideCongestionController::OnTransportFeedback(
242 const rtcp::TransportFeedback& feedback) { 243 const rtcp::TransportFeedback& feedback) {
243 RTC_DCHECK(worker_thread_checker_.CalledOnValidThread()); 244 RTC_DCHECK(worker_thread_checker_.CalledOnValidThread());
244 transport_feedback_adapter_.OnTransportFeedback(feedback); 245 transport_feedback_adapter_.OnTransportFeedback(feedback);
245 std::vector<PacketFeedback> feedback_vector = 246 std::vector<PacketFeedback> feedback_vector =
246 transport_feedback_adapter_.GetTransportFeedbackVector(); 247 transport_feedback_adapter_.GetTransportFeedbackVector();
247 DelayBasedBwe::Result result; 248 DelayBasedBwe::Result result;
248 { 249 {
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
311 bool SendSideCongestionController::IsSendQueueFull() const { 312 bool SendSideCongestionController::IsSendQueueFull() const {
312 return pacer_->ExpectedQueueTimeMs() > PacedSender::kMaxQueueLengthMs; 313 return pacer_->ExpectedQueueTimeMs() > PacedSender::kMaxQueueLengthMs;
313 } 314 }
314 315
315 bool SendSideCongestionController::IsNetworkDown() const { 316 bool SendSideCongestionController::IsNetworkDown() const {
316 rtc::CritScope cs(&network_state_lock_); 317 rtc::CritScope cs(&network_state_lock_);
317 return network_state_ == kNetworkDown; 318 return network_state_ == kNetworkDown;
318 } 319 }
319 320
320 } // namespace webrtc 321 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698