Revert of Remove VCMQmRobustness.

webrtc/modules/video_coding/media_optimization.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 15 matching lines @@
     uint32_t* fec_overhead_rate_bps,
     VCMProtectionCallback* video_protection_callback) {
   FecProtectionParams delta_fec_params;
   FecProtectionParams key_fec_params;
   // Get the FEC code rate for Key frames (set to 0 when NA).
   key_fec_params.fec_rate = selected_method->RequiredProtectionFactorK();
 
   // Get the FEC code rate for Delta frames (set to 0 when NA).
   delta_fec_params.fec_rate = selected_method->RequiredProtectionFactorD();
 
+  // Get the FEC-UEP protection status for Key frames: UEP on/off.
+  key_fec_params.use_uep_protection = selected_method->RequiredUepProtectionK();
+
+  // Get the FEC-UEP protection status for Delta frames: UEP on/off.
+  delta_fec_params.use_uep_protection =
+      selected_method->RequiredUepProtectionD();
+
   // The RTP module currently requires the same |max_fec_frames| for both
   // key and delta frames.
   delta_fec_params.max_fec_frames = selected_method->MaxFramesFec();
   key_fec_params.max_fec_frames = selected_method->MaxFramesFec();
 
   // Set the FEC packet mask type. |kFecMaskBursty| is more effective for
   // consecutive losses and little/no packet re-ordering. As we currently
   // do not have feedback data on the degree of correlated losses and packet
   // re-ordering, we keep default setting to |kFecMaskRandom| for now.
   delta_fec_params.fec_mask_type = kFecMaskRandom;
@@ skipping 169 matching lines @@
 
   // For now use the filtered loss for computing the robustness settings.
   loss_prot_logic_->UpdateFilteredLossPr(packet_loss_enc);
 
   // Rate cost of the protection methods.
   float protection_overhead_rate = 0.0f;
 
   // Update protection settings, when applicable.
   float sent_video_rate_kbps = 0.0f;
   if (loss_prot_logic_->SelectedType() != kNone) {
+    // Update protection method with content metrics.
+    selected_method->UpdateContentMetrics(content_->ShortTermAvgData());
+
     // Update method will compute the robustness settings for the given
     // protection method and the overhead cost
     // the protection method is set by the user via SetVideoProtection.
     loss_prot_logic_->UpdateMethod();
 
     // Update protection callback with protection settings.
     uint32_t sent_video_rate_bps = 0;
     uint32_t sent_nack_rate_bps = 0;
     uint32_t sent_fec_rate_bps = 0;
     // Get the bit cost of protection method, based on the amount of
@@ skipping 379 matching lines @@
       if (video_target_bitrate_ >
           suspension_threshold_bps_ + suspension_window_bps_) {
         video_suspended_ = false;
       }
     }
   }
 }
 
 }  // namespace media_optimization
 }  // namespace webrtc