Merge methods for configuring NACK/FEC/hybrid.

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

 /*
  *  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.
  */
 
 #ifndef WEBRTC_MODULES_VIDEO_CODING_MEDIA_OPT_UTIL_H_
 #define WEBRTC_MODULES_VIDEO_CODING_MEDIA_OPT_UTIL_H_
 
 #include <math.h>
 #include <stdlib.h>
 
 #include "webrtc/base/exp_filter.h"
+#include "webrtc/base/scoped_ptr.h"
 #include "webrtc/modules/video_coding/main/source/internal_defines.h"
 #include "webrtc/modules/video_coding/main/source/qm_select.h"
 #include "webrtc/system_wrappers/interface/trace.h"
 #include "webrtc/typedefs.h"
 
 namespace webrtc {
 namespace media_optimization {
 
 // Number of time periods used for (max) window filter for packet loss
 // TODO (marpan): set reasonable window size for filtered packet loss,
@@ skipping 300 matching lines @@
                                uint8_t lossPr255);
 
     void Reset(int64_t nowMs);
 
     void Release();
 
 private:
     // Sets the available loss protection methods.
     void UpdateMaxLossHistory(uint8_t lossPr255, int64_t now);
     uint8_t MaxFilteredLossPr(int64_t nowMs) const;
-    VCMProtectionMethod* _selectedMethod;
+    rtc::scoped_ptr<VCMProtectionMethod> _selectedMethod;
     VCMProtectionParameters _currentParameters;
     int64_t _rtt;
     float _lossPr;
     float _bitRate;
     float _frameRate;
     float _keyFrameSize;
     uint8_t _fecRateKey;
     uint8_t _fecRateDelta;
     int64_t _lastPrUpdateT;
     int64_t _lastPacketPerFrameUpdateT;
     int64_t _lastPacketPerFrameUpdateTKey;
     rtc::ExpFilter _lossPr255;
     VCMLossProbabilitySample _lossPrHistory[kLossPrHistorySize];
     uint8_t _shortMaxLossPr255;
     rtc::ExpFilter _packetsPerFrame;
     rtc::ExpFilter _packetsPerFrameKey;
     uint16_t _codecWidth;
     uint16_t _codecHeight;
     int _numLayers;
 };
 
 }  // namespace media_optimization
 }  // namespace webrtc
 
 #endif // WEBRTC_MODULES_VIDEO_CODING_MEDIA_OPT_UTIL_H_