Index: webrtc/modules/video_coding/codecs/h264/h264_encoder_impl.cc |
diff --git a/webrtc/modules/video_coding/codecs/h264/h264_encoder_impl.cc b/webrtc/modules/video_coding/codecs/h264/h264_encoder_impl.cc |
index f29a4895ff181c72c4f5342082d5efb14e147955..2070f22890ff90d3028f91ab034ae342c7014bce 100644 |
--- a/webrtc/modules/video_coding/codecs/h264/h264_encoder_impl.cc |
+++ b/webrtc/modules/video_coding/codecs/h264/h264_encoder_impl.cc |
@@ -48,6 +48,8 @@ int NumberOfThreads(int width, int height, int number_of_cores) { |
// } else { |
// return 1; // 1 thread for VGA or less. |
// } |
+// TODO(sprang): Also check sSliceArgument.uiSliceNum om GetEncoderPrams(), |
+// before enabling multithreading here. |
return 1; |
} |
@@ -445,7 +447,9 @@ SEncParamExt H264EncoderImpl::CreateEncoderParams() const { |
#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 |