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

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

Issue 2697833002: Replace AudioReceiveStream::DeliverRtp with OnRtpPacket. (Closed)
Patch Set: Another return value fix. 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 | « webrtc/audio/audio_receive_stream_unittest.cc ('k') | webrtc/test/mock_voe_channel_proxy.h » ('j') | no next file with comments »
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 1180 matching lines...) Expand 10 before | Expand all | Expand 10 after
1191 1191
1192 NotifyBweOfReceivedPacket(*parsed_packet, media_type); 1192 NotifyBweOfReceivedPacket(*parsed_packet, media_type);
1193 1193
1194 uint32_t ssrc = parsed_packet->Ssrc(); 1194 uint32_t ssrc = parsed_packet->Ssrc();
1195 1195
1196 if (media_type == MediaType::ANY || media_type == MediaType::AUDIO) { 1196 if (media_type == MediaType::ANY || media_type == MediaType::AUDIO) {
1197 auto it = audio_receive_ssrcs_.find(ssrc); 1197 auto it = audio_receive_ssrcs_.find(ssrc);
1198 if (it != audio_receive_ssrcs_.end()) { 1198 if (it != audio_receive_ssrcs_.end()) {
1199 received_bytes_per_second_counter_.Add(static_cast<int>(length)); 1199 received_bytes_per_second_counter_.Add(static_cast<int>(length));
1200 received_audio_bytes_per_second_counter_.Add(static_cast<int>(length)); 1200 received_audio_bytes_per_second_counter_.Add(static_cast<int>(length));
1201 auto status = it->second->DeliverRtp(packet, length, packet_time) 1201 it->second->OnRtpPacket(*parsed_packet);
1202 ? DELIVERY_OK 1202 event_log_->LogRtpHeader(kIncomingPacket, media_type, packet, length);
1203 : DELIVERY_PACKET_ERROR; 1203 return DELIVERY_OK;
1204 if (status == DELIVERY_OK)
1205 event_log_->LogRtpHeader(kIncomingPacket, media_type, packet, length);
1206 return status;
1207 } 1204 }
1208 } 1205 }
1209 if (media_type == MediaType::ANY || media_type == MediaType::VIDEO) { 1206 if (media_type == MediaType::ANY || media_type == MediaType::VIDEO) {
1210 auto it = video_receive_ssrcs_.find(ssrc); 1207 auto it = video_receive_ssrcs_.find(ssrc);
1211 if (it != video_receive_ssrcs_.end()) { 1208 if (it != video_receive_ssrcs_.end()) {
1212 received_bytes_per_second_counter_.Add(static_cast<int>(length)); 1209 received_bytes_per_second_counter_.Add(static_cast<int>(length));
1213 received_video_bytes_per_second_counter_.Add(static_cast<int>(length)); 1210 received_video_bytes_per_second_counter_.Add(static_cast<int>(length));
1214 it->second->OnRtpPacket(*parsed_packet); 1211 it->second->OnRtpPacket(*parsed_packet);
1215 1212
1216 // Deliver media packets to FlexFEC subsystem. 1213 // Deliver media packets to FlexFEC subsystem.
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
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
OLDNEW
« no previous file with comments | « webrtc/audio/audio_receive_stream_unittest.cc ('k') | webrtc/test/mock_voe_channel_proxy.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698