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

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

Issue 2974453002: Protected streams report RTP messages directly to the FlexFec streams (Closed)
Patch Set: Appease lint. Created 3 years, 4 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/call/flexfec_receive_stream_impl.h ('k') | webrtc/media/BUILD.gn » ('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) 2016 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2016 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 139 matching lines...) Expand 10 before | Expand all | Expand 10 after
150 // here at all, we'd then delete the OnRtpPacket method and instead register 150 // here at all, we'd then delete the OnRtpPacket method and instead register
151 // |receiver_| as the RtpPacketSinkInterface for this stream. 151 // |receiver_| as the RtpPacketSinkInterface for this stream.
152 // TODO(nisse): Passing |this| from the constructor to the RtpDemuxer, before 152 // TODO(nisse): Passing |this| from the constructor to the RtpDemuxer, before
153 // the object is fully initialized, is risky. But it works in this case 153 // the object is fully initialized, is risky. But it works in this case
154 // because locking in our caller, Call::CreateFlexfecReceiveStream, ensures 154 // because locking in our caller, Call::CreateFlexfecReceiveStream, ensures
155 // that the demuxer doesn't call OnRtpPacket before this object is fully 155 // that the demuxer doesn't call OnRtpPacket before this object is fully
156 // constructed. Registering |receiver_| instead of |this| would solve this 156 // constructed. Registering |receiver_| instead of |this| would solve this
157 // problem too. 157 // problem too.
158 rtp_stream_receiver_ = 158 rtp_stream_receiver_ =
159 receiver_controller->CreateReceiver(config_.remote_ssrc, this); 159 receiver_controller->CreateReceiver(config_.remote_ssrc, this);
160 for (uint32_t ssrc : config.protected_media_ssrcs)
161 receiver_controller->AddSink(ssrc, this);
162 } 160 }
163 161
164 FlexfecReceiveStreamImpl::~FlexfecReceiveStreamImpl() { 162 FlexfecReceiveStreamImpl::~FlexfecReceiveStreamImpl() {
165 LOG(LS_INFO) << "~FlexfecReceiveStreamImpl: " << config_.ToString(); 163 LOG(LS_INFO) << "~FlexfecReceiveStreamImpl: " << config_.ToString();
166 Stop(); 164 Stop();
167 process_thread_->DeRegisterModule(rtp_rtcp_.get()); 165 process_thread_->DeRegisterModule(rtp_rtcp_.get());
168 } 166 }
169 167
170 void FlexfecReceiveStreamImpl::OnRtpPacket(const RtpPacketReceived& packet) { 168 void FlexfecReceiveStreamImpl::OnRtpPacket(const RtpPacketReceived& packet) {
171 { 169 {
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
205 FlexfecReceiveStreamImpl::Stats FlexfecReceiveStreamImpl::GetStats() const { 203 FlexfecReceiveStreamImpl::Stats FlexfecReceiveStreamImpl::GetStats() const {
206 return FlexfecReceiveStream::Stats(); 204 return FlexfecReceiveStream::Stats();
207 } 205 }
208 206
209 const FlexfecReceiveStream::Config& FlexfecReceiveStreamImpl::GetConfig() 207 const FlexfecReceiveStream::Config& FlexfecReceiveStreamImpl::GetConfig()
210 const { 208 const {
211 return config_; 209 return config_;
212 } 210 }
213 211
214 } // namespace webrtc 212 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/call/flexfec_receive_stream_impl.h ('k') | webrtc/media/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698