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

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

Issue 2638083002: Attach TransportFeedbackPacketLossTracker to ANA (PLR only) (Closed)
Patch Set: Rebased Created 3 years, 9 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 246 matching lines...) Expand 10 before | Expand all | Expand 10 after
257 257
258 RemoteBitrateEstimator* CongestionController::GetRemoteBitrateEstimator( 258 RemoteBitrateEstimator* CongestionController::GetRemoteBitrateEstimator(
259 bool send_side_bwe) { 259 bool send_side_bwe) {
260 if (send_side_bwe) { 260 if (send_side_bwe) {
261 return &remote_estimator_proxy_; 261 return &remote_estimator_proxy_;
262 } else { 262 } else {
263 return &remote_bitrate_estimator_; 263 return &remote_bitrate_estimator_;
264 } 264 }
265 } 265 }
266 266
267 void CongestionController::RegisterTransportFeedbackAdapterObserver(
268 TransportFeedbackAdapterObserver* observer) {
269 transport_feedback_adapter_.RegisterTransportFeedbackAdapterObserver(
270 observer);
271 }
272
273 void CongestionController::DeRegisterTransportFeedbackAdapterObserver(
274 TransportFeedbackAdapterObserver* observer) {
275 transport_feedback_adapter_.DeRegisterTransportFeedbackAdapterObserver(
276 observer);
277 }
278
267 RateLimiter* CongestionController::GetRetransmissionRateLimiter() { 279 RateLimiter* CongestionController::GetRetransmissionRateLimiter() {
268 return retransmission_rate_limiter_.get(); 280 return retransmission_rate_limiter_.get();
269 } 281 }
270 282
271 void CongestionController::EnablePeriodicAlrProbing(bool enable) { 283 void CongestionController::EnablePeriodicAlrProbing(bool enable) {
272 probe_controller_->EnablePeriodicAlrProbing(enable); 284 probe_controller_->EnablePeriodicAlrProbing(enable);
273 } 285 }
274 286
275 void CongestionController::SetAllocatedSendBitrateLimits( 287 void CongestionController::SetAllocatedSendBitrateLimits(
276 int min_send_bitrate_bps, 288 int min_send_bitrate_bps,
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
326 remote_bitrate_estimator_.TimeUntilNextProcess()); 338 remote_bitrate_estimator_.TimeUntilNextProcess());
327 } 339 }
328 340
329 void CongestionController::Process() { 341 void CongestionController::Process() {
330 bitrate_controller_->Process(); 342 bitrate_controller_->Process();
331 remote_bitrate_estimator_.Process(); 343 remote_bitrate_estimator_.Process();
332 probe_controller_->Process(); 344 probe_controller_->Process();
333 MaybeTriggerOnNetworkChanged(); 345 MaybeTriggerOnNetworkChanged();
334 } 346 }
335 347
336 void CongestionController::AddPacket(uint16_t sequence_number, 348 void CongestionController::AddPacket(uint32_t ssrc,
349 uint16_t sequence_number,
337 size_t length, 350 size_t length,
338 const PacedPacketInfo& pacing_info) { 351 const PacedPacketInfo& pacing_info) {
339 transport_feedback_adapter_.AddPacket(sequence_number, length, pacing_info); 352 transport_feedback_adapter_.AddPacket(ssrc, sequence_number, length,
353 pacing_info);
340 } 354 }
341 355
342 void CongestionController::OnTransportFeedback( 356 void CongestionController::OnTransportFeedback(
343 const rtcp::TransportFeedback& feedback) { 357 const rtcp::TransportFeedback& feedback) {
344 RTC_DCHECK(worker_thread_checker_.CalledOnValidThread()); 358 RTC_DCHECK(worker_thread_checker_.CalledOnValidThread());
345 transport_feedback_adapter_.OnTransportFeedback(feedback); 359 transport_feedback_adapter_.OnTransportFeedback(feedback);
346 std::vector<PacketFeedback> feedback_vector = 360 std::vector<PacketFeedback> feedback_vector =
347 transport_feedback_adapter_.GetTransportFeedbackVector(); 361 transport_feedback_adapter_.GetTransportFeedbackVector();
348 if (feedback_vector.empty()) 362 if (feedback_vector.empty())
349 return; 363 return;
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
415 bool CongestionController::IsSendQueueFull() const { 429 bool CongestionController::IsSendQueueFull() const {
416 return pacer_->ExpectedQueueTimeMs() > PacedSender::kMaxQueueLengthMs; 430 return pacer_->ExpectedQueueTimeMs() > PacedSender::kMaxQueueLengthMs;
417 } 431 }
418 432
419 bool CongestionController::IsNetworkDown() const { 433 bool CongestionController::IsNetworkDown() const {
420 rtc::CritScope cs(&network_state_lock_); 434 rtc::CritScope cs(&network_state_lock_);
421 return network_state_ == kNetworkDown; 435 return network_state_ == kNetworkDown;
422 } 436 }
423 437
424 } // namespace webrtc 438 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698