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

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

Issue 2663063008: Remove unnecessary RTPHeaderParser, following https://codereview.webrtc.org/2659563002/ (Closed)
Patch Set: remove unrelated change 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.cc ('k') | no next file » | 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 190 matching lines...) Expand 10 before | Expand all | Expand 10 after
201 ReceiveRtpConfig(const std::vector<RtpExtension>& extensions, 201 ReceiveRtpConfig(const std::vector<RtpExtension>& extensions,
202 bool transport_cc) 202 bool transport_cc)
203 : extensions(extensions), transport_cc(transport_cc) {} 203 : extensions(extensions), transport_cc(transport_cc) {}
204 204
205 // Registered RTP header extensions for each stream. Note that RTP header 205 // Registered RTP header extensions for each stream. Note that RTP header
206 // extensions are negotiated per track ("m= line") in the SDP, but we have 206 // extensions are negotiated per track ("m= line") in the SDP, but we have
207 // no notion of tracks at the Call level. We therefore store the RTP header 207 // no notion of tracks at the Call level. We therefore store the RTP header
208 // extensions per SSRC instead, which leads to some storage overhead. 208 // extensions per SSRC instead, which leads to some storage overhead.
209 RtpHeaderExtensionMap extensions; 209 RtpHeaderExtensionMap extensions;
210 // Set if the RTCP feedback message needed for send side BWE was negotiated. 210 // Set if the RTCP feedback message needed for send side BWE was negotiated.
211 bool transport_cc; 211 bool transport_cc = false;
212 }; 212 };
213 std::map<uint32_t, ReceiveRtpConfig> receive_rtp_config_ 213 std::map<uint32_t, ReceiveRtpConfig> receive_rtp_config_
214 GUARDED_BY(receive_crit_); 214 GUARDED_BY(receive_crit_);
215 215
216 std::unique_ptr<RWLockWrapper> send_crit_; 216 std::unique_ptr<RWLockWrapper> send_crit_;
217 // Audio and Video send streams are owned by the client that creates them. 217 // Audio and Video send streams are owned by the client that creates them.
218 std::map<uint32_t, AudioSendStream*> audio_send_ssrcs_ GUARDED_BY(send_crit_); 218 std::map<uint32_t, AudioSendStream*> audio_send_ssrcs_ GUARDED_BY(send_crit_);
219 std::map<uint32_t, VideoSendStream*> video_send_ssrcs_ GUARDED_BY(send_crit_); 219 std::map<uint32_t, VideoSendStream*> video_send_ssrcs_ GUARDED_BY(send_crit_);
220 std::set<VideoSendStream*> video_send_streams_ GUARDED_BY(send_crit_); 220 std::set<VideoSendStream*> video_send_streams_ GUARDED_BY(send_crit_);
221 221
(...skipping 1035 matching lines...) Expand 10 before | Expand all | Expand 10 after
1257 if (media_type != MediaType::AUDIO || 1257 if (media_type != MediaType::AUDIO ||
1258 (transport_cc && header.extension.hasTransportSequenceNumber)) { 1258 (transport_cc && header.extension.hasTransportSequenceNumber)) {
1259 congestion_controller_->OnReceivedPacket( 1259 congestion_controller_->OnReceivedPacket(
1260 packet.arrival_time_ms(), packet.payload_size() + packet.padding_size(), 1260 packet.arrival_time_ms(), packet.payload_size() + packet.padding_size(),
1261 header); 1261 header);
1262 } 1262 }
1263 } 1263 }
1264 1264
1265 } // namespace internal 1265 } // namespace internal
1266 } // namespace webrtc 1266 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/audio/audio_receive_stream.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698