diff --git a/AUTHORS b/AUTHORS index 831ee0dc25..ebcdd21158 100644 --- a/AUTHORS +++ b/AUTHORS @@ -24,6 +24,7 @@ Anil Kumar Ben Strong Berthold Herrmann Bob Withers +Brett Hebert Brett Hebert Bridger Maxwell Bruno Pitrus @@ -153,6 +154,7 @@ NVIDIA Corporation <*@nvidia.com> Opera Software ASA <*@opera.com> Optical Tone Ltd <*@opticaltone.com> Pengutronix e.K. <*@pengutronix.de> +Quebic Inc. <*@quebic.com> Raptor Computing Systems, LLC <*@raptorcs.com> RingCentral, Inc. <*@ringcentral.com> Signal Messenger, LLC <*@signal.org> diff --git a/modules/video_coding/codecs/h264/h264_encoder_impl.cc b/modules/video_coding/codecs/h264/h264_encoder_impl.cc index f6d52c6539..bc823a520a 100644 --- a/modules/video_coding/codecs/h264/h264_encoder_impl.cc +++ b/modules/video_coding/codecs/h264/h264_encoder_impl.cc @@ -53,20 +53,17 @@ enum H264EncoderImplEvent { }; int NumberOfThreads(int width, int height, int number_of_cores) { - // 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. - // } // TODO(sprang): Also check sSliceArgument.uiSliceNum om GetEncoderPrams(), // before enabling multithreading here. - return 1; + 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. + } } VideoFrameType ConvertToVideoFrameType(EVideoFrameType type) {