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 1238 matching lines...) Loading... |
1249 void RTPSender::AddPacketToTransportFeedback( | 1249 void RTPSender::AddPacketToTransportFeedback( |
1250 uint16_t packet_id, | 1250 uint16_t packet_id, |
1251 const RtpPacketToSend& packet, | 1251 const RtpPacketToSend& packet, |
1252 const PacedPacketInfo& pacing_info) { | 1252 const PacedPacketInfo& pacing_info) { |
1253 size_t packet_size = packet.payload_size() + packet.padding_size(); | 1253 size_t packet_size = packet.payload_size() + packet.padding_size(); |
1254 if (send_side_bwe_with_overhead_) { | 1254 if (send_side_bwe_with_overhead_) { |
1255 packet_size = packet.size(); | 1255 packet_size = packet.size(); |
1256 } | 1256 } |
1257 | 1257 |
1258 if (transport_feedback_observer_) { | 1258 if (transport_feedback_observer_) { |
1259 transport_feedback_observer_->AddPacket(packet_id, packet_size, | 1259 transport_feedback_observer_->AddPacket(SSRC(), packet_id, packet_size, |
1260 pacing_info); | 1260 pacing_info); |
1261 } | 1261 } |
1262 } | 1262 } |
1263 | 1263 |
1264 void RTPSender::UpdateRtpOverhead(const RtpPacketToSend& packet) { | 1264 void RTPSender::UpdateRtpOverhead(const RtpPacketToSend& packet) { |
1265 if (!overhead_observer_) | 1265 if (!overhead_observer_) |
1266 return; | 1266 return; |
1267 size_t overhead_bytes_per_packet; | 1267 size_t overhead_bytes_per_packet; |
1268 { | 1268 { |
1269 rtc::CritScope lock(&send_critsect_); | 1269 rtc::CritScope lock(&send_critsect_); |
1270 if (rtp_overhead_bytes_per_packet_ == packet.headers_size()) { | 1270 if (rtp_overhead_bytes_per_packet_ == packet.headers_size()) { |
1271 return; | 1271 return; |
1272 } | 1272 } |
1273 rtp_overhead_bytes_per_packet_ = packet.headers_size(); | 1273 rtp_overhead_bytes_per_packet_ = packet.headers_size(); |
1274 overhead_bytes_per_packet = rtp_overhead_bytes_per_packet_; | 1274 overhead_bytes_per_packet = rtp_overhead_bytes_per_packet_; |
1275 } | 1275 } |
1276 overhead_observer_->OnOverheadChanged(overhead_bytes_per_packet); | 1276 overhead_observer_->OnOverheadChanged(overhead_bytes_per_packet); |
1277 } | 1277 } |
1278 | 1278 |
1279 } // namespace webrtc | 1279 } // namespace webrtc |
OLD | NEW |