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 134 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
145 packet_feedback_vector_.push_back(PacketInfo( | 145 packet_feedback_vector_.push_back(PacketInfo( |
146 -1, arrival_time_ms, media_packet.sender_timestamp_ms(), | 146 -1, arrival_time_ms, media_packet.sender_timestamp_ms(), |
147 media_packet.header().sequenceNumber, media_packet.payload_size(), true)); | 147 media_packet.header().sequenceNumber, media_packet.payload_size(), true)); |
148 | 148 |
149 // Log received packet information. | 149 // Log received packet information. |
150 BweReceiver::ReceivePacket(arrival_time_ms, media_packet); | 150 BweReceiver::ReceivePacket(arrival_time_ms, media_packet); |
151 } | 151 } |
152 | 152 |
153 FeedbackPacket* SendSideBweReceiver::GetFeedback(int64_t now_ms) { | 153 FeedbackPacket* SendSideBweReceiver::GetFeedback(int64_t now_ms) { |
154 if (now_ms - last_feedback_ms_ < kFeedbackIntervalMs) | 154 if (now_ms - last_feedback_ms_ < kFeedbackIntervalMs) |
155 return NULL; | 155 return nullptr; |
156 last_feedback_ms_ = now_ms; | 156 last_feedback_ms_ = now_ms; |
157 int64_t corrected_send_time_ms = | 157 int64_t corrected_send_time_ms = |
158 packet_feedback_vector_.back().send_time_ms + now_ms - | 158 packet_feedback_vector_.back().send_time_ms + now_ms - |
159 packet_feedback_vector_.back().arrival_time_ms; | 159 packet_feedback_vector_.back().arrival_time_ms; |
160 FeedbackPacket* fb = new SendSideBweFeedback( | 160 FeedbackPacket* fb = new SendSideBweFeedback( |
161 flow_id_, now_ms * 1000, corrected_send_time_ms, packet_feedback_vector_); | 161 flow_id_, now_ms * 1000, corrected_send_time_ms, packet_feedback_vector_); |
162 packet_feedback_vector_.clear(); | 162 packet_feedback_vector_.clear(); |
163 return fb; | 163 return fb; |
164 } | 164 } |
165 | 165 |
166 } // namespace bwe | 166 } // namespace bwe |
167 } // namespace testing | 167 } // namespace testing |
168 } // namespace webrtc | 168 } // namespace webrtc |
OLD | NEW |