Remove the video channel id completely.

webrtc/video_engine/vie_encoder.cc

 /*
  *  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 84 matching lines @@
   // Implements BitrateObserver.
   virtual void OnNetworkChanged(uint32_t bitrate_bps,
                                 uint8_t fraction_lost,
                                 int64_t rtt) {
     owner_->OnNetworkChanged(bitrate_bps, fraction_lost, rtt);
   }
  private:
   ViEEncoder* owner_;
 };
 
-ViEEncoder::ViEEncoder(int32_t channel_id,
-                       uint32_t number_of_cores,
+ViEEncoder::ViEEncoder(uint32_t number_of_cores,
                        ProcessThread* module_process_thread,
                        SendStatisticsProxy* stats_proxy,
                        I420FrameCallback* pre_encode_callback,
                        PacedSender* pacer,
                        BitrateAllocator* bitrate_allocator)
-    : channel_id_(channel_id),
-      number_of_cores_(number_of_cores),
+    : number_of_cores_(number_of_cores),
       vpm_(VideoProcessingModule::Create()),
       qm_callback_(new QMVideoSettingsCallback(vpm_.get())),
       vcm_(VideoCodingModule::Create(Clock::GetRealTimeClock(),
                                      this,
                                      qm_callback_.get())),
       send_payload_router_(NULL),
       data_cs_(CriticalSectionWrapper::CreateCriticalSection()),
       stats_proxy_(stats_proxy),
       pre_encode_callback_(pre_encode_callback),
       pacer_(pacer),
@@ skipping 45 matching lines @@
 void ViEEncoder::StopThreadsAndRemoveSharedMembers() {
   if (bitrate_allocator_)
     bitrate_allocator_->RemoveBitrateObserver(bitrate_observer_.get());
   module_process_thread_->DeRegisterModule(vcm_.get());
   module_process_thread_->DeRegisterModule(vpm_.get());
 }
 
 ViEEncoder::~ViEEncoder() {
 }
 
-int ViEEncoder::Owner() const {
-  return channel_id_;
-}
-
 void ViEEncoder::SetNetworkTransmissionState(bool is_transmitting) {
   {
     CriticalSectionScoped cs(data_cs_.get());
     network_is_transmitting_ = is_transmitting;
   }
 }
 
 void ViEEncoder::Pause() {
   CriticalSectionScoped cs(data_cs_.get());
   encoder_paused_ = true;
@@ skipping 488 matching lines @@
   std::vector<uint32_t> stream_bitrates = AllocateStreamBitrates(
       bitrate_bps, stream_configs, send_codec.numberOfSimulcastStreams);
   send_payload_router_->SetTargetSendBitrates(stream_bitrates);
 
   {
     CriticalSectionScoped cs(data_cs_.get());
     last_observed_bitrate_bps_ = bitrate_bps;
     if (video_suspended_ == video_is_suspended)
       return;
     video_suspended_ = video_is_suspended;
-    LOG(LS_INFO) << "Video suspended " << video_is_suspended
-                 << " for channel " << channel_id_;
+
+    std::stringstream ss;
+    for (const auto& it : ssrc_streams_) {
+      ss << it.first << " ";
+    }
+    LOG(LS_INFO) << "Video suspend state changed " << video_is_suspended

[pbos-webrtc, 2015/10/19 10:04:14]

Just log ssrc_streams_.front() (should always be non-empty, right?) instead and
remove the stringstream so we don't have to do any string construction here.

[mflodman, 2015/10/19 11:52:59]

I agree. I had it that way originally, but then changed to log all SSRCs this
way. I'll change, to .begin()->first, and submit.

+                 << " for ssrc " << ss.str();
   }
   // Video suspend-state changed, inform codec observer.
   if (stats_proxy_)
     stats_proxy_->OnSuspendChange(video_is_suspended);
 }
 
 void ViEEncoder::SuspendBelowMinBitrate() {
   vcm_->SuspendBelowMinBitrate();
   bitrate_allocator_->EnforceMinBitrate(false);
 }
@@ skipping 15 matching lines @@
     const uint32_t width,
     const uint32_t height) {
   return vpm_->SetTargetResolution(width, height, frame_rate);
 }
 
 void QMVideoSettingsCallback::SetTargetFramerate(int frame_rate) {
   vpm_->SetTargetFramerate(frame_rate);
 }
 
 }  // namespace webrtc