Wire up FlexFEC in VideoEngine2.

webrtc/config.cc

 /*
  *  Copyright (c) 2014 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.
  */
 #include "webrtc/config.h"
@@ skipping 13 matching lines @@
 
 std::string UlpfecConfig::ToString() const {
   std::stringstream ss;
   ss << "{ulpfec_payload_type: " << ulpfec_payload_type;
   ss << ", red_payload_type: " << red_payload_type;
   ss << ", red_rtx_payload_type: " << red_rtx_payload_type;
   ss << '}';
   return ss.str();
 }
 
+bool UlpfecConfig::operator==(const UlpfecConfig& other) const {
+  return ulpfec_payload_type == other.ulpfec_payload_type &&
+         red_payload_type == other.red_payload_type &&
+         red_rtx_payload_type == other.red_rtx_payload_type;
+}
+
 FlexfecConfig::FlexfecConfig()
     : flexfec_payload_type(-1), flexfec_ssrc(0), protected_media_ssrcs() {}
 
 FlexfecConfig::~FlexfecConfig() = default;
 
 std::string FlexfecConfig::ToString() const {
   std::stringstream ss;
   ss << "{flexfec_payload_type: " << flexfec_payload_type;
   ss << ", flexfec_ssrc: " << flexfec_ssrc;
   ss << ", protected_media_ssrcs: [";
   size_t i = 0;
   for (; i + 1 < protected_media_ssrcs.size(); ++i)
     ss << protected_media_ssrcs[i] << ", ";
   if (!protected_media_ssrcs.empty())
     ss << protected_media_ssrcs[i];
   ss << "]}";
   return ss.str();
 }
 
+bool FlexfecConfig::IsCompleteAndEnabled() const {
+  // Check if FlexFEC is enabled.
+  if (flexfec_payload_type < 0)
+    return false;
+  // Do we have the necessary SSRC information?
+  if (flexfec_ssrc == 0)
+    return false;
+  // TODO(brandtr): Update this check when we support multistream protection.
+  if (protected_media_ssrcs.size() != 1)

[magjed_webrtc, 2016/11/18 14:28:00]

I think you will need to write 1u to avoid warnings about comparing integers of
different sign.

[brandtr, 2016/11/21 08:52:03]

I didn't receive any compiler warnings here, but might as well add the suffix.

+    return false;
+  return true;
+}
+
+bool FlexfecConfig::operator==(const FlexfecConfig& other) const {
+  return flexfec_payload_type == other.flexfec_payload_type &&
+         flexfec_ssrc == other.flexfec_ssrc &&
+         protected_media_ssrcs == other.protected_media_ssrcs;
+}
+
 std::string RtpExtension::ToString() const {
   std::stringstream ss;
   ss << "{uri: " << uri;
   ss << ", id: " << id;
   ss << '}';
   return ss.str();
 }
 
 const char* RtpExtension::kAudioLevelUri =
     "urn:ietf:params:rtp-hdrext:ssrc-audio-level";
@@ skipping 153 matching lines @@
 void VideoEncoderConfig::Vp9EncoderSpecificSettings::FillVideoCodecVp9(
     VideoCodecVP9* vp9_settings) const {
   *vp9_settings = specifics_;
 }
 
 DecoderSpecificSettings::DecoderSpecificSettings() = default;
 
 DecoderSpecificSettings::~DecoderSpecificSettings() = default;
 
 }  // namespace webrtc