Remove base channel for video receivers.

webrtc/video_engine/vie_channel_group.h

Index: webrtc/video_engine/vie_channel_group.h
diff --git a/webrtc/video_engine/vie_channel_group.h b/webrtc/video_engine/vie_channel_group.h
index ff001f97d8f68b4f132af33fca4993a23a506e4d..499ec7305d17fea6a55fae85474fa29c481d8b12 100644
--- a/webrtc/video_engine/vie_channel_group.h
+++ b/webrtc/video_engine/vie_channel_group.h
@@ -16,6 +16,7 @@
 #include <set>
 #include <vector>
 
+#include "webrtc/base/criticalsection.h"
 #include "webrtc/base/scoped_ptr.h"
 #include "webrtc/modules/bitrate_controller/include/bitrate_controller.h"
 
@@ -46,25 +47,14 @@ class ChannelGroup : public BitrateObserver {
                          int engine_id,
                          Transport* transport,
                          int number_of_cores,
-                         const std::vector<uint32_t>& ssrcs,
-                         bool disable_default_encoder);
+                         const std::vector<uint32_t>& ssrcs);
   bool CreateReceiveChannel(int channel_id,
                             int engine_id,
-                            int base_channel_id,
                             Transport* transport,
-                            int number_of_cores,
-                            bool disable_default_encoder);
+                            int number_of_cores);
   void DeleteChannel(int channel_id);
-  void AddChannel(int channel_id);
-  void RemoveChannel(int channel_id);
-  bool HasChannel(int channel_id) const;
-  bool Empty() const;
   ViEChannel* GetChannel(int channel_id) const;
   ViEEncoder* GetEncoder(int channel_id) const;
-  std::vector<int> GetChannelIds() const;
-  bool OtherChannelsUsingEncoder(int channel_id) const;
-  void GetChannelsUsingEncoder(int channel_id, ChannelList* channels) const;
-
   void SetSyncInterface(VoEVideoSync* sync_interface);
 
   void SetChannelRembStatus(bool sender, bool receiver, ViEChannel* channel);
@@ -82,7 +72,6 @@ class ChannelGroup : public BitrateObserver {
 
  private:
   typedef std::map<int, ViEChannel*> ChannelMap;
-  typedef std::set<int> ChannelSet;
   typedef std::map<int, ViEEncoder*> EncoderMap;
 
   bool CreateChannel(int channel_id,
@@ -91,10 +80,8 @@ class ChannelGroup : public BitrateObserver {
                      int number_of_cores,
                      ViEEncoder* vie_encoder,
                      size_t max_rtp_streams,
-                     bool sender,
-                     bool disable_default_encoder);
+                     bool sender);
   ViEChannel* PopChannel(int channel_id);
-  ViEEncoder* PopEncoder(int channel_id);
 
   rtc::scoped_ptr<VieRemb> remb_;
   rtc::scoped_ptr<BitrateAllocator> bitrate_allocator_;
@@ -103,12 +90,10 @@ class ChannelGroup : public BitrateObserver {
   rtc::scoped_ptr<EncoderStateFeedback> encoder_state_feedback_;
   rtc::scoped_ptr<PacketRouter> packet_router_;
   rtc::scoped_ptr<PacedSender> pacer_;
-  ChannelSet channels_;
   ChannelMap channel_map_;
   // Maps Channel id -> ViEEncoder.
-  EncoderMap vie_encoder_map_;
-  EncoderMap send_encoders_;
-  rtc::scoped_ptr<CriticalSectionWrapper> encoder_map_cs_;
+  mutable rtc::CriticalSection encoder_map_crit_;
+  EncoderMap vie_encoder_map_ GUARDED_BY(encoder_map_crit_);
 
   const rtc::scoped_ptr<Config> config_;