Revert of Remove VCMQmRobustness.

webrtc/modules/video_coding/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 16 matching lines @@
 static const int kPacketLossMax = 129;
 
 namespace media_optimization {
 
 VCMProtectionMethod::VCMProtectionMethod()
     : _effectivePacketLoss(0),
       _protectionFactorK(0),
       _protectionFactorD(0),
       _scaleProtKey(2.0f),
       _maxPayloadSize(1460),
+      _qmRobustness(new VCMQmRobustness()),
+      _useUepProtectionK(false),
+      _useUepProtectionD(true),
       _corrFecCost(1.0),
       _type(kNone) {}
 
-VCMProtectionMethod::~VCMProtectionMethod() {}
+VCMProtectionMethod::~VCMProtectionMethod() {
+  delete _qmRobustness;
+}
+void VCMProtectionMethod::UpdateContentMetrics(
+    const VideoContentMetrics* contentMetrics) {
+  _qmRobustness->UpdateContent(contentMetrics);
+}
 
 VCMNackFecMethod::VCMNackFecMethod(int64_t lowRttNackThresholdMs,
                                    int64_t highRttNackThresholdMs)
     : VCMFecMethod(),
       _lowRttNackMs(lowRttNackThresholdMs),
       _highRttNackMs(highRttNackThresholdMs),
       _maxFramesFec(1) {
   assert(lowRttNackThresholdMs >= -1 && highRttNackThresholdMs >= -1);
   assert(highRttNackThresholdMs == -1 ||
          lowRttNackThresholdMs <= highRttNackThresholdMs);
@@ skipping 266 matching lines @@
     if (codeRateDelta < firstPartitionProt) {
       codeRateDelta = firstPartitionProt;
     }
   }
 
   // Check limit on amount of protection for P frame; 50% is max.
   if (codeRateDelta >= kPacketLossMax) {
     codeRateDelta = kPacketLossMax - 1;
   }
 
+  float adjustFec = 1.0f;
+  // Avoid additional adjustments when layers are active.
+  // TODO(mikhal/marco): Update adjusmtent based on layer info.
+  if (parameters->numLayers == 1) {
+    adjustFec = _qmRobustness->AdjustFecFactor(
+        codeRateDelta, parameters->bitRate, parameters->frameRate,
+        parameters->rtt, packetLoss);
+  }
+
+  codeRateDelta = static_cast<uint8_t>(codeRateDelta * adjustFec);
+
   // For Key frame:
   // Effectively at a higher rate, so we scale/boost the rate
   // The boost factor may depend on several factors: ratio of packet
   // number of I to P frames, how much protection placed on P frames, etc.
   const uint8_t packetFrameDelta = (uint8_t)(0.5 + parameters->packetsPerFrame);
   const uint8_t packetFrameKey =
       (uint8_t)(0.5 + parameters->packetsPerFrameKey);
   const uint8_t boostKey = BoostCodeRateKey(packetFrameDelta, packetFrameKey);
 
   rateIndexTable = (uint8_t)VCM_MAX(
@@ skipping 47 matching lines @@
   // We reduce cost factor (which will reduce overhead for FEC and
   // hybrid method) and not the protectionFactor.
   _corrFecCost = 1.0f;
   if (estNumFecGen < 1.1f && _protectionFactorD < minProtLevelFec) {
     _corrFecCost = 0.5f;
   }
   if (estNumFecGen < 0.9f && _protectionFactorD < minProtLevelFec) {
     _corrFecCost = 0.0f;
   }
 
+  // TODO(marpan): Set the UEP protection on/off for Key and Delta frames
+  _useUepProtectionK = _qmRobustness->SetUepProtection(
+      codeRateKey, parameters->bitRate, packetLoss, 0);
+
+  _useUepProtectionD = _qmRobustness->SetUepProtection(
+      codeRateDelta, parameters->bitRate, packetLoss, 1);
+
   // DONE WITH FEC PROTECTION SETTINGS
   return true;
 }
 
 int VCMFecMethod::BitsPerFrame(const VCMProtectionParameters* parameters) {
   // When temporal layers are available FEC will only be applied on the base
   // layer.
   const float bitRateRatio =
       kVp8LayerRateAlloction[parameters->numLayers - 1][0];
   float frameRateRatio = powf(1 / 2.0, parameters->numLayers - 1);
@@ skipping 244 matching lines @@
   _shortMaxLossPr255 = 0;
   Release();
 }
 
 void VCMLossProtectionLogic::Release() {
   _selectedMethod.reset();
 }
 
 }  // namespace media_optimization
 }  // namespace webrtc