| 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 1198 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1209 if (media_type == MediaType::ANY || media_type == MediaType::VIDEO) { | 1209 if (media_type == MediaType::ANY || media_type == MediaType::VIDEO) { |
| 1210 auto it = video_receive_ssrcs_.find(ssrc); | 1210 auto it = video_receive_ssrcs_.find(ssrc); |
| 1211 if (it != video_receive_ssrcs_.end()) { | 1211 if (it != video_receive_ssrcs_.end()) { |
| 1212 received_bytes_per_second_counter_.Add(static_cast<int>(length)); | 1212 received_bytes_per_second_counter_.Add(static_cast<int>(length)); |
| 1213 received_video_bytes_per_second_counter_.Add(static_cast<int>(length)); | 1213 received_video_bytes_per_second_counter_.Add(static_cast<int>(length)); |
| 1214 it->second->OnRtpPacket(*parsed_packet); | 1214 it->second->OnRtpPacket(*parsed_packet); |
| 1215 | 1215 |
| 1216 // Deliver media packets to FlexFEC subsystem. | 1216 // Deliver media packets to FlexFEC subsystem. |
| 1217 auto it_bounds = flexfec_receive_ssrcs_media_.equal_range(ssrc); | 1217 auto it_bounds = flexfec_receive_ssrcs_media_.equal_range(ssrc); |
| 1218 for (auto it = it_bounds.first; it != it_bounds.second; ++it) | 1218 for (auto it = it_bounds.first; it != it_bounds.second; ++it) |
| 1219 it->second->AddAndProcessReceivedPacket(*parsed_packet); | 1219 it->second->OnRtpPacket(*parsed_packet); |
| 1220 | 1220 |
| 1221 event_log_->LogRtpHeader(kIncomingPacket, media_type, packet, length); | 1221 event_log_->LogRtpHeader(kIncomingPacket, media_type, packet, length); |
| 1222 return DELIVERY_OK; | 1222 return DELIVERY_OK; |
| 1223 } | 1223 } |
| 1224 } | 1224 } |
| 1225 if (media_type == MediaType::ANY || media_type == MediaType::VIDEO) { | 1225 if (media_type == MediaType::ANY || media_type == MediaType::VIDEO) { |
| 1226 auto it = flexfec_receive_ssrcs_protection_.find(ssrc); | 1226 auto it = flexfec_receive_ssrcs_protection_.find(ssrc); |
| 1227 if (it != flexfec_receive_ssrcs_protection_.end()) { | 1227 if (it != flexfec_receive_ssrcs_protection_.end()) { |
| 1228 auto status = it->second->AddAndProcessReceivedPacket(*parsed_packet) | 1228 it->second->OnRtpPacket(*parsed_packet); |
| 1229 ? DELIVERY_OK | 1229 event_log_->LogRtpHeader(kIncomingPacket, media_type, packet, length); |
| 1230 : DELIVERY_PACKET_ERROR; | 1230 return DELIVERY_OK; |
| 1231 if (status == DELIVERY_OK) | |
| 1232 event_log_->LogRtpHeader(kIncomingPacket, media_type, packet, length); | |
| 1233 return status; | |
| 1234 } | 1231 } |
| 1235 } | 1232 } |
| 1236 return DELIVERY_UNKNOWN_SSRC; | 1233 return DELIVERY_UNKNOWN_SSRC; |
| 1237 } | 1234 } |
| 1238 | 1235 |
| 1239 PacketReceiver::DeliveryStatus Call::DeliverPacket( | 1236 PacketReceiver::DeliveryStatus Call::DeliverPacket( |
| 1240 MediaType media_type, | 1237 MediaType media_type, |
| 1241 const uint8_t* packet, | 1238 const uint8_t* packet, |
| 1242 size_t length, | 1239 size_t length, |
| 1243 const PacketTime& packet_time) { | 1240 const PacketTime& packet_time) { |
| (...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1288 if (media_type != MediaType::AUDIO || | 1285 if (media_type != MediaType::AUDIO || |
| 1289 (use_send_side_bwe && header.extension.hasTransportSequenceNumber)) { | 1286 (use_send_side_bwe && header.extension.hasTransportSequenceNumber)) { |
| 1290 congestion_controller_->OnReceivedPacket( | 1287 congestion_controller_->OnReceivedPacket( |
| 1291 packet.arrival_time_ms(), packet.payload_size() + packet.padding_size(), | 1288 packet.arrival_time_ms(), packet.payload_size() + packet.padding_size(), |
| 1292 header); | 1289 header); |
| 1293 } | 1290 } |
| 1294 } | 1291 } |
| 1295 | 1292 |
| 1296 } // namespace internal | 1293 } // namespace internal |
| 1297 } // namespace webrtc | 1294 } // namespace webrtc |
| OLD | NEW |