Remove the video channel id completely.

webrtc/video_engine/vie_encoder.cc

Index: webrtc/video_engine/vie_encoder.cc
diff --git a/webrtc/video_engine/vie_encoder.cc b/webrtc/video_engine/vie_encoder.cc
index 45e9612358a1bfc580940c081223041144b2317f..5a7efc67da69dfb6564ab529deb588e34f656370 100644
--- a/webrtc/video_engine/vie_encoder.cc
+++ b/webrtc/video_engine/vie_encoder.cc
@@ -102,15 +102,13 @@ class ViEBitrateObserver : public BitrateObserver {
   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(),
@@ -176,10 +174,6 @@ void ViEEncoder::StopThreadsAndRemoveSharedMembers() {
 ViEEncoder::~ViEEncoder() {
 }
 
-int ViEEncoder::Owner() const {
-  return channel_id_;
-}
-
 void ViEEncoder::SetNetworkTransmissionState(bool is_transmitting) {
   {
     CriticalSectionScoped cs(data_cs_.get());
@@ -688,8 +682,13 @@ void ViEEncoder::OnNetworkChanged(uint32_t 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_)