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

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

Issue 1581113006: Support REMB in combination with send-side BWE. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 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
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 220 matching lines...) Expand 10 before | Expand all | Expand 10 after
231 if (send_side_bwe) 231 if (send_side_bwe)
232 return remote_estimator_proxy_.get(); 232 return remote_estimator_proxy_.get();
233 else 233 else
234 return remote_bitrate_estimator_.get(); 234 return remote_bitrate_estimator_.get();
235 } 235 }
236 236
237 TransportFeedbackObserver* 237 TransportFeedbackObserver*
238 CongestionController::GetTransportFeedbackObserver() { 238 CongestionController::GetTransportFeedbackObserver() {
239 if (transport_feedback_adapter_.get() == nullptr) { 239 if (transport_feedback_adapter_.get() == nullptr) {
240 transport_feedback_adapter_.reset(new TransportFeedbackAdapter( 240 transport_feedback_adapter_.reset(new TransportFeedbackAdapter(
241 bitrate_controller_->CreateRtcpBandwidthObserver(), 241 bitrate_controller_.get(), Clock::GetRealTimeClock(), process_thread_));
242 Clock::GetRealTimeClock(), process_thread_));
243 transport_feedback_adapter_->SetBitrateEstimator( 242 transport_feedback_adapter_->SetBitrateEstimator(
244 new RemoteBitrateEstimatorAbsSendTime( 243 new RemoteBitrateEstimatorAbsSendTime(
245 transport_feedback_adapter_.get(), Clock::GetRealTimeClock())); 244 transport_feedback_adapter_.get(), Clock::GetRealTimeClock()));
246 transport_feedback_adapter_->GetBitrateEstimator()->SetMinBitrate( 245 transport_feedback_adapter_->GetBitrateEstimator()->SetMinBitrate(
247 min_bitrate_bps_); 246 min_bitrate_bps_);
248 call_stats_->RegisterStatsObserver(transport_feedback_adapter_.get()); 247 call_stats_->RegisterStatsObserver(transport_feedback_adapter_.get());
249 } 248 }
250 return transport_feedback_adapter_.get(); 249 return transport_feedback_adapter_.get();
251 } 250 }
252 251
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
285 } 284 }
286 } 285 }
287 286
288 void CongestionController::OnSentPacket(const rtc::SentPacket& sent_packet) { 287 void CongestionController::OnSentPacket(const rtc::SentPacket& sent_packet) {
289 if (transport_feedback_adapter_) { 288 if (transport_feedback_adapter_) {
290 transport_feedback_adapter_->OnSentPacket(sent_packet.packet_id, 289 transport_feedback_adapter_->OnSentPacket(sent_packet.packet_id,
291 sent_packet.send_time_ms); 290 sent_packet.send_time_ms);
292 } 291 }
293 } 292 }
294 } // namespace webrtc 293 } // namespace webrtc
OLDNEW
« no previous file with comments | « no previous file | webrtc/modules/bitrate_controller/bitrate_controller_impl.h » ('j') | webrtc/video/end_to_end_tests.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698