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

Side by Side Diff: webrtc/video_engine/vie_channel.cc

Issue 1244753002: Remove kProtectionKey* and VCMKeyRequestMode. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 5 years, 5 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
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2012 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 140 matching lines...) Expand 10 before | Expand all | Expand 10 after
151 if (paced_sender_) { 151 if (paced_sender_) {
152 for (RtpRtcp* rtp_rtcp : rtp_rtcp_modules_) 152 for (RtpRtcp* rtp_rtcp : rtp_rtcp_modules_)
153 rtp_rtcp->SetStorePacketsStatus(true, nack_history_size_sender_); 153 rtp_rtcp->SetStorePacketsStatus(true, nack_history_size_sender_);
154 } 154 }
155 if (sender_) { 155 if (sender_) {
156 packet_router_->AddRtpModule(rtp_rtcp_modules_[0]); 156 packet_router_->AddRtpModule(rtp_rtcp_modules_[0]);
157 std::list<RtpRtcp*> send_rtp_modules(1, rtp_rtcp_modules_[0]); 157 std::list<RtpRtcp*> send_rtp_modules(1, rtp_rtcp_modules_[0]);
158 send_payload_router_->SetSendingRtpModules(send_rtp_modules); 158 send_payload_router_->SetSendingRtpModules(send_rtp_modules);
159 DCHECK(!send_payload_router_->active()); 159 DCHECK(!send_payload_router_->active());
160 } 160 }
161 if (vcm_->SetVideoProtection(kProtectionKeyOnLoss, true)) {
162 return -1;
163 }
164 if (vcm_->RegisterReceiveCallback(this) != 0) { 161 if (vcm_->RegisterReceiveCallback(this) != 0) {
165 return -1; 162 return -1;
166 } 163 }
167 vcm_->RegisterFrameTypeCallback(this); 164 vcm_->RegisterFrameTypeCallback(this);
168 vcm_->RegisterReceiveStatisticsCallback(this); 165 vcm_->RegisterReceiveStatisticsCallback(this);
169 vcm_->RegisterDecoderTimingCallback(this); 166 vcm_->RegisterDecoderTimingCallback(this);
170 vcm_->SetRenderDelay(kViEDefaultRenderDelayMs); 167 vcm_->SetRenderDelay(kViEDefaultRenderDelayMs);
171 168
172 module_process_thread_->RegisterModule(vcm_); 169 module_process_thread_->RegisterModule(vcm_);
173 module_process_thread_->RegisterModule(&vie_sync_); 170 module_process_thread_->RegisterModule(&vie_sync_);
(...skipping 1094 matching lines...) Expand 10 before | Expand all | Expand 10 after
1268 CriticalSectionScoped cs(crit_.get()); 1265 CriticalSectionScoped cs(crit_.get());
1269 vcm_receive_stats_callback_ = receive_statistics_proxy; 1266 vcm_receive_stats_callback_ = receive_statistics_proxy;
1270 } 1267 }
1271 1268
1272 void ViEChannel::SetIncomingVideoStream( 1269 void ViEChannel::SetIncomingVideoStream(
1273 IncomingVideoStream* incoming_video_stream) { 1270 IncomingVideoStream* incoming_video_stream) {
1274 CriticalSectionScoped cs(crit_.get()); 1271 CriticalSectionScoped cs(crit_.get());
1275 incoming_video_stream_ = incoming_video_stream; 1272 incoming_video_stream_ = incoming_video_stream;
1276 } 1273 }
1277 } // namespace webrtc 1274 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698