Let FlexfecReceiveStreamImpl send RTCP RRs.

webrtc/call/flexfec_receive_stream_impl.cc

 /*
  *  Copyright (c) 2016 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/call/flexfec_receive_stream_impl.h"
 
-#include <utility>
+#include <string>
 
 #include "webrtc/base/checks.h"
 #include "webrtc/base/logging.h"
+#include "webrtc/modules/rtp_rtcp/include/flexfec_receiver.h"
+#include "webrtc/modules/rtp_rtcp/include/receive_statistics.h"
+#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp.h"
+#include "webrtc/modules/rtp_rtcp/source/rtp_packet_received.h"
+#include "webrtc/modules/utility/include/process_thread.h"
+#include "webrtc/system_wrappers/include/clock.h"
 
 namespace webrtc {
 
 std::string FlexfecReceiveStream::Stats::ToString(int64_t time_ms) const {
   std::stringstream ss;
   ss << "FlexfecReceiveStream stats: " << time_ms
      << ", {flexfec_bitrate_bps: " << flexfec_bitrate_bps << "}";
   return ss.str();
 }
 
@@ skipping 63 matching lines @@
            "supports protecting a single media stream. "
            "To avoid confusion, disabling FlexFEC completely.";
     return nullptr;
   }
   RTC_DCHECK_EQ(1U, config.protected_media_ssrcs.size());
   return std::unique_ptr<FlexfecReceiver>(
       new FlexfecReceiver(config.remote_ssrc, config.protected_media_ssrcs[0],
                           recovered_packet_receiver));
 }
 
+std::unique_ptr<RtpRtcp> CreateRtpRtcpModule(
+    ReceiveStatistics* receive_statistics,
+    Transport* rtcp_send_transport,
+    RtcpRttStats* rtt_stats) {
+  RtpRtcp::Configuration configuration;
+  configuration.audio = false;

[danilchap, 2017/01/10 13:48:17]

add configuration.clock = Clock::GetRealTimeClock();
though CreateRtpRtcp would add that line itself, it is better to control clock
you are using, to ensure it is same clock you pass to ReceiveStatistics::Create

[brandtr, 2017/01/11 09:55:24]

Done.

+  configuration.receiver_only = true;
+  configuration.receive_statistics = receive_statistics;
+  configuration.outgoing_transport = rtcp_send_transport;
+  configuration.rtt_stats = rtt_stats;
+  std::unique_ptr<RtpRtcp> rtp_rtcp(RtpRtcp::CreateRtpRtcp(configuration));
+
+  return rtp_rtcp;
+}
+
 }  // namespace
 
 FlexfecReceiveStreamImpl::FlexfecReceiveStreamImpl(
     const Config& config,
-    RecoveredPacketReceiver* recovered_packet_receiver)
-    : started_(false),
-      config_(config),
-      receiver_(
-          MaybeCreateFlexfecReceiver(config_, recovered_packet_receiver)) {
+    RecoveredPacketReceiver* recovered_packet_receiver,
+    RtcpRttStats* rtt_stats,
+    ProcessThread* process_thread)
+    : config_(config),
+      started_(false),
+      receiver_(MaybeCreateFlexfecReceiver(config_, recovered_packet_receiver)),
+      rtp_receive_statistics_(
+          ReceiveStatistics::Create(Clock::GetRealTimeClock())),
+      rtp_rtcp_(CreateRtpRtcpModule(rtp_receive_statistics_.get(),
+                                    config_.rtcp_send_transport,
+                                    rtt_stats)),
+      process_thread_(process_thread) {
   LOG(LS_INFO) << "FlexfecReceiveStreamImpl: " << config_.ToString();
+
+  // RTCP reporting.
+  rtp_rtcp_->SetSendingMediaStatus(false);
+  rtp_rtcp_->SetRTCPStatus(config_.rtcp_mode);
+  rtp_rtcp_->SetSSRC(config_.local_ssrc);
+  process_thread_->RegisterModule(rtp_rtcp_.get());
 }
 
 FlexfecReceiveStreamImpl::~FlexfecReceiveStreamImpl() {
   LOG(LS_INFO) << "~FlexfecReceiveStreamImpl: " << config_.ToString();
   Stop();
+  process_thread_->DeRegisterModule(rtp_rtcp_.get());
 }
 
 bool FlexfecReceiveStreamImpl::AddAndProcessReceivedPacket(
-    RtpPacketReceived packet) {
+    const RtpPacketReceived& packet) {
   {
     rtc::CritScope cs(&crit_);
     if (!started_)
       return false;
   }
+
   if (!receiver_)
     return false;
-  return receiver_->AddAndProcessReceivedPacket(std::move(packet));
+
+  if (!receiver_->AddAndProcessReceivedPacket(packet))
+    return false;
+
+  // Do not report media packets in the RTCP RRs generated by |rtp_rtcp_|.
+  if (packet.Ssrc() == config_.remote_ssrc) {
+    RTPHeader header;
+    packet.GetHeader(&header);
+    // FlexFEC packets are never retransmitted.
+    const bool kNotRetransmitted = false;
+    rtp_receive_statistics_->IncomingPacket(header, packet.size(),
+                                            kNotRetransmitted);
+  }
+
+  return true;
 }
 
 void FlexfecReceiveStreamImpl::Start() {
   rtc::CritScope cs(&crit_);
   started_ = true;
 }
 
 void FlexfecReceiveStreamImpl::Stop() {
   rtc::CritScope cs(&crit_);
   started_ = false;
 }
 
 // TODO(brandtr): Implement this member function when we have designed the
 // stats for FlexFEC.
 FlexfecReceiveStreamImpl::Stats FlexfecReceiveStreamImpl::GetStats() const {
   return FlexfecReceiveStream::Stats();
 }
 
 }  // namespace webrtc