chromium/chromium-dev
SHA256
11
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 597716 from network:chromium

Browse Source 
- Up to 66.0.3359.81
- Bump to 66.0.3359.66
- Update chromium-gcc7.patch to include more quirks
- Bump to 66.0.3359.45
- Bump to 66.0.3359.33
- Version bump to 66.0.3359.26
- Bump the requirement for the clang version
- Conditionalize harfbuzz switch
- Update to 66.0.3359.22
- Apply patches using %autopatch
- Add patch to build with gcc7 properly chromium-gcc7.patch
- Drop patch chromium-sandbox-pie.patch as we have pie default now
- Add patch to build with leap variant of drm chromium-drm.patch
- Add patch to build ffmpeg from system chromium-ffmpeg.patch

- Up to 66.0.3355.0
- Disable clang by default again

- Up to 66.0.3350.0

- Drop patch fix_network_api_crash.patch

- Bump to 66.0.3343.3

- Bump to 65.0.3325.51

- Disable gconf support
- Bump to 65.0.3325.31
- Update to 65.0.3325.18
- Try to have automatic ozone platform detection

OBS-URL: https://build.opensuse.org/request/show/597716
OBS-URL: https://build.opensuse.org/package/show/network:chromium/chromium?expand=0&rev=1114
This commit is contained in:
Tomáš Chvátal
2018-04-18 08:59:31 +00:00
committed by Git OBS Bridge
parent 7fc836ab2a
commit 761036a084
18 changed files with 1171 additions and 1191 deletions
Download Patch File Download Diff File Expand all files Collapse all files

191
chromium-vaapi.patch
View File

@@ -1,4 +1,4 @@
From 4bf343ab8c4a538205f9c1e96a661e40620c716b Mon Sep 17 00:00:00 2001
From d9ef948bf4a739f95acbd98ef88b04caa29d8dda Mon Sep 17 00:00:00 2001
From: Daniel Charles <daniel.charles@intel.com>
Date: Fri, 09 Feb 2018 14:39:27 -0800
Subject: [PATCH] Enable VAVDA, VAVEA and VAJDA on linux with VAAPI only
@@ -29,14 +29,16 @@ TEST=subjective testing with VAVDA,VAVEA and VAJDA, autotest for encoder
have libva/intel-vaapi-driver installed and not installed in the system
repeat on different hardware families
Cq-Include-Trybots: master.tryserver.chromium.android:android_optional_gpu_tests_rel;master.tryserver.chromium.linux:linux_optional_gpu_tests_rel;master.tryserver.chromium.mac:mac_optional_gpu_tests_rel;master.tryserver.chromium.win:win_optional_gpu_tests_rel
Cq-Include-Trybots: luci.chromium.try:android_optional_gpu_tests_rel;luci.chromium.try:linux_optional_gpu_tests_rel;luci.chromium.try:mac_optional_gpu_tests_rel;master.tryserver.chromium.win:win_optional_gpu_tests_rel
Change-Id: Ifbbf5c9e5221a8b5733fc6d4d0cf984a1f103171
Signed-off-by: Daniel Charles <daniel.charles@intel.com>
---
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -1249,12 +1249,14 @@ const FeatureEntry kFeatureEntries[] = {
Index: chromium-66.0.3359.81/chrome/browser/about_flags.cc
===================================================================
--- chromium-66.0.3359.81.orig/chrome/browser/about_flags.cc
+++ chromium-66.0.3359.81/chrome/browser/about_flags.cc
@@ -1234,12 +1234,14 @@ const FeatureEntry kFeatureEntries[] = {
flag_descriptions::kUiPartialSwapDescription, kOsAll,
SINGLE_DISABLE_VALUE_TYPE(switches::kUIDisablePartialSwap)},
#if BUILDFLAG(ENABLE_WEBRTC)
@@ -51,7 +53,7 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
{"enable-webrtc-hw-h264-encoding",
flag_descriptions::kWebrtcHwH264EncodingName,
flag_descriptions::kWebrtcHwH264EncodingDescription, kOsAndroid | kOsCrOS,
@@ -1550,6 +1552,13 @@ const FeatureEntry kFeatureEntries[] = {
@@ -1553,6 +1555,13 @@ const FeatureEntry kFeatureEntries[] = {
flag_descriptions::kShowTouchHudDescription, kOsCrOS,
SINGLE_VALUE_TYPE(ash::switches::kAshTouchHud)},
#endif // OS_CHROMEOS
@@ -65,7 +67,7 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
{
"disable-accelerated-video-decode",
flag_descriptions::kAcceleratedVideoDecodeName,
@@ -1557,6 +1566,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -1560,6 +1569,7 @@ const FeatureEntry kFeatureEntries[] = {
kOsMac | kOsWin | kOsCrOS | kOsAndroid,
SINGLE_DISABLE_VALUE_TYPE(switches::kDisableAcceleratedVideoDecode),
},
@@ -73,7 +75,7 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
#if defined(OS_WIN)
{"enable-hdr", flag_descriptions::kEnableHDRName,
flag_descriptions::kEnableHDRDescription, kOsWin,
@@ -2268,12 +2278,17 @@ const FeatureEntry kFeatureEntries[] = {
@@ -2280,12 +2290,17 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(features::kOpenVR)},
#endif // ENABLE_OPENVR
#endif // ENABLE_VR
@@ -93,8 +95,10 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
{"v8-cache-options", flag_descriptions::kV8CacheOptionsName,
flag_descriptions::kV8CacheOptionsDescription, kOsAll,
MULTI_VALUE_TYPE(kV8CacheOptionsChoices)},
--- a/chrome/browser/chromeos/login/chrome_restart_request.cc
+++ b/chrome/browser/chromeos/login/chrome_restart_request.cc
Index: chromium-66.0.3359.81/chrome/browser/chromeos/login/chrome_restart_request.cc
===================================================================
--- chromium-66.0.3359.81.orig/chrome/browser/chromeos/login/chrome_restart_request.cc
+++ chromium-66.0.3359.81/chrome/browser/chromeos/login/chrome_restart_request.cc
@@ -19,6 +19,7 @@
#include "base/sys_info.h"
#include "base/timer/timer.h"
@@ -118,7 +122,7 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
::switches::kDisableBlinkFeatures,
::switches::kDisableCastStreamingHWEncoding,
::switches::kDisableDistanceFieldText,
@@ -164,7 +170,7 @@ void DeriveCommandLine(const GURL& start
@@ -163,7 +169,7 @@ void DeriveCommandLine(const GURL& start
::switches::kDisableWebGLImageChromium,
::switches::kEnableWebGLImageChromium,
::switches::kEnableWebVR,
@@ -127,8 +131,10 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
::switches::kDisableWebRtcHWDecoding,
::switches::kDisableWebRtcHWEncoding,
#endif
--- a/chrome/browser/flag_descriptions.cc
+++ b/chrome/browser/flag_descriptions.cc
Index: chromium-66.0.3359.81/chrome/browser/flag_descriptions.cc
===================================================================
--- chromium-66.0.3359.81.orig/chrome/browser/flag_descriptions.cc
+++ chromium-66.0.3359.81/chrome/browser/flag_descriptions.cc
@@ -14,6 +14,13 @@ const char kAccelerated2dCanvasDescripti
"Enables the use of the GPU to perform 2d canvas rendering instead of "
"using software rendering.";
@@ -143,7 +149,7 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
const char kAcceleratedVideoDecodeName[] = "Hardware-accelerated video decode";
const char kAcceleratedVideoDecodeDescription[] =
"Hardware-accelerated video decode where available.";
@@ -1597,6 +1604,7 @@ const char kWebrtcEchoCanceller3Name[] =
@@ -1723,6 +1730,7 @@ const char kWebrtcEchoCanceller3Name[] =
const char kWebrtcEchoCanceller3Description[] =
"Experimental WebRTC echo canceller (AEC3).";
@@ -151,7 +157,7 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
const char kWebrtcHwDecodingName[] = "WebRTC hardware video decoding";
const char kWebrtcHwDecodingDescription[] =
"Support in WebRTC for decoding video streams using platform hardware.";
@@ -1604,6 +1612,7 @@ const char kWebrtcHwDecodingDescription[
@@ -1730,6 +1738,7 @@ const char kWebrtcHwDecodingDescription[
const char kWebrtcHwEncodingName[] = "WebRTC hardware video encoding";
const char kWebrtcHwEncodingDescription[] =
"Support in WebRTC for encoding video streams using platform hardware.";
@@ -159,7 +165,7 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
const char kWebrtcHwH264EncodingName[] = "WebRTC hardware h264 video encoding";
const char kWebrtcHwH264EncodingDescription[] =
@@ -2434,14 +2443,16 @@ const char kTranslateNewUxDescription[]
@@ -2549,14 +2558,16 @@ const char kTabStripKeyboardFocusDescrip
// Chrome OS -------------------------------------------------------------------
@@ -177,8 +183,10 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
const char kAllowTouchpadThreeFingerClickName[] = "Touchpad three-finger-click";
const char kAllowTouchpadThreeFingerClickDescription[] =
"Enables touchpad three-finger-click as middle button.";
--- a/chrome/browser/flag_descriptions.h
+++ b/chrome/browser/flag_descriptions.h
Index: chromium-66.0.3359.81/chrome/browser/flag_descriptions.h
===================================================================
--- chromium-66.0.3359.81.orig/chrome/browser/flag_descriptions.h
+++ chromium-66.0.3359.81/chrome/browser/flag_descriptions.h
@@ -37,6 +37,10 @@ namespace flag_descriptions {
extern const char kAccelerated2dCanvasName[];
extern const char kAccelerated2dCanvasDescription[];
@@ -190,7 +198,7 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
extern const char kAcceleratedVideoDecodeName[];
extern const char kAcceleratedVideoDecodeDescription[];
@@ -1498,13 +1502,17 @@ extern const char kPermissionPromptPersi
@@ -1561,13 +1565,17 @@ extern const char kPermissionPromptPersi
#endif // defined(OS_MACOSX)
@@ -211,9 +219,11 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
extern const char kAllowTouchpadThreeFingerClickName[];
extern const char kAllowTouchpadThreeFingerClickDescription[];
--- a/content/browser/gpu/compositor_util.cc
+++ b/content/browser/gpu/compositor_util.cc
@@ -98,7 +98,11 @@ const GpuFeatureData GetGpuFeatureData(s
Index: chromium-66.0.3359.81/content/browser/gpu/compositor_util.cc
===================================================================
--- chromium-66.0.3359.81.orig/content/browser/gpu/compositor_util.cc
+++ chromium-66.0.3359.81/content/browser/gpu/compositor_util.cc
@@ -99,7 +99,11 @@ const GpuFeatureData GetGpuFeatureData(s
{"video_decode",
manager->GetFeatureStatus(
gpu::GPU_FEATURE_TYPE_ACCELERATED_VIDEO_DECODE),
@@ -225,9 +235,11 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
"Accelerated video decode has been disabled, either via blacklist,"
" about:flags or the command line.",
true},
--- a/content/browser/gpu/gpu_process_host.cc
+++ b/content/browser/gpu/gpu_process_host.cc
@@ -120,7 +120,7 @@ static const char* const kSwitchNames[]
Index: chromium-66.0.3359.81/content/browser/gpu/gpu_process_host.cc
===================================================================
--- chromium-66.0.3359.81.orig/content/browser/gpu/gpu_process_host.cc
+++ chromium-66.0.3359.81/content/browser/gpu/gpu_process_host.cc
@@ -132,7 +132,7 @@ static const char* const kSwitchNames[]
switches::kDisableGLExtensions,
switches::kDisableLogging,
switches::kDisableShaderNameHashing,
@@ -236,9 +248,11 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
switches::kDisableWebRtcHWEncoding,
#endif
#if defined(OS_WIN)
--- a/content/browser/renderer_host/media/video_capture_browsertest.cc
+++ b/content/browser/renderer_host/media/video_capture_browsertest.cc
@@ -164,8 +164,13 @@ class VideoCaptureBrowserTest : public C
Index: chromium-66.0.3359.81/content/browser/renderer_host/media/video_capture_browsertest.cc
===================================================================
--- chromium-66.0.3359.81.orig/content/browser/renderer_host/media/video_capture_browsertest.cc
+++ chromium-66.0.3359.81/content/browser/renderer_host/media/video_capture_browsertest.cc
@@ -163,8 +163,13 @@ class VideoCaptureBrowserTest : public C
base::CommandLine::ForCurrentProcess()->AppendSwitch(
switches::kUseFakeJpegDecodeAccelerator);
} else {
@@ -252,8 +266,10 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
}
}
--- a/content/browser/renderer_host/media/video_capture_gpu_jpeg_decoder.cc
+++ b/content/browser/renderer_host/media/video_capture_gpu_jpeg_decoder.cc
Index: chromium-66.0.3359.81/content/browser/renderer_host/media/video_capture_gpu_jpeg_decoder.cc
===================================================================
--- chromium-66.0.3359.81.orig/content/browser/renderer_host/media/video_capture_gpu_jpeg_decoder.cc
+++ chromium-66.0.3359.81/content/browser/renderer_host/media/video_capture_gpu_jpeg_decoder.cc
@@ -65,15 +65,21 @@ void VideoCaptureGpuJpegDecoder::Initial
bool is_platform_supported =
base::CommandLine::ForCurrentProcess()->HasSwitch(
@@ -280,9 +296,11 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
decoder_status_ = FAILED;
RecordInitDecodeUMA_Locked();
return;
--- a/content/browser/renderer_host/render_process_host_impl.cc
+++ b/content/browser/renderer_host/render_process_host_impl.cc
@@ -2530,7 +2530,11 @@ void RenderProcessHostImpl::PropagateBro
Index: chromium-66.0.3359.81/content/browser/renderer_host/render_process_host_impl.cc
===================================================================
--- chromium-66.0.3359.81.orig/content/browser/renderer_host/render_process_host_impl.cc
+++ chromium-66.0.3359.81/content/browser/renderer_host/render_process_host_impl.cc
@@ -2524,7 +2524,11 @@ void RenderProcessHostImpl::PropagateBro
switches::kDefaultTileHeight,
switches::kDisable2dCanvasImageChromium,
switches::kDisableAcceleratedJpegDecoding,
@@ -294,7 +312,7 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
switches::kDisableBackgroundTimerThrottling,
switches::kDisableBreakpad,
switches::kDisableCompositorUkmForTests,
@@ -2663,8 +2667,10 @@ void RenderProcessHostImpl::PropagateBro
@@ -2658,8 +2662,10 @@ void RenderProcessHostImpl::PropagateBro
switches::kDisableMojoRenderer,
#endif
#if BUILDFLAG(ENABLE_WEBRTC)
@@ -305,8 +323,10 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
switches::kEnableWebRtcSrtpAesGcm,
switches::kEnableWebRtcSrtpEncryptedHeaders,
switches::kEnableWebRtcStunOrigin,
--- a/content/browser/webrtc/webrtc_media_recorder_browsertest.cc
+++ b/content/browser/webrtc/webrtc_media_recorder_browsertest.cc
Index: chromium-66.0.3359.81/content/browser/webrtc/webrtc_media_recorder_browsertest.cc
===================================================================
--- chromium-66.0.3359.81.orig/content/browser/webrtc/webrtc_media_recorder_browsertest.cc
+++ chromium-66.0.3359.81/content/browser/webrtc/webrtc_media_recorder_browsertest.cc
@@ -58,7 +58,12 @@ class WebRtcMediaRecorderTest
return;
// This flag is also used for encoding, https://crbug.com/616640.
@@ -321,10 +341,12 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
}
private:
--- a/content/gpu/BUILD.gn
+++ b/content/gpu/BUILD.gn
@@ -125,4 +125,8 @@ target(link_target_type, "gpu_sources")
if (is_desktop_linux && (!is_chromecast || is_cast_desktop_build)) {
Index: chromium-66.0.3359.81/content/gpu/BUILD.gn
===================================================================
--- chromium-66.0.3359.81.orig/content/gpu/BUILD.gn
+++ chromium-66.0.3359.81/content/gpu/BUILD.gn
@@ -130,4 +130,8 @@ target(link_target_type, "gpu_sources")
(!is_chromecast || is_cast_desktop_build)) {
configs += [ "//build/config/linux/dri" ]
}
+
@@ -332,9 +354,11 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
+ public_configs = [ "//media/gpu:libva_config" ]
+ }
}
--- a/content/gpu/gpu_main.cc
+++ b/content/gpu/gpu_main.cc
@@ -273,7 +273,7 @@ int GpuMain(const MainFunctionParams& pa
Index: chromium-66.0.3359.81/content/gpu/gpu_main.cc
===================================================================
--- chromium-66.0.3359.81.orig/content/gpu/gpu_main.cc
+++ chromium-66.0.3359.81/content/gpu/gpu_main.cc
@@ -286,7 +286,7 @@ int GpuMain(const MainFunctionParams& pa
base::PlatformThread::SetName("CrGpuMain");
@@ -343,7 +367,7 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
// Set thread priority before sandbox initialization.
base::PlatformThread::SetCurrentThreadPriority(base::ThreadPriority::DISPLAY);
#endif
@@ -302,7 +302,7 @@ int GpuMain(const MainFunctionParams& pa
@@ -315,7 +315,7 @@ int GpuMain(const MainFunctionParams& pa
GetContentClient()->SetGpuInfo(gpu_init->gpu_info());
base::ThreadPriority io_thread_priority = base::ThreadPriority::NORMAL;
@@ -352,8 +376,10 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
io_thread_priority = base::ThreadPriority::DISPLAY;
#endif
--- a/content/public/browser/gpu_utils.cc
+++ b/content/public/browser/gpu_utils.cc
Index: chromium-66.0.3359.81/content/public/browser/gpu_utils.cc
===================================================================
--- chromium-66.0.3359.81.orig/content/public/browser/gpu_utils.cc
+++ chromium-66.0.3359.81/content/public/browser/gpu_utils.cc
@@ -7,6 +7,7 @@
#include "base/command_line.h"
#include "base/single_thread_task_runner.h"
@@ -362,7 +388,7 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
#include "content/browser/gpu/gpu_process_host.h"
#include "content/public/common/content_features.h"
#include "content/public/common/content_switches.h"
@@ -55,10 +56,18 @@ const gpu::GpuPreferences GetGpuPreferen
@@ -55,9 +56,17 @@ const gpu::GpuPreferences GetGpuPreferen
gpu_preferences.in_process_gpu =
command_line->HasSwitch(switches::kInProcessGPU);
gpu_preferences.disable_accelerated_video_decode =
@@ -376,14 +402,14 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
+ !command_line->HasSwitch(switches::kEnableAcceleratedVideo);
+#else
command_line->HasSwitch(switches::kDisableAcceleratedVideoEncode);
-#if BUILDFLAG(ENABLE_WEBRTC)
+#endif
+#if BUILDFLAG(ENABLE_WEBRTC) && (defined(OS_CHROMEOS) || defined(OS_ANDROID))
gpu_preferences.disable_web_rtc_hw_encoding =
command_line->HasSwitch(switches::kDisableWebRtcHWEncoding);
#endif
--- a/content/public/common/content_switches.cc
+++ b/content/public/common/content_switches.cc
#if defined(OS_WIN)
uint32_t enable_accelerated_vpx_decode_val =
gpu::GpuPreferences::VPX_VENDOR_MICROSOFT;
Index: chromium-66.0.3359.81/content/public/common/content_switches.cc
===================================================================
--- chromium-66.0.3359.81.orig/content/public/common/content_switches.cc
+++ chromium-66.0.3359.81/content/public/common/content_switches.cc
@@ -78,12 +78,21 @@ const char kDisable3DAPIs[]
// Disable gpu-accelerated 2d canvas.
@@ -407,7 +433,7 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
// Disables hardware acceleration of video decode, where available.
const char kDisableAcceleratedVideoDecode[] =
"disable-accelerated-video-decode";
@@ -888,11 +897,13 @@ const char kZygoteProcess[]
@@ -859,11 +868,13 @@ const char kZygoteProcess[]
// ignores this switch on its stable and beta channels.
const char kDisableWebRtcEncryption[] = "disable-webrtc-encryption";
@@ -421,8 +447,10 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
// Enables negotiation of GCM cipher suites from RFC 7714 for SRTP in WebRTC.
// See https://tools.ietf.org/html/rfc7714 for further information.
--- a/content/public/common/content_switches.h
+++ b/content/public/common/content_switches.h
Index: chromium-66.0.3359.81/content/public/common/content_switches.h
===================================================================
--- chromium-66.0.3359.81.orig/content/public/common/content_switches.h
+++ chromium-66.0.3359.81/content/public/common/content_switches.h
@@ -33,7 +33,11 @@ CONTENT_EXPORT extern const char kDisabl
CONTENT_EXPORT extern const char kDisable3DAPIs[];
CONTENT_EXPORT extern const char kDisableAccelerated2dCanvas[];
@@ -435,7 +463,7 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
CONTENT_EXPORT extern const char kDisableAcceleratedVideoDecode[];
CONTENT_EXPORT extern const char kDisableAcceleratedVideoEncode[];
CONTENT_EXPORT extern const char kDisableAudioSupportForDesktopShare[];
@@ -107,6 +111,9 @@ CONTENT_EXPORT extern const char kDisabl
@@ -106,6 +110,9 @@ CONTENT_EXPORT extern const char kDisabl
CONTENT_EXPORT extern const char kDomAutomationController[];
extern const char kDisable2dCanvasClipAntialiasing[];
CONTENT_EXPORT extern const char kDumpBlinkRuntimeCallStats[];
@@ -445,7 +473,7 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
CONTENT_EXPORT extern const char kEnableAggressiveDOMStorageFlushing[];
CONTENT_EXPORT extern const char kEnableAutomation[];
CONTENT_EXPORT extern const char kEnablePreferCompositingToLCDText[];
@@ -244,8 +251,10 @@ CONTENT_EXPORT extern const char kZygote
@@ -240,8 +247,10 @@ CONTENT_EXPORT extern const char kZygote
#if BUILDFLAG(ENABLE_WEBRTC)
CONTENT_EXPORT extern const char kDisableWebRtcEncryption[];
@@ -456,9 +484,11 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
CONTENT_EXPORT extern const char kEnableWebRtcSrtpAesGcm[];
CONTENT_EXPORT extern const char kEnableWebRtcSrtpEncryptedHeaders[];
CONTENT_EXPORT extern const char kEnableWebRtcStunOrigin[];
--- a/content/renderer/media/webrtc/peer_connection_dependency_factory.cc
+++ b/content/renderer/media/webrtc/peer_connection_dependency_factory.cc
@@ -245,12 +245,19 @@ void PeerConnectionDependencyFactory::In
Index: chromium-66.0.3359.81/content/renderer/media/webrtc/peer_connection_dependency_factory.cc
===================================================================
--- chromium-66.0.3359.81.orig/content/renderer/media/webrtc/peer_connection_dependency_factory.cc
+++ chromium-66.0.3359.81/content/renderer/media/webrtc/peer_connection_dependency_factory.cc
@@ -282,10 +282,18 @@ void PeerConnectionDependencyFactory::In
const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess();
if (gpu_factories && gpu_factories->IsGpuVideoAcceleratorEnabled()) {
@@ -469,20 +499,19 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
+#endif
decoder_factory.reset(new RTCVideoDecoderFactory(gpu_factories));
- if (!cmd_line->HasSwitch(switches::kDisableWebRtcHWEncoding)) {
+#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+ if (cmd_line->HasSwitch(switches::kEnableAcceleratedVideo))
+#else
+ if (!cmd_line->HasSwitch(switches::kDisableWebRtcHWEncoding))
if (!cmd_line->HasSwitch(switches::kDisableWebRtcHWEncoding))
+#endif
encoder_factory.reset(new RTCVideoEncoderFactory(gpu_factories));
- }
}
#if defined(OS_ANDROID)
--- a/content/renderer/render_thread_impl.cc
+++ b/content/renderer/render_thread_impl.cc
@@ -1485,7 +1485,11 @@ media::GpuVideoAcceleratorFactories* Ren
Index: chromium-66.0.3359.81/content/renderer/render_thread_impl.cc
===================================================================
--- chromium-66.0.3359.81.orig/content/renderer/render_thread_impl.cc
+++ chromium-66.0.3359.81/content/renderer/render_thread_impl.cc
@@ -1581,7 +1581,11 @@ media::GpuVideoAcceleratorFactories* Ren
scoped_refptr<base::SingleThreadTaskRunner> media_task_runner =
GetMediaThreadTaskRunner();
const bool enable_video_accelerator =
@@ -494,8 +523,10 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
(gpu_channel_host->gpu_feature_info()
.status_values[gpu::GPU_FEATURE_TYPE_ACCELERATED_VIDEO_DECODE] ==
gpu::kGpuFeatureStatusEnabled);
--- a/gpu/config/software_rendering_list.json
+++ b/gpu/config/software_rendering_list.json
Index: chromium-66.0.3359.81/gpu/config/software_rendering_list.json
===================================================================
--- chromium-66.0.3359.81.orig/gpu/config/software_rendering_list.json
+++ chromium-66.0.3359.81/gpu/config/software_rendering_list.json
@@ -373,17 +373,6 @@
]
},
@@ -514,10 +545,12 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
"id": 50,
"description": "Disable VMware software renderer on older Mesa",
"cr_bugs": [145531, 332596, 571899, 629434],
--- a/media/gpu/BUILD.gn
+++ b/media/gpu/BUILD.gn
@@ -24,6 +24,14 @@ if (is_mac) {
import("//build/config/mac/mac_sdk.gni")
Index: chromium-66.0.3359.81/media/gpu/BUILD.gn
===================================================================
--- chromium-66.0.3359.81.orig/media/gpu/BUILD.gn
+++ chromium-66.0.3359.81/media/gpu/BUILD.gn
@@ -482,6 +482,14 @@ if (use_v4l2_codec || use_vaapi || is_ma
}
}
+if (is_desktop_linux && use_vaapi) {
@@ -529,9 +562,9 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
+}
+
if (use_vaapi) {
action("libva_generate_stubs") {
extra_header = "vaapi/va_stub_header.fragment"
@@ -353,6 +361,10 @@ component("gpu") {
test("jpeg_encode_accelerator_unittest") {
deps = [
@@ -542,6 +550,10 @@ if (use_v4l2_codec || use_vaapi) {
if (use_ozone) {
deps += [ "//ui/ozone" ]
}
@@ -540,5 +573,5 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
+ public_configs = [ ":libva_config" ]
+ }
}
}
if (is_win) {