← Back to branch summary

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

« back to all changes in this revision

Viewing changes to debian/patches/enable_vaapi_on_linux.diff

  • Committer: Saikrishna Arcot
  • Date: 2015-04-13 12:31:05 UTC
  • Revision ID: saiarcot895@gmail.com-20150413123105-emrcclraqd1t94yw
Tags: 42.0.2311.82-0ubuntu1~ppa1~utopic1
* New upstream version 42.0.2311.82
* Refreshed and updated patches

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/enable_vaapi_on_linux.diff
1
1
Index: beta.vivid/content/common/gpu/media/gpu_video_decode_accelerator.cc
2
2
===================================================================
3
 
--- beta.vivid.orig/content/common/gpu/media/gpu_video_decode_accelerator.cc    2015-03-27 08:28:04.616478122 -0400
4
 
+++ beta.vivid/content/common/gpu/media/gpu_video_decode_accelerator.cc 2015-03-27 08:28:04.612478186 -0400
 
3
--- beta.vivid.orig/content/common/gpu/media/gpu_video_decode_accelerator.cc    2015-04-13 08:30:29.599668600 -0400
 
4
+++ beta.vivid/content/common/gpu/media/gpu_video_decode_accelerator.cc 2015-04-13 08:30:29.550669290 -0400
5
5
@@ -30,7 +30,7 @@
6
6
 #include "content/common/gpu/media/dxva_video_decode_accelerator.h"
7
7
 #elif defined(OS_MACOSX)
22
22
                                         base::Unretained(this))));
23
23
Index: beta.vivid/content/content_common.gypi
24
24
===================================================================
25
 
--- beta.vivid.orig/content/content_common.gypi 2015-03-27 08:28:04.616478122 -0400
26
 
+++ beta.vivid/content/content_common.gypi      2015-03-27 08:28:04.612478186 -0400
 
25
--- beta.vivid.orig/content/content_common.gypi 2015-04-13 08:30:29.599668600 -0400
 
26
+++ beta.vivid/content/content_common.gypi      2015-04-13 08:30:29.555669218 -0400
27
27
@@ -856,7 +856,7 @@
28
28
         'common/gpu/media/tegra_v4l2_video_device.h',
29
29
       ],
35
35
         '../third_party/libyuv/libyuv.gyp:libyuv',
36
36
Index: beta.vivid/content/content_gpu.gypi
37
37
===================================================================
38
 
--- beta.vivid.orig/content/content_gpu.gypi    2015-03-27 08:28:04.616478122 -0400
39
 
+++ beta.vivid/content/content_gpu.gypi 2015-03-27 08:28:04.612478186 -0400
 
38
--- beta.vivid.orig/content/content_gpu.gypi    2015-04-13 08:30:29.599668600 -0400
 
39
+++ beta.vivid/content/content_gpu.gypi 2015-04-13 08:30:29.558669176 -0400
40
40
@@ -39,7 +39,7 @@
41
41
         ],
42
42
       },
48
48
       ],
49
49
Index: beta.vivid/content/content_tests.gypi
50
50
===================================================================
51
 
--- beta.vivid.orig/content/content_tests.gypi  2015-03-27 08:28:04.616478122 -0400
52
 
+++ beta.vivid/content/content_tests.gypi       2015-03-27 08:28:04.612478186 -0400
53
 
@@ -1633,7 +1633,7 @@
 
51
--- beta.vivid.orig/content/content_tests.gypi  2015-04-13 08:30:29.599668600 -0400
 
52
+++ beta.vivid/content/content_tests.gypi       2015-04-13 08:30:29.563669106 -0400
 
53
@@ -1634,7 +1634,7 @@
54
54
           },
55
55
         ]
56
56
     }],
61
61
             'target_name': 'vaapi_h264_decoder_unittest',
62
62
Index: beta.vivid/content/public/common/content_switches.cc
63
63
===================================================================
64
 
--- beta.vivid.orig/content/public/common/content_switches.cc   2015-03-27 08:28:04.616478122 -0400
65
 
+++ beta.vivid/content/public/common/content_switches.cc        2015-03-27 08:28:04.612478186 -0400
66
 
@@ -928,7 +928,7 @@
 
64
--- beta.vivid.orig/content/public/common/content_switches.cc   2015-04-13 08:30:29.599668600 -0400
 
65
+++ beta.vivid/content/public/common/content_switches.cc        2015-04-13 08:30:29.571668994 -0400
 
66
@@ -931,7 +931,7 @@
67
67
 // Disable web audio API.
68
68
 const char kDisableWebAudio[]               = "disable-webaudio";
69
69
 
74
74
 
75
75
Index: beta.vivid/content/public/common/content_switches.h
76
76
===================================================================
77
 
--- beta.vivid.orig/content/public/common/content_switches.h    2015-03-27 08:28:04.616478122 -0400
78
 
+++ beta.vivid/content/public/common/content_switches.h 2015-03-27 08:28:04.613478170 -0400
79
 
@@ -265,7 +265,7 @@
 
77
--- beta.vivid.orig/content/public/common/content_switches.h    2015-04-13 08:30:29.599668600 -0400
 
78
+++ beta.vivid/content/public/common/content_switches.h 2015-04-13 08:30:29.574668952 -0400
 
79
@@ -266,7 +266,7 @@
80
80
 
81
81
 CONTENT_EXPORT extern const char kDisableWebAudio[];
82
82
 
87
87
 #endif
88
88
Index: beta.vivid/media/media.gyp
89
89
===================================================================
90
 
--- beta.vivid.orig/media/media.gyp     2015-03-27 08:28:04.616478122 -0400
91
 
+++ beta.vivid/media/media.gyp  2015-03-27 08:28:04.613478170 -0400
 
90
--- beta.vivid.orig/media/media.gyp     2015-04-13 08:30:29.599668600 -0400
 
91
+++ beta.vivid/media/media.gyp  2015-04-13 08:30:29.574668952 -0400
92
92
@@ -729,7 +729,7 @@
93
93
           ],
94
94
         }],
100
100
             'filters/h264_bitstream_buffer.h',
101
101
Index: beta.vivid/gpu/config/software_rendering_list_json.cc
102
102
===================================================================
103
 
--- beta.vivid.orig/gpu/config/software_rendering_list_json.cc  2015-03-27 08:28:04.616478122 -0400
104
 
+++ beta.vivid/gpu/config/software_rendering_list_json.cc       2015-03-27 08:28:04.613478170 -0400
 
103
--- beta.vivid.orig/gpu/config/software_rendering_list_json.cc  2015-04-13 08:30:29.599668600 -0400
 
104
+++ beta.vivid/gpu/config/software_rendering_list_json.cc       2015-04-13 08:30:29.575668938 -0400
105
105
@@ -507,17 +507,6 @@
106
106
       ]
107
107
     },
134
134
       "features": [
135
135
Index: beta.vivid/content/common/sandbox_linux/bpf_gpu_policy_linux.cc
136
136
===================================================================
137
 
--- beta.vivid.orig/content/common/sandbox_linux/bpf_gpu_policy_linux.cc        2015-03-27 08:28:04.616478122 -0400
138
 
+++ beta.vivid/content/common/sandbox_linux/bpf_gpu_policy_linux.cc     2015-03-27 08:28:04.613478170 -0400
 
137
--- beta.vivid.orig/content/common/sandbox_linux/bpf_gpu_policy_linux.cc        2015-04-13 08:30:29.599668600 -0400
 
138
+++ beta.vivid/content/common/sandbox_linux/bpf_gpu_policy_linux.cc     2015-04-13 08:30:29.583668825 -0400
139
139
@@ -21,6 +21,8 @@
140
140
 #include "base/logging.h"
141
141
 #include "base/memory/scoped_ptr.h"
233
233
 }
234
234
Index: beta.vivid/chrome/browser/about_flags.cc
235
235
===================================================================
236
 
--- beta.vivid.orig/chrome/browser/about_flags.cc       2015-03-27 08:28:04.616478122 -0400
237
 
+++ beta.vivid/chrome/browser/about_flags.cc    2015-03-27 08:28:04.614478154 -0400
 
236
--- beta.vivid.orig/chrome/browser/about_flags.cc       2015-04-13 08:30:29.599668600 -0400
 
237
+++ beta.vivid/chrome/browser/about_flags.cc    2015-04-13 08:30:29.583668825 -0400
238
238
@@ -942,7 +942,7 @@
239
239
   { "disable-accelerated-video-decode",
240
240
     IDS_FLAGS_DISABLE_ACCELERATED_VIDEO_DECODE_NAME,
246
246
 #if defined(USE_ASH)
247
247
Index: beta.vivid/content/common/gpu/media/vaapi_wrapper.cc
248
248
===================================================================
249
 
--- beta.vivid.orig/content/common/gpu/media/vaapi_wrapper.cc   2015-03-27 08:28:04.616478122 -0400
250
 
+++ beta.vivid/content/common/gpu/media/vaapi_wrapper.cc        2015-03-27 08:28:04.614478154 -0400
 
249
--- beta.vivid.orig/content/common/gpu/media/vaapi_wrapper.cc   2015-04-13 08:30:29.599668600 -0400
 
250
+++ beta.vivid/content/common/gpu/media/vaapi_wrapper.cc        2015-04-13 08:30:29.592668698 -0400
251
251
@@ -184,14 +184,17 @@
252
252
 
253
253
   if (!vaapi_wrapper->VaInitialize(report_error_to_uma_cb))