chromium-dev: rebased the chromium_vaapi.patch against 48.0.2535.0

1 files changed, 212 insertions, 60 deletions

diff --git a/chromium-dev/build/patches/chromium_vaapi.patch b/chromium-dev/build/patches/chromium_vaapi.patch
index 080fd9db..0547646f 100644
--- a/chromium-dev/build/patches/chromium_vaapi.patch
+++ b/chromium-dev/build/patches/chromium_vaapi.patch
@@ -1,13 +1,16 @@
-#
-# Taken from:
-# https://code.launchpad.net/~saiarcot895/chromium-browser/chromium-browser.wily.dev
-# And rebased against chromium-dev 46.0.2478.0 sources.
-#
+Description:
+Enables using VA-API hardware acceleration in Linux. The patch for bpf_gpu_policy_linux.cc initially came from https://codereview.chromium.org/15955009/diff/92001/content/common/sandbox_linux/bpf_gpu_policy_linux.cc
 
-diff -uarN chromium-46.0.2478.0.orig/chrome/browser/about_flags.cc chromium-46.0.2478.0/chrome/browser/about_flags.cc
---- chromium-46.0.2478.0.orig/chrome/browser/about_flags.cc	2015-08-09 21:01:31.000000000 +0200
-+++ chromium-46.0.2478.0/chrome/browser/about_flags.cc	2015-08-12 14:27:02.671697290 +0200
-@@ -1011,7 +1011,7 @@
+Taken from:
+https://code.launchpad.net/~saiarcot895/chromium-browser/chromium-browser.wily.dev
+And rebased against chromium-dev 48.0.2535.0 sources.
+
+--------
+
+diff -uarN chromium-48.0.2535.0.orig/chrome/browser/about_flags.cc chromium-48.0.2535.0/chrome/browser/about_flags.cc
+--- chromium-48.0.2535.0.orig/chrome/browser/about_flags.cc	2015-10-14 09:01:19.000000000 +0200
++++ chromium-48.0.2535.0/chrome/browser/about_flags.cc	2015-10-18 13:19:06.991657439 +0200
+@@ -1007,7 +1007,7 @@
       "disable-accelerated-video-decode",
       IDS_FLAGS_DISABLE_ACCELERATED_VIDEO_DECODE_NAME,
       IDS_FLAGS_DISABLE_ACCELERATED_VIDEO_DECODE_DESCRIPTION,
@@ -16,9 +19,23 @@ diff -uarN chromium-46.0.2478.0.orig/chrome/browser/about_flags.cc chromium-46.0
       SINGLE_VALUE_TYPE(switches::kDisableAcceleratedVideoDecode),
      },
  #if defined(USE_ASH)
-diff -uarN chromium-46.0.2478.0.orig/content/common/gpu/media/gpu_video_decode_accelerator.cc chromium-46.0.2478.0/content/common/gpu/media/gpu_video_decode_accelerator.cc
---- chromium-46.0.2478.0.orig/content/common/gpu/media/gpu_video_decode_accelerator.cc	2015-08-07 22:29:22.000000000 +0200
-+++ chromium-46.0.2478.0/content/common/gpu/media/gpu_video_decode_accelerator.cc	2015-08-12 14:27:02.560679020 +0200
+diff -uarN chromium-48.0.2535.0.orig/content/common/gpu/client/command_buffer_proxy_impl.cc chromium-48.0.2535.0/content/common/gpu/client/command_buffer_proxy_impl.cc
+--- chromium-48.0.2535.0.orig/content/common/gpu/client/command_buffer_proxy_impl.cc	2015-10-14 09:01:20.000000000 +0200
++++ chromium-48.0.2535.0/content/common/gpu/client/command_buffer_proxy_impl.cc	2015-10-18 13:19:07.023662747 +0200
+@@ -614,8 +614,10 @@
+ 
+ scoped_ptr<media::VideoDecodeAccelerator>
+ CommandBufferProxyImpl::CreateVideoDecoder() {
++  TRACE_EVENT0("gpu", "CommandBufferProxyImpl::CreateVideoDecoder");
+   if (!channel_)
+     return scoped_ptr<media::VideoDecodeAccelerator>();
++  VLOG(1) << "About to create GpuVideoDecodeAcceleratorHost.";
+   return scoped_ptr<media::VideoDecodeAccelerator>(
+       new GpuVideoDecodeAcceleratorHost(channel_, this));
+ }
+diff -uarN chromium-48.0.2535.0.orig/content/common/gpu/media/gpu_video_decode_accelerator.cc chromium-48.0.2535.0/content/common/gpu/media/gpu_video_decode_accelerator.cc
+--- chromium-48.0.2535.0.orig/content/common/gpu/media/gpu_video_decode_accelerator.cc	2015-10-14 09:01:20.000000000 +0200
++++ chromium-48.0.2535.0/content/common/gpu/media/gpu_video_decode_accelerator.cc	2015-10-18 13:19:06.911644181 +0200
 @@ -33,7 +33,7 @@
  #include "content/common/gpu/media/dxva_video_decode_accelerator.h"
  #elif defined(OS_MACOSX)
@@ -28,19 +45,96 @@ diff -uarN chromium-46.0.2478.0.orig/content/common/gpu/media/gpu_video_decode_a
  #if defined(USE_V4L2_CODEC)
  #include "content/common/gpu/media/v4l2_device.h"
  #include "content/common/gpu/media/v4l2_slice_video_decode_accelerator.h"
-@@ -346,7 +346,7 @@
+@@ -252,6 +252,8 @@
+   }
+ #endif
+ 
++  VLOG(1) << "Initializing GPU video decode accelerator.";
++
+   // Array of Create..VDA() function pointers, maybe applicable to the current
+   // platform. This list is ordered by priority of use and it should be the
+   // same as the order of querying supported profiles of VDAs.
+@@ -265,11 +267,14 @@
+       &GpuVideoDecodeAccelerator::CreateAndroidVDA};
+ 
+   for (const auto& create_vda_function : create_vda_fps) {
++    VLOG(1) << "Testing create_vda_function.";
+     video_decode_accelerator_ = (this->*create_vda_function)();
+     if (!video_decode_accelerator_ ||
+         !video_decode_accelerator_->Initialize(profile, this))
+       continue;
+ 
++    VLOG(1) << "Initialization successful.";
++
+     if (video_decode_accelerator_->CanDecodeOnIOThread()) {
+       filter_ = new MessageFilter(this, host_route_id_);
+       stub_->channel()->AddFilter(filter_.get());
+@@ -347,7 +352,9 @@
  scoped_ptr<media::VideoDecodeAccelerator>
  GpuVideoDecodeAccelerator::CreateVaapiVDA() {
    scoped_ptr<media::VideoDecodeAccelerator> decoder;
 -#if defined(OS_CHROMEOS) && defined(ARCH_CPU_X86_FAMILY)
++  VLOG(1) << "About to create new VAAPI video decode accelerator.";
 +#if (defined(OS_CHROMEOS) || defined(OS_LINUX)) && defined(ARCH_CPU_X86_FAMILY)
++  VLOG(1) << "Creating new VAAPI video decode accelerator.";
    decoder.reset(new VaapiVideoDecodeAccelerator(
        make_context_current_, base::Bind(&GpuVideoDecodeAccelerator::BindImage,
                                          base::Unretained(this))));
-diff -uarN chromium-46.0.2478.0.orig/content/common/gpu/media/vaapi_wrapper.cc chromium-46.0.2478.0/content/common/gpu/media/vaapi_wrapper.cc
---- chromium-46.0.2478.0.orig/content/common/gpu/media/vaapi_wrapper.cc	2015-08-07 22:29:22.000000000 +0200
-+++ chromium-46.0.2478.0/content/common/gpu/media/vaapi_wrapper.cc	2015-08-12 14:27:02.681698936 +0200
-@@ -146,7 +146,7 @@
+@@ -401,7 +408,7 @@
+   // can be initialized by corresponding VDA successfully.
+ #if defined(OS_WIN)
+   profiles = DXVAVideoDecodeAccelerator::GetSupportedProfiles();
+-#elif defined(OS_CHROMEOS)
++#elif defined(OS_CHROMEOS) || defined(OS_LINUX)
+   media::VideoDecodeAccelerator::SupportedProfiles vda_profiles;
+ #if defined(USE_V4L2_CODEC)
+   vda_profiles = V4L2VideoDecodeAccelerator::GetSupportedProfiles();
+diff -uarN chromium-48.0.2535.0.orig/content/common/gpu/media/vaapi_video_decode_accelerator.cc chromium-48.0.2535.0/content/common/gpu/media/vaapi_video_decode_accelerator.cc
+--- chromium-48.0.2535.0.orig/content/common/gpu/media/vaapi_video_decode_accelerator.cc	2015-10-14 09:01:20.000000000 +0200
++++ chromium-48.0.2535.0/content/common/gpu/media/vaapi_video_decode_accelerator.cc	2015-10-18 13:19:07.006659929 +0200
+@@ -324,17 +324,17 @@
+ 
+   base::AutoLock auto_lock(lock_);
+   DCHECK_EQ(state_, kUninitialized);
+-  DVLOG(2) << "Initializing VAVDA, profile: " << profile;
++  VLOG(1) << "Initializing VAVDA, profile: " << profile;
+ 
+ #if defined(USE_X11)
+   if (gfx::GetGLImplementation() != gfx::kGLImplementationDesktopGL) {
+-    DVLOG(1) << "HW video decode acceleration not available without "
++    VLOG(1) << "HW video decode acceleration not available without "
+                 "DesktopGL (GLX).";
+     return false;
+   }
+ #elif defined(USE_OZONE)
+   if (gfx::GetGLImplementation() != gfx::kGLImplementationEGLGLES2) {
+-    DVLOG(1) << "HW video decode acceleration not available without "
++    VLOG(1) << "HW video decode acceleration not available without "
+              << "EGLGLES2.";
+     return false;
+   }
+@@ -344,7 +344,7 @@
+       VaapiWrapper::kDecode, profile, base::Bind(&ReportToUMA, VAAPI_ERROR));
+ 
+   if (!vaapi_wrapper_.get()) {
+-    DVLOG(1) << "Failed initializing VAAPI for profile " << profile;
++    VLOG(1) << "Failed initializing VAAPI for profile " << profile;
+     return false;
+   }
+ 
+@@ -361,7 +361,7 @@
+     vp9_accelerator_.reset(new VaapiVP9Accelerator(this, vaapi_wrapper_.get()));
+     decoder_.reset(new VP9Decoder(vp9_accelerator_.get()));
+   } else {
+-    DLOG(ERROR) << "Unsupported profile " << profile;
++    VLOG(1) << "Unsupported profile " << profile;
+     return false;
+   }
+ 
+diff -uarN chromium-48.0.2535.0.orig/content/common/gpu/media/vaapi_wrapper.cc chromium-48.0.2535.0/content/common/gpu/media/vaapi_wrapper.cc
+--- chromium-48.0.2535.0.orig/content/common/gpu/media/vaapi_wrapper.cc	2015-10-14 09:01:20.000000000 +0200
++++ chromium-48.0.2535.0/content/common/gpu/media/vaapi_wrapper.cc	2015-10-18 13:19:07.004659596 +0200
+@@ -147,7 +147,7 @@
      VAProfile va_profile,
      const base::Closure& report_error_to_uma_cb) {
    if (!profile_infos_.Get().IsProfileSupported(mode, va_profile)) {
@@ -49,7 +143,30 @@ diff -uarN chromium-46.0.2478.0.orig/content/common/gpu/media/vaapi_wrapper.cc c
      return nullptr;
    }
  
-@@ -384,7 +384,7 @@
+@@ -306,15 +306,17 @@
+ bool VaapiWrapper::VaInitialize(const base::Closure& report_error_to_uma_cb) {
+   static bool vaapi_functions_initialized = PostSandboxInitialization();
+   if (!vaapi_functions_initialized) {
+-    bool running_on_chromeos = false;
+-#if defined(OS_CHROMEOS)
++    bool error_level_logging = false;
++#if defined(OS_LINUX)
++    error_level_logging = true;
++#elif defined(OS_CHROMEOS)
+     // When chrome runs on linux with chromeos=1, do not log error message
+     // without VAAPI libraries.
+-    running_on_chromeos = base::SysInfo::IsRunningOnChromeOS();
++    error_level_logging = base::SysInfo::IsRunningOnChromeOS();
+ #endif
+     static const char kErrorMsg[] = "Failed to initialize VAAPI libs";
+-    if (running_on_chromeos)
+-      LOG(ERROR) << kErrorMsg;
++    if (error_level_logging)
++      VLOG(1) << kErrorMsg;
+     else
+       DVLOG(1) << kErrorMsg;
+     return false;
+@@ -385,7 +387,7 @@
    if (std::find(supported_entrypoints.begin(),
                  supported_entrypoints.end(),
                  entrypoint) == supported_entrypoints.end()) {
@@ -58,7 +175,7 @@ diff -uarN chromium-46.0.2478.0.orig/content/common/gpu/media/vaapi_wrapper.cc c
      return false;
    }
    return true;
-@@ -408,8 +408,8 @@
+@@ -409,8 +411,8 @@
      if (attribs[i].type != required_attribs[i].type ||
          (attribs[i].value & required_attribs[i].value) !=
              required_attribs[i].value) {
@@ -69,9 +186,9 @@ diff -uarN chromium-46.0.2478.0.orig/content/common/gpu/media/vaapi_wrapper.cc c
        return false;
      }
    }
-diff -uarN chromium-46.0.2478.0.orig/content/common/sandbox_linux/bpf_gpu_policy_linux.cc chromium-46.0.2478.0/content/common/sandbox_linux/bpf_gpu_policy_linux.cc
---- chromium-46.0.2478.0.orig/content/common/sandbox_linux/bpf_gpu_policy_linux.cc	2015-08-07 22:29:22.000000000 +0200
-+++ chromium-46.0.2478.0/content/common/sandbox_linux/bpf_gpu_policy_linux.cc	2015-08-12 14:27:02.658695149 +0200
+diff -uarN chromium-48.0.2535.0.orig/content/common/sandbox_linux/bpf_gpu_policy_linux.cc chromium-48.0.2535.0/content/common/sandbox_linux/bpf_gpu_policy_linux.cc
+--- chromium-48.0.2535.0.orig/content/common/sandbox_linux/bpf_gpu_policy_linux.cc	2015-10-14 09:01:20.000000000 +0200
++++ chromium-48.0.2535.0/content/common/sandbox_linux/bpf_gpu_policy_linux.cc	2015-10-18 13:29:07.942272472 +0200
 @@ -21,6 +21,8 @@
  #include "base/logging.h"
  #include "base/memory/scoped_ptr.h"
@@ -111,11 +228,12 @@ diff -uarN chromium-46.0.2478.0.orig/content/common/sandbox_linux/bpf_gpu_policy
    const base::CommandLine& command_line =
        *base::CommandLine::ForCurrentProcess();
    accelerated_encode_enabled =
-@@ -299,23 +308,41 @@
+@@ -299,27 +308,41 @@
      // inside the sandbox, so preload them now.
      if (IsAcceleratedVaapiVideoEncodeEnabled() ||
          IsAcceleratedVideoDecodeEnabled()) {
 -      const char* I965DrvVideoPath = NULL;
+-      const char* I965HybridDrvVideoPath = NULL;
 +      VLOG(1) << "Attempting to enable hardware video acceleration.";
 +      StubPathMap paths;
 +      paths[kModuleVa].push_back("libva.so.1");
@@ -127,6 +245,7 @@ diff -uarN chromium-46.0.2478.0.orig/content/common/sandbox_linux/bpf_gpu_policy
  
 -      if (IsArchitectureX86_64()) {
 -        I965DrvVideoPath = "/usr/lib64/va/drivers/i965_drv_video.so";
+-        I965HybridDrvVideoPath = "/usr/lib64/va/drivers/hybrid_drv_video.so";
 -      } else if (IsArchitectureI386()) {
 -        I965DrvVideoPath = "/usr/lib/va/drivers/i965_drv_video.so";
 +      // libva drivers won't get loaded even above two libraries get dlopened.
@@ -148,6 +267,8 @@ diff -uarN chromium-46.0.2478.0.orig/content/common/sandbox_linux/bpf_gpu_policy
        }
  
 -      dlopen(I965DrvVideoPath, RTLD_NOW|RTLD_GLOBAL|RTLD_NODELETE);
+-      if (I965HybridDrvVideoPath)
+-        dlopen(I965HybridDrvVideoPath, RTLD_NOW|RTLD_GLOBAL|RTLD_NODELETE);
 -      dlopen("libva.so.1", RTLD_NOW|RTLD_GLOBAL|RTLD_NODELETE);
 -#if defined(USE_OZONE)
 -      dlopen("libva-drm.so.1", RTLD_NOW|RTLD_GLOBAL|RTLD_NODELETE);
@@ -167,10 +288,10 @@ diff -uarN chromium-46.0.2478.0.orig/content/common/sandbox_linux/bpf_gpu_policy
  
    return true;
  }
-diff -uarN chromium-46.0.2478.0.orig/content/content_common.gypi chromium-46.0.2478.0/content/content_common.gypi
---- chromium-46.0.2478.0.orig/content/content_common.gypi	2015-08-09 21:01:31.000000000 +0200
-+++ chromium-46.0.2478.0/content/content_common.gypi	2015-08-12 14:27:02.571680830 +0200
-@@ -854,7 +854,7 @@
+diff -uarN chromium-48.0.2535.0.orig/content/content_common.gypi chromium-48.0.2535.0/content/content_common.gypi
+--- chromium-48.0.2535.0.orig/content/content_common.gypi	2015-10-14 09:01:21.000000000 +0200
++++ chromium-48.0.2535.0/content/content_common.gypi	2015-10-18 13:19:06.929647164 +0200
+@@ -860,7 +860,7 @@
          },
        ],
      }],
@@ -179,7 +300,7 @@ diff -uarN chromium-46.0.2478.0.orig/content/content_common.gypi chromium-46.0.2
        'sources': [
          'common/gpu/media/accelerated_video_decoder.h',
          'common/gpu/media/h264_decoder.cc',
-@@ -906,7 +906,7 @@
+@@ -916,7 +916,7 @@
          'common/gpu/media/tegra_v4l2_device.h',
        ],
      }],
@@ -188,10 +309,10 @@ diff -uarN chromium-46.0.2478.0.orig/content/content_common.gypi chromium-46.0.2
        'dependencies': [
          '../media/media.gyp:media',
          '../third_party/libyuv/libyuv.gyp:libyuv',
-diff -uarN chromium-46.0.2478.0.orig/content/content_gpu.gypi chromium-46.0.2478.0/content/content_gpu.gypi
---- chromium-46.0.2478.0.orig/content/content_gpu.gypi	2015-08-07 22:29:22.000000000 +0200
-+++ chromium-46.0.2478.0/content/content_gpu.gypi	2015-08-12 14:27:02.571680830 +0200
-@@ -36,7 +36,7 @@
+diff -uarN chromium-48.0.2535.0.orig/content/content_gpu.gypi chromium-48.0.2535.0/content/content_gpu.gypi
+--- chromium-48.0.2535.0.orig/content/content_gpu.gypi	2015-10-14 09:01:21.000000000 +0200
++++ chromium-48.0.2535.0/content/content_gpu.gypi	2015-10-18 13:19:06.940648986 +0200
+@@ -38,7 +38,7 @@
          ],
        },
      }],
@@ -200,10 +321,10 @@ diff -uarN chromium-46.0.2478.0.orig/content/content_gpu.gypi chromium-46.0.2478
        'include_dirs': [
          '<(DEPTH)/third_party/libva',
        ],
-diff -uarN chromium-46.0.2478.0.orig/content/content_tests.gypi chromium-46.0.2478.0/content/content_tests.gypi
---- chromium-46.0.2478.0.orig/content/content_tests.gypi	2015-08-10 21:00:40.000000000 +0200
-+++ chromium-46.0.2478.0/content/content_tests.gypi	2015-08-12 14:27:02.593684451 +0200
-@@ -1706,7 +1706,7 @@
+diff -uarN chromium-48.0.2535.0.orig/content/content_tests.gypi chromium-48.0.2535.0/content/content_tests.gypi
+--- chromium-48.0.2535.0.orig/content/content_tests.gypi	2015-10-14 09:01:21.000000000 +0200
++++ chromium-48.0.2535.0/content/content_tests.gypi	2015-10-18 13:19:06.941649152 +0200
+@@ -1743,7 +1743,7 @@
            },
          ]
      }],
@@ -212,33 +333,55 @@ diff -uarN chromium-46.0.2478.0.orig/content/content_tests.gypi chromium-46.0.24
        'targets': [
            {
              'target_name': 'vaapi_jpeg_decoder_unittest',
-diff -uarN chromium-46.0.2478.0.orig/content/public/common/content_switches.cc chromium-46.0.2478.0/content/public/common/content_switches.cc
---- chromium-46.0.2478.0.orig/content/public/common/content_switches.cc	2015-08-09 21:01:31.000000000 +0200
-+++ chromium-46.0.2478.0/content/public/common/content_switches.cc	2015-08-12 14:27:02.614687907 +0200
-@@ -964,7 +964,7 @@
- // Disable web audio API.
- const char kDisableWebAudio[]               = "disable-webaudio";
+diff -uarN chromium-48.0.2535.0.orig/content/gpu/gpu_main.cc chromium-48.0.2535.0/content/gpu/gpu_main.cc
+--- chromium-48.0.2535.0.orig/content/gpu/gpu_main.cc	2015-10-14 09:01:21.000000000 +0200
++++ chromium-48.0.2535.0/content/gpu/gpu_main.cc	2015-10-18 13:19:07.016661587 +0200
+@@ -66,7 +66,7 @@
+ #include "content/common/sandbox_mac.h"
+ #endif
  
--#if defined(OS_CHROMEOS)
-+#if defined(OS_CHROMEOS) || defined(OS_LINUX)
- // Disables panel fitting (used for mirror mode).
- const char kDisablePanelFitting[]           = "disable-panel-fitting";
+-#if defined(OS_CHROMEOS) && defined(ARCH_CPU_X86_FAMILY)
++#if (defined(OS_CHROMEOS) || defined(OS_LINUX)) && defined(ARCH_CPU_X86_FAMILY)
+ #include "content/common/gpu/media/vaapi_wrapper.h"
+ #endif
+ 
+@@ -231,7 +231,7 @@
+   GetGpuInfoFromCommandLine(gpu_info, command_line);
+   gpu_info.in_process_gpu = false;
  
-diff -uarN chromium-46.0.2478.0.orig/content/public/common/content_switches.h chromium-46.0.2478.0/content/public/common/content_switches.h
---- chromium-46.0.2478.0.orig/content/public/common/content_switches.h	2015-08-09 21:01:31.000000000 +0200
-+++ chromium-46.0.2478.0/content/public/common/content_switches.h	2015-08-12 14:27:02.615688072 +0200
-@@ -276,7 +276,7 @@
+-#if defined(OS_CHROMEOS) && defined(ARCH_CPU_X86_FAMILY)
++#if (defined(OS_CHROMEOS) || defined(OS_LINUX)) && defined(ARCH_CPU_X86_FAMILY)
+   VaapiWrapper::PreSandboxInitialization();
+ #endif
  
- CONTENT_EXPORT extern const char kDisableWebAudio[];
+diff -uarN chromium-48.0.2535.0.orig/content/public/common/content_switches.cc chromium-48.0.2535.0/content/public/common/content_switches.cc
+--- chromium-48.0.2535.0.orig/content/public/common/content_switches.cc	2015-10-14 09:01:21.000000000 +0200
++++ chromium-48.0.2535.0/content/public/common/content_switches.cc	2015-10-18 13:19:06.948650315 +0200
+@@ -920,7 +920,9 @@
+ #if defined(OS_CHROMEOS)
+ // Disables panel fitting (used for mirror mode).
+ const char kDisablePanelFitting[]           = "disable-panel-fitting";
++#endif
  
--#if defined(OS_CHROMEOS)
 +#if defined(OS_CHROMEOS) || defined(OS_LINUX)
+ // Disables VA-API accelerated video encode.
+ const char kDisableVaapiAcceleratedVideoEncode[] =
+     "disable-vaapi-accelerated-video-encode";
+diff -uarN chromium-48.0.2535.0.orig/content/public/common/content_switches.h chromium-48.0.2535.0/content/public/common/content_switches.h
+--- chromium-48.0.2535.0.orig/content/public/common/content_switches.h	2015-10-14 09:01:21.000000000 +0200
++++ chromium-48.0.2535.0/content/public/common/content_switches.h	2015-10-18 13:19:06.949650480 +0200
+@@ -272,6 +272,8 @@
+ 
+ #if defined(OS_CHROMEOS)
  CONTENT_EXPORT extern const char kDisablePanelFitting[];
++#endif
++#if defined(OS_CHROMEOS) || defined(OS_LINUX)
  CONTENT_EXPORT extern const char kDisableVaapiAcceleratedVideoEncode[];
  #endif
-diff -uarN chromium-46.0.2478.0.orig/gpu/config/software_rendering_list_json.cc chromium-46.0.2478.0/gpu/config/software_rendering_list_json.cc
---- chromium-46.0.2478.0.orig/gpu/config/software_rendering_list_json.cc	2015-08-07 22:29:23.000000000 +0200
-+++ chromium-46.0.2478.0/gpu/config/software_rendering_list_json.cc	2015-08-12 14:27:02.641692352 +0200
+ 
+diff -uarN chromium-48.0.2535.0.orig/gpu/config/software_rendering_list_json.cc chromium-48.0.2535.0/gpu/config/software_rendering_list_json.cc
+--- chromium-48.0.2535.0.orig/gpu/config/software_rendering_list_json.cc	2015-10-14 09:01:21.000000000 +0200
++++ chromium-48.0.2535.0/gpu/config/software_rendering_list_json.cc	2015-10-18 13:19:06.966653298 +0200
 @@ -481,17 +481,6 @@
        ]
      },
@@ -257,7 +400,7 @@ diff -uarN chromium-46.0.2478.0.orig/gpu/config/software_rendering_list_json.cc
        "id": 49,
        "description": "NVidia GeForce GT 650M can cause the system to hang with flash 3D",
        "cr_bugs": [140175],
-@@ -1041,6 +1030,11 @@
+@@ -1039,6 +1028,11 @@
              "op": ">=",
              "value": "3.0"
            }
@@ -269,10 +412,10 @@ diff -uarN chromium-46.0.2478.0.orig/gpu/config/software_rendering_list_json.cc
          }
        ],
        "features": [
-diff -uarN chromium-46.0.2478.0.orig/media/media.gyp chromium-46.0.2478.0/media/media.gyp
---- chromium-46.0.2478.0.orig/media/media.gyp	2015-08-09 21:01:31.000000000 +0200
-+++ chromium-46.0.2478.0/media/media.gyp	2015-08-12 14:27:02.633691036 +0200
-@@ -752,7 +752,7 @@
+diff -uarN chromium-48.0.2535.0.orig/media/media.gyp chromium-48.0.2535.0/media/media.gyp
+--- chromium-48.0.2535.0.orig/media/media.gyp	2015-10-14 09:01:21.000000000 +0200
++++ chromium-48.0.2535.0/media/media.gyp	2015-10-18 13:19:06.950650645 +0200
+@@ -759,7 +759,7 @@
            ],
          }],
          # For VaapiVideoEncodeAccelerator.
@@ -281,3 +424,12 @@ diff -uarN chromium-46.0.2478.0.orig/media/media.gyp chromium-46.0.2478.0/media/
            'sources': [
              'filters/h264_bitstream_buffer.cc',
              'filters/h264_bitstream_buffer.h',
+@@ -1379,7 +1379,7 @@
+             'player_android',
+           ],
+         }],
+-        ['target_arch != "arm" and chromeos == 1 and use_x11 == 1', {
++        ['target_arch != "arm" and (chromeos == 1 or desktop_linux == 1) and use_x11 == 1', {
+           'sources': [
+             'filters/h264_bitstream_buffer_unittest.cc',
+           ],