Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
openSUSE
chromium.8771
chromium-vaapi.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File chromium-vaapi.patch of Package chromium.8771
Index: chromium-70.0.3538.45/chrome/browser/about_flags.cc =================================================================== --- chromium-70.0.3538.45.orig/chrome/browser/about_flags.cc +++ chromium-70.0.3538.45/chrome/browser/about_flags.cc @@ -1775,7 +1775,7 @@ const FeatureEntry kFeatureEntries[] = { "disable-accelerated-video-decode", flag_descriptions::kAcceleratedVideoDecodeName, flag_descriptions::kAcceleratedVideoDecodeDescription, - kOsMac | kOsWin | kOsCrOS | kOsAndroid, + kOsMac | kOsWin | kOsCrOS | kOsAndroid | kOsLinux, 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 #endif // ENABLE_VR -#if defined(OS_CHROMEOS) +#if defined(OS_CHROMEOS) || defined(OS_LINUX) {"disable-accelerated-mjpeg-decode", flag_descriptions::kAcceleratedMjpegDecodeName, - flag_descriptions::kAcceleratedMjpegDecodeDescription, kOsCrOS, + flag_descriptions::kAcceleratedMjpegDecodeDescription, kOsCrOS | kOsLinux, SINGLE_DISABLE_VALUE_TYPE(switches::kDisableAcceleratedMjpegDecode)}, -#endif // OS_CHROMEOS +#endif {"v8-cache-options", flag_descriptions::kV8CacheOptionsName, flag_descriptions::kV8CacheOptionsDescription, kOsAll, MULTI_VALUE_TYPE(kV8CacheOptionsChoices)}, Index: chromium-70.0.3538.45/chrome/browser/flag_descriptions.cc =================================================================== --- chromium-70.0.3538.45.orig/chrome/browser/flag_descriptions.cc +++ chromium-70.0.3538.45/chrome/browser/flag_descriptions.cc @@ -3055,7 +3055,7 @@ const char kTextSuggestionsTouchBarDescr // Chrome OS ------------------------------------------------------------------- -#if defined(OS_CHROMEOS) +#if defined(OS_CHROMEOS) || (defined(OS_LINUX) && !defined(OS_ANDROID)) const char kAcceleratedMjpegDecodeName[] = "Hardware-accelerated mjpeg decode for captured frame"; @@ -3590,7 +3590,7 @@ const char kZipArchiverUnpackerName[] = const char kZipArchiverUnpackerDescription[] = "Enable or disable the ability to unpack archives in incognito mode"; -#endif // defined(OS_CHROMEOS) +#endif // defined(OS_CHROMEOS) || BUILDFLAG(USE_VAAPI) // Random platform combinations ----------------------------------------------- Index: chromium-70.0.3538.45/chrome/browser/flag_descriptions.h =================================================================== --- chromium-70.0.3538.45.orig/chrome/browser/flag_descriptions.h +++ chromium-70.0.3538.45/chrome/browser/flag_descriptions.h @@ -1846,13 +1846,17 @@ extern const char kPermissionPromptPersi #endif // defined(OS_MACOSX) -// Chrome OS ------------------------------------------------------------------ - -#if defined(OS_CHROMEOS) +#if defined(OS_CHROMEOS) || (defined(OS_LINUX) && !defined(OS_ANDROID)) extern const char kAcceleratedMjpegDecodeName[]; extern const char kAcceleratedMjpegDecodeDescription[]; +#endif + +// Chrome OS ------------------------------------------------------------------ + +#if defined(OS_CHROMEOS) + extern const char kAllowTouchpadThreeFingerClickName[]; extern const char kAllowTouchpadThreeFingerClickDescription[]; Index: chromium-70.0.3538.45/components/viz/service/main/viz_main_impl.cc =================================================================== --- chromium-70.0.3538.45.orig/components/viz/service/main/viz_main_impl.cc +++ chromium-70.0.3538.45/components/viz/service/main/viz_main_impl.cc @@ -41,7 +41,7 @@ std::unique_ptr<base::Thread> CreateAndS // It should be possible to use |main_task_runner_| for doing IO tasks. base::Thread::Options thread_options(base::MessageLoop::TYPE_IO, 0); thread_options.priority = base::ThreadPriority::NORMAL; -#if defined(OS_ANDROID) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_CHROMEOS) // TODO(reveman): Remove this in favor of setting it explicitly for each // type of process. thread_options.priority = base::ThreadPriority::DISPLAY; Index: chromium-70.0.3538.45/content/gpu/BUILD.gn =================================================================== --- chromium-70.0.3538.45.orig/content/gpu/BUILD.gn +++ chromium-70.0.3538.45/content/gpu/BUILD.gn @@ -6,6 +6,7 @@ import("//build/config/jumbo.gni") import("//build/config/ui.gni") import("//gpu/vulkan/features.gni") import("//media/media_options.gni") +import("//media/gpu/args.gni") import("//ui/ozone/ozone.gni") # See //content/BUILD.gn for how this works. @@ -49,7 +50,6 @@ target(link_target_type, "gpu_sources") ] configs += [ "//content:content_implementation" ] - deps = [ "//base", "//base/third_party/dynamic_annotations", @@ -134,4 +134,8 @@ target(link_target_type, "gpu_sources") (!is_chromecast || is_cast_desktop_build)) { configs += [ "//build/config/linux/dri" ] } + + if (is_desktop_linux && use_vaapi) { + public_configs = [ "//media/gpu:libva_config" ] + } } Index: chromium-70.0.3538.45/content/gpu/gpu_main.cc =================================================================== --- chromium-70.0.3538.45.orig/content/gpu/gpu_main.cc +++ chromium-70.0.3538.45/content/gpu/gpu_main.cc @@ -283,7 +283,7 @@ int GpuMain(const MainFunctionParams& pa base::PlatformThread::SetName("CrGpuMain"); -#if defined(OS_ANDROID) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_CHROMEOS) // Set thread priority before sandbox initialization. base::PlatformThread::SetCurrentThreadPriority(base::ThreadPriority::DISPLAY); #endif @@ -316,7 +316,7 @@ int GpuMain(const MainFunctionParams& pa GetContentClient()->SetGpuInfo(gpu_init->gpu_info()); base::ThreadPriority io_thread_priority = base::ThreadPriority::NORMAL; -#if defined(OS_ANDROID) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_CHROMEOS) io_thread_priority = base::ThreadPriority::DISPLAY; #endif Index: chromium-70.0.3538.45/gpu/config/software_rendering_list.json =================================================================== --- chromium-70.0.3538.45.orig/gpu/config/software_rendering_list.json +++ chromium-70.0.3538.45/gpu/config/software_rendering_list.json @@ -374,17 +374,6 @@ ] }, { - "id": 48, - "description": "Accelerated video decode is unavailable on Linux", - "cr_bugs": [137247], - "os": { - "type": "linux" - }, - "features": [ - "accelerated_video_decode" - ] - }, - { "id": 50, "description": "Disable VMware software renderer on older Mesa", "cr_bugs": [145531, 332596, 571899, 629434], Index: chromium-70.0.3538.45/media/base/media_switches.cc =================================================================== --- chromium-70.0.3538.45.orig/media/base/media_switches.cc +++ chromium-70.0.3538.45/media/base/media_switches.cc @@ -468,7 +468,7 @@ bool IsVideoCaptureAcceleratedJpegDecodi switches::kUseFakeJpegDecodeAccelerator)) { return true; } -#if defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) return true; #endif return false; Index: chromium-70.0.3538.45/media/filters/BUILD.gn =================================================================== --- chromium-70.0.3538.45.orig/media/filters/BUILD.gn +++ chromium-70.0.3538.45/media/filters/BUILD.gn @@ -5,6 +5,7 @@ import("//build/config/jumbo.gni") import("//media/media_options.gni") import("//third_party/libaom/options.gni") +import("//media/gpu/args.gni") jumbo_source_set("filters") { # Do not expand the visibility here without double-checking with OWNERS, this @@ -198,7 +199,7 @@ jumbo_source_set("filters") { deps += [ "//media/base/android" ] } - if (current_cpu != "arm" && is_linux) { + if (use_vaapi) { sources += [ "h264_bitstream_buffer.cc", "h264_bitstream_buffer.h", Index: chromium-70.0.3538.45/media/gpu/BUILD.gn =================================================================== --- chromium-70.0.3538.45.orig/media/gpu/BUILD.gn +++ chromium-70.0.3538.45/media/gpu/BUILD.gn @@ -499,6 +499,12 @@ if (use_v4l2_codec || use_vaapi || is_ma } } +import("//build/config/linux/pkg_config.gni") + +pkg_config("libva_config") { + packages = [ "libva" ] +} + if (use_vaapi) { test("jpeg_encode_accelerator_unittest") { deps = [ @@ -569,6 +575,7 @@ if (use_v4l2_codec || use_vaapi) { if (use_ozone) { deps += [ "//ui/ozone" ] } + public_configs = [ ":libva_config" ] } } Index: chromium-70.0.3538.45/media/gpu/gpu_video_decode_accelerator_factory.cc =================================================================== --- chromium-70.0.3538.45.orig/media/gpu/gpu_video_decode_accelerator_factory.cc +++ chromium-70.0.3538.45/media/gpu/gpu_video_decode_accelerator_factory.cc @@ -56,6 +56,7 @@ gpu::VideoDecodeAcceleratorCapabilities // profile (instead of calculating a superset). // TODO(posciak,henryhsu): improve this so that we choose a superset of // resolutions and other supported profile parameters. + DVLOG(1) << "Get Supported profiles"; VideoDecodeAccelerator::Capabilities capabilities; #if defined(OS_WIN) capabilities.supported_profiles = Index: chromium-70.0.3538.45/media/gpu/vaapi/vaapi_wrapper.cc =================================================================== --- chromium-70.0.3538.45.orig/media/gpu/vaapi/vaapi_wrapper.cc +++ chromium-70.0.3538.45/media/gpu/vaapi/vaapi_wrapper.cc @@ -337,7 +337,7 @@ bool VADisplayState::InitializeOnce() { DVLOG(1) << "VAAPI version: " << major_version << "." << minor_version << " " << va_vendor_string_; - if (major_version != VA_MAJOR_VERSION || minor_version != VA_MINOR_VERSION) { + if (major_version != VA_MAJOR_VERSION) { LOG(ERROR) << "This build of Chromium requires VA-API version " << VA_MAJOR_VERSION << "." << VA_MINOR_VERSION << ", system version: " << major_version << "." << minor_version; @@ -969,7 +969,11 @@ scoped_refptr<VASurface> VaapiWrapper::C } va_attrib_extbuf.num_planes = num_planes; +#if VA_CHECK_VERSION(1, 0, 0) + std::vector<uintptr_t> fds(num_fds); +#else std::vector<unsigned long> fds(num_fds); +#endif for (size_t i = 0; i < num_fds; ++i) { int dmabuf_fd = pixmap->GetDmaBufFd(i); if (dmabuf_fd < 0) {
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor
