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 1204 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1215 auto status = it->second->DeliverRtp(packet, length, packet_time) | 1215 auto status = it->second->DeliverRtp(packet, length, packet_time) |
1216 ? DELIVERY_OK | 1216 ? DELIVERY_OK |
1217 : DELIVERY_PACKET_ERROR; | 1217 : DELIVERY_PACKET_ERROR; |
1218 // Deliver media packets to FlexFEC subsystem. RTP header extensions need | 1218 // Deliver media packets to FlexFEC subsystem. RTP header extensions need |
1219 // not be parsed, as FlexFEC is oblivious to the semantic meaning of the | 1219 // not be parsed, as FlexFEC is oblivious to the semantic meaning of the |
1220 // packet contents beyond the 12 byte RTP base header. The BWE is fed | 1220 // packet contents beyond the 12 byte RTP base header. The BWE is fed |
1221 // information about these media packets from the regular media pipeline. | 1221 // information about these media packets from the regular media pipeline. |
1222 if (parsed_packet) { | 1222 if (parsed_packet) { |
1223 auto it_bounds = flexfec_receive_ssrcs_media_.equal_range(ssrc); | 1223 auto it_bounds = flexfec_receive_ssrcs_media_.equal_range(ssrc); |
1224 for (auto it = it_bounds.first; it != it_bounds.second; ++it) | 1224 for (auto it = it_bounds.first; it != it_bounds.second; ++it) |
1225 it->second->AddAndProcessReceivedPacket(*parsed_packet); | 1225 it->second->OnRtpPacket(*parsed_packet); |
1226 } | 1226 } |
1227 if (status == DELIVERY_OK) | 1227 if (status == DELIVERY_OK) |
1228 event_log_->LogRtpHeader(kIncomingPacket, media_type, packet, length); | 1228 event_log_->LogRtpHeader(kIncomingPacket, media_type, packet, length); |
1229 return status; | 1229 return status; |
1230 } | 1230 } |
1231 } | 1231 } |
1232 if (media_type == MediaType::ANY || media_type == MediaType::VIDEO) { | 1232 if (media_type == MediaType::ANY || media_type == MediaType::VIDEO) { |
1233 auto it = flexfec_receive_ssrcs_protection_.find(ssrc); | 1233 auto it = flexfec_receive_ssrcs_protection_.find(ssrc); |
1234 if (it != flexfec_receive_ssrcs_protection_.end()) { | 1234 if (it != flexfec_receive_ssrcs_protection_.end()) { |
1235 if (parsed_packet) { | 1235 if (parsed_packet) { |
1236 auto status = it->second->AddAndProcessReceivedPacket(*parsed_packet) | 1236 it->second->OnRtpPacket(*parsed_packet); |
1237 ? DELIVERY_OK | 1237 event_log_->LogRtpHeader(kIncomingPacket, media_type, packet, length); |
1238 : DELIVERY_PACKET_ERROR; | 1238 return DELIVERY_OK; |
1239 if (status == DELIVERY_OK) | |
1240 event_log_->LogRtpHeader(kIncomingPacket, media_type, packet, length); | |
1241 return status; | |
1242 } | 1239 } |
1243 } | 1240 } |
1244 } | 1241 } |
1245 return DELIVERY_UNKNOWN_SSRC; | 1242 return DELIVERY_UNKNOWN_SSRC; |
1246 } | 1243 } |
1247 | 1244 |
1248 PacketReceiver::DeliveryStatus Call::DeliverPacket( | 1245 PacketReceiver::DeliveryStatus Call::DeliverPacket( |
1249 MediaType media_type, | 1246 MediaType media_type, |
1250 const uint8_t* packet, | 1247 const uint8_t* packet, |
1251 size_t length, | 1248 size_t length, |
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1297 if (media_type != MediaType::AUDIO || | 1294 if (media_type != MediaType::AUDIO || |
1298 (use_send_side_bwe && header.extension.hasTransportSequenceNumber)) { | 1295 (use_send_side_bwe && header.extension.hasTransportSequenceNumber)) { |
1299 congestion_controller_->OnReceivedPacket( | 1296 congestion_controller_->OnReceivedPacket( |
1300 packet.arrival_time_ms(), packet.payload_size() + packet.padding_size(), | 1297 packet.arrival_time_ms(), packet.payload_size() + packet.padding_size(), |
1301 header); | 1298 header); |
1302 } | 1299 } |
1303 } | 1300 } |
1304 | 1301 |
1305 } // namespace internal | 1302 } // namespace internal |
1306 } // namespace webrtc | 1303 } // namespace webrtc |
OLD | NEW |