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

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

Issue 2086633002: Revert of Remove audio/video distinction for probe packets. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: 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 crit_sect_(CriticalSectionWrapper::CreateCriticalSection()), 41 crit_sect_(CriticalSectionWrapper::CreateCriticalSection()),
42 rbe_(new RemoteBitrateEstimatorSingleStream(observer_, clock_)), 42 rbe_(new RemoteBitrateEstimatorSingleStream(observer_, clock_)),
43 using_absolute_send_time_(false), 43 using_absolute_send_time_(false),
44 packets_since_absolute_send_time_(0), 44 packets_since_absolute_send_time_(0),
45 min_bitrate_bps_(RemoteBitrateEstimator::kDefaultMinBitrateBps) {} 45 min_bitrate_bps_(RemoteBitrateEstimator::kDefaultMinBitrateBps) {}
46 46
47 virtual ~WrappingBitrateEstimator() {} 47 virtual ~WrappingBitrateEstimator() {}
48 48
49 void IncomingPacket(int64_t arrival_time_ms, 49 void IncomingPacket(int64_t arrival_time_ms,
50 size_t payload_size, 50 size_t payload_size,
51 const RTPHeader& header) override { 51 const RTPHeader& header,
52 bool was_paced) override {
52 CriticalSectionScoped cs(crit_sect_.get()); 53 CriticalSectionScoped cs(crit_sect_.get());
53 PickEstimatorFromHeader(header); 54 PickEstimatorFromHeader(header);
54 rbe_->IncomingPacket(arrival_time_ms, payload_size, header); 55 rbe_->IncomingPacket(arrival_time_ms, payload_size, header, was_paced);
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 275 matching lines...) Expand 10 before | Expand all | Expand 10 after
340 bool CongestionController::IsSendQueueFull() const { 341 bool CongestionController::IsSendQueueFull() const {
341 return pacer_->ExpectedQueueTimeMs() > PacedSender::kMaxQueueLengthMs; 342 return pacer_->ExpectedQueueTimeMs() > PacedSender::kMaxQueueLengthMs;
342 } 343 }
343 344
344 bool CongestionController::IsNetworkDown() const { 345 bool CongestionController::IsNetworkDown() const {
345 rtc::CritScope cs(&critsect_); 346 rtc::CritScope cs(&critsect_);
346 return network_state_ == kNetworkDown; 347 return network_state_ == kNetworkDown;
347 } 348 }
348 349
349 } // namespace webrtc 350 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/audio/audio_receive_stream_unittest.cc ('k') | webrtc/modules/congestion_controller/delay_based_bwe.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698