OLD | NEW |
1 /* | 1 /* |
2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2012 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 1242 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1253 void RTPSender::AddPacketToTransportFeedback( | 1253 void RTPSender::AddPacketToTransportFeedback( |
1254 uint16_t packet_id, | 1254 uint16_t packet_id, |
1255 const RtpPacketToSend& packet, | 1255 const RtpPacketToSend& packet, |
1256 const PacedPacketInfo& pacing_info) { | 1256 const PacedPacketInfo& pacing_info) { |
1257 size_t packet_size = packet.payload_size() + packet.padding_size(); | 1257 size_t packet_size = packet.payload_size() + packet.padding_size(); |
1258 if (send_side_bwe_with_overhead_) { | 1258 if (send_side_bwe_with_overhead_) { |
1259 packet_size = packet.size(); | 1259 packet_size = packet.size(); |
1260 } | 1260 } |
1261 | 1261 |
1262 if (transport_feedback_observer_) { | 1262 if (transport_feedback_observer_) { |
1263 transport_feedback_observer_->AddPacket(packet_id, packet_size, | 1263 uint32_t ssrc; |
| 1264 { |
| 1265 rtc::CritScope lock(&send_critsect_); |
| 1266 ssrc = *ssrc_; |
| 1267 } |
| 1268 transport_feedback_observer_->AddPacket(ssrc, packet_id, packet_size, |
1264 pacing_info); | 1269 pacing_info); |
1265 } | 1270 } |
1266 } | 1271 } |
1267 | 1272 |
1268 void RTPSender::UpdateRtpOverhead(const RtpPacketToSend& packet) { | 1273 void RTPSender::UpdateRtpOverhead(const RtpPacketToSend& packet) { |
1269 if (!overhead_observer_) | 1274 if (!overhead_observer_) |
1270 return; | 1275 return; |
1271 size_t overhead_bytes_per_packet; | 1276 size_t overhead_bytes_per_packet; |
1272 { | 1277 { |
1273 rtc::CritScope lock(&send_critsect_); | 1278 rtc::CritScope lock(&send_critsect_); |
1274 if (rtp_overhead_bytes_per_packet_ == packet.headers_size()) { | 1279 if (rtp_overhead_bytes_per_packet_ == packet.headers_size()) { |
1275 return; | 1280 return; |
1276 } | 1281 } |
1277 rtp_overhead_bytes_per_packet_ = packet.headers_size(); | 1282 rtp_overhead_bytes_per_packet_ = packet.headers_size(); |
1278 overhead_bytes_per_packet = rtp_overhead_bytes_per_packet_; | 1283 overhead_bytes_per_packet = rtp_overhead_bytes_per_packet_; |
1279 } | 1284 } |
1280 overhead_observer_->OnOverheadChanged(overhead_bytes_per_packet); | 1285 overhead_observer_->OnOverheadChanged(overhead_bytes_per_packet); |
1281 } | 1286 } |
1282 | 1287 |
1283 } // namespace webrtc | 1288 } // namespace webrtc |
OLD | NEW |