Revert of Remove VCMQmRobustness.

webrtc/modules/video_coding/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.
  */
 
@@ skipping 120 matching lines @@
   virtual bool RequiredUepProtectionK() { return _useUepProtectionK; }
 
   // Extracts whether the the FEC Unequal protection (UEP) is used for Delta
   // frame.
   //
   // Return value                 : Required Unequal protection on/off state.
   virtual bool RequiredUepProtectionD() { return _useUepProtectionD; }
 
   virtual int MaxFramesFec() const { return 1; }
 
+  // Updates content metrics
+  void UpdateContentMetrics(const VideoContentMetrics* contentMetrics);
+
  protected:
   uint8_t _effectivePacketLoss;
   uint8_t _protectionFactorK;
   uint8_t _protectionFactorD;
   // Estimation of residual loss after the FEC
   float _scaleProtKey;
   int32_t _maxPayloadSize;
 
+  VCMQmRobustness* _qmRobustness;
   bool _useUepProtectionK;
   bool _useUepProtectionD;
   float _corrFecCost;
   enum VCMProtectionMethodEnum _type;
 };
 
 class VCMNackMethod : public VCMProtectionMethod {
  public:
   VCMNackMethod();
   virtual ~VCMNackMethod();
@@ skipping 190 matching lines @@
   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_