Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(97)

Side by Side Diff: webrtc/call/call.cc

Issue 2681673004: Replace RtpStreamReceiver::DeliverRtp with OnRtpPacket. (Closed)
Patch Set: Address feedback. Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | webrtc/video/rtp_stream_receiver.h » ('j') | webrtc/video/rtp_stream_receiver.h » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 1193 matching lines...) Expand 10 before | Expand all | Expand 10 after
1204 if (status == DELIVERY_OK) 1204 if (status == DELIVERY_OK)
1205 event_log_->LogRtpHeader(kIncomingPacket, media_type, packet, length); 1205 event_log_->LogRtpHeader(kIncomingPacket, media_type, packet, length);
1206 return status; 1206 return status;
1207 } 1207 }
1208 } 1208 }
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 // TODO(brandtr): Notify the BWE of received media packets here. 1214 auto status = it->second->OnRtpPacket(*parsed_packet)
1215 auto status = it->second->DeliverRtp(packet, length, packet_time)
1216 ? DELIVERY_OK 1215 ? DELIVERY_OK
1217 : DELIVERY_PACKET_ERROR; 1216 : DELIVERY_PACKET_ERROR;
1218 // Deliver media packets to FlexFEC subsystem. RTP header extensions need 1217 // Deliver media packets to FlexFEC subsystem.
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
1221 // information about these media packets from the regular media pipeline.
1222 if (parsed_packet) { 1218 if (parsed_packet) {
1223 auto it_bounds = flexfec_receive_ssrcs_media_.equal_range(ssrc); 1219 auto it_bounds = flexfec_receive_ssrcs_media_.equal_range(ssrc);
1224 for (auto it = it_bounds.first; it != it_bounds.second; ++it) 1220 for (auto it = it_bounds.first; it != it_bounds.second; ++it)
1225 it->second->AddAndProcessReceivedPacket(*parsed_packet); 1221 it->second->AddAndProcessReceivedPacket(*parsed_packet);
1226 } 1222 }
1227 if (status == DELIVERY_OK) 1223 if (status == DELIVERY_OK)
1228 event_log_->LogRtpHeader(kIncomingPacket, media_type, packet, length); 1224 event_log_->LogRtpHeader(kIncomingPacket, media_type, packet, length);
1229 return status; 1225 return status;
1230 } 1226 }
1231 } 1227 }
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
1297 if (media_type != MediaType::AUDIO || 1293 if (media_type != MediaType::AUDIO ||
1298 (use_send_side_bwe && header.extension.hasTransportSequenceNumber)) { 1294 (use_send_side_bwe && header.extension.hasTransportSequenceNumber)) {
1299 congestion_controller_->OnReceivedPacket( 1295 congestion_controller_->OnReceivedPacket(
1300 packet.arrival_time_ms(), packet.payload_size() + packet.padding_size(), 1296 packet.arrival_time_ms(), packet.payload_size() + packet.padding_size(),
1301 header); 1297 header);
1302 } 1298 }
1303 } 1299 }
1304 1300
1305 } // namespace internal 1301 } // namespace internal
1306 } // namespace webrtc 1302 } // namespace webrtc
OLDNEW
« no previous file with comments | « no previous file | webrtc/video/rtp_stream_receiver.h » ('j') | webrtc/video/rtp_stream_receiver.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698