Merge methods for configuring NACK/FEC/hybrid.

BUG=webrtc:1695 R=stefan@webrtc.org Review URL: https://codereview.webrtc.org/1226143013 Cr-Commit-Position: refs/heads/master@{#9580}
2015-07-14 09:36:34 -07:00
parent caa498abbf
commit ba8c15b857
20 changed files with 126 additions and 226 deletions
--- a/webrtc/modules/video_coding/main/interface/video_coding_defines.h
+++ b/webrtc/modules/video_coding/main/interface/video_coding_defines.h
@ -41,8 +41,6 @@ enum { kDefaultStartBitrateKbps = 300 };
 enum VCMVideoProtection {
  kProtectionNone,
  kProtectionNack,                // Both send-side and receive-side
-  kProtectionNackSender,          // Send-side only
-  kProtectionNackReceiver,        // Receive-side only
  kProtectionFEC,
  kProtectionNackFEC,
  kProtectionKeyOnLoss,