| |
@@ -1,4 +1,4 @@
|
| |
- From 9eef10b939b9eee6e7bb58c4ca3a8e119df518c1 Mon Sep 17 00:00:00 2001
|
| |
+ From efdd5bdf093e9074c9eba73650ff5ad95b280ec8 Mon Sep 17 00:00:00 2001
|
| |
From: Akarshan Biswas <akarshan.biswas@gmail.com>
|
| |
Date: Sun, 4 Nov 2018 20:26:54 +0530
|
| |
Subject: [PATCH] Enable vaapi on Linux
|
| |
@@ -17,10 +17,10 @@
|
| |
10 files changed, 52 insertions(+), 35 deletions(-)
|
| |
|
| |
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
|
| |
- index d029d0648..39df8d6cf 100644
|
| |
+ index db54ccb61..f32075fb8 100644
|
| |
--- a/chrome/browser/about_flags.cc
|
| |
+++ b/chrome/browser/about_flags.cc
|
| |
- @@ -1775,7 +1775,7 @@ const FeatureEntry kFeatureEntries[] = {
|
| |
+ @@ -1797,7 +1797,7 @@ const FeatureEntry kFeatureEntries[] = {
|
| |
"disable-accelerated-video-decode",
|
| |
flag_descriptions::kAcceleratedVideoDecodeName,
|
| |
flag_descriptions::kAcceleratedVideoDecodeDescription,
|
| |
@@ -29,9 +29,9 @@
|
| |
SINGLE_DISABLE_VALUE_TYPE(switches::kDisableAcceleratedVideoDecode),
|
| |
},
|
| |
#if defined(OS_WIN)
|
| |
- @@ -2457,12 +2457,12 @@ const FeatureEntry kFeatureEntries[] = {
|
| |
- FEATURE_VALUE_TYPE(features::kOpenVR)},
|
| |
- #endif // ENABLE_OPENVR
|
| |
+ @@ -2456,12 +2456,12 @@ const FeatureEntry kFeatureEntries[] = {
|
| |
+ FEATURE_VALUE_TYPE(service_manager::features::kXRSandbox)},
|
| |
+ #endif // ENABLE_ISOLATED_XR_SERVICE
|
| |
#endif // ENABLE_VR
|
| |
-#if defined(OS_CHROMEOS)
|
| |
+#if defined(OS_CHROMEOS) || defined(OS_LINUX)
|
| |
@@ -45,7 +45,7 @@
|
| |
{"v8-cache-options", flag_descriptions::kV8CacheOptionsName,
|
| |
flag_descriptions::kV8CacheOptionsDescription, kOsAll,
|
| |
MULTI_VALUE_TYPE(kV8CacheOptionsChoices)},
|
| |
- @@ -4444,12 +4444,14 @@ const FeatureEntry kFeatureEntries[] = {
|
| |
+ @@ -4371,12 +4371,14 @@ const FeatureEntry kFeatureEntries[] = {
|
| |
"AutofillDropdownLayout")},
|
| |
#endif // OS_ANDROID
|
| |
|
| |
@@ -63,10 +63,10 @@
|
| |
flag_descriptions::kEnableHomeLauncherGesturesName,
|
| |
flag_descriptions::kEnableHomeLauncherGesturesDescription, kOsCrOS,
|
| |
diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
|
| |
- index 0cb812619..df8ecb24e 100644
|
| |
+ index 6cc51bbfb..3c4babe3d 100644
|
| |
--- a/chrome/browser/flag_descriptions.cc
|
| |
+++ b/chrome/browser/flag_descriptions.cc
|
| |
- @@ -3053,9 +3053,9 @@ const char kTextSuggestionsTouchBarDescription[] =
|
| |
+ @@ -2996,9 +2996,9 @@ const char kTextSuggestionsTouchBarDescription[] =
|
| |
|
| |
#endif
|
| |
|
| |
@@ -78,7 +78,7 @@
|
| |
|
| |
const char kAcceleratedMjpegDecodeName[] =
|
| |
"Hardware-accelerated mjpeg decode for captured frame";
|
| |
- @@ -3063,6 +3063,18 @@ const char kAcceleratedMjpegDecodeDescription[] =
|
| |
+ @@ -3006,6 +3006,18 @@ const char kAcceleratedMjpegDecodeDescription[] =
|
| |
"Enable hardware-accelerated mjpeg decode for captured frame where "
|
| |
"available.";
|
| |
|
| |
@@ -97,7 +97,7 @@
|
| |
const char kAllowTouchpadThreeFingerClickName[] = "Touchpad three-finger-click";
|
| |
const char kAllowTouchpadThreeFingerClickDescription[] =
|
| |
"Enables touchpad three-finger-click as middle button.";
|
| |
- @@ -3564,12 +3576,6 @@ const char kUseMonitorColorSpaceDescription[] =
|
| |
+ @@ -3524,12 +3536,6 @@ const char kUseMonitorColorSpaceDescription[] =
|
| |
"Enables Chrome to use the color space information provided by the monitor"
|
| |
" instead of the default sRGB color space.";
|
| |
|
| |
@@ -111,10 +111,10 @@
|
| |
"Experimental Chromecast support for Video Player";
|
| |
const char kVideoPlayerChromecastSupportDescription[] =
|
| |
diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
|
| |
- index b3c5e5691..14d7e33e9 100644
|
| |
+ index 944695782..38d8fe144 100644
|
| |
--- a/chrome/browser/flag_descriptions.h
|
| |
+++ b/chrome/browser/flag_descriptions.h
|
| |
- @@ -1846,13 +1846,22 @@ extern const char kPermissionPromptPersistenceToggleDescription[];
|
| |
+ @@ -1824,13 +1824,22 @@ extern const char kPermissionPromptPersistenceToggleDescription[];
|
| |
|
| |
#endif // defined(OS_MACOSX)
|
| |
|
| |
@@ -139,7 +139,7 @@
|
| |
extern const char kAllowTouchpadThreeFingerClickName[];
|
| |
extern const char kAllowTouchpadThreeFingerClickDescription[];
|
| |
|
| |
- @@ -2158,9 +2167,6 @@ extern const char kUseMashDescription[];
|
| |
+ @@ -2145,9 +2154,6 @@ extern const char kUseMashDescription[];
|
| |
extern const char kUseMonitorColorSpaceName[];
|
| |
extern const char kUseMonitorColorSpaceDescription[];
|
| |
|
| |
@@ -150,7 +150,7 @@
|
| |
extern const char kVideoPlayerChromecastSupportDescription[];
|
| |
|
| |
diff --git a/components/viz/service/main/viz_main_impl.cc b/components/viz/service/main/viz_main_impl.cc
|
| |
- index 2196abef4..b4e0a1ae1 100644
|
| |
+ index 6f5f55de7..b90db3738 100644
|
| |
--- a/components/viz/service/main/viz_main_impl.cc
|
| |
+++ b/components/viz/service/main/viz_main_impl.cc
|
| |
@@ -41,7 +41,7 @@ std::unique_ptr<base::Thread> CreateAndStartIOThread() {
|
| |
@@ -185,10 +185,10 @@
|
| |
+ }
|
| |
}
|
| |
diff --git a/content/gpu/gpu_main.cc b/content/gpu/gpu_main.cc
|
| |
- index f589d015d..03fd1b44a 100644
|
| |
+ index 8397889b6..188d960a4 100644
|
| |
--- a/content/gpu/gpu_main.cc
|
| |
+++ b/content/gpu/gpu_main.cc
|
| |
- @@ -283,7 +283,7 @@ int GpuMain(const MainFunctionParams& parameters) {
|
| |
+ @@ -284,7 +284,7 @@ int GpuMain(const MainFunctionParams& parameters) {
|
| |
|
| |
base::PlatformThread::SetName("CrGpuMain");
|
| |
|
| |
@@ -197,7 +197,7 @@
|
| |
// Set thread priority before sandbox initialization.
|
| |
base::PlatformThread::SetCurrentThreadPriority(base::ThreadPriority::DISPLAY);
|
| |
#endif
|
| |
- @@ -316,7 +316,7 @@ int GpuMain(const MainFunctionParams& parameters) {
|
| |
+ @@ -317,7 +317,7 @@ int GpuMain(const MainFunctionParams& parameters) {
|
| |
GetContentClient()->SetGpuInfo(gpu_init->gpu_info());
|
| |
|
| |
base::ThreadPriority io_thread_priority = base::ThreadPriority::NORMAL;
|
| |
@@ -207,10 +207,10 @@
|
| |
#endif
|
| |
|
| |
diff --git a/gpu/config/software_rendering_list.json b/gpu/config/software_rendering_list.json
|
| |
- index 445953a64..0aac9ddb6 100644
|
| |
+ index cb6118b6a..7b8ea0f75 100644
|
| |
--- a/gpu/config/software_rendering_list.json
|
| |
+++ b/gpu/config/software_rendering_list.json
|
| |
- @@ -373,17 +373,6 @@
|
| |
+ @@ -369,17 +369,6 @@
|
| |
"all"
|
| |
]
|
| |
},
|
| |
@@ -229,10 +229,10 @@
|
| |
"id": 50,
|
| |
"description": "Disable VMware software renderer on older Mesa",
|
| |
diff --git a/media/base/media_switches.cc b/media/base/media_switches.cc
|
| |
- index 684c1d5cf..e887e60bb 100644
|
| |
+ index 41bfa9172..30ca4f40a 100644
|
| |
--- a/media/base/media_switches.cc
|
| |
+++ b/media/base/media_switches.cc
|
| |
- @@ -468,7 +468,7 @@ bool IsVideoCaptureAcceleratedJpegDecodingEnabled() {
|
| |
+ @@ -495,7 +495,7 @@ bool IsVideoCaptureAcceleratedJpegDecodingEnabled() {
|
| |
switches::kUseFakeJpegDecodeAccelerator)) {
|
| |
return true;
|
| |
}
|
| |
@@ -242,7 +242,7 @@
|
| |
#endif
|
| |
return false;
|
| |
diff --git a/media/filters/BUILD.gn b/media/filters/BUILD.gn
|
| |
- index ab6215152..b8d1ee896 100644
|
| |
+ index d558b537a..9ad090e07 100644
|
| |
--- a/media/filters/BUILD.gn
|
| |
+++ b/media/filters/BUILD.gn
|
| |
@@ -5,6 +5,7 @@
|
| |
@@ -253,7 +253,7 @@
|
| |
|
| |
jumbo_source_set("filters") {
|
| |
# Do not expand the visibility here without double-checking with OWNERS, this
|
| |
- @@ -198,7 +199,7 @@ jumbo_source_set("filters") {
|
| |
+ @@ -200,7 +201,7 @@ jumbo_source_set("filters") {
|
| |
deps += [ "//media/base/android" ]
|
| |
}
|
| |
|
| |
@@ -263,10 +263,10 @@
|
| |
"h264_bitstream_buffer.cc",
|
| |
"h264_bitstream_buffer.h",
|
| |
diff --git a/media/gpu/BUILD.gn b/media/gpu/BUILD.gn
|
| |
- index 9ef4730a4..0c3a06c24 100644
|
| |
+ index 07bfdefda..7e33cd747 100644
|
| |
--- a/media/gpu/BUILD.gn
|
| |
+++ b/media/gpu/BUILD.gn
|
| |
- @@ -501,6 +501,12 @@ if (use_v4l2_codec || use_vaapi || is_mac || is_win) {
|
| |
+ @@ -508,6 +508,12 @@ if (use_v4l2_codec || use_vaapi || is_mac || is_win) {
|
| |
}
|
| |
}
|
| |
|
| |
@@ -279,7 +279,7 @@
|
| |
if (use_vaapi) {
|
| |
test("jpeg_encode_accelerator_unittest") {
|
| |
deps = [
|
| |
- @@ -571,6 +577,7 @@ if (use_v4l2_codec || use_vaapi) {
|
| |
+ @@ -578,6 +584,7 @@ if (is_chromeos || is_linux) {
|
| |
if (use_ozone) {
|
| |
deps += [ "//ui/ozone" ]
|
| |
}
|
| |
@@ -288,5 +288,5 @@
|
| |
}
|
| |
|
| |
--
|
| |
- 2.19.1
|
| |
+ 2.19.2
|
| |
|
| |