Commit c3757411 authored by Yuta Hijikata's avatar Yuta Hijikata Committed by Chromium LUCI CQ

LaCrOS: Remove thread limitation on lacros-chrome.

Removes limitation on thread numbers applied to lacros-
chrome that is only necessary for linux not chrome os.

Bug: 1052397
Change-Id: I196a7ab7656cce1d79e853e1929c83ae269ae541
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2592219
Commit-Queue: Joe Downing <joedow@chromium.org>
Reviewed-by: default avatarJoe Downing <joedow@chromium.org>
Auto-Submit: Yuta Hijikata <ythjkt@chromium.org>
Cr-Commit-Position: refs/heads/master@{#843543}
parent b3af0790
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
#include "base/memory/ptr_util.h" #include "base/memory/ptr_util.h"
#include "base/system/sys_info.h" #include "base/system/sys_info.h"
#include "build/build_config.h" #include "build/build_config.h"
#include "build/chromeos_buildflags.h"
#include "remoting/base/util.h" #include "remoting/base/util.h"
#include "remoting/proto/video.pb.h" #include "remoting/proto/video.pb.h"
#include "third_party/libvpx/source/libvpx/vpx/vp8cx.h" #include "third_party/libvpx/source/libvpx/vpx/vp8cx.h"
...@@ -84,11 +85,11 @@ void SetVp8CodecParameters(vpx_codec_enc_cfg_t* config, ...@@ -84,11 +85,11 @@ void SetVp8CodecParameters(vpx_codec_enc_cfg_t* config,
const webrtc::DesktopSize& size) { const webrtc::DesktopSize& size) {
SetCommonCodecParameters(config, size); SetCommonCodecParameters(config, size);
#if defined(OS_LINUX) #if defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)
// On Linux, using too many threads for VP8 encoding has been linked to high // On Linux, using too many threads for VP8 encoding has been linked to high
// CPU usage on machines that are under stress. See http://crbug.com/1151148. // CPU usage on machines that are under stress. See http://crbug.com/1151148.
config->g_threads = std::min(config->g_threads, 2U); config->g_threads = std::min(config->g_threads, 2U);
#endif // defined(OS_LINUX) #endif // defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)
// Value of 2 means using the real time profile. This is basically a // Value of 2 means using the real time profile. This is basically a
// redundant option since we explicitly select real time mode when doing // redundant option since we explicitly select real time mode when doing
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment