diff options
| author | stefan@webrtc.org <stefan@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2014-06-12 15:12:25 +0000 |
|---|---|---|
| committer | stefan@webrtc.org <stefan@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2014-06-12 15:12:25 +0000 |
| commit | cb254aac3b18ac41ff175c816190390589182965 (patch) | |
| tree | 30bd67ced177dfcbac0a4b432d4ef3f848791653 /webrtc/modules/pacing | |
| parent | 27f062ae6fec5b7ae5bb0250cb1de73bdd06983e (diff) | |
| download | webrtc-cb254aac3b18ac41ff175c816190390589182965.tar.gz | |
Enable pacing by default and remove the option to disable it from the new API.
BUG=1672
R=mflodman@webrtc.org, pbos@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/17659004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6416 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'webrtc/modules/pacing')
| -rw-r--r-- | webrtc/modules/pacing/paced_sender.cc | 2 | ||||
| -rw-r--r-- | webrtc/modules/pacing/paced_sender_unittest.cc | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/webrtc/modules/pacing/paced_sender.cc b/webrtc/modules/pacing/paced_sender.cc index 125d3c0cdf..e9f9bddced 100644 --- a/webrtc/modules/pacing/paced_sender.cc +++ b/webrtc/modules/pacing/paced_sender.cc @@ -124,7 +124,7 @@ PacedSender::PacedSender(Callback* callback, int max_bitrate_kbps, int min_bitrate_kbps) : callback_(callback), - enabled_(false), + enabled_(true), paused_(false), max_queue_length_ms_(kDefaultMaxQueueLengthMs), critsect_(CriticalSectionWrapper::CreateCriticalSection()), diff --git a/webrtc/modules/pacing/paced_sender_unittest.cc b/webrtc/modules/pacing/paced_sender_unittest.cc index 435c93c54a..9763c80070 100644 --- a/webrtc/modules/pacing/paced_sender_unittest.cc +++ b/webrtc/modules/pacing/paced_sender_unittest.cc @@ -61,7 +61,6 @@ class PacedSenderTest : public ::testing::Test { // Need to initialize PacedSender after we initialize clock. send_bucket_.reset( new PacedSender(&callback_, kPaceMultiplier * kTargetBitrate, 0)); - send_bucket_->SetStatus(true); } void SendAndExpectPacket(PacedSender::Priority priority, @@ -276,7 +275,6 @@ TEST_F(PacedSenderTest, VerifyAverageBitrateVaryingMediaPayload) { PacedSenderPadding callback; send_bucket_.reset( new PacedSender(&callback, kPaceMultiplier * kTargetBitrate, 0)); - send_bucket_->SetStatus(true); send_bucket_->UpdateBitrate(kPaceMultiplier * kTargetBitrate, kTargetBitrate); int64_t start_time = TickTime::MillisecondTimestamp(); int media_bytes = 0; |