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

Side by Side Diff: webrtc/modules/video_coding/main/source/video_sender.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) 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 293 matching lines...) Expand 10 before | Expand all | Expand 10 after
304 break; 304 break;
305 case kProtectionNack: 305 case kProtectionNack:
306 _mediaOpt.SetProtectionMethod(media_optimization::kNack); 306 _mediaOpt.SetProtectionMethod(media_optimization::kNack);
307 break; 307 break;
308 case kProtectionNackFEC: 308 case kProtectionNackFEC:
309 _mediaOpt.SetProtectionMethod(media_optimization::kNackFec); 309 _mediaOpt.SetProtectionMethod(media_optimization::kNackFec);
310 break; 310 break;
311 case kProtectionFEC: 311 case kProtectionFEC:
312 _mediaOpt.SetProtectionMethod(media_optimization::kFec); 312 _mediaOpt.SetProtectionMethod(media_optimization::kFec);
313 break; 313 break;
314 case kProtectionKeyOnLoss:
315 case kProtectionKeyOnKeyLoss:
316 // Ignore receiver modes.
317 return;
318 } 314 }
319 } 315 }
320 // Add one raw video frame to the encoder, blocking. 316 // Add one raw video frame to the encoder, blocking.
321 int32_t VideoSender::AddVideoFrame(const VideoFrame& videoFrame, 317 int32_t VideoSender::AddVideoFrame(const VideoFrame& videoFrame,
322 const VideoContentMetrics* contentMetrics, 318 const VideoContentMetrics* contentMetrics,
323 const CodecSpecificInfo* codecSpecificInfo) { 319 const CodecSpecificInfo* codecSpecificInfo) {
324 UpdateEncoderParameters(); 320 UpdateEncoderParameters();
325 CriticalSectionScoped cs(_sendCritSect); 321 CriticalSectionScoped cs(_sendCritSect);
326 if (_encoder == nullptr) { 322 if (_encoder == nullptr) {
327 return VCM_UNINITIALIZED; 323 return VCM_UNINITIALIZED;
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
402 int window_bps = std::max(threshold_bps / 10, 10000); 398 int window_bps = std::max(threshold_bps / 10, 10000);
403 _mediaOpt.SuspendBelowMinBitrate(threshold_bps, window_bps); 399 _mediaOpt.SuspendBelowMinBitrate(threshold_bps, window_bps);
404 } 400 }
405 401
406 bool VideoSender::VideoSuspended() const { 402 bool VideoSender::VideoSuspended() const {
407 CriticalSectionScoped cs(_sendCritSect); 403 CriticalSectionScoped cs(_sendCritSect);
408 return _mediaOpt.IsVideoSuspended(); 404 return _mediaOpt.IsVideoSuspended();
409 } 405 }
410 } // namespace vcm 406 } // namespace vcm
411 } // namespace webrtc 407 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698