Move ownership of send ViEChannels and ViEEncoder to VideoSendStream.

webrtc/video_engine/vie_channel_group.h

 /*
  *  Copyright (c) 2012 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 23 matching lines @@
 class ProcessThread;
 class RemoteBitrateEstimator;
 class RemoteEstimatorProxy;
 class SendStatisticsProxy;
 class TransportFeedbackAdapter;
 class ViEChannel;
 class ViEEncoder;
 class VieRemb;
 class VoEVideoSync;
 
-typedef std::list<ViEChannel*> ChannelList;
-
 // Channel group contains data common for several channels. All channels in the
 // group are assumed to send/receive data to the same end-point.
 class ChannelGroup : public BitrateObserver {
  public:
   explicit ChannelGroup(ProcessThread* process_thread);
   ~ChannelGroup();
-  bool CreateSendChannel(int channel_id,
-                         Transport* transport,
-                         SendStatisticsProxy* stats_proxy,
-                         I420FrameCallback* pre_encode_callback,
-                         int number_of_cores,
-                         const VideoSendStream::Config& config);
   bool CreateReceiveChannel(int channel_id,
                             Transport* transport,
                             int number_of_cores,
                             const VideoReceiveStream::Config& config);
   void DeleteChannel(int channel_id);
   ViEChannel* GetChannel(int channel_id) const;
-  ViEEncoder* GetEncoder(int channel_id) const;
+  void AddEncoder(const std::vector<uint32_t>& ssrcs, ViEEncoder* encoder);
+  void RemoveEncoder(ViEEncoder* encoder);
   void SetSyncInterface(VoEVideoSync* sync_interface);
   void SetBweBitrates(int min_bitrate_bps,
                       int start_bitrate_bps,
                       int max_bitrate_bps);
 
   void SetChannelRembStatus(bool sender, bool receiver, ViEChannel* channel);
 
   BitrateController* GetBitrateController() const;
+  RemoteBitrateEstimator* GetRemoteBitrateEstimator() const;
   CallStats* GetCallStats() const;
-  RemoteBitrateEstimator* GetRemoteBitrateEstimator() const;
-  EncoderStateFeedback* GetEncoderStateFeedback() const;
   int64_t GetPacerQueuingDelayMs() const;
+  PacedSender* pacer() const { return pacer_.get(); }
+  PacketRouter* packet_router() const { return packet_router_.get(); }
+  BitrateAllocator* bitrate_allocator() const {
+      return bitrate_allocator_.get(); }
+  TransportFeedbackObserver* GetTransportFeedbackObserver();
+  RtcpIntraFrameObserver* GetRtcpIntraFrameObserver() const;
 
   // Implements BitrateObserver.
   void OnNetworkChanged(uint32_t target_bitrate_bps,
                         uint8_t fraction_loss,
                         int64_t rtt) override;
 
  private:
   typedef std::map<int, ViEChannel*> ChannelMap;
-  typedef std::map<int, ViEEncoder*> EncoderMap;
 
   bool CreateChannel(int channel_id,
                      Transport* transport,
                      int number_of_cores,
-                     ViEEncoder* vie_encoder,
                      size_t max_rtp_streams,
                      bool sender,
                      RemoteBitrateEstimator* bitrate_estimator,
                      TransportFeedbackObserver* feedback_observer);
   ViEChannel* PopChannel(int channel_id);
 
   rtc::scoped_ptr<VieRemb> remb_;
   rtc::scoped_ptr<BitrateAllocator> bitrate_allocator_;
   rtc::scoped_ptr<CallStats> call_stats_;
   rtc::scoped_ptr<PacketRouter> packet_router_;
   rtc::scoped_ptr<PacedSender> pacer_;
   rtc::scoped_ptr<RemoteBitrateEstimator> remote_bitrate_estimator_;
   rtc::scoped_ptr<RemoteEstimatorProxy> remote_estimator_proxy_;
   rtc::scoped_ptr<EncoderStateFeedback> encoder_state_feedback_;
   ChannelMap channel_map_;
-  // Maps Channel id -> ViEEncoder.
-  mutable rtc::CriticalSection encoder_map_crit_;
-  EncoderMap vie_encoder_map_ GUARDED_BY(encoder_map_crit_);
+
+  mutable rtc::CriticalSection encoder_crit_;
+  std::vector<ViEEncoder*> encoders_ GUARDED_BY(encoder_crit_);
 
   // Registered at construct time and assumed to outlive this class.
   ProcessThread* const process_thread_;
   rtc::scoped_ptr<ProcessThread> pacer_thread_;
 
   rtc::scoped_ptr<BitrateController> bitrate_controller_;
   rtc::scoped_ptr<TransportFeedbackAdapter> transport_feedback_adapter_;
   int min_bitrate_bps_;
 };
 
 }  // namespace webrtc
 
 #endif  // WEBRTC_VIDEO_ENGINE_VIE_CHANNEL_GROUP_H_