← Back to branch summary

~chromium-team/chromium-browser/artful-beta

« back to all changes in this revision

Viewing changes to debian/patches/enable_vaapi_on_linux.diff

  • Committer: Chad MILLER
  • Date: 2015-05-27 13:55:13 UTC
  • Revision ID: chad.miller@canonical.com-20150527135513-1w2pbsknn2nrl8sq
Revert attempt to get libva on ARM too.  Assume whitelist of AMD64 and I386 
is right.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/enable_vaapi_on_linux.diff
11
11
 #if defined(USE_ASH)
12
12
--- a/content/common/gpu/media/gpu_video_decode_accelerator.cc
13
13
+++ b/content/common/gpu/media/gpu_video_decode_accelerator.cc
14
 
@@ -30,16 +30,14 @@
 
14
@@ -30,7 +30,7 @@
15
15
 #include "content/common/gpu/media/dxva_video_decode_accelerator.h"
16
16
 #elif defined(OS_MACOSX)
17
17
 #include "content/common/gpu/media/vt_video_decode_accelerator.h"
20
20
 #if defined(USE_V4L2_CODEC)
21
21
 #include "content/common/gpu/media/v4l2_device.h"
22
22
 #include "content/common/gpu/media/v4l2_slice_video_decode_accelerator.h"
23
 
 #include "content/common/gpu/media/v4l2_video_decode_accelerator.h"
24
 
 #endif
25
 
-#if defined(ARCH_CPU_X86_FAMILY)
26
 
 #include "content/common/gpu/media/vaapi_video_decode_accelerator.h"
27
 
 #include "ui/gl/gl_implementation.h"
28
 
-#endif
29
 
 #elif defined(USE_OZONE)
30
 
 #include "media/ozone/media_ozone_platform.h"
31
 
 #elif defined(OS_ANDROID)
32
 
@@ -342,7 +340,7 @@ void GpuVideoDecodeAccelerator::BindImag
 
23
@@ -342,7 +342,7 @@ void GpuVideoDecodeAccelerator::BindImag
33
24
 scoped_ptr<media::VideoDecodeAccelerator>
34
25
 GpuVideoDecodeAccelerator::CreateVaapiVDA() {
35
26
   scoped_ptr<media::VideoDecodeAccelerator> decoder;
101
92
   const base::CommandLine& command_line =
102
93
       *base::CommandLine::ForCurrentProcess();
103
94
   accelerated_encode_enabled =
104
 
@@ -290,28 +299,44 @@ bool GpuProcessPolicy::PreSandboxHook()
105
 
       GpuBrokerProcessPolicy::Create,
106
 
       std::vector<BrokerFilePermission>());  // No extra files in whitelist.
107
 
 
108
 
-  if (IsArchitectureX86_64() || IsArchitectureI386()) {
109
 
     // Accelerated video dlopen()'s some shared objects
 
95
@@ -295,23 +304,41 @@ bool GpuProcessPolicy::PreSandboxHook()
110
96
     // inside the sandbox, so preload them now.
111
97
     if (IsAcceleratedVaapiVideoEncodeEnabled() ||
112
98
         IsAcceleratedVideoDecodeEnabled()) {
158
144
+        return false;
159
145
+      }
160
146
+    }  // end of IsAcceleratedVaapiVideoEncodeEnabled() || IsAcceleratedVideoDecodeEnabled()
 
147
+  }  // end of IsArchitectureX86_64() || IsArchitectureI386()
161
148
 
162
149
   return true;
163
150
 }
264
251
         }],
265
252
         # For VaapiVideoEncodeAccelerator.
266
253
-        ['target_arch != "arm" and chromeos == 1', {
267
 
+        ['chromeos == 1 or desktop_linux == 1', {
 
254
+        ['target_arch != "arm" and (chromeos == 1 or desktop_linux == 1)', {
268
255
           'sources': [
269
256
             'filters/h264_bitstream_buffer.cc',
270
257
             'filters/h264_bitstream_buffer.h',