Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * Copyright (c) 2013 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2013 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 header_ = RTPHeader(); | 145 header_ = RTPHeader(); |
| 146 header_.sequenceNumber = sequence_number; | 146 header_.sequenceNumber = sequence_number; |
| 147 } | 147 } |
| 148 | 148 |
| 149 void MediaPacket::SetAbsSendTimeMs(int64_t abs_send_time_ms) { | 149 void MediaPacket::SetAbsSendTimeMs(int64_t abs_send_time_ms) { |
| 150 header_.extension.hasAbsoluteSendTime = true; | 150 header_.extension.hasAbsoluteSendTime = true; |
| 151 header_.extension.absoluteSendTime = ((static_cast<int64_t>(abs_send_time_ms * | 151 header_.extension.absoluteSendTime = ((static_cast<int64_t>(abs_send_time_ms * |
| 152 (1 << 18)) + 500) / 1000) & 0x00fffffful; | 152 (1 << 18)) + 500) / 1000) & 0x00fffffful; |
| 153 } | 153 } |
| 154 | 154 |
| 155 BbrBweFeedback::BbrBweFeedback( | |
| 156 int flow_id, | |
| 157 int64_t send_time_us, | |
| 158 int64_t latest_send_time_ms, | |
| 159 const std::vector<std::pair<uint64_t, int64_t> >& packet_feedback_vector) | |
|
philipel
2017/05/29 09:38:49
Change from
std::vector<std::pair<uint64_t, int64_
gnish2
2017/05/29 11:04:26
Done.
| |
| 160 : FeedbackPacket(flow_id, send_time_us, latest_send_time_ms), | |
| 161 packet_feedback_vector_(packet_feedback_vector) {} | |
| 162 | |
| 155 RembFeedback::RembFeedback(int flow_id, | 163 RembFeedback::RembFeedback(int flow_id, |
| 156 int64_t send_time_us, | 164 int64_t send_time_us, |
| 157 int64_t last_send_time_ms, | 165 int64_t last_send_time_ms, |
| 158 uint32_t estimated_bps, | 166 uint32_t estimated_bps, |
| 159 RTCPReportBlock report_block) | 167 RTCPReportBlock report_block) |
| 160 : FeedbackPacket(flow_id, send_time_us, last_send_time_ms), | 168 : FeedbackPacket(flow_id, send_time_us, last_send_time_ms), |
| 161 estimated_bps_(estimated_bps), | 169 estimated_bps_(estimated_bps), |
| 162 report_block_(report_block) { | 170 report_block_(report_block) { |
| 163 } | 171 } |
| 164 | 172 |
| (...skipping 646 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 811 uint32_t PeriodicKeyFrameSource::NextPacketSize(uint32_t frame_size, | 819 uint32_t PeriodicKeyFrameSource::NextPacketSize(uint32_t frame_size, |
| 812 uint32_t remaining_payload) { | 820 uint32_t remaining_payload) { |
| 813 uint32_t fragments = | 821 uint32_t fragments = |
| 814 (frame_size + (kMaxPayloadSizeBytes - 1)) / kMaxPayloadSizeBytes; | 822 (frame_size + (kMaxPayloadSizeBytes - 1)) / kMaxPayloadSizeBytes; |
| 815 uint32_t avg_size = (frame_size + fragments - 1) / fragments; | 823 uint32_t avg_size = (frame_size + fragments - 1) / fragments; |
| 816 return std::min(avg_size, remaining_payload); | 824 return std::min(avg_size, remaining_payload); |
| 817 } | 825 } |
| 818 } // namespace bwe | 826 } // namespace bwe |
| 819 } // namespace testing | 827 } // namespace testing |
| 820 } // namespace webrtc | 828 } // namespace webrtc |
| OLD | NEW |