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

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

Issue 1512853002: Nuke TickTime::UseFakeClock. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: cl format Created 5 years 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 129 matching lines...) Expand 10 before | Expand all | Expand 10 after
140 int min_bitrate_bps_; 140 int min_bitrate_bps_;
141 141
142 RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(WrappingBitrateEstimator); 142 RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(WrappingBitrateEstimator);
143 }; 143 };
144 144
145 } // namespace 145 } // namespace
146 146
147 CongestionController::CongestionController(ProcessThread* process_thread, 147 CongestionController::CongestionController(ProcessThread* process_thread,
148 CallStats* call_stats, 148 CallStats* call_stats,
149 BitrateObserver* bitrate_observer) 149 BitrateObserver* bitrate_observer)
150 : remb_(new VieRemb()), 150 : clock_(Clock::GetRealTimeClock()),
mflodman 2015/12/09 10:11:25 We might as well skip this member, inject an insta
pbos-webrtc 2015/12/09 10:19:04 Done.
151 remb_(new VieRemb(clock_)),
151 packet_router_(new PacketRouter()), 152 packet_router_(new PacketRouter()),
152 pacer_(new PacedSender(Clock::GetRealTimeClock(), 153 pacer_(new PacedSender(clock_,
153 packet_router_.get(), 154 packet_router_.get(),
154 BitrateController::kDefaultStartBitrateKbps, 155 BitrateController::kDefaultStartBitrateKbps,
155 PacedSender::kDefaultPaceMultiplier * 156 PacedSender::kDefaultPaceMultiplier *
156 BitrateController::kDefaultStartBitrateKbps, 157 BitrateController::kDefaultStartBitrateKbps,
157 0)), 158 0)),
158 remote_bitrate_estimator_( 159 remote_bitrate_estimator_(
159 new WrappingBitrateEstimator(remb_.get(), Clock::GetRealTimeClock())), 160 new WrappingBitrateEstimator(remb_.get(), clock_)),
160 remote_estimator_proxy_( 161 remote_estimator_proxy_(
161 new RemoteEstimatorProxy(Clock::GetRealTimeClock(), 162 new RemoteEstimatorProxy(clock_, packet_router_.get())),
162 packet_router_.get())),
163 process_thread_(process_thread), 163 process_thread_(process_thread),
164 call_stats_(call_stats), 164 call_stats_(call_stats),
165 pacer_thread_(ProcessThread::Create("PacerThread")), 165 pacer_thread_(ProcessThread::Create("PacerThread")),
166 // Constructed last as this object calls the provided callback on 166 // Constructed last as this object calls the provided callback on
167 // construction. 167 // construction.
168 bitrate_controller_( 168 bitrate_controller_(
169 BitrateController::CreateBitrateController(Clock::GetRealTimeClock(), 169 BitrateController::CreateBitrateController(Clock::GetRealTimeClock(),
170 bitrate_observer)), 170 bitrate_observer)),
171 min_bitrate_bps_(RemoteBitrateEstimator::kDefaultMinBitrateBps) { 171 min_bitrate_bps_(RemoteBitrateEstimator::kDefaultMinBitrateBps) {
172 call_stats_->RegisterStatsObserver(remote_bitrate_estimator_.get()); 172 call_stats_->RegisterStatsObserver(remote_bitrate_estimator_.get());
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
285 } 285 }
286 } 286 }
287 287
288 void CongestionController::OnSentPacket(const rtc::SentPacket& sent_packet) { 288 void CongestionController::OnSentPacket(const rtc::SentPacket& sent_packet) {
289 if (transport_feedback_adapter_) { 289 if (transport_feedback_adapter_) {
290 transport_feedback_adapter_->OnSentPacket(sent_packet.packet_id, 290 transport_feedback_adapter_->OnSentPacket(sent_packet.packet_id,
291 sent_packet.send_time_ms); 291 sent_packet.send_time_ms);
292 } 292 }
293 } 293 }
294 } // namespace webrtc 294 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698