← Back to branch summary

~saiarcot895/chromium-browser/chromium-browser.precise.beta

« back to all changes in this revision

Viewing changes to debian/patches/enable_vaapi_on_linux.diff

  • Committer: Saikrishna Arcot
  • Date: 2016-02-24 12:41:31 UTC
  • Revision ID: saikrishna@saikrishna-vps-20160224124131-pdqchndokodh4lox
Tags: 49.0.2623.56-0ubuntu1~ppa1~12.04.1
* New upstream version 49.0.2623.56
* Updated patches.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/enable_vaapi_on_linux.diff
1
1
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.
2
2
 
3
 
Index: beta.wily/content/common/gpu/media/gpu_video_decode_accelerator.cc
 
3
Index: beta.xenial/content/common/gpu/media/gpu_video_decode_accelerator.cc
4
4
===================================================================
5
 
--- beta.wily.orig/content/common/gpu/media/gpu_video_decode_accelerator.cc
6
 
+++ beta.wily/content/common/gpu/media/gpu_video_decode_accelerator.cc
 
5
--- beta.xenial.orig/content/common/gpu/media/gpu_video_decode_accelerator.cc
 
6
+++ beta.xenial/content/common/gpu/media/gpu_video_decode_accelerator.cc
7
7
@@ -34,7 +34,7 @@
8
8
 #include "content/common/gpu/media/dxva_video_decode_accelerator_win.h"
9
9
 #elif defined(OS_MACOSX)
42
42
   decoder.reset(new VaapiVideoDecodeAccelerator(
43
43
       make_context_current_, base::Bind(&GpuVideoDecodeAccelerator::BindImage,
44
44
                                         base::Unretained(this))));
45
 
Index: beta.wily/content/content_common.gypi
 
45
Index: beta.xenial/content/content_common.gypi
46
46
===================================================================
47
 
--- beta.wily.orig/content/content_common.gypi
48
 
+++ beta.wily/content/content_common.gypi
 
47
--- beta.xenial.orig/content/content_common.gypi
 
48
+++ beta.xenial/content/content_common.gypi
49
49
@@ -878,7 +878,7 @@
50
50
         },
51
51
       ],
64
64
       'dependencies': [
65
65
         '../media/media.gyp:media',
66
66
         '../third_party/libyuv/libyuv.gyp:libyuv',
67
 
Index: beta.wily/content/content_gpu.gypi
 
67
Index: beta.xenial/content/content_gpu.gypi
68
68
===================================================================
69
 
--- beta.wily.orig/content/content_gpu.gypi
70
 
+++ beta.wily/content/content_gpu.gypi
 
69
--- beta.xenial.orig/content/content_gpu.gypi
 
70
+++ beta.xenial/content/content_gpu.gypi
71
71
@@ -38,7 +38,7 @@
72
72
         ],
73
73
       },
77
77
       'include_dirs': [
78
78
         '<(DEPTH)/third_party/libva',
79
79
       ],
80
 
Index: beta.wily/content/content_tests.gypi
 
80
Index: beta.xenial/content/content_tests.gypi
81
81
===================================================================
82
 
--- beta.wily.orig/content/content_tests.gypi
83
 
+++ beta.wily/content/content_tests.gypi
 
82
--- beta.xenial.orig/content/content_tests.gypi
 
83
+++ beta.xenial/content/content_tests.gypi
84
84
@@ -1757,7 +1757,7 @@
85
85
           },
86
86
         ]
90
90
       'targets': [
91
91
           {
92
92
             'target_name': 'vaapi_jpeg_decoder_unittest',
93
 
Index: beta.wily/content/public/common/content_switches.cc
 
93
Index: beta.xenial/content/public/common/content_switches.cc
94
94
===================================================================
95
 
--- beta.wily.orig/content/public/common/content_switches.cc
96
 
+++ beta.wily/content/public/common/content_switches.cc
 
95
--- beta.xenial.orig/content/public/common/content_switches.cc
 
96
+++ beta.xenial/content/public/common/content_switches.cc
97
97
@@ -944,7 +944,9 @@ const char kDisableWebAudio[]
98
98
 #if defined(OS_CHROMEOS)
99
99
 // Disables panel fitting (used for mirror mode).
104
104
 // Disables VA-API accelerated video encode.
105
105
 const char kDisableVaapiAcceleratedVideoEncode[] =
106
106
     "disable-vaapi-accelerated-video-encode";
107
 
Index: beta.wily/content/public/common/content_switches.h
 
107
Index: beta.xenial/content/public/common/content_switches.h
108
108
===================================================================
109
 
--- beta.wily.orig/content/public/common/content_switches.h
110
 
+++ beta.wily/content/public/common/content_switches.h
 
109
--- beta.xenial.orig/content/public/common/content_switches.h
 
110
+++ beta.xenial/content/public/common/content_switches.h
111
111
@@ -277,6 +277,8 @@ CONTENT_EXPORT extern const char kDisabl
112
112
 
113
113
 #if defined(OS_CHROMEOS)
117
117
 CONTENT_EXPORT extern const char kDisableVaapiAcceleratedVideoEncode[];
118
118
 #endif
119
119
 
120
 
Index: beta.wily/media/media.gyp
 
120
Index: beta.xenial/media/media.gyp
121
121
===================================================================
122
 
--- beta.wily.orig/media/media.gyp
123
 
+++ beta.wily/media/media.gyp
 
122
--- beta.xenial.orig/media/media.gyp
 
123
+++ beta.xenial/media/media.gyp
124
124
@@ -783,7 +783,7 @@
125
125
           ],
126
126
         }],
139
139
           'sources': [
140
140
             'filters/h264_bitstream_buffer_unittest.cc',
141
141
           ],
142
 
Index: beta.wily/gpu/config/software_rendering_list_json.cc
 
142
Index: beta.xenial/gpu/config/software_rendering_list_json.cc
143
143
===================================================================
144
 
--- beta.wily.orig/gpu/config/software_rendering_list_json.cc
145
 
+++ beta.wily/gpu/config/software_rendering_list_json.cc
 
144
--- beta.xenial.orig/gpu/config/software_rendering_list_json.cc
 
145
+++ beta.xenial/gpu/config/software_rendering_list_json.cc
146
146
@@ -481,17 +481,6 @@ const char kSoftwareRenderingListJson[]
147
147
       ]
148
148
     },
161
161
       "id": 49,
162
162
       "description": "NVidia GeForce GT 650M can cause the system to hang with flash 3D",
163
163
       "cr_bugs": [140175],
164
 
Index: beta.wily/content/common/sandbox_linux/bpf_gpu_policy_linux.cc
 
164
Index: beta.xenial/content/common/sandbox_linux/bpf_gpu_policy_linux.cc
165
165
===================================================================
166
 
--- beta.wily.orig/content/common/sandbox_linux/bpf_gpu_policy_linux.cc
167
 
+++ beta.wily/content/common/sandbox_linux/bpf_gpu_policy_linux.cc
 
166
--- beta.xenial.orig/content/common/sandbox_linux/bpf_gpu_policy_linux.cc
 
167
+++ beta.xenial/content/common/sandbox_linux/bpf_gpu_policy_linux.cc
168
168
@@ -22,6 +22,8 @@
169
169
 #include "base/macros.h"
170
170
 #include "base/memory/scoped_ptr.h"
264
264
 
265
265
   return true;
266
266
 }
267
 
Index: beta.wily/chrome/browser/about_flags.cc
 
267
Index: beta.xenial/chrome/browser/about_flags.cc
268
268
===================================================================
269
 
--- beta.wily.orig/chrome/browser/about_flags.cc
270
 
+++ beta.wily/chrome/browser/about_flags.cc
271
 
@@ -936,7 +936,7 @@ const FeatureEntry kFeatureEntries[] = {
 
269
--- beta.xenial.orig/chrome/browser/about_flags.cc
 
270
+++ beta.xenial/chrome/browser/about_flags.cc
 
271
@@ -937,7 +937,7 @@ const FeatureEntry kFeatureEntries[] = {
272
272
      "disable-accelerated-video-decode",
273
273
      IDS_FLAGS_ACCELERATED_VIDEO_DECODE_NAME,
274
274
      IDS_FLAGS_ACCELERATED_VIDEO_DECODE_DESCRIPTION,
277
277
      SINGLE_DISABLE_VALUE_TYPE(switches::kDisableAcceleratedVideoDecode),
278
278
     },
279
279
 #if defined(USE_ASH)
280
 
Index: beta.wily/content/common/gpu/media/vaapi_wrapper.cc
 
280
Index: beta.xenial/content/common/gpu/media/vaapi_wrapper.cc
281
281
===================================================================
282
 
--- beta.wily.orig/content/common/gpu/media/vaapi_wrapper.cc
283
 
+++ beta.wily/content/common/gpu/media/vaapi_wrapper.cc
 
282
--- beta.xenial.orig/content/common/gpu/media/vaapi_wrapper.cc
 
283
+++ beta.xenial/content/common/gpu/media/vaapi_wrapper.cc
284
284
@@ -186,7 +186,7 @@ scoped_refptr<VaapiWrapper> VaapiWrapper
285
285
     VAProfile va_profile,
286
286
     const base::Closure& report_error_to_uma_cb) {
333
333
       return false;
334
334
     }
335
335
   }
336
 
Index: beta.wily/content/common/gpu/media/vaapi_video_decode_accelerator.cc
 
336
Index: beta.xenial/content/common/gpu/media/vaapi_video_decode_accelerator.cc
337
337
===================================================================
338
 
--- beta.wily.orig/content/common/gpu/media/vaapi_video_decode_accelerator.cc
339
 
+++ beta.wily/content/common/gpu/media/vaapi_video_decode_accelerator.cc
 
338
--- beta.xenial.orig/content/common/gpu/media/vaapi_video_decode_accelerator.cc
 
339
+++ beta.xenial/content/common/gpu/media/vaapi_video_decode_accelerator.cc
340
340
@@ -334,17 +334,17 @@ bool VaapiVideoDecodeAccelerator::Initia
341
341
 
342
342
   base::AutoLock auto_lock(lock_);
376
376
     return false;
377
377
   }
378
378
 
379
 
Index: beta.wily/content/gpu/gpu_main.cc
 
379
Index: beta.xenial/content/gpu/gpu_main.cc
380
380
===================================================================
381
 
--- beta.wily.orig/content/gpu/gpu_main.cc
382
 
+++ beta.wily/content/gpu/gpu_main.cc
 
381
--- beta.xenial.orig/content/gpu/gpu_main.cc
 
382
+++ beta.xenial/content/gpu/gpu_main.cc
383
383
@@ -76,7 +76,7 @@
384
384
 #include "content/common/sandbox_mac.h"
385
385
 #endif
398
398
   VaapiWrapper::PreSandboxInitialization();
399
399
 #endif
400
400
 
401
 
Index: beta.wily/content/common/gpu/client/command_buffer_proxy_impl.cc
 
401
Index: beta.xenial/content/common/gpu/client/command_buffer_proxy_impl.cc
402
402
===================================================================
403
 
--- beta.wily.orig/content/common/gpu/client/command_buffer_proxy_impl.cc
404
 
+++ beta.wily/content/common/gpu/client/command_buffer_proxy_impl.cc
 
403
--- beta.xenial.orig/content/common/gpu/client/command_buffer_proxy_impl.cc
 
404
+++ beta.xenial/content/common/gpu/client/command_buffer_proxy_impl.cc
405
405
@@ -698,8 +698,10 @@ bool CommandBufferProxyImpl::ProduceFron
406
406
 
407
407
 scoped_ptr<media::VideoDecodeAccelerator>