2019-03-13 16:23:42 +00:00
|
|
|
From abc7295ca1653c85472916909f0eb76e28e79a58 Mon Sep 17 00:00:00 2001
|
|
|
|
|
From: Akarshan Biswas <akarshan.biswas@gmail.com>
|
|
|
|
|
Date: Thu, 24 Jan 2019 12:45:29 +0530
|
|
|
|
|
Subject: [PATCH] Enable mojo with VDA2 on Linux
|
|
|
|
|
|
|
|
|
|
---
|
|
|
|
|
chrome/browser/about_flags.cc | 8 ++++----
|
|
|
|
|
chrome/browser/flag_descriptions.cc | 9 +++++++--
|
|
|
|
|
chrome/browser/flag_descriptions.h | 10 ++++++++--
|
|
|
|
|
gpu/config/software_rendering_list.json | 3 ++-
|
|
|
|
|
media/media_options.gni | 9 ++++++---
|
|
|
|
|
media/mojo/services/gpu_mojo_media_client.cc | 4 ++--
|
|
|
|
|
6 files changed, 29 insertions(+), 14 deletions(-)
|
|
|
|
|
|
2019-08-02 08:37:13 +00:00
|
|
|
Index: chromium-76.0.3806.1/chrome/browser/about_flags.cc
|
2019-03-13 10:16:54 +00:00
|
|
|
===================================================================
|
2019-08-02 08:37:13 +00:00
|
|
|
--- chromium-76.0.3806.1.orig/chrome/browser/about_flags.cc
|
|
|
|
|
+++ chromium-76.0.3806.1/chrome/browser/about_flags.cc
|
2019-09-12 07:25:11 +00:00
|
|
|
@@ -1634,14 +1634,14 @@ const FeatureEntry kFeatureEntries[] = {
|
2018-04-08 10:50:56 +00:00
|
|
|
"disable-accelerated-video-decode",
|
|
|
|
|
flag_descriptions::kAcceleratedVideoDecodeName,
|
2018-10-17 08:03:27 +00:00
|
|
|
flag_descriptions::kAcceleratedVideoDecodeDescription,
|
|
|
|
|
- kOsMac | kOsWin | kOsCrOS | kOsAndroid,
|
|
|
|
|
+ kOsMac | kOsWin | kOsCrOS | kOsAndroid | kOsLinux,
|
2018-04-08 10:50:56 +00:00
|
|
|
SINGLE_DISABLE_VALUE_TYPE(switches::kDisableAcceleratedVideoDecode),
|
|
|
|
|
},
|
2019-09-12 07:25:11 +00:00
|
|
|
{
|
|
|
|
|
"disable-accelerated-video-encode",
|
|
|
|
|
flag_descriptions::kAcceleratedVideoEncodeName,
|
|
|
|
|
flag_descriptions::kAcceleratedVideoEncodeDescription,
|
|
|
|
|
- kOsMac | kOsWin | kOsCrOS | kOsAndroid,
|
|
|
|
|
+ kOsMac | kOsWin | kOsCrOS | kOsAndroid | kOsLinux,
|
|
|
|
|
SINGLE_DISABLE_VALUE_TYPE(switches::kDisableAcceleratedVideoEncode),
|
|
|
|
|
},
|
2019-08-02 08:37:13 +00:00
|
|
|
{"enable-history-favicons-google-server-query",
|
2019-09-12 07:25:11 +00:00
|
|
|
@@ -2115,10 +2115,10 @@ const FeatureEntry kFeatureEntries[] = {
|
2018-12-06 08:33:56 +00:00
|
|
|
FEATURE_VALUE_TYPE(service_manager::features::kXRSandbox)},
|
2019-09-12 07:25:11 +00:00
|
|
|
#endif // !defined(OS_ANDROID)
|
2018-04-08 10:50:56 +00:00
|
|
|
#endif // ENABLE_VR
|
|
|
|
|
-#if defined(OS_CHROMEOS)
|
2018-10-17 08:03:27 +00:00
|
|
|
+#if defined(OS_CHROMEOS) || defined(OS_LINUX)
|
2018-04-08 10:50:56 +00:00
|
|
|
{"disable-accelerated-mjpeg-decode",
|
|
|
|
|
flag_descriptions::kAcceleratedMjpegDecodeName,
|
2018-10-17 08:03:27 +00:00
|
|
|
- flag_descriptions::kAcceleratedMjpegDecodeDescription, kOsCrOS,
|
|
|
|
|
+ flag_descriptions::kAcceleratedMjpegDecodeDescription, kOsCrOS | kOsLinux,
|
2018-04-08 10:50:56 +00:00
|
|
|
SINGLE_DISABLE_VALUE_TYPE(switches::kDisableAcceleratedMjpegDecode)},
|
2019-08-02 08:37:13 +00:00
|
|
|
#endif // OS_CHROMEOS
|
|
|
|
|
{"system-keyboard-lock", flag_descriptions::kSystemKeyboardLockName,
|
|
|
|
|
Index: chromium-76.0.3806.1/chrome/browser/flag_descriptions.cc
|
2019-03-13 10:16:54 +00:00
|
|
|
===================================================================
|
2019-08-02 08:37:13 +00:00
|
|
|
--- chromium-76.0.3806.1.orig/chrome/browser/flag_descriptions.cc
|
|
|
|
|
+++ chromium-76.0.3806.1/chrome/browser/flag_descriptions.cc
|
2019-09-12 07:25:11 +00:00
|
|
|
@@ -2969,15 +2969,20 @@ const char kMacSystemMediaPermissionsInf
|
2019-03-13 16:23:42 +00:00
|
|
|
|
|
|
|
|
#endif
|
2018-04-08 10:50:56 +00:00
|
|
|
|
2019-03-13 16:23:42 +00:00
|
|
|
-// Chrome OS -------------------------------------------------------------------
|
|
|
|
|
+// Chrome OS Linux-------------------------------------------------------------------
|
2018-04-08 10:50:56 +00:00
|
|
|
|
|
|
|
|
-#if defined(OS_CHROMEOS)
|
|
|
|
|
+#if defined(OS_CHROMEOS) || (defined(OS_LINUX) && !defined(OS_ANDROID))
|
|
|
|
|
|
|
|
|
|
const char kAcceleratedMjpegDecodeName[] =
|
|
|
|
|
"Hardware-accelerated mjpeg decode for captured frame";
|
2019-03-13 16:23:42 +00:00
|
|
|
const char kAcceleratedMjpegDecodeDescription[] =
|
|
|
|
|
"Enable hardware-accelerated mjpeg decode for captured frame where "
|
|
|
|
|
"available.";
|
|
|
|
|
+#endif
|
|
|
|
|
+
|
|
|
|
|
+// Chrome OS --------------------------------------------------
|
|
|
|
|
+
|
|
|
|
|
+#if defined(OS_CHROMEOS)
|
2018-07-25 09:58:33 +00:00
|
|
|
|
2019-06-07 19:47:47 +00:00
|
|
|
const char kAppServiceAshName[] = "App Service Ash";
|
|
|
|
|
const char kAppServiceAshDescription[] =
|
2019-08-02 08:37:13 +00:00
|
|
|
Index: chromium-76.0.3806.1/chrome/browser/flag_descriptions.h
|
2019-03-13 10:16:54 +00:00
|
|
|
===================================================================
|
2019-08-02 08:37:13 +00:00
|
|
|
--- chromium-76.0.3806.1.orig/chrome/browser/flag_descriptions.h
|
|
|
|
|
+++ chromium-76.0.3806.1/chrome/browser/flag_descriptions.h
|
2019-09-12 07:25:11 +00:00
|
|
|
@@ -1766,11 +1766,15 @@ extern const char kPermissionPromptPersi
|
2018-04-08 10:50:56 +00:00
|
|
|
|
2019-06-07 19:47:47 +00:00
|
|
|
// Chrome OS ------------------------------------------------------------------
|
2019-03-13 16:23:42 +00:00
|
|
|
|
2018-04-08 10:50:56 +00:00
|
|
|
-#if defined(OS_CHROMEOS)
|
|
|
|
|
+#if defined(OS_CHROMEOS) || (defined(OS_LINUX) && !defined(OS_ANDROID))
|
|
|
|
|
|
|
|
|
|
extern const char kAcceleratedMjpegDecodeName[];
|
|
|
|
|
extern const char kAcceleratedMjpegDecodeDescription[];
|
|
|
|
|
|
2019-03-13 16:23:42 +00:00
|
|
|
+#endif // defined(OS_CHROMEOS) || (defined(OS_LINUX) && !defined(OS_ANDROID))
|
2018-04-08 10:50:56 +00:00
|
|
|
+
|
|
|
|
|
+#if defined(OS_CHROMEOS)
|
|
|
|
|
+
|
2019-06-07 19:47:47 +00:00
|
|
|
extern const char kAppServiceAshName[];
|
|
|
|
|
extern const char kAppServiceAshDescription[];
|
2018-04-08 10:50:56 +00:00
|
|
|
|
2019-08-02 08:37:13 +00:00
|
|
|
Index: chromium-76.0.3806.1/gpu/config/software_rendering_list.json
|
2019-03-13 10:16:54 +00:00
|
|
|
===================================================================
|
2019-08-02 08:37:13 +00:00
|
|
|
--- chromium-76.0.3806.1.orig/gpu/config/software_rendering_list.json
|
|
|
|
|
+++ chromium-76.0.3806.1/gpu/config/software_rendering_list.json
|
2019-09-12 07:25:11 +00:00
|
|
|
@@ -334,11 +334,12 @@
|
2018-04-08 10:50:56 +00:00
|
|
|
},
|
2019-01-30 08:50:03 +00:00
|
|
|
{
|
2019-03-13 16:23:42 +00:00
|
|
|
"id": 48,
|
2018-04-08 10:50:56 +00:00
|
|
|
- "description": "Accelerated video decode is unavailable on Linux",
|
2019-03-13 16:23:42 +00:00
|
|
|
+ "description": "Accelerated VA-API video decode is not supported on NVIDIA platforms",
|
|
|
|
|
"cr_bugs": [137247],
|
|
|
|
|
"os": {
|
|
|
|
|
"type": "linux"
|
|
|
|
|
},
|
|
|
|
|
+ "vendor_id": "0x10de",
|
|
|
|
|
"features": [
|
|
|
|
|
"accelerated_video_decode"
|
|
|
|
|
]
|