| 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 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 68 last_log_time_ms_ = now_ms; | 68 last_log_time_ms_ = now_ms; |
| 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 std::sort(packet_feedback_vector.begin(), packet_feedback_vector.end(), |
| 79 PacketFeedbackComparator()); |
| 78 acknowledged_bitrate_estimator_->IncomingPacketFeedbackVector( | 80 acknowledged_bitrate_estimator_->IncomingPacketFeedbackVector( |
| 79 packet_feedback_vector); | 81 packet_feedback_vector); |
| 80 DelayBasedBwe::Result result = bwe_->IncomingPacketFeedbackVector( | 82 DelayBasedBwe::Result result = bwe_->IncomingPacketFeedbackVector( |
| 81 packet_feedback_vector, acknowledged_bitrate_estimator_->bitrate_bps()); | 83 packet_feedback_vector, acknowledged_bitrate_estimator_->bitrate_bps()); |
| 82 if (result.updated) | 84 if (result.updated) |
| 83 bitrate_controller_->OnDelayBasedBweResult(result); | 85 bitrate_controller_->OnDelayBasedBweResult(result); |
| 84 | 86 |
| 85 if (has_received_ack_) { | 87 if (has_received_ack_) { |
| 86 int expected_packets = fb.packet_feedback_vector().back().sequence_number - | 88 int expected_packets = fb.packet_feedback_vector().back().sequence_number - |
| 87 last_acked_seq_num_; | 89 last_acked_seq_num_; |
| (...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 167 packet_feedback_vector_.back().arrival_time_ms; | 169 packet_feedback_vector_.back().arrival_time_ms; |
| 168 FeedbackPacket* fb = new SendSideBweFeedback( | 170 FeedbackPacket* fb = new SendSideBweFeedback( |
| 169 flow_id_, now_ms * 1000, corrected_send_time_ms, packet_feedback_vector_); | 171 flow_id_, now_ms * 1000, corrected_send_time_ms, packet_feedback_vector_); |
| 170 packet_feedback_vector_.clear(); | 172 packet_feedback_vector_.clear(); |
| 171 return fb; | 173 return fb; |
| 172 } | 174 } |
| 173 | 175 |
| 174 } // namespace bwe | 176 } // namespace bwe |
| 175 } // namespace testing | 177 } // namespace testing |
| 176 } // namespace webrtc | 178 } // namespace webrtc |
| OLD | NEW |