Make SendStatisticsProxy let through FlexFEC packets.

webrtc/video/send_statistics_proxy.cc

 /*
  *  Copyright (c) 2013 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 326 matching lines @@
       RTC_HISTOGRAMS_COUNTS_10000(
           kIndex, uma_prefix_ + "RetransmittedBitrateSentInKbps",
           static_cast<int>(rtp_rtx.retransmitted.TotalBytes() * 8 /
                            elapsed_sec / 1000));
       if (!rtp_config.rtx.ssrcs.empty()) {
         RTC_HISTOGRAMS_COUNTS_10000(
             kIndex, uma_prefix_ + "RtxBitrateSentInKbps",
             static_cast<int>(rtx.transmitted.TotalBytes() * 8 / elapsed_sec /
                              1000));
       }
-      if (rtp_config.ulpfec.red_payload_type != -1) {
+      if (rtp_config.flexfec.flexfec_payload_type != -1 ||
+          rtp_config.ulpfec.red_payload_type != -1) {
         RTC_HISTOGRAMS_COUNTS_10000(kIndex,
                                     uma_prefix_ + "FecBitrateSentInKbps",
                                     static_cast<int>(rtp_rtx.fec.TotalBytes() *
                                                      8 / elapsed_sec / 1000));
       }
     }
   }
 }
 
 void SendStatisticsProxy::OnEncoderReconfigured(
@@ skipping 53 matching lines @@
   }
 }
 
 VideoSendStream::StreamStats* SendStatisticsProxy::GetStatsEntry(
     uint32_t ssrc) {
   std::map<uint32_t, VideoSendStream::StreamStats>::iterator it =
       stats_.substreams.find(ssrc);
   if (it != stats_.substreams.end())
     return &it->second;
 
-  bool is_rtx = false;
-  if (std::find(rtp_config_.ssrcs.begin(), rtp_config_.ssrcs.end(), ssrc) ==
-      rtp_config_.ssrcs.end()) {
-    if (std::find(rtp_config_.rtx.ssrcs.begin(), rtp_config_.rtx.ssrcs.end(),
-                  ssrc) == rtp_config_.rtx.ssrcs.end()) {
-      return nullptr;
-    }
-    is_rtx = true;
-  }
+  bool is_media = std::find(rtp_config_.ssrcs.begin(), rtp_config_.ssrcs.end(),
+                            ssrc) != rtp_config_.ssrcs.end();
+  bool is_flexfec = rtp_config_.flexfec.flexfec_payload_type != -1 &&
+                    ssrc == rtp_config_.flexfec.flexfec_ssrc;
+  bool is_rtx =
+      std::find(rtp_config_.rtx.ssrcs.begin(), rtp_config_.rtx.ssrcs.end(),
+                ssrc) != rtp_config_.rtx.ssrcs.end();
+  if (!is_media && !is_flexfec && !is_rtx)
+    return nullptr;
 
   // Insert new entry and return ptr.
   VideoSendStream::StreamStats* entry = &stats_.substreams[ssrc];
   entry->is_rtx = is_rtx;
 
   return entry;
 }
 
 void SendStatisticsProxy::OnInactiveSsrc(uint32_t ssrc) {
   rtc::CritScope lock(&crit_);
@@ skipping 244 matching lines @@
   return Fraction(min_required_samples, 1000.0f);
 }
 
 int SendStatisticsProxy::BoolSampleCounter::Fraction(
     int min_required_samples, float multiplier) const {
   if (num_samples < min_required_samples || num_samples == 0)
     return -1;
   return static_cast<int>((sum * multiplier / num_samples) + 0.5f);
 }
 }  // namespace webrtc