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

Unified Diff: webrtc/modules/video_coding/main/source/video_sender.cc

Issue 1226143013: Merge methods for configuring NACK/FEC/hybrid. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: rebase 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webrtc/modules/video_coding/main/source/video_receiver.cc ('k') | webrtc/video/video_receive_stream.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/modules/video_coding/main/source/video_sender.cc
diff --git a/webrtc/modules/video_coding/main/source/video_sender.cc b/webrtc/modules/video_coding/main/source/video_sender.cc
index 93d82084f32d5be9ec0d3d8609eee8233ac8883b..1be2f06803754fdecda72d02ddb8a632fd24eae7 100644
--- a/webrtc/modules/video_coding/main/source/video_sender.cc
+++ b/webrtc/modules/video_coding/main/source/video_sender.cc
@@ -296,24 +296,21 @@ int32_t VideoSender::RegisterProtectionCallback(
}
// Enable or disable a video protection method.
-void VideoSender::SetVideoProtection(bool enable,
- VCMVideoProtection videoProtection) {
+void VideoSender::SetVideoProtection(VCMVideoProtection videoProtection) {
CriticalSectionScoped cs(_sendCritSect);
switch (videoProtection) {
case kProtectionNone:
- _mediaOpt.EnableProtectionMethod(enable, media_optimization::kNone);
+ _mediaOpt.SetProtectionMethod(media_optimization::kNone);
break;
case kProtectionNack:
- case kProtectionNackSender:
- _mediaOpt.EnableProtectionMethod(enable, media_optimization::kNack);
+ _mediaOpt.SetProtectionMethod(media_optimization::kNack);
break;
case kProtectionNackFEC:
- _mediaOpt.EnableProtectionMethod(enable, media_optimization::kNackFec);
+ _mediaOpt.SetProtectionMethod(media_optimization::kNackFec);
break;
case kProtectionFEC:
- _mediaOpt.EnableProtectionMethod(enable, media_optimization::kFec);
+ _mediaOpt.SetProtectionMethod(media_optimization::kFec);
break;
- case kProtectionNackReceiver:
case kProtectionKeyOnLoss:
case kProtectionKeyOnKeyLoss:
// Ignore receiver modes.
« no previous file with comments | « webrtc/modules/video_coding/main/source/video_receiver.cc ('k') | webrtc/video/video_receive_stream.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698