Configure OpenH264 sSliceArgument.uiSliceNum set to 1.

webrtc/modules/video_coding/codecs/h264/h264_encoder_impl.cc

 /*
  *  Copyright (c) 2015 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 30 matching lines @@
   // see crbug.com/583348. Until further investigated, only use one thread.
 //  if (width * height >= 1920 * 1080 && number_of_cores > 8) {
 //    return 8;  // 8 threads for 1080p on high perf machines.
 //  } else if (width * height > 1280 * 960 && number_of_cores >= 6) {
 //    return 3;  // 3 threads for 1080p.
 //  } else if (width * height > 640 * 480 && number_of_cores >= 3) {
 //    return 2;  // 2 threads for qHD/HD.
 //  } else {
 //    return 1;  // 1 thread for VGA or less.
 //  }
+// TODO(sprang): Also check sSliceArgument.uiSliceNum om GetEncoderPrams(),
+//               before enabling multithreading here.
   return 1;
 }
 
 FrameType ConvertToVideoFrameType(EVideoFrameType type) {
   switch (type) {
     case videoFrameTypeIDR:
       return kVideoFrameKey;
     case videoFrameTypeSkip:
     case videoFrameTypeI:
     case videoFrameTypeP:
@@ skipping 377 matching lines @@
   encoder_params.sSpatialLayers[0].iSpatialBitrate =
       encoder_params.iTargetBitrate;
   encoder_params.sSpatialLayers[0].iMaxSpatialBitrate =
       encoder_params.iMaxBitrate;
 #if (OPENH264_MAJOR == 1) && (OPENH264_MINOR <= 5)
   // Slice num according to number of threads.
   encoder_params.sSpatialLayers[0].sSliceCfg.uiSliceMode = SM_AUTO_SLICE;
 #else
   // When uiSliceMode = SM_FIXEDSLCNUM_SLICE, uiSliceNum = 0 means auto design
   // it with cpu core number.
-  encoder_params.sSpatialLayers[0].sSliceArgument.uiSliceNum = 0;
+  // TODO(sprang): Set to 0 when we understand why the rate controller borks
+  //               when uiSliceNum > 1.
+  encoder_params.sSpatialLayers[0].sSliceArgument.uiSliceNum = 1;
   encoder_params.sSpatialLayers[0].sSliceArgument.uiSliceMode =
       SM_FIXEDSLCNUM_SLICE;
 #endif
 
   return encoder_params;
 }
 
 void H264EncoderImpl::ReportInit() {
   if (has_reported_init_)
     return;
@@ skipping 19 matching lines @@
 
 int32_t H264EncoderImpl::SetPeriodicKeyFrames(bool enable) {
   return WEBRTC_VIDEO_CODEC_OK;
 }
 
 void H264EncoderImpl::OnDroppedFrame() {
   quality_scaler_.ReportDroppedFrame();
 }
 
 }  // namespace webrtc