Merge methods for configuring NACK/FEC/hybrid.

webrtc/modules/video_coding/main/source/media_opt_util.cc

 /*
  *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 501 matching lines @@
     // of packets (total rate: source+fec) FEC in RTP module assumes protection
     // factor is defined relative to source number of packets so we should
     // convert the factor to reduce mismatch between mediaOpt suggested rate and
     // the actual rate
     _protectionFactorK = ConvertFECRate(_protectionFactorK);
     _protectionFactorD = ConvertFECRate(_protectionFactorD);
 
     return true;
 }
 VCMLossProtectionLogic::VCMLossProtectionLogic(int64_t nowMs):
-_selectedMethod(NULL),
 _currentParameters(),
 _rtt(0),
 _lossPr(0.0f),
 _bitRate(0.0f),
 _frameRate(0.0f),
 _keyFrameSize(0.0f),
 _fecRateKey(0),
 _fecRateDelta(0),
 _lastPrUpdateT(0),
 _lossPr255(0.9999f),
 _lossPrHistory(),
 _shortMaxLossPr255(0),
 _packetsPerFrame(0.9999f),
 _packetsPerFrameKey(0.9999f),
 _codecWidth(0),
 _codecHeight(0),
 _numLayers(1)
 {
     Reset(nowMs);
 }
 
 VCMLossProtectionLogic::~VCMLossProtectionLogic()
 {
     Release();
 }
 
 void VCMLossProtectionLogic::SetMethod(
     enum VCMProtectionMethodEnum newMethodType) {
-  if (_selectedMethod != nullptr) {
-    if (_selectedMethod->Type() == newMethodType)
-      return;
-    // Remove old method.
-    delete _selectedMethod;
-  }
+  if (_selectedMethod && _selectedMethod->Type() == newMethodType)
+    return;
 
   switch(newMethodType) {
     case kNack:
-      _selectedMethod = new VCMNackMethod();
+      _selectedMethod.reset(new VCMNackMethod());
       break;
     case kFec:
-      _selectedMethod = new VCMFecMethod();
+      _selectedMethod.reset(new VCMFecMethod());
       break;
     case kNackFec:
-      _selectedMethod = new VCMNackFecMethod(kLowRttNackMs, -1);
+      _selectedMethod.reset(new VCMNackFecMethod(kLowRttNackMs, -1));
       break;
     case kNone:
-      _selectedMethod = nullptr;
+      _selectedMethod.reset();
       break;
   }
   UpdateMethod();
 }
 
 void
 VCMLossProtectionLogic::UpdateRtt(int64_t rtt)
 {
     _rtt = rtt;
 }
@@ skipping 139 matching lines @@
     _codecHeight = height;
 }
 
 void VCMLossProtectionLogic::UpdateNumLayers(int numLayers) {
   _numLayers = (numLayers == 0) ? 1 : numLayers;
 }
 
 bool
 VCMLossProtectionLogic::UpdateMethod()
 {
-    if (_selectedMethod == NULL)
-    {
-        return false;
-    }
+    if (!_selectedMethod)
+      return false;
     _currentParameters.rtt = _rtt;
     _currentParameters.lossPr = _lossPr;
     _currentParameters.bitRate = _bitRate;
     _currentParameters.frameRate = _frameRate; // rename actual frame rate?
     _currentParameters.keyFrameSize = _keyFrameSize;
     _currentParameters.fecRateDelta = _fecRateDelta;
     _currentParameters.fecRateKey = _fecRateKey;
     _currentParameters.packetsPerFrame = _packetsPerFrame.filtered();
     _currentParameters.packetsPerFrameKey = _packetsPerFrameKey.filtered();
     _currentParameters.codecWidth = _codecWidth;
     _currentParameters.codecHeight = _codecHeight;
     _currentParameters.numLayers = _numLayers;
     return _selectedMethod->UpdateParameters(&_currentParameters);
 }
 
 VCMProtectionMethod*
 VCMLossProtectionLogic::SelectedMethod() const
 {
-    return _selectedMethod;
+    return _selectedMethod.get();
 }
 
 VCMProtectionMethodEnum VCMLossProtectionLogic::SelectedType() const {
-  return _selectedMethod == nullptr ? kNone : _selectedMethod->Type();
+  return _selectedMethod ? _selectedMethod->Type() : kNone;
 }
 
 void
 VCMLossProtectionLogic::Reset(int64_t nowMs)
 {
     _lastPrUpdateT = nowMs;
     _lastPacketPerFrameUpdateT = nowMs;
     _lastPacketPerFrameUpdateTKey = nowMs;
     _lossPr255.Reset(0.9999f);
     _packetsPerFrame.Reset(0.9999f);
     _fecRateDelta = _fecRateKey = 0;
     for (int32_t i = 0; i < kLossPrHistorySize; i++)
     {
         _lossPrHistory[i].lossPr255 = 0;
         _lossPrHistory[i].timeMs = -1;
     }
     _shortMaxLossPr255 = 0;
     Release();
 }
 
-void
-VCMLossProtectionLogic::Release()
-{
-    delete _selectedMethod;
-    _selectedMethod = NULL;
+void VCMLossProtectionLogic::Release() {
+  _selectedMethod.reset();
 }
 
 }  // namespace media_optimization
 }  // namespace webrtc