chromium: rebased the vaapi patch against chromium-44.0.2403.89 source

1 files changed, 65 insertions, 55 deletions

diff --git a/chromium/build/patches/chromium_vaapi.patch b/chromium/build/patches/chromium_vaapi.patch
index a62a6e39..62fcdb17 100644
--- a/chromium/build/patches/chromium_vaapi.patch
+++ b/chromium/build/patches/chromium_vaapi.patch
@@ -1,13 +1,14 @@
-#
-# Taken from:
-# https://code.launchpad.net/~saiarcot895o
-# To be precise: https://bazaar.launchpad.net/~saiarcot895/chromium-browser/chromium-browser.utopic.beta/view/head:/debian/patches/enable_vaapi_on_linux.diff
-# And rebased against chromium-43.0.2357.65 source.
-#
-diff -uarN chromium-43.0.2357.65.orig/chrome/browser/about_flags.cc chromium-43.0.2357.65/chrome/browser/about_flags.cc
---- chromium-43.0.2357.65.orig/chrome/browser/about_flags.cc	2015-05-14 00:35:45.000000000 +0200
-+++ chromium-43.0.2357.65/chrome/browser/about_flags.cc	2015-05-21 11:41:29.223180021 +0200
-@@ -986,7 +986,7 @@
+Taken from: https://code.launchpad.net/~saiarcot895
+
+To be precise: http://bazaar.launchpad.net/~saiarcot895/chromium-browser/chromium-browser.utopic.beta/view/head:/debian/patches/enable_vaapi_on_linux.diff
+And rebased against chromium-44.0.2403.89 source.
+
+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 -uar chromium-44.0.2403.89.orig/chrome/browser/about_flags.cc chromium-44.0.2403.89/chrome/browser/about_flags.cc
+--- chromium-44.0.2403.89.orig/chrome/browser/about_flags.cc	2015-07-15 22:29:57.000000000 +0200
++++ chromium-44.0.2403.89/chrome/browser/about_flags.cc	2015-07-22 21:18:10.826797437 +0200
+@@ -1063,7 +1063,7 @@
    { "disable-accelerated-video-decode",
      IDS_FLAGS_DISABLE_ACCELERATED_VIDEO_DECODE_NAME,
      IDS_FLAGS_DISABLE_ACCELERATED_VIDEO_DECODE_DESCRIPTION,
@@ -16,10 +17,10 @@ diff -uarN chromium-43.0.2357.65.orig/chrome/browser/about_flags.cc chromium-43.
      SINGLE_VALUE_TYPE(switches::kDisableAcceleratedVideoDecode),
    },
  #if defined(USE_ASH)
-diff -uarN chromium-43.0.2357.65.orig/content/common/gpu/media/gpu_video_decode_accelerator.cc chromium-43.0.2357.65/content/common/gpu/media/gpu_video_decode_accelerator.cc
---- chromium-43.0.2357.65.orig/content/common/gpu/media/gpu_video_decode_accelerator.cc	2015-05-14 00:35:46.000000000 +0200
-+++ chromium-43.0.2357.65/content/common/gpu/media/gpu_video_decode_accelerator.cc	2015-05-21 11:41:29.231181350 +0200
-@@ -30,7 +30,7 @@
+diff -uar chromium-44.0.2403.89.orig/content/common/gpu/media/gpu_video_decode_accelerator.cc chromium-44.0.2403.89/content/common/gpu/media/gpu_video_decode_accelerator.cc
+--- chromium-44.0.2403.89.orig/content/common/gpu/media/gpu_video_decode_accelerator.cc	2015-07-15 22:30:03.000000000 +0200
++++ chromium-44.0.2403.89/content/common/gpu/media/gpu_video_decode_accelerator.cc	2015-07-22 21:18:10.822796777 +0200
+@@ -33,7 +33,7 @@
  #include "content/common/gpu/media/dxva_video_decode_accelerator.h"
  #elif defined(OS_MACOSX)
  #include "content/common/gpu/media/vt_video_decode_accelerator.h"
@@ -28,7 +29,7 @@ diff -uarN chromium-43.0.2357.65.orig/content/common/gpu/media/gpu_video_decode_
  #if defined(USE_V4L2_CODEC)
  #include "content/common/gpu/media/v4l2_device.h"
  #include "content/common/gpu/media/v4l2_slice_video_decode_accelerator.h"
-@@ -342,7 +342,7 @@
+@@ -346,7 +346,7 @@
  scoped_ptr<media::VideoDecodeAccelerator>
  GpuVideoDecodeAccelerator::CreateVaapiVDA() {
    scoped_ptr<media::VideoDecodeAccelerator> decoder;
@@ -37,10 +38,10 @@ diff -uarN chromium-43.0.2357.65.orig/content/common/gpu/media/gpu_video_decode_
    decoder.reset(new VaapiVideoDecodeAccelerator(
        make_context_current_, base::Bind(&GpuVideoDecodeAccelerator::BindImage,
                                          base::Unretained(this))));
-diff -uarN chromium-43.0.2357.65.orig/content/common/gpu/media/vaapi_wrapper.cc chromium-43.0.2357.65/content/common/gpu/media/vaapi_wrapper.cc
---- chromium-43.0.2357.65.orig/content/common/gpu/media/vaapi_wrapper.cc	2015-05-14 00:35:46.000000000 +0200
-+++ chromium-43.0.2357.65/content/common/gpu/media/vaapi_wrapper.cc	2015-05-21 11:41:29.231181350 +0200
-@@ -142,7 +142,7 @@
+diff -uar chromium-44.0.2403.89.orig/content/common/gpu/media/vaapi_wrapper.cc chromium-44.0.2403.89/content/common/gpu/media/vaapi_wrapper.cc
+--- chromium-44.0.2403.89.orig/content/common/gpu/media/vaapi_wrapper.cc	2015-07-15 22:30:03.000000000 +0200
++++ chromium-44.0.2403.89/content/common/gpu/media/vaapi_wrapper.cc	2015-07-22 21:18:10.827797602 +0200
+@@ -146,7 +146,7 @@
      VAProfile va_profile,
      const base::Closure& report_error_to_uma_cb) {
    if (!profile_infos_.Get().IsProfileSupported(mode, va_profile)) {
@@ -49,7 +50,7 @@ diff -uarN chromium-43.0.2357.65.orig/content/common/gpu/media/vaapi_wrapper.cc
      return nullptr;
    }
  
-@@ -360,7 +360,7 @@
+@@ -378,7 +378,7 @@
    if (std::find(supported_entrypoints.begin(),
                  supported_entrypoints.end(),
                  entrypoint) == supported_entrypoints.end()) {
@@ -58,7 +59,7 @@ diff -uarN chromium-43.0.2357.65.orig/content/common/gpu/media/vaapi_wrapper.cc
      return false;
    }
    return true;
-@@ -384,8 +384,8 @@
+@@ -402,8 +402,8 @@
      if (attribs[i].type != required_attribs[i].type ||
          (attribs[i].value & required_attribs[i].value) !=
              required_attribs[i].value) {
@@ -69,9 +70,9 @@ diff -uarN chromium-43.0.2357.65.orig/content/common/gpu/media/vaapi_wrapper.cc
        return false;
      }
    }
-diff -uarN chromium-43.0.2357.65.orig/content/common/sandbox_linux/bpf_gpu_policy_linux.cc chromium-43.0.2357.65/content/common/sandbox_linux/bpf_gpu_policy_linux.cc
---- chromium-43.0.2357.65.orig/content/common/sandbox_linux/bpf_gpu_policy_linux.cc	2015-05-14 00:35:46.000000000 +0200
-+++ chromium-43.0.2357.65/content/common/sandbox_linux/bpf_gpu_policy_linux.cc	2015-05-21 11:41:29.242183176 +0200
+diff -uar chromium-44.0.2403.89.orig/content/common/sandbox_linux/bpf_gpu_policy_linux.cc chromium-44.0.2403.89/content/common/sandbox_linux/bpf_gpu_policy_linux.cc
+--- chromium-44.0.2403.89.orig/content/common/sandbox_linux/bpf_gpu_policy_linux.cc	2015-07-15 22:30:03.000000000 +0200
++++ chromium-44.0.2403.89/content/common/sandbox_linux/bpf_gpu_policy_linux.cc	2015-07-22 21:18:10.825797272 +0200
 @@ -21,6 +21,8 @@
  #include "base/logging.h"
  #include "base/memory/scoped_ptr.h"
@@ -167,10 +168,19 @@ diff -uarN chromium-43.0.2357.65.orig/content/common/sandbox_linux/bpf_gpu_polic
  
    return true;
  }
-diff -uarN chromium-43.0.2357.65.orig/content/content_common.gypi chromium-43.0.2357.65/content/content_common.gypi
---- chromium-43.0.2357.65.orig/content/content_common.gypi	2015-05-14 00:35:46.000000000 +0200
-+++ chromium-43.0.2357.65/content/content_common.gypi	2015-05-21 11:41:29.254185168 +0200
-@@ -863,7 +863,7 @@
+diff -uar chromium-44.0.2403.89.orig/content/content_common.gypi chromium-44.0.2403.89/content/content_common.gypi
+--- chromium-44.0.2403.89.orig/content/content_common.gypi	2015-07-15 22:30:03.000000000 +0200
++++ chromium-44.0.2403.89/content/content_common.gypi	2015-07-22 21:18:10.823796942 +0200
+@@ -824,7 +824,7 @@
+         },
+       ],
+     }],
+-    ['chromeos==1', {
++    ['chromeos==1 or desktop_linux==1', {
+       'sources': [
+         'common/gpu/media/accelerated_video_decoder.h',
+         'common/gpu/media/h264_decoder.cc',
+@@ -873,7 +873,7 @@
          'common/gpu/media/tegra_v4l2_device.h',
        ],
      }],
@@ -179,9 +189,9 @@ diff -uarN chromium-43.0.2357.65.orig/content/content_common.gypi chromium-43.0.
        'dependencies': [
          '../media/media.gyp:media',
          '../third_party/libyuv/libyuv.gyp:libyuv',
-diff -uarN chromium-43.0.2357.65.orig/content/content_gpu.gypi chromium-43.0.2357.65/content/content_gpu.gypi
---- chromium-43.0.2357.65.orig/content/content_gpu.gypi	2015-05-14 00:23:07.000000000 +0200
-+++ chromium-43.0.2357.65/content/content_gpu.gypi	2015-05-21 11:41:29.255185335 +0200
+diff -uar chromium-44.0.2403.89.orig/content/content_gpu.gypi chromium-44.0.2403.89/content/content_gpu.gypi
+--- chromium-44.0.2403.89.orig/content/content_gpu.gypi	2015-07-15 22:30:03.000000000 +0200
++++ chromium-44.0.2403.89/content/content_gpu.gypi	2015-07-22 21:18:10.823796942 +0200
 @@ -36,7 +36,7 @@
          ],
        },
@@ -191,10 +201,10 @@ diff -uarN chromium-43.0.2357.65.orig/content/content_gpu.gypi chromium-43.0.235
        'include_dirs': [
          '<(DEPTH)/third_party/libva',
        ],
-diff -uarN chromium-43.0.2357.65.orig/content/content_tests.gypi chromium-43.0.2357.65/content/content_tests.gypi
---- chromium-43.0.2357.65.orig/content/content_tests.gypi	2015-05-14 00:35:46.000000000 +0200
-+++ chromium-43.0.2357.65/content/content_tests.gypi	2015-05-21 11:41:29.257185668 +0200
-@@ -1661,7 +1661,7 @@
+diff -uar chromium-44.0.2403.89.orig/content/content_tests.gypi chromium-44.0.2403.89/content/content_tests.gypi
+--- chromium-44.0.2403.89.orig/content/content_tests.gypi	2015-07-15 22:30:03.000000000 +0200
++++ chromium-44.0.2403.89/content/content_tests.gypi	2015-07-22 21:18:10.824797107 +0200
+@@ -1652,7 +1652,7 @@
            },
          ]
      }],
@@ -202,11 +212,11 @@ diff -uarN chromium-43.0.2357.65.orig/content/content_tests.gypi chromium-43.0.2
 +    ['(chromeos==1 or desktop_linux==1) and target_arch != "arm"', {
        'targets': [
            {
-             'target_name': 'vaapi_h264_decoder_unittest',
-diff -uarN chromium-43.0.2357.65.orig/content/public/common/content_switches.cc chromium-43.0.2357.65/content/public/common/content_switches.cc
---- chromium-43.0.2357.65.orig/content/public/common/content_switches.cc	2015-05-14 00:35:46.000000000 +0200
-+++ chromium-43.0.2357.65/content/public/common/content_switches.cc	2015-05-21 11:41:29.283189983 +0200
-@@ -935,7 +935,7 @@
+             'target_name': 'vaapi_jpeg_decoder_unittest',
+diff -uar chromium-44.0.2403.89.orig/content/public/common/content_switches.cc chromium-44.0.2403.89/content/public/common/content_switches.cc
+--- chromium-44.0.2403.89.orig/content/public/common/content_switches.cc	2015-07-15 22:30:03.000000000 +0200
++++ chromium-44.0.2403.89/content/public/common/content_switches.cc	2015-07-22 21:18:10.824797107 +0200
+@@ -960,7 +960,7 @@
  // Disable web audio API.
  const char kDisableWebAudio[]               = "disable-webaudio";
  
@@ -215,10 +225,10 @@ diff -uarN chromium-43.0.2357.65.orig/content/public/common/content_switches.cc
  // Disables panel fitting (used for mirror mode).
  const char kDisablePanelFitting[]           = "disable-panel-fitting";
  
-diff -uarN chromium-43.0.2357.65.orig/content/public/common/content_switches.h chromium-43.0.2357.65/content/public/common/content_switches.h
---- chromium-43.0.2357.65.orig/content/public/common/content_switches.h	2015-05-14 00:35:46.000000000 +0200
-+++ chromium-43.0.2357.65/content/public/common/content_switches.h	2015-05-21 11:41:29.292191479 +0200
-@@ -269,7 +269,7 @@
+diff -uar chromium-44.0.2403.89.orig/content/public/common/content_switches.h chromium-44.0.2403.89/content/public/common/content_switches.h
+--- chromium-44.0.2403.89.orig/content/public/common/content_switches.h	2015-07-15 22:30:03.000000000 +0200
++++ chromium-44.0.2403.89/content/public/common/content_switches.h	2015-07-22 21:18:10.824797107 +0200
+@@ -273,7 +273,7 @@
  
  CONTENT_EXPORT extern const char kDisableWebAudio[];
  
@@ -227,10 +237,10 @@ diff -uarN chromium-43.0.2357.65.orig/content/public/common/content_switches.h c
  CONTENT_EXPORT extern const char kDisablePanelFitting[];
  CONTENT_EXPORT extern const char kDisableVaapiAcceleratedVideoEncode[];
  #endif
-diff -uarN chromium-43.0.2357.65.orig/gpu/config/software_rendering_list_json.cc chromium-43.0.2357.65/gpu/config/software_rendering_list_json.cc
---- chromium-43.0.2357.65.orig/gpu/config/software_rendering_list_json.cc	2015-05-14 00:35:46.000000000 +0200
-+++ chromium-43.0.2357.65/gpu/config/software_rendering_list_json.cc	2015-05-21 11:41:29.293191645 +0200
-@@ -481,17 +481,6 @@
+diff -uar chromium-44.0.2403.89.orig/gpu/config/software_rendering_list_json.cc chromium-44.0.2403.89/gpu/config/software_rendering_list_json.cc
+--- chromium-44.0.2403.89.orig/gpu/config/software_rendering_list_json.cc	2015-07-15 22:30:04.000000000 +0200
++++ chromium-44.0.2403.89/gpu/config/software_rendering_list_json.cc	2015-07-22 21:18:10.825797272 +0200
+@@ -475,17 +475,6 @@
        ]
      },
      {
@@ -248,9 +258,9 @@ diff -uarN chromium-43.0.2357.65.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],
-@@ -1056,6 +1045,11 @@
-           "os": {
-             "type": "android"
+@@ -1034,6 +1023,11 @@
+             "op": ">=",
+             "value": "3.0"
            }
 +        },
 +        {
@@ -260,10 +270,10 @@ diff -uarN chromium-43.0.2357.65.orig/gpu/config/software_rendering_list_json.cc
          }
        ],
        "features": [
-diff -uarN chromium-43.0.2357.65.orig/media/media.gyp chromium-43.0.2357.65/media/media.gyp
---- chromium-43.0.2357.65.orig/media/media.gyp	2015-05-14 00:35:46.000000000 +0200
-+++ chromium-43.0.2357.65/media/media.gyp	2015-05-21 11:41:29.294191811 +0200
-@@ -739,7 +739,7 @@
+diff -uar chromium-44.0.2403.89.orig/media/media.gyp chromium-44.0.2403.89/media/media.gyp
+--- chromium-44.0.2403.89.orig/media/media.gyp	2015-07-15 22:30:04.000000000 +0200
++++ chromium-44.0.2403.89/media/media.gyp	2015-07-22 21:18:10.825797272 +0200
+@@ -701,7 +701,7 @@
            ],
          }],
          # For VaapiVideoEncodeAccelerator.