Make ReconfigureVideoEncoder void.

webrtc/video/video_send_stream.cc

 /*
  *  Copyright (c) 2013 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 270 matching lines @@
   }
 
   RTC_DCHECK(config.encoder_settings.encoder != nullptr);
   RTC_DCHECK_GE(config.encoder_settings.payload_type, 0);
   RTC_DCHECK_LE(config.encoder_settings.payload_type, 127);
   RTC_CHECK_EQ(0, vie_encoder_.RegisterExternalEncoder(
                       config.encoder_settings.encoder,
                       config.encoder_settings.payload_type,
                       config.encoder_settings.internal_source));
 
-  RTC_CHECK(ReconfigureVideoEncoder(encoder_config));
+  ReconfigureVideoEncoder(encoder_config);
 
   vie_channel_.RegisterSendSideDelayObserver(&stats_proxy_);
 
   if (config_.post_encode_callback)
     vie_encoder_.RegisterPostEncodeImageCallback(&encoded_frame_proxy_);
 
   if (config_.suspend_below_min_bitrate)
     vie_encoder_.SuspendBelowMinBitrate();
 
   vie_channel_.RegisterRtcpPacketTypeCounterObserver(&stats_proxy_);
@@ skipping 42 matching lines @@
 }
 
 void VideoSendStream::Stop() {
   if (!payload_router_.active())
     return;
   // TODO(pbos): Make sure the encoder stops here.
   payload_router_.set_active(false);
   vie_receiver_->StopReceive();
 }
 
-bool VideoSendStream::ReconfigureVideoEncoder(
+void VideoSendStream::ReconfigureVideoEncoder(
     const VideoEncoderConfig& config) {
   TRACE_EVENT0("webrtc", "VideoSendStream::(Re)configureVideoEncoder");
   LOG(LS_INFO) << "(Re)configureVideoEncoder: " << config.ToString();
   const std::vector<VideoStream>& streams = config.streams;
+  static const int kEncoderMinBitrate = 30;

[stefan-webrtc, 2016/03/02 15:56:33]

Kbps

[pbos-webrtc, 2016/03/02 15:57:56]

Done.

   RTC_DCHECK(!streams.empty());
   RTC_DCHECK_GE(config_.rtp.ssrcs.size(), streams.size());
 
   VideoCodec video_codec;
   memset(&video_codec, 0, sizeof(video_codec));
   video_codec.codecType =
       PayloadNameToCodecType(config_.encoder_settings.payload_name);
 
   switch (config.content_type) {
     case VideoEncoderConfig::ContentType::kRealtimeVideo:
@@ skipping 51 matching lines @@
   }
 
   strncpy(video_codec.plName,
           config_.encoder_settings.payload_name.c_str(),
           kPayloadNameSize - 1);
   video_codec.plName[kPayloadNameSize - 1] = '\0';
   video_codec.plType = config_.encoder_settings.payload_type;
   video_codec.numberOfSimulcastStreams =
       static_cast<unsigned char>(streams.size());
   video_codec.minBitrate = streams[0].min_bitrate_bps / 1000;
+  if (video_codec.minBitrate < kEncoderMinBitrate)
+    video_codec.minBitrate = kEncoderMinBitrate;
   RTC_DCHECK_LE(streams.size(), static_cast<size_t>(kMaxSimulcastStreams));
   if (video_codec.codecType == kVideoCodecVP9) {
     // If the vector is empty, bitrates will be configured automatically.
     RTC_DCHECK(config.spatial_layers.empty() ||
                config.spatial_layers.size() ==
                    video_codec.codecSpecific.VP9.numberOfSpatialLayers);
     RTC_DCHECK_LE(video_codec.codecSpecific.VP9.numberOfSpatialLayers,
                   kMaxSimulcastStreams);
     for (size_t i = 0; i < config.spatial_layers.size(); ++i)
       video_codec.spatialLayers[i] = config.spatial_layers[i];
@@ skipping 24 matching lines @@
     video_codec.height = std::max(
         video_codec.height, static_cast<uint16_t>(streams[i].height));
     video_codec.minBitrate =
         std::min(static_cast<uint16_t>(video_codec.minBitrate),
                  static_cast<uint16_t>(streams[i].min_bitrate_bps / 1000));
     video_codec.maxBitrate += streams[i].max_bitrate_bps / 1000;
     video_codec.qpMax = std::max(video_codec.qpMax,
                                  static_cast<unsigned int>(streams[i].max_qp));
   }
 
-  // Set to zero to not update the bitrate controller from ViEEncoder, as
-  // the bitrate controller is already set from Call.
-  video_codec.startBitrate = 0;
+  if (video_codec.maxBitrate == 0) {
+    // Unset max bitrate -> cap to one bit per pixel.
+    video_codec.maxBitrate =
+        (video_codec.width * video_codec.height * video_codec.maxFramerate) /
+        1000;
+  }
+  if (video_codec.maxBitrate < kEncoderMinBitrate)
+    video_codec.maxBitrate = kEncoderMinBitrate;
 
   RTC_DCHECK_GT(streams[0].max_framerate, 0);
   video_codec.maxFramerate = streams[0].max_framerate;
 
-  if (!SetSendCodec(video_codec)) {
-    LOG(LS_WARNING) << "(Re)configureVideoEncoder: SetSendCodec failed "
-                       "for config: "
-                    << config.ToString();
-    return false;
-  }
+  vie_encoder_.SetEncoder(video_codec);
+
   // Clear stats for disabled layers.
   for (size_t i = video_codec.numberOfSimulcastStreams;
        i < config_.rtp.ssrcs.size(); ++i) {
     stats_proxy_.OnInactiveSsrc(config_.rtp.ssrcs[i]);
   }
 
   stats_proxy_.SetContentType(config.content_type);
 
   RTC_DCHECK_GE(config.min_transmit_bitrate_bps, 0);
   vie_encoder_.SetMinTransmitBitrate(config.min_transmit_bitrate_bps / 1000);
-
-  return true;
 }
 
 bool VideoSendStream::DeliverRtcp(const uint8_t* packet, size_t length) {
   return vie_receiver_->DeliverRtcp(packet, length);
 }
 
 VideoSendStream::Stats VideoSendStream::GetStats() {
   return stats_proxy_.GetStats();
 }
 
@@ skipping 77 matching lines @@
   vie_encoder_.SetNetworkTransmissionState(state == kNetworkUp);
   if (state == kNetworkDown) {
     for (RtpRtcp* rtp_rtcp : rtp_rtcp_modules_)
       rtp_rtcp->SetRTCPStatus(RtcpMode::kOff);
   }
 }
 
 int VideoSendStream::GetPaddingNeededBps() const {
   return vie_encoder_.GetPaddingNeededBps();
 }
-
-bool VideoSendStream::SetSendCodec(VideoCodec video_codec) {
-  static const int kEncoderMinBitrate = 30;
-  if (video_codec.maxBitrate == 0) {
-    // Unset max bitrate -> cap to one bit per pixel.
-    video_codec.maxBitrate =
-        (video_codec.width * video_codec.height * video_codec.maxFramerate) /
-        1000;
-  }
-
-  if (video_codec.minBitrate < kEncoderMinBitrate)
-    video_codec.minBitrate = kEncoderMinBitrate;
-  if (video_codec.maxBitrate < kEncoderMinBitrate)
-    video_codec.maxBitrate = kEncoderMinBitrate;
-
-  // Stop the media flow while reconfiguring.
-  vie_encoder_.Pause();
-
-  if (vie_encoder_.SetEncoder(video_codec) != 0) {
-    LOG(LS_ERROR) << "Failed to set encoder.";
-    return false;
-  }
-
-  size_t num_streams = video_codec.numberOfSimulcastStreams > 0
-                           ? video_codec.numberOfSimulcastStreams
-                           : 1;
-  payload_router_.SetSendingRtpModules(num_streams);
-
-  // Restart the media flow
-  vie_encoder_.Restart();
-
-  return true;
-}
 }  // namespace internal
 }  // namespace webrtc