Roll OpenH264 from v1.4.1 to v1.6.0

content/renderer/media/video_track_recorder.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/media/video_track_recorder.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/logging.h"
@@ skipping 1005 matching lines @@
     init_params.iRCMode = RC_BITRATE_MODE;
     init_params.iTargetBitrate = bits_per_second_;
   } else {
     init_params.iRCMode = RC_OFF_MODE;
   }
 
   // Threading model: Set to 1 due to https://crbug.com/583348.
   init_params.iMultipleThreadIdc = 1;
 
   // TODO(mcasas): consider reducing complexity if there are few CPUs available.
-  DCHECK_EQ(MEDIUM_COMPLEXITY, init_params.iComplexityMode);
+  init_params.iComplexityMode = MEDIUM_COMPLEXITY;
   DCHECK(!init_params.bEnableDenoise);
   DCHECK(init_params.bEnableFrameSkip);
 
   // The base spatial layer 0 is the only one we use.
   DCHECK_EQ(1, init_params.iSpatialLayerNum);
   init_params.sSpatialLayers[0].iVideoWidth        = init_params.iPicWidth;
   init_params.sSpatialLayers[0].iVideoHeight       = init_params.iPicHeight;
   init_params.sSpatialLayers[0].iSpatialBitrate    = init_params.iTargetBitrate;
-  // Slice num according to number of threads.
-  init_params.sSpatialLayers[0].sSliceCfg.uiSliceMode = SM_AUTO_SLICE;
+
+  // When uiSliceMode = SM_FIXEDSLCNUM_SLICE, uiSliceNum = 0 means auto design
+  // it with cpu core number.
+  // TODO(sprang): Set to 0 when we understand why the rate controller borks
+  // when uiSliceNum > 1. See https://github.com/cisco/openh264/issues/2591
+  init_params.sSpatialLayers[0].sSliceArgument.uiSliceNum = 1;
+  init_params.sSpatialLayers[0].sSliceArgument.uiSliceMode =
+      SM_FIXEDSLCNUM_SLICE;
 
   if (openh264_encoder_->InitializeExt(&init_params) != cmResultSuccess) {
     NOTREACHED() << "Failed to initialize OpenH264 encoder";
     return;
   }
 
   int pixel_format = EVideoFormatType::videoFormatI420;
   openh264_encoder_->SetOption(ENCODER_OPTION_DATAFORMAT, &pixel_format);
 }
 #endif //#if BUILDFLAG(RTC_USE_H264)
@@ skipping 96 matching lines @@
     encoder_->SetPaused(paused_before_init_);
 
   // StartFrameEncode() will be called on Render IO thread.
   MediaStreamVideoSink::ConnectToTrack(
       track_,
       base::Bind(&VideoTrackRecorder::Encoder::StartFrameEncode, encoder_),
       false);
 }
 
 }  // namespace content