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

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

Issue 2005313003: Propagate probing cluster id to SendTimeHistory. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Feedback fixes. Created 4 years, 6 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 30 matching lines...) Expand all
41 rbe_(new RemoteBitrateEstimatorSingleStream(observer_, clock_)), 41 rbe_(new RemoteBitrateEstimatorSingleStream(observer_, clock_)),
42 using_absolute_send_time_(false), 42 using_absolute_send_time_(false),
43 packets_since_absolute_send_time_(0), 43 packets_since_absolute_send_time_(0),
44 min_bitrate_bps_(RemoteBitrateEstimator::kDefaultMinBitrateBps) {} 44 min_bitrate_bps_(RemoteBitrateEstimator::kDefaultMinBitrateBps) {}
45 45
46 virtual ~WrappingBitrateEstimator() {} 46 virtual ~WrappingBitrateEstimator() {}
47 47
48 void IncomingPacket(int64_t arrival_time_ms, 48 void IncomingPacket(int64_t arrival_time_ms,
49 size_t payload_size, 49 size_t payload_size,
50 const RTPHeader& header, 50 const RTPHeader& header,
51 bool was_paced) override { 51 int probe_cluster_id) override {
52 CriticalSectionScoped cs(crit_sect_.get()); 52 CriticalSectionScoped cs(crit_sect_.get());
53 PickEstimatorFromHeader(header); 53 PickEstimatorFromHeader(header);
54 rbe_->IncomingPacket(arrival_time_ms, payload_size, header, was_paced); 54 rbe_->IncomingPacket(arrival_time_ms, payload_size, header,
55 probe_cluster_id);
stefan-webrtc 2016/05/26 16:29:49 Note that this code is running on the receive-side
55 } 56 }
56 57
57 void Process() override { 58 void Process() override {
58 CriticalSectionScoped cs(crit_sect_.get()); 59 CriticalSectionScoped cs(crit_sect_.get());
59 rbe_->Process(); 60 rbe_->Process();
60 } 61 }
61 62
62 int64_t TimeUntilNextProcess() override { 63 int64_t TimeUntilNextProcess() override {
63 CriticalSectionScoped cs(crit_sect_.get()); 64 CriticalSectionScoped cs(crit_sect_.get());
64 return rbe_->TimeUntilNextProcess(); 65 return rbe_->TimeUntilNextProcess();
(...skipping 274 matching lines...) Expand 10 before | Expand all | Expand 10 after
339 bool CongestionController::IsSendQueueFull() const { 340 bool CongestionController::IsSendQueueFull() const {
340 return pacer_->ExpectedQueueTimeMs() > PacedSender::kMaxQueueLengthMs; 341 return pacer_->ExpectedQueueTimeMs() > PacedSender::kMaxQueueLengthMs;
341 } 342 }
342 343
343 bool CongestionController::IsNetworkDown() const { 344 bool CongestionController::IsNetworkDown() const {
344 rtc::CritScope cs(&critsect_); 345 rtc::CritScope cs(&critsect_);
345 return network_state_ == kNetworkDown; 346 return network_state_ == kNetworkDown;
346 } 347 }
347 348
348 } // namespace webrtc 349 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698