Move FlexfecReceiveStream from api/call/ to call/.

webrtc/call/call.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 12 matching lines @@
 #include "webrtc/base/basictypes.h"
 #include "webrtc/base/checks.h"
 #include "webrtc/base/constructormagic.h"
 #include "webrtc/base/logging.h"
 #include "webrtc/base/task_queue.h"
 #include "webrtc/base/thread_annotations.h"
 #include "webrtc/base/thread_checker.h"
 #include "webrtc/base/trace_event.h"
 #include "webrtc/call/bitrate_allocator.h"
 #include "webrtc/call/call.h"
-#include "webrtc/call/flexfec_receive_stream.h"
+#include "webrtc/call/flexfec_receive_stream_impl.h"
 #include "webrtc/config.h"
 #include "webrtc/logging/rtc_event_log/rtc_event_log.h"
 #include "webrtc/modules/bitrate_controller/include/bitrate_controller.h"
 #include "webrtc/modules/congestion_controller/include/congestion_controller.h"
 #include "webrtc/modules/pacing/paced_sender.h"
 #include "webrtc/modules/rtp_rtcp/include/flexfec_receiver.h"
 #include "webrtc/modules/rtp_rtcp/include/rtp_header_parser.h"
 #include "webrtc/modules/rtp_rtcp/source/byte_io.h"
 #include "webrtc/modules/utility/include/process_thread.h"
 #include "webrtc/system_wrappers/include/clock.h"
@@ skipping 40 matching lines @@
   webrtc::VideoSendStream* CreateVideoSendStream(
       webrtc::VideoSendStream::Config config,
       VideoEncoderConfig encoder_config) override;
   void DestroyVideoSendStream(webrtc::VideoSendStream* send_stream) override;
 
   webrtc::VideoReceiveStream* CreateVideoReceiveStream(
       webrtc::VideoReceiveStream::Config configuration) override;
   void DestroyVideoReceiveStream(
       webrtc::VideoReceiveStream* receive_stream) override;
 
-  webrtc::FlexfecReceiveStream* CreateFlexfecReceiveStream(
-      const webrtc::FlexfecReceiveStream::Config& config) override;
+  FlexfecReceiveStream* CreateFlexfecReceiveStream(
+      const FlexfecReceiveStream::Config& config) override;
   void DestroyFlexfecReceiveStream(
-      webrtc::FlexfecReceiveStream* receive_stream) override;
+      FlexfecReceiveStream* receive_stream) override;
 
   Stats GetStats() const override;
 
   // Implements PacketReceiver.
   DeliveryStatus DeliverPacket(MediaType media_type,
                                const uint8_t* packet,
                                size_t length,
                                const PacketTime& packet_time) override;
 
   // Implements RecoveredPacketReceiver.
@@ skipping 68 matching lines @@
   // Audio, Video, and FlexFEC receive streams are owned by the client that
   // creates them.
   std::map<uint32_t, AudioReceiveStream*> audio_receive_ssrcs_
       GUARDED_BY(receive_crit_);
   std::map<uint32_t, VideoReceiveStream*> video_receive_ssrcs_
       GUARDED_BY(receive_crit_);
   std::set<VideoReceiveStream*> video_receive_streams_
       GUARDED_BY(receive_crit_);
   // Each media stream could conceivably be protected by multiple FlexFEC
   // streams.
-  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_
+  std::multimap<uint32_t, FlexfecReceiveStreamImpl*>
+      flexfec_receive_ssrcs_media_ GUARDED_BY(receive_crit_);
+  std::map<uint32_t, FlexfecReceiveStreamImpl*>
+      flexfec_receive_ssrcs_protection_ GUARDED_BY(receive_crit_);
+  std::set<FlexfecReceiveStreamImpl*> flexfec_receive_streams_
       GUARDED_BY(receive_crit_);
   std::map<std::string, AudioReceiveStream*> sync_stream_mapping_
       GUARDED_BY(receive_crit_);
 
   std::unique_ptr<RWLockWrapper> send_crit_;
   // Audio and Video send streams are owned by the client that creates them.
   std::map<uint32_t, AudioSendStream*> audio_send_ssrcs_ GUARDED_BY(send_crit_);
   std::map<uint32_t, VideoSendStream*> video_send_ssrcs_ GUARDED_BY(send_crit_);
   std::set<VideoSendStream*> video_send_streams_ GUARDED_BY(send_crit_);
 
@@ skipping 447 matching lines @@
       }
     }
     video_receive_streams_.erase(receive_stream_impl);
     RTC_CHECK(receive_stream_impl != nullptr);
     ConfigureSync(receive_stream_impl->config().sync_group);
   }
   UpdateAggregateNetworkState();
   delete receive_stream_impl;
 }
 
-webrtc::FlexfecReceiveStream* Call::CreateFlexfecReceiveStream(
-    const webrtc::FlexfecReceiveStream::Config& config) {
+FlexfecReceiveStream* Call::CreateFlexfecReceiveStream(
+    const FlexfecReceiveStream::Config& config) {
   TRACE_EVENT0("webrtc", "Call::CreateFlexfecReceiveStream");
   RTC_DCHECK(configuration_thread_checker_.CalledOnValidThread());
-  FlexfecReceiveStream* receive_stream = new FlexfecReceiveStream(config, this);
+  FlexfecReceiveStreamImpl* receive_stream =
+      new FlexfecReceiveStreamImpl(config, this);
 
   {
     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.remote_ssrc) ==
                flexfec_receive_ssrcs_protection_.end());
     flexfec_receive_ssrcs_protection_[config.remote_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) {
+void Call::DestroyFlexfecReceiveStream(FlexfecReceiveStream* receive_stream) {
   TRACE_EVENT0("webrtc", "Call::DestroyFlexfecReceiveStream");
   RTC_DCHECK(configuration_thread_checker_.CalledOnValidThread());
   RTC_DCHECK(receive_stream != nullptr);
-  // There exist no other derived classes of webrtc::FlexfecReceiveStream,
+  // There exist no other derived classes of FlexfecReceiveStream,
   // so this downcast is safe.
-  FlexfecReceiveStream* receive_stream_impl =
-      static_cast<FlexfecReceiveStream*>(receive_stream);
+  FlexfecReceiveStreamImpl* receive_stream_impl =
+      static_cast<FlexfecReceiveStreamImpl*>(receive_stream);
   {
     WriteLockScoped write_lock(*receive_crit_);
-    // Remove all SSRCs pointing to the FlexfecReceiveStream to be destroyed.
+    // Remove all SSRCs pointing to the FlexfecReceiveStreamImpl to be
+    // destroyed.
     auto media_it = flexfec_receive_ssrcs_media_.begin();
     while (media_it != flexfec_receive_ssrcs_media_.end()) {
       if (media_it->second == receive_stream_impl)
         media_it = 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 == receive_stream_impl)
@@ skipping 423 matching lines @@
   uint32_t ssrc = ByteReader<uint32_t>::ReadBigEndian(&packet[8]);
   ReadLockScoped read_lock(*receive_crit_);
   auto it = video_receive_ssrcs_.find(ssrc);
   if (it == video_receive_ssrcs_.end())
     return false;
   return it->second->OnRecoveredPacket(packet, length);
 }
 
 }  // namespace internal
 }  // namespace webrtc