Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(177)

Unified Diff: webrtc/modules/video_coding/codecs/h264/h264_encoder_impl.cc

Issue 2458673002: Configure OpenH264 sSliceArgument.uiSliceNum set to 1. (Closed)
Patch Set: Set uiSliceNum = 1 until rate controller is fixed Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698