Remove default ViEEncoder encoder instance.

webrtc/video_engine/vie_channel_group.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 172 matching lines @@
   DCHECK(channel_map_.empty());
   DCHECK(!remb_->InUse());
   DCHECK(vie_encoder_map_.empty());
 }
 
 bool ChannelGroup::CreateSendChannel(int channel_id,
                                      int engine_id,
                                      Transport* transport,
                                      int number_of_cores,
                                      const std::vector<uint32_t>& ssrcs) {
-  // TODO(pbos): Remove checks for empty ssrcs and add this check when there's
-  // no base channel.
-  // DCHECK(!ssrcs.empty());
+  DCHECK(!ssrcs.empty());
   rtc::scoped_ptr<ViEEncoder> vie_encoder(new ViEEncoder(
       channel_id, number_of_cores, *process_thread_, pacer_.get(),
-      bitrate_allocator_.get(), bitrate_controller_.get(), false));
+      bitrate_allocator_.get(), bitrate_controller_.get()));
   if (!vie_encoder->Init()) {
     return false;
   }
   ViEEncoder* encoder = vie_encoder.get();
   if (!CreateChannel(channel_id, engine_id, transport, number_of_cores,
-                     vie_encoder.release(), ssrcs.empty() ? 1 : ssrcs.size(),
-                     true)) {
+                     vie_encoder.release(), ssrcs.size(), true)) {
     return false;
   }
   ViEChannel* channel = channel_map_[channel_id];
   // Connect the encoder with the send packet router, to enable sending.
   encoder->StartThreadsAndSetSharedMembers(channel->send_payload_router(),
                                            channel->vcm_protection_callback());
 
-  if (!ssrcs.empty()) {
-    encoder_state_feedback_->AddEncoder(ssrcs, encoder);
-    std::vector<uint32_t> first_ssrc(1, ssrcs[0]);
-    encoder->SetSsrcs(first_ssrc);
-  }
+  encoder_state_feedback_->AddEncoder(ssrcs, encoder);
+  std::vector<uint32_t> first_ssrc(1, ssrcs[0]);
+  encoder->SetSsrcs(first_ssrc);
   return true;
 }
 
 bool ChannelGroup::CreateReceiveChannel(int channel_id,
                                         int engine_id,
                                         Transport* transport,
                                         int number_of_cores) {
   return CreateChannel(channel_id, engine_id, transport, number_of_cores,
                        nullptr, 1, false);
 }
@@ skipping 140 matching lines @@
     rtc::CritScope lock(&encoder_map_crit_);
     for (const auto& encoder : vie_encoder_map_)
       pad_up_to_bitrate_bps += encoder.second->GetPaddingNeededBps();
   }
   pacer_->UpdateBitrate(
       target_bitrate_bps / 1000,
       PacedSender::kDefaultPaceMultiplier * target_bitrate_bps / 1000,
       pad_up_to_bitrate_bps / 1000);
 }
 }  // namespace webrtc