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

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

Issue 2444923002: Revert of Fix some chromium style warnings in remote_bitrate_estimator.h (Closed)
Patch Set: Created 4 years, 1 month 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
« no previous file with comments | « no previous file | webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 : observer_(observer), 57 : observer_(observer),
58 clock_(clock), 58 clock_(clock),
59 crit_sect_(CriticalSectionWrapper::CreateCriticalSection()), 59 crit_sect_(CriticalSectionWrapper::CreateCriticalSection()),
60 rbe_(new RemoteBitrateEstimatorSingleStream(observer_, clock_)), 60 rbe_(new RemoteBitrateEstimatorSingleStream(observer_, clock_)),
61 using_absolute_send_time_(false), 61 using_absolute_send_time_(false),
62 packets_since_absolute_send_time_(0), 62 packets_since_absolute_send_time_(0),
63 min_bitrate_bps_(RemoteBitrateEstimator::kDefaultMinBitrateBps) {} 63 min_bitrate_bps_(RemoteBitrateEstimator::kDefaultMinBitrateBps) {}
64 64
65 virtual ~WrappingBitrateEstimator() {} 65 virtual ~WrappingBitrateEstimator() {}
66 66
67 void IncomingPacketFeedbackVector(
68 const std::vector<PacketInfo>& packet_feedback_vector) override {
69 assert(false);
70 }
71
72 void IncomingPacket(int64_t arrival_time_ms, 67 void IncomingPacket(int64_t arrival_time_ms,
73 size_t payload_size, 68 size_t payload_size,
74 const RTPHeader& header) override { 69 const RTPHeader& header) override {
75 CriticalSectionScoped cs(crit_sect_.get()); 70 CriticalSectionScoped cs(crit_sect_.get());
76 PickEstimatorFromHeader(header); 71 PickEstimatorFromHeader(header);
77 rbe_->IncomingPacket(arrival_time_ms, payload_size, header); 72 rbe_->IncomingPacket(arrival_time_ms, payload_size, header);
78 } 73 }
79 74
80 void Process() override { 75 void Process() override {
81 CriticalSectionScoped cs(crit_sect_.get()); 76 CriticalSectionScoped cs(crit_sect_.get());
(...skipping 295 matching lines...) Expand 10 before | Expand all | Expand 10 after
377 bool CongestionController::IsSendQueueFull() const { 372 bool CongestionController::IsSendQueueFull() const {
378 return pacer_->ExpectedQueueTimeMs() > PacedSender::kMaxQueueLengthMs; 373 return pacer_->ExpectedQueueTimeMs() > PacedSender::kMaxQueueLengthMs;
379 } 374 }
380 375
381 bool CongestionController::IsNetworkDown() const { 376 bool CongestionController::IsNetworkDown() const {
382 rtc::CritScope cs(&critsect_); 377 rtc::CritScope cs(&critsect_);
383 return network_state_ == kNetworkDown; 378 return network_state_ == kNetworkDown;
384 } 379 }
385 380
386 } // namespace webrtc 381 } // namespace webrtc
OLDNEW
« no previous file with comments | « no previous file | webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698