git.iko.soy/typeable/nixpkgs
on master help sign in
chromium: update vaapi patch

https://github.com/NixOS/nixpkgs/issues/73878

commita52d7674cc7bdf5fbccf1d273fadc58f008c839e authorHerwig Hochleitner <herwig@bendlas.net> dateFri 22 Nov 2019, 10:51 (7 years ago) parent9d208a6
3 files changed+56−119
pkgs/applications/networking/browsers/chromium/common.nix+2−2 pkgs/applications/networking/browsers/chromium/patches/chromium-vaapi.patch−117 pkgs/applications/networking/browsers/chromium/patches/vaapi-fix.patch+54
pkgs/applications/networking/browsers/chromium/common.nix+2−2
@@ -150,8 +150,8 @@ let
150150 # ++ optionals (channel == "dev") [ ( githubPatch "<patch>" "0000000000000000000000000000000000000000000000000000000000000000" ) ]
151151 # ++ optional (versionRange "68" "72") ( githubPatch "<patch>" "0000000000000000000000000000000000000000000000000000000000000000" )
152152 ] ++ optionals (useVaapi) [
153− # source: https://aur.archlinux.org/cgit/aur.git/plain/chromium-vaapi.patch?h=chromium-vaapi
154− ./patches/chromium-vaapi.patch
153+ # source: https://aur.archlinux.org/cgit/aur.git/tree/vaapi-fix.patch?h=chromium-vaapi
154+ ./patches/vaapi-fix.patch
155155 ] ++ optional stdenv.isAarch64 (fetchpatch {
156156 url = https://raw.githubusercontent.com/OSSystems/meta-browser/e4a667deaaf9a26a3a1aeb355770d1f29da549ad/recipes-browser/chromium/files/aarch64-skia-build-fix.patch;
157157 postFetch = "substituteInPlace $out --replace __aarch64__ SK_CPU_ARM64";
pkgs/applications/networking/browsers/chromium/patches/chromium-vaapi.patchdeleted−117
@@ -1,117 +0,0 @@
1−From abc7295ca1653c85472916909f0eb76e28e79a58 Mon Sep 17 00:00:00 2001
2−From: Akarshan Biswas <akarshan.biswas@gmail.com>
3−Date: Thu, 24 Jan 2019 12:45:29 +0530
4−Subject: [PATCH] Enable mojo with VDA2 on Linux
5−
6−---
7− chrome/browser/about_flags.cc | 8 ++++----
8− chrome/browser/flag_descriptions.cc | 9 +++++++--
9− chrome/browser/flag_descriptions.h | 10 ++++++++--
10− gpu/config/software_rendering_list.json | 3 ++-
11− media/media_options.gni | 9 ++++++---
12− media/mojo/services/gpu_mojo_media_client.cc | 4 ++--
13− 6 files changed, 29 insertions(+), 14 deletions(-)
14−
15−diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
16−index 0a84c6ac1..be2aa1d8b 100644
17−--- a/chrome/browser/about_flags.cc
18−+++ b/chrome/browser/about_flags.cc
19−@@ -1714,7 +1714,7 @@ const FeatureEntry kFeatureEntries[] = {
20− "disable-accelerated-video-decode",
21− flag_descriptions::kAcceleratedVideoDecodeName,
22− flag_descriptions::kAcceleratedVideoDecodeDescription,
23−- kOsMac | kOsWin | kOsCrOS | kOsAndroid,
24−+ kOsMac | kOsWin | kOsCrOS | kOsAndroid | kOsLinux,
25− SINGLE_DISABLE_VALUE_TYPE(switches::kDisableAcceleratedVideoDecode),
26− },
27− #if defined(OS_WIN)
28−@@ -2345,12 +2345,12 @@ const FeatureEntry kFeatureEntries[] = {
29− FEATURE_VALUE_TYPE(service_manager::features::kXRSandbox)},
30− #endif // ENABLE_ISOLATED_XR_SERVICE
31− #endif // ENABLE_VR
32−-#if defined(OS_CHROMEOS)
33−+#if defined(OS_CHROMEOS) || defined(OS_LINUX)
34− {"disable-accelerated-mjpeg-decode",
35− flag_descriptions::kAcceleratedMjpegDecodeName,
36−- flag_descriptions::kAcceleratedMjpegDecodeDescription, kOsCrOS,
37−+ flag_descriptions::kAcceleratedMjpegDecodeDescription, kOsCrOS | kOsLinux,
38− SINGLE_DISABLE_VALUE_TYPE(switches::kDisableAcceleratedMjpegDecode)},
39−-#endif // OS_CHROMEOS
40−+#endif // OS_CHROMEOS // OS_LINUX
41− {"v8-cache-options", flag_descriptions::kV8CacheOptionsName,
42− flag_descriptions::kV8CacheOptionsDescription, kOsAll,
43− MULTI_VALUE_TYPE(kV8CacheOptionsChoices)},
44−diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
45−index 62637e092..86f89fc6e 100644
46−--- a/chrome/browser/flag_descriptions.cc
47−+++ b/chrome/browser/flag_descriptions.cc
48−@@ -3085,15 +3085,20 @@ const char kTextSuggestionsTouchBarDescription[] =
49−
50− #endif
51−
52−-// Chrome OS -------------------------------------------------------------------
53−+// Chrome OS Linux-------------------------------------------------------------------
54−
55−-#if defined(OS_CHROMEOS)
56−+#if defined(OS_CHROMEOS) || (defined(OS_LINUX) && !defined(OS_ANDROID))
57−
58− const char kAcceleratedMjpegDecodeName[] =
59− "Hardware-accelerated mjpeg decode for captured frame";
60− const char kAcceleratedMjpegDecodeDescription[] =
61− "Enable hardware-accelerated mjpeg decode for captured frame where "
62− "available.";
63−+#endif
64−+
65−+// Chrome OS --------------------------------------------------
66−+
67−+#if defined(OS_CHROMEOS)
68−
69− const char kAllowTouchpadThreeFingerClickName[] = "Touchpad three-finger-click";
70− const char kAllowTouchpadThreeFingerClickDescription[] =
71−diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
72−index 5dac660bb..6cc4115da 100644
73−--- a/chrome/browser/flag_descriptions.h
74−+++ b/chrome/browser/flag_descriptions.h
75−@@ -1846,13 +1846,19 @@ extern const char kPermissionPromptPersistenceToggleDescription[];
76−
77− #endif // defined(OS_MACOSX)
78−
79−-// Chrome OS ------------------------------------------------------------------
80−+// Chrome OS and Linux ------------------------------------------------------------------
81−
82−-#if defined(OS_CHROMEOS)
83−+#if defined(OS_CHROMEOS) || (defined(OS_LINUX) && !defined(OS_ANDROID))
84−
85− extern const char kAcceleratedMjpegDecodeName[];
86− extern const char kAcceleratedMjpegDecodeDescription[];
87−
88−+#endif // defined(OS_CHROMEOS) || (defined(OS_LINUX) && !defined(OS_ANDROID))
89−+
90−+// Chrome OS ------------------------------------------------------------------------
91−+
92−+#if defined(OS_CHROMEOS)
93−+
94− extern const char kAllowTouchpadThreeFingerClickName[];
95− extern const char kAllowTouchpadThreeFingerClickDescription[];
96−
97−diff --git a/gpu/config/software_rendering_list.json b/gpu/config/software_rendering_list.json
98−index 65f37b3f1..ae8a1718f 100644
99−--- a/gpu/config/software_rendering_list.json
100−+++ b/gpu/config/software_rendering_list.json
101−@@ -371,11 +371,12 @@
102− },
103− {
104− "id": 48,
105−- "description": "Accelerated video decode is unavailable on Linux",
106−+ "description": "Accelerated VA-API video decode is not supported on NVIDIA platforms",
107− "cr_bugs": [137247],
108− "os": {
109− "type": "linux"
110− },
111−+ "vendor_id": "0x10de",
112− "features": [
113− "accelerated_video_decode"
114− ]
115−--
116−2.20.1
117−
pkgs/applications/networking/browsers/chromium/patches/vaapi-fix.patchnew file+54
@@ -0,0 +1,54 @@
1+--- a/media/gpu/vaapi/vaapi_video_decode_accelerator.cc
2++++ b/media/gpu/vaapi/vaapi_video_decode_accelerator.cc
3+@@ -635,6 +635,7 @@
4+ // |vpp_vaapi_wrapper_| for VaapiPicture to DownloadFromSurface() the VA's
5+ // internal decoded frame.
6+ if (buffer_allocation_mode_ != BufferAllocationMode::kNone &&
7++ buffer_allocation_mode_ != BufferAllocationMode::kWrapVdpau &&
8+ !vpp_vaapi_wrapper_) {
9+ vpp_vaapi_wrapper_ = VaapiWrapper::Create(
10+ VaapiWrapper::kVideoProcess, VAProfileNone,
11+@@ -650,7 +651,8 @@
12+ // only used as a copy destination. Therefore, the VaapiWrapper used and
13+ // owned by |picture| is |vpp_vaapi_wrapper_|.
14+ std::unique_ptr<VaapiPicture> picture = vaapi_picture_factory_->Create(
15+- (buffer_allocation_mode_ == BufferAllocationMode::kNone)
16++ ((buffer_allocation_mode_ == BufferAllocationMode::kNone) ||
17++ (buffer_allocation_mode_ == BufferAllocationMode::kWrapVdpau))
18+ ? vaapi_wrapper_
19+ : vpp_vaapi_wrapper_,
20+ make_context_current_cb_, bind_image_cb_, buffers[i]);
21+@@ -1077,6 +1079,14 @@
22+
23+ VaapiVideoDecodeAccelerator::BufferAllocationMode
24+ VaapiVideoDecodeAccelerator::DecideBufferAllocationMode() {
25++ // NVIDIA blobs use VDPAU
26++ if (base::StartsWith(VaapiWrapper::GetVendorStringForTesting(),
27++ "Splitted-Desktop Systems VDPAU",
28++ base::CompareCase::SENSITIVE)) {
29++ LOG(INFO) << "VA-API driver on VDPAU backend";
30++ return BufferAllocationMode::kWrapVdpau;
31++ }
32++
33+ // TODO(crbug.com/912295): Enable a better BufferAllocationMode for IMPORT
34+ // |output_mode_| as well.
35+ if (output_mode_ == VideoDecodeAccelerator::Config::OutputMode::IMPORT)
36+@@ -1089,7 +1099,7 @@
37+ // depends on the bitstream and sometimes it's not enough to cover the amount
38+ // of frames needed by the client pipeline (see b/133733739).
39+ // TODO(crbug.com/911754): Enable for VP9 Profile 2.
40+- if (IsGeminiLakeOrLater() &&
41++ if (false && IsGeminiLakeOrLater() &&
42+ (profile_ == VP9PROFILE_PROFILE0 || profile_ == VP8PROFILE_ANY)) {
43+ // Add one to the reference frames for the one being currently egressed, and
44+ // an extra allocation for both |client_| and |decoder_|, see
45+--- a/media/gpu/vaapi/vaapi_video_decode_accelerator.h
46++++ b/media/gpu/vaapi/vaapi_video_decode_accelerator.h
47+@@ -204,6 +204,7 @@
48+ // Using |client_|s provided PictureBuffers and as many internally
49+ // allocated.
50+ kNormal,
51++ kWrapVdpau,
52+ };
53+
54+ // Decides the concrete buffer allocation mode, depending on the hardware