Remove the video channel id completely.

webrtc/call/call.cc

Index: webrtc/call/call.cc
diff --git a/webrtc/call/call.cc b/webrtc/call/call.cc
index ce5bceb359d520607fbb4c7813a52b16c943fd4a..720fa84add343befb16af89eec8a5258f50ae91e 100644
--- a/webrtc/call/call.cc
+++ b/webrtc/call/call.cc
@@ -94,7 +94,6 @@ class Call : public webrtc::Call, public PacketReceiver {
   const int num_cpu_cores_;
   const rtc::scoped_ptr<ProcessThread> module_process_thread_;
   const rtc::scoped_ptr<ChannelGroup> channel_group_;
-  volatile int next_channel_id_;
   Call::Config config_;
 
   // Needs to be held while write-locking |receive_crit_| or |send_crit_|. This
@@ -138,7 +137,6 @@ Call::Call(const Call::Config& config)
     : num_cpu_cores_(CpuInfo::DetectNumberOfCores()),
       module_process_thread_(ProcessThread::Create("ModuleProcessThread")),
       channel_group_(new ChannelGroup(module_process_thread_.get())),
-      next_channel_id_(0),
       config_(config),
       network_enabled_(true),
       receive_crit_(RWLockWrapper::CreateRWLock()),
@@ -260,9 +258,8 @@ webrtc::VideoSendStream* Call::CreateVideoSendStream(
   // TODO(mflodman): Base the start bitrate on a current bandwidth estimate, if
   // the call has already started.
   VideoSendStream* send_stream = new VideoSendStream(num_cpu_cores_,
-      module_process_thread_.get(), channel_group_.get(),
-      rtc::AtomicOps::Increment(&next_channel_id_), config, encoder_config,
-      suspended_video_send_ssrcs_);
+      module_process_thread_.get(), channel_group_.get(), config,
+      encoder_config, suspended_video_send_ssrcs_);
 
   // This needs to be taken before send_crit_ as both locks need to be held
   // while changing network state.
@@ -319,9 +316,8 @@ webrtc::VideoReceiveStream* Call::CreateVideoReceiveStream(
     const webrtc::VideoReceiveStream::Config& config) {
   TRACE_EVENT0("webrtc", "Call::CreateVideoReceiveStream");
   VideoReceiveStream* receive_stream = new VideoReceiveStream(
-      num_cpu_cores_, channel_group_.get(),
-      rtc::AtomicOps::Increment(&next_channel_id_), config,
-      config_.voice_engine, module_process_thread_.get());
+      num_cpu_cores_, channel_group_.get(), config, config_.voice_engine,
+      module_process_thread_.get());
 
   // This needs to be taken before receive_crit_ as both locks need to be held
   // while changing network state.