commit 7c7796b8ecc8f2cab2670acda98888a57b6e7dff
author brandtr <brandtr@webrtc.org> Mon Jul 03 13:02:53 2017
committer Commit Bot <commit-bot@chromium.org> Mon Jul 03 13:02:53 2017
tree 29bca588a6c18784d3f32bc70a34631c65a159f6
parent 48587f91f8493b64b807957e4d48c5faf7b295d8

Register FlexFEC SSRC to receive RTCP on sending side.

BUG=webrtc:5654

Review-Url: https://codereview.webrtc.org/2965883002
Cr-Commit-Position: refs/heads/master@{#18877}

webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.cc

diff --git a/webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.cc b/webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.cc
index a6c7647..d79e689 100644
--- a/webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.cc
+++ b/webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.cc
@@ -235,7 +235,9 @@
 }
 
 rtc::Optional<uint32_t> ModuleRtpRtcpImpl::FlexfecSsrc() const {
-  return rtp_sender_->FlexfecSsrc();
+  if (rtp_sender_)
+    return rtp_sender_->FlexfecSsrc();
+  return rtc::Optional<uint32_t>();
 }
 
 int32_t ModuleRtpRtcpImpl::IncomingRtcpPacket(
@@ -865,6 +867,9 @@
   ssrcs.insert(main_ssrc);
   if (RtxSendStatus() != kRtxOff)
     ssrcs.insert(rtp_sender_->RtxSsrc());
+  rtc::Optional<uint32_t> flexfec_ssrc = FlexfecSsrc();
+  if (flexfec_ssrc)
+    ssrcs.insert(*flexfec_ssrc);
   rtcp_receiver_.SetSsrcs(main_ssrc, ssrcs);
 }