| 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 281eb3d55a8f0a38ada596f913b0d928a4853f04..99402607c1c1071c2303f7ff14312f297beefe91 100644
|
| --- a/webrtc/modules/video_coding/codecs/h264/h264_encoder_impl.cc
|
| +++ b/webrtc/modules/video_coding/codecs/h264/h264_encoder_impl.cc
|
| @@ -28,15 +28,18 @@ namespace {
|
| const bool kOpenH264EncoderDetailedLogging = false;
|
|
|
| int NumberOfThreads(int width, int height, int number_of_cores) {
|
| - 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(hbos): In Chromium, multiple threads do not work with sandbox on Mac,
|
| + // 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.
|
| +// }
|
| + return 1;
|
| }
|
|
|
| } // namespace
|
|
|