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

Side by Side Diff: webrtc/modules/remote_bitrate_estimator/test/packet_sender.cc

Issue 1202253003: More Simulation Framework features (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Comments addressed [4] Created 5 years, 5 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) 2015 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2015 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 26 matching lines...) Expand all
37 ++it; 37 ++it;
38 } 38 }
39 } 39 }
40 return fb_packets; 40 return fb_packets;
41 } 41 }
42 42
43 VideoSender::VideoSender(PacketProcessorListener* listener, 43 VideoSender::VideoSender(PacketProcessorListener* listener,
44 VideoSource* source, 44 VideoSource* source,
45 BandwidthEstimatorType estimator_type) 45 BandwidthEstimatorType estimator_type)
46 : PacketSender(listener, source->flow_id()), 46 : PacketSender(listener, source->flow_id()),
47 running_(true),
47 source_(source), 48 source_(source),
48 bwe_(CreateBweSender(estimator_type, 49 bwe_(CreateBweSender(estimator_type,
49 source_->bits_per_second() / 1000, 50 source_->bits_per_second() / 1000,
50 this, 51 this,
51 &clock_)) { 52 &clock_)),
53 previous_sending_bitrate_(0) {
52 modules_.push_back(bwe_.get()); 54 modules_.push_back(bwe_.get());
53 } 55 }
54 56
55 VideoSender::~VideoSender() { 57 VideoSender::~VideoSender() {
56 } 58 }
57 59
58 void VideoSender::RunFor(int64_t time_ms, Packets* in_out) { 60 void VideoSender::RunFor(int64_t time_ms, Packets* in_out) {
59 std::list<FeedbackPacket*> feedbacks = GetFeedbackPackets( 61 std::list<FeedbackPacket*> feedbacks = GetFeedbackPackets(
60 in_out, clock_.TimeInMilliseconds() + time_ms, source_->flow_id()); 62 in_out, clock_.TimeInMilliseconds() + time_ms, source_->flow_id());
61 ProcessFeedbackAndGeneratePackets(time_ms, &feedbacks, in_out); 63 ProcessFeedbackAndGeneratePackets(time_ms, &feedbacks, in_out);
62 } 64 }
63 65
64 void VideoSender::ProcessFeedbackAndGeneratePackets( 66 void VideoSender::ProcessFeedbackAndGeneratePackets(
65 int64_t time_ms, 67 int64_t time_ms,
66 std::list<FeedbackPacket*>* feedbacks, 68 std::list<FeedbackPacket*>* feedbacks,
67 Packets* packets) { 69 Packets* packets) {
68 do { 70 do {
69 // Make sure to at least run Process() below every 100 ms. 71 // Make sure to at least run Process() below every 100 ms.
70 int64_t time_to_run_ms = std::min<int64_t>(time_ms, 100); 72 int64_t time_to_run_ms = std::min<int64_t>(time_ms, 100);
71 if (!feedbacks->empty()) { 73 if (!feedbacks->empty()) {
72 int64_t time_until_feedback_ms = 74 int64_t time_until_feedback_ms =
73 feedbacks->front()->send_time_us() / 1000 - 75 feedbacks->front()->send_time_us() / 1000 -
74 clock_.TimeInMilliseconds(); 76 clock_.TimeInMilliseconds();
75 time_to_run_ms = 77 time_to_run_ms =
76 std::max<int64_t>(std::min(time_ms, time_until_feedback_ms), 0); 78 std::max<int64_t>(std::min(time_ms, time_until_feedback_ms), 0);
77 } 79 }
80
81 if (!running_) {
82 source_->SetBitrateBps(0);
83 }
84
78 Packets generated; 85 Packets generated;
79 source_->RunFor(time_to_run_ms, &generated); 86 source_->RunFor(time_to_run_ms, &generated);
80 bwe_->OnPacketsSent(generated); 87 bwe_->OnPacketsSent(generated);
81 packets->merge(generated, DereferencingComparator<Packet>); 88 packets->merge(generated, DereferencingComparator<Packet>);
89
82 clock_.AdvanceTimeMilliseconds(time_to_run_ms); 90 clock_.AdvanceTimeMilliseconds(time_to_run_ms);
91
83 if (!feedbacks->empty()) { 92 if (!feedbacks->empty()) {
84 bwe_->GiveFeedback(*feedbacks->front()); 93 bwe_->GiveFeedback(*feedbacks->front());
85 delete feedbacks->front(); 94 delete feedbacks->front();
86 feedbacks->pop_front(); 95 feedbacks->pop_front();
87 } 96 }
97
88 bwe_->Process(); 98 bwe_->Process();
99
89 time_ms -= time_to_run_ms; 100 time_ms -= time_to_run_ms;
90 } while (time_ms > 0); 101 } while (time_ms > 0);
91 assert(feedbacks->empty()); 102 assert(feedbacks->empty());
92 } 103 }
93 104
94 int VideoSender::GetFeedbackIntervalMs() const { 105 int VideoSender::GetFeedbackIntervalMs() const {
95 return bwe_->GetFeedbackIntervalMs(); 106 return bwe_->GetFeedbackIntervalMs();
96 } 107 }
97 108
98 void VideoSender::OnNetworkChanged(uint32_t target_bitrate_bps, 109 void VideoSender::OnNetworkChanged(uint32_t target_bitrate_bps,
99 uint8_t fraction_lost, 110 uint8_t fraction_lost,
100 int64_t rtt) { 111 int64_t rtt) {
101 source_->SetBitrateBps(target_bitrate_bps); 112 source_->SetBitrateBps(target_bitrate_bps);
102 } 113 }
103 114
115 void VideoSender::Pause() {
116 running_ = false;
117 previous_sending_bitrate_ = TargetBitrateKbps();
118 }
119
120 void VideoSender::Resume() {
121 running_ = true;
122 source_->SetBitrateBps(previous_sending_bitrate_);
123 }
124
125 uint32_t VideoSender::TargetBitrateKbps() {
126 return (source_->bits_per_second() + 500) / 1000;
127 }
128
104 PacedVideoSender::PacedVideoSender(PacketProcessorListener* listener, 129 PacedVideoSender::PacedVideoSender(PacketProcessorListener* listener,
105 VideoSource* source, 130 VideoSource* source,
106 BandwidthEstimatorType estimator) 131 BandwidthEstimatorType estimator)
107 : VideoSender(listener, source, estimator), 132 : VideoSender(listener, source, estimator),
108 pacer_(&clock_, 133 pacer_(&clock_,
109 this, 134 this,
110 source->bits_per_second() / 1000, 135 source->bits_per_second() / 1000,
111 PacedSender::kDefaultPaceMultiplier * source->bits_per_second() / 136 PacedSender::kDefaultPaceMultiplier * source->bits_per_second() /
112 1000, 137 1000,
113 0) { 138 0) {
(...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after
255 280
256 void PacedVideoSender::OnNetworkChanged(uint32_t target_bitrate_bps, 281 void PacedVideoSender::OnNetworkChanged(uint32_t target_bitrate_bps,
257 uint8_t fraction_lost, 282 uint8_t fraction_lost,
258 int64_t rtt) { 283 int64_t rtt) {
259 VideoSender::OnNetworkChanged(target_bitrate_bps, fraction_lost, rtt); 284 VideoSender::OnNetworkChanged(target_bitrate_bps, fraction_lost, rtt);
260 pacer_.UpdateBitrate( 285 pacer_.UpdateBitrate(
261 target_bitrate_bps / 1000, 286 target_bitrate_bps / 1000,
262 PacedSender::kDefaultPaceMultiplier * target_bitrate_bps / 1000, 0); 287 PacedSender::kDefaultPaceMultiplier * target_bitrate_bps / 1000, 0);
263 } 288 }
264 289
290 const int kNoLimit = std::numeric_limits<int>::max();
291 const int kPacketSizeBytes = 1200;
292
293 TcpSender::TcpSender(PacketProcessorListener* listener,
294 int flow_id,
295 int64_t offset_ms)
296 : TcpSender(listener, flow_id, offset_ms, kNoLimit) {
297 }
298
299 TcpSender::TcpSender(PacketProcessorListener* listener,
300 int flow_id,
301 int64_t offset_ms,
302 int send_limit_bytes)
303 : PacketSender(listener, flow_id),
304 cwnd_(10),
305 ssthresh_(kNoLimit),
306 ack_received_(false),
307 last_acked_seq_num_(0),
308 next_sequence_number_(0),
309 offset_ms_(offset_ms),
310 last_reduction_time_ms_(-1),
311 last_rtt_ms_(0),
312 total_sent_bytes_(0),
313 send_limit_bytes_(send_limit_bytes),
314 running_(true),
315 last_generated_packets_ms_(0),
316 num_recent_sent_packets_(0),
317 bitrate_kbps_(0) {
318 }
319
265 void TcpSender::RunFor(int64_t time_ms, Packets* in_out) { 320 void TcpSender::RunFor(int64_t time_ms, Packets* in_out) {
266 if (clock_.TimeInMilliseconds() + time_ms < offset_ms_) { 321 if (clock_.TimeInMilliseconds() + time_ms < offset_ms_) {
267 clock_.AdvanceTimeMilliseconds(time_ms); 322 clock_.AdvanceTimeMilliseconds(time_ms);
323 if (running_) {
324 running_ = false;
325 }
268 return; 326 return;
269 } 327 }
328
329 if (!running_) {
330 running_ = true;
331 }
332
270 int64_t start_time_ms = clock_.TimeInMilliseconds(); 333 int64_t start_time_ms = clock_.TimeInMilliseconds();
271 BWE_TEST_LOGGING_CONTEXT("Sender"); 334 BWE_TEST_LOGGING_CONTEXT("Sender");
272 BWE_TEST_LOGGING_CONTEXT(*flow_ids().begin()); 335 BWE_TEST_LOGGING_CONTEXT(*flow_ids().begin());
273 336
274 std::list<FeedbackPacket*> feedbacks = GetFeedbackPackets( 337 std::list<FeedbackPacket*> feedbacks = GetFeedbackPackets(
275 in_out, clock_.TimeInMilliseconds() + time_ms, *flow_ids().begin()); 338 in_out, clock_.TimeInMilliseconds() + time_ms, *flow_ids().begin());
276 // The number of packets which are sent in during time_ms depends on the 339 // The number of packets which are sent in during time_ms depends on the
277 // number of packets in_flight_ and the max number of packets in flight 340 // number of packets in_flight_ and the max number of packets in flight
278 // (cwnd_). Therefore SendPackets() isn't directly dependent on time_ms. 341 // (cwnd_). Therefore SendPackets() isn't directly dependent on time_ms.
279 for (FeedbackPacket* fb : feedbacks) { 342 for (FeedbackPacket* fb : feedbacks) {
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
352 void TcpSender::HandleLoss() { 415 void TcpSender::HandleLoss() {
353 if (clock_.TimeInMilliseconds() - last_reduction_time_ms_ < last_rtt_ms_) 416 if (clock_.TimeInMilliseconds() - last_reduction_time_ms_ < last_rtt_ms_)
354 return; 417 return;
355 last_reduction_time_ms_ = clock_.TimeInMilliseconds(); 418 last_reduction_time_ms_ = clock_.TimeInMilliseconds();
356 ssthresh_ = std::max(static_cast<int>(in_flight_.size() / 2), 2); 419 ssthresh_ = std::max(static_cast<int>(in_flight_.size() / 2), 2);
357 cwnd_ = ssthresh_; 420 cwnd_ = ssthresh_;
358 } 421 }
359 422
360 Packets TcpSender::GeneratePackets(size_t num_packets) { 423 Packets TcpSender::GeneratePackets(size_t num_packets) {
361 Packets generated; 424 Packets generated;
425
426 UpdateSendBitrateEstimate(num_packets);
427
362 for (size_t i = 0; i < num_packets; ++i) { 428 for (size_t i = 0; i < num_packets; ++i) {
363 generated.push_back(new MediaPacket(*flow_ids().begin(), 429 if ((total_sent_bytes_ + kPacketSizeBytes) > send_limit_bytes_) {
364 1000 * clock_.TimeInMilliseconds(), 430 if (running_) {
365 1200, next_sequence_number_++)); 431 running_ = false;
432 }
433 break;
434 }
435 generated.push_back(
436 new MediaPacket(*flow_ids().begin(), 1000 * clock_.TimeInMilliseconds(),
437 kPacketSizeBytes, next_sequence_number_++));
366 generated.back()->set_sender_timestamp_us( 438 generated.back()->set_sender_timestamp_us(
367 1000 * clock_.TimeInMilliseconds()); 439 1000 * clock_.TimeInMilliseconds());
440
441 total_sent_bytes_ += kPacketSizeBytes;
368 } 442 }
443
369 return generated; 444 return generated;
370 } 445 }
446
447 void TcpSender::UpdateSendBitrateEstimate(size_t num_packets) {
448 const int kTimeWindowMs = 500;
449 num_recent_sent_packets_ += num_packets;
450
451 int64_t delta_ms = clock_.TimeInMilliseconds() - last_generated_packets_ms_;
452 if (delta_ms >= kTimeWindowMs) {
453 bitrate_kbps_ =
454 static_cast<uint32_t>(8 * num_recent_sent_packets_ * kPacketSizeBytes) /
455 delta_ms;
456 last_generated_packets_ms_ = clock_.TimeInMilliseconds();
457 num_recent_sent_packets_ = 0;
458 }
459 }
460
461 uint32_t TcpSender::TargetBitrateKbps() {
462 return bitrate_kbps_;
463 }
464
371 } // namespace bwe 465 } // namespace bwe
372 } // namespace testing 466 } // namespace testing
373 } // namespace webrtc 467 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698