OLD | NEW |
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 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
69 } | 69 } |
70 } | 70 } |
71 } | 71 } |
72 | 72 |
73 int64_t rtt_ms = | 73 int64_t rtt_ms = |
74 clock_->TimeInMilliseconds() - feedback.latest_send_time_ms(); | 74 clock_->TimeInMilliseconds() - feedback.latest_send_time_ms(); |
75 bwe_->OnRttUpdate(rtt_ms, rtt_ms); | 75 bwe_->OnRttUpdate(rtt_ms, rtt_ms); |
76 BWE_TEST_LOGGING_PLOT(1, "RTT", clock_->TimeInMilliseconds(), rtt_ms); | 76 BWE_TEST_LOGGING_PLOT(1, "RTT", clock_->TimeInMilliseconds(), rtt_ms); |
77 | 77 |
78 acknowledged_bitrate_estimator_->IncomingPacketFeedbackVector( | 78 acknowledged_bitrate_estimator_->IncomingPacketFeedbackVector( |
79 packet_feedback_vector); | 79 packet_feedback_vector, false); |
80 DelayBasedBwe::Result result = bwe_->IncomingPacketFeedbackVector( | 80 DelayBasedBwe::Result result = bwe_->IncomingPacketFeedbackVector( |
81 packet_feedback_vector, acknowledged_bitrate_estimator_->bitrate_bps()); | 81 packet_feedback_vector, acknowledged_bitrate_estimator_->bitrate_bps()); |
82 if (result.updated) | 82 if (result.updated) |
83 bitrate_controller_->OnDelayBasedBweResult(result); | 83 bitrate_controller_->OnDelayBasedBweResult(result); |
84 | 84 |
85 if (has_received_ack_) { | 85 if (has_received_ack_) { |
86 int expected_packets = fb.packet_feedback_vector().back().sequence_number - | 86 int expected_packets = fb.packet_feedback_vector().back().sequence_number - |
87 last_acked_seq_num_; | 87 last_acked_seq_num_; |
88 // Assuming no reordering for now. | 88 // Assuming no reordering for now. |
89 if (expected_packets > 0) { | 89 if (expected_packets > 0) { |
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
167 packet_feedback_vector_.back().arrival_time_ms; | 167 packet_feedback_vector_.back().arrival_time_ms; |
168 FeedbackPacket* fb = new SendSideBweFeedback( | 168 FeedbackPacket* fb = new SendSideBweFeedback( |
169 flow_id_, now_ms * 1000, corrected_send_time_ms, packet_feedback_vector_); | 169 flow_id_, now_ms * 1000, corrected_send_time_ms, packet_feedback_vector_); |
170 packet_feedback_vector_.clear(); | 170 packet_feedback_vector_.clear(); |
171 return fb; | 171 return fb; |
172 } | 172 } |
173 | 173 |
174 } // namespace bwe | 174 } // namespace bwe |
175 } // namespace testing | 175 } // namespace testing |
176 } // namespace webrtc | 176 } // namespace webrtc |
OLD | NEW |