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

Side by Side Diff: webrtc/video_engine/vie_channel_group.cc

Issue 1188823007: Only use paced packets for estimating bitrate probes. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Added unittest Created 5 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
« no previous file with comments | « webrtc/video/rampup_tests.cc ('k') | webrtc/video_engine/vie_receiver.cc » ('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 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 kAimdControl, 48 kAimdControl,
49 min_bitrate_bps_)), 49 min_bitrate_bps_)),
50 using_absolute_send_time_(false), 50 using_absolute_send_time_(false),
51 packets_since_absolute_send_time_(0) { 51 packets_since_absolute_send_time_(0) {
52 } 52 }
53 53
54 virtual ~WrappingBitrateEstimator() {} 54 virtual ~WrappingBitrateEstimator() {}
55 55
56 void IncomingPacket(int64_t arrival_time_ms, 56 void IncomingPacket(int64_t arrival_time_ms,
57 size_t payload_size, 57 size_t payload_size,
58 const RTPHeader& header) override { 58 const RTPHeader& header,
59 bool was_paced) override {
59 CriticalSectionScoped cs(crit_sect_.get()); 60 CriticalSectionScoped cs(crit_sect_.get());
60 PickEstimatorFromHeader(header); 61 PickEstimatorFromHeader(header);
61 rbe_->IncomingPacket(arrival_time_ms, payload_size, header); 62 rbe_->IncomingPacket(arrival_time_ms, payload_size, header, was_paced);
62 } 63 }
63 64
64 int32_t Process() override { 65 int32_t Process() override {
65 CriticalSectionScoped cs(crit_sect_.get()); 66 CriticalSectionScoped cs(crit_sect_.get());
66 return rbe_->Process(); 67 return rbe_->Process();
67 } 68 }
68 69
69 int64_t TimeUntilNextProcess() override { 70 int64_t TimeUntilNextProcess() override {
70 CriticalSectionScoped cs(crit_sect_.get()); 71 CriticalSectionScoped cs(crit_sect_.get());
71 return rbe_->TimeUntilNextProcess(); 72 return rbe_->TimeUntilNextProcess();
(...skipping 406 matching lines...) Expand 10 before | Expand all | Expand 10 after
478 pad_up_to_bitrate_bps += 479 pad_up_to_bitrate_bps +=
479 encoder.second->GetPaddingNeededBps(target_bitrate_bps); 480 encoder.second->GetPaddingNeededBps(target_bitrate_bps);
480 } 481 }
481 } 482 }
482 pacer_->UpdateBitrate( 483 pacer_->UpdateBitrate(
483 target_bitrate_bps / 1000, 484 target_bitrate_bps / 1000,
484 PacedSender::kDefaultPaceMultiplier * target_bitrate_bps / 1000, 485 PacedSender::kDefaultPaceMultiplier * target_bitrate_bps / 1000,
485 pad_up_to_bitrate_bps / 1000); 486 pad_up_to_bitrate_bps / 1000);
486 } 487 }
487 } // namespace webrtc 488 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/video/rampup_tests.cc ('k') | webrtc/video_engine/vie_receiver.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698