Integrate FlexfecReceiveStream with Call.

webrtc/call/call.cc

Index: webrtc/call/call.cc
diff --git a/webrtc/call/call.cc b/webrtc/call/call.cc
index 7d39936b5fb51bb32a45f1f831307fbfe73f39e6..cb2a244bb648eef7d9a47126db47c06ea10aa945 100644
--- a/webrtc/call/call.cc
+++ b/webrtc/call/call.cc
@@ -12,6 +12,7 @@
 #include <algorithm>
 #include <map>
 #include <memory>
+#include <utility>
 #include <vector>
 
 #include "webrtc/audio/audio_receive_stream.h"
@@ -28,6 +29,7 @@
 #include "webrtc/base/trace_event.h"
 #include "webrtc/call.h"
 #include "webrtc/call/bitrate_allocator.h"
+#include "webrtc/call/flexfec_receive_stream.h"
 #include "webrtc/config.h"
 #include "webrtc/logging/rtc_event_log/rtc_event_log.h"
 #include "webrtc/modules/bitrate_controller/include/bitrate_controller.h"
@@ -66,6 +68,7 @@ class Call : public webrtc::Call,
   explicit Call(const Call::Config& config);
   virtual ~Call();
 
+  // Implements webrtc::Call.
   PacketReceiver* Receiver() override;
 
   webrtc::AudioSendStream* CreateAudioSendStream(
@@ -87,8 +90,14 @@ class Call : public webrtc::Call,
   void DestroyVideoReceiveStream(
       webrtc::VideoReceiveStream* receive_stream) override;
 
+  webrtc::FlexfecReceiveStream* CreateFlexfecReceiveStream(
+      webrtc::FlexfecReceiveStream::Config configuration) override;
+  void DestroyFlexfecReceiveStream(
+      webrtc::FlexfecReceiveStream* receive_stream) override;
+
   Stats GetStats() const override;
 
+  // Implements PacketReceiver.
   DeliveryStatus DeliverPacket(MediaType media_type,
                                const uint8_t* packet,
                                size_t length,
@@ -160,6 +169,12 @@ class Call : public webrtc::Call,
       GUARDED_BY(receive_crit_);
   std::set<VideoReceiveStream*> video_receive_streams_
       GUARDED_BY(receive_crit_);
+  std::multimap<uint32_t, FlexfecReceiveStream*> flexfec_receive_ssrcs_media_
+      GUARDED_BY(receive_crit_);
+  std::map<uint32_t, FlexfecReceiveStream*> flexfec_receive_ssrcs_protection_
+      GUARDED_BY(receive_crit_);
+  std::set<FlexfecReceiveStream*> flexfec_receive_streams_
+      GUARDED_BY(receive_crit_);
   std::map<std::string, AudioReceiveStream*> sync_stream_mapping_
       GUARDED_BY(receive_crit_);
 
@@ -578,6 +593,66 @@ void Call::DestroyVideoReceiveStream(
   delete receive_stream_impl;
 }
 
+webrtc::FlexfecReceiveStream* Call::CreateFlexfecReceiveStream(
+    webrtc::FlexfecReceiveStream::Config configuration) {
+  TRACE_EVENT0("webrtc", "Call::CreateFlexfecReceiveStream");
+  RTC_DCHECK(configuration_thread_checker_.CalledOnValidThread());
+  FlexfecReceiveStream* receive_stream =
+      new FlexfecReceiveStream(std::move(configuration), this);
+
+  const webrtc::FlexfecReceiveStream::Config& config = receive_stream->config();
+  {
+    WriteLockScoped write_lock(*receive_crit_);
+    for (auto ssrc : config.protected_media_ssrcs)
+      flexfec_receive_ssrcs_media_.insert(std::make_pair(ssrc, receive_stream));
+    RTC_DCHECK(flexfec_receive_ssrcs_protection_.find(config.flexfec_ssrc) ==
+               flexfec_receive_ssrcs_protection_.end());
+    flexfec_receive_ssrcs_protection_[config.flexfec_ssrc] = receive_stream;
+    flexfec_receive_streams_.insert(receive_stream);
+  }
+  // TODO(brandtr): Store config in RtcEventLog here.
+  return receive_stream;
+}
+
+void Call::DestroyFlexfecReceiveStream(
+    webrtc::FlexfecReceiveStream* receive_stream) {
+  TRACE_EVENT0("webrtc", "Call::DestroyFlexfecReceiveStream");
+  RTC_DCHECK(configuration_thread_checker_.CalledOnValidThread());
+  RTC_DCHECK(receive_stream != nullptr);
+  FlexfecReceiveStream* receive_stream_impl = nullptr;
+  {
+    WriteLockScoped write_lock(*receive_crit_);
+    // Remove all ssrcs pointing to a receive stream.

[stefan-webrtc, 2016/10/18 18:13:29]

"...pointing to the FlexFec receive stream to be destroyed", right?

[brandtr, 2016/10/19 08:14:31]

Yep, fixed.

+    auto media_it = flexfec_receive_ssrcs_media_.begin();
+    while (media_it != flexfec_receive_ssrcs_media_.end()) {
+      if (media_it->second ==
+          static_cast<FlexfecReceiveStream*>(receive_stream)) {
+        if (receive_stream_impl != nullptr)
+          RTC_DCHECK(receive_stream_impl == media_it->second);
+        receive_stream_impl = media_it->second;
+        flexfec_receive_ssrcs_media_.erase(media_it++);
+      } else {
+        ++media_it;
+      }
+    }
+    auto prot_it = flexfec_receive_ssrcs_protection_.begin();
+    while (prot_it != flexfec_receive_ssrcs_protection_.end()) {
+      if (prot_it->second ==
+          static_cast<FlexfecReceiveStream*>(receive_stream)) {
+        if (receive_stream_impl != nullptr)
+          RTC_DCHECK(receive_stream_impl == prot_it->second);
+        receive_stream_impl = prot_it->second;
+        flexfec_receive_ssrcs_protection_.erase(prot_it++);
+      } else {
+        ++prot_it;
+      }
+    }
+    flexfec_receive_streams_.erase(receive_stream_impl);

[stefan-webrtc, 2016/10/18 18:13:29]

If flexfec_receive_streams_ own the receive stream and has unique_ptrs then I
think we can remove the delete below, or am I missing something?

[brandtr, 2016/10/19 08:14:31]

Yes, but Call will not own the created FlexfecReceiveStream. This is the same as
how VideoReceiveStream is handled; it is owned by WebRtcVideoChannel2, but the
Call functions are responsible for creating and destroying the objects. See
e.g.:
https://cs.chromium.org/chromium/src/third_party/webrtc/call/call.cc?l=518
https://cs.chromium.org/chromium/src/third_party/webrtc/call/call.cc?l=546
https://cs.chromium.org/chromium/src/third_party/webrtc/media/engine/webrtcvi...
https://cs.chromium.org/chromium/src/third_party/webrtc/media/engine/webrtcvi...

I think it would make sense to change all of the streams to use unique_ptr's, in
order to make the ownerships clear, but that is probably better to do in a
another CL.

+    RTC_CHECK(receive_stream_impl != nullptr);
+  }
+  delete receive_stream_impl;
+}
+
 Call::Stats Call::GetStats() const {
   // TODO(solenberg): Some test cases in EndToEndTest use this from a different
   // thread. Re-enable once that is fixed.
@@ -923,6 +998,23 @@ PacketReceiver::DeliveryStatus Call::DeliverRtp(MediaType media_type,
       auto status = it->second->DeliverRtp(packet, length, packet_time)
                         ? DELIVERY_OK
                         : DELIVERY_PACKET_ERROR;
+      auto flexfec_lower_it = flexfec_receive_ssrcs_media_.lower_bound(ssrc);
+      auto flexfec_upper_it = flexfec_receive_ssrcs_media_.upper_bound(ssrc);
+      while (flexfec_lower_it != flexfec_upper_it) {
+        flexfec_lower_it->second->AddAndProcessReceivedPacket(packet, length);
+        ++flexfec_lower_it;
+      }
+      if (status == DELIVERY_OK)
+        event_log_->LogRtpHeader(kIncomingPacket, media_type, packet, length);
+      return status;
+    }
+  }
+  if (media_type == MediaType::ANY || media_type == MediaType::VIDEO) {
+    auto it = flexfec_receive_ssrcs_protection_.find(ssrc);
+    if (it != flexfec_receive_ssrcs_protection_.end()) {
+      auto status = it->second->AddAndProcessReceivedPacket(packet, length)
+                        ? DELIVERY_OK
+                        : DELIVERY_PACKET_ERROR;
       if (status == DELIVERY_OK)
         event_log_->LogRtpHeader(kIncomingPacket, media_type, packet, length);
       return status;