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 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
62 int64_t now_ms = clock_->TimeInMilliseconds(); | 62 int64_t now_ms = clock_->TimeInMilliseconds(); |
63 if (now_ms - last_log_time_ms_ > 5000) { | 63 if (now_ms - last_log_time_ms_ > 5000) { |
64 LOG(LS_WARNING) << "Ack arrived too late."; | 64 LOG(LS_WARNING) << "Ack arrived too late."; |
65 last_log_time_ms_ = now_ms; | 65 last_log_time_ms_ = now_ms; |
66 } | 66 } |
67 } | 67 } |
68 } | 68 } |
69 | 69 |
70 int64_t rtt_ms = | 70 int64_t rtt_ms = |
71 clock_->TimeInMilliseconds() - feedback.latest_send_time_ms(); | 71 clock_->TimeInMilliseconds() - feedback.latest_send_time_ms(); |
72 // fprintf(stderr, "%ld\n", rtt_ms); | |
philipel
2017/05/30 09:43:38
Undo this change
gnish2
2017/05/30 15:13:22
Done.
| |
72 bwe_->OnRttUpdate(rtt_ms, rtt_ms); | 73 bwe_->OnRttUpdate(rtt_ms, rtt_ms); |
73 BWE_TEST_LOGGING_PLOT(1, "RTT", clock_->TimeInMilliseconds(), rtt_ms); | 74 BWE_TEST_LOGGING_PLOT(1, "RTT", clock_->TimeInMilliseconds(), rtt_ms); |
74 | 75 |
75 DelayBasedBwe::Result result = | 76 DelayBasedBwe::Result result = |
76 bwe_->IncomingPacketFeedbackVector(packet_feedback_vector); | 77 bwe_->IncomingPacketFeedbackVector(packet_feedback_vector); |
77 if (result.updated) | 78 if (result.updated) |
78 bitrate_controller_->OnDelayBasedBweResult(result); | 79 bitrate_controller_->OnDelayBasedBweResult(result); |
79 | 80 |
80 if (has_received_ack_) { | 81 if (has_received_ack_) { |
81 int expected_packets = fb.packet_feedback_vector().back().sequence_number - | 82 int expected_packets = fb.packet_feedback_vector().back().sequence_number - |
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
162 packet_feedback_vector_.back().arrival_time_ms; | 163 packet_feedback_vector_.back().arrival_time_ms; |
163 FeedbackPacket* fb = new SendSideBweFeedback( | 164 FeedbackPacket* fb = new SendSideBweFeedback( |
164 flow_id_, now_ms * 1000, corrected_send_time_ms, packet_feedback_vector_); | 165 flow_id_, now_ms * 1000, corrected_send_time_ms, packet_feedback_vector_); |
165 packet_feedback_vector_.clear(); | 166 packet_feedback_vector_.clear(); |
166 return fb; | 167 return fb; |
167 } | 168 } |
168 | 169 |
169 } // namespace bwe | 170 } // namespace bwe |
170 } // namespace testing | 171 } // namespace testing |
171 } // namespace webrtc | 172 } // namespace webrtc |
OLD | NEW |