~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-06-25 03:38:51 UTC
  • Revision ID: saiarcot895@gmail.com-20150625033851-jacp4ttjapr9qbtt
Tags: 44.0.2403.61-0ubuntu1~ppa1~utopic1
* New upstream version 44.0.2403.61
* Refreshed and updated patches.

Show diffs side-by-side

added added

removed removed

Lines of Context:
2
2
 
3
3
Index: beta.vivid/content/common/gpu/media/gpu_video_decode_accelerator.cc
4
4
===================================================================
5
 
--- beta.vivid.orig/content/common/gpu/media/gpu_video_decode_accelerator.cc    2015-06-05 11:28:00.943201387 -0400
6
 
+++ beta.vivid/content/common/gpu/media/gpu_video_decode_accelerator.cc 2015-06-05 11:28:00.888202108 -0400
 
5
--- beta.vivid.orig/content/common/gpu/media/gpu_video_decode_accelerator.cc    2015-06-24 23:38:26.668425149 -0400
 
6
+++ beta.vivid/content/common/gpu/media/gpu_video_decode_accelerator.cc 2015-06-24 23:38:26.657425312 -0400
7
7
@@ -33,7 +33,7 @@
8
8
 #include "content/common/gpu/media/dxva_video_decode_accelerator.h"
9
9
 #elif defined(OS_MACOSX)
24
24
                                         base::Unretained(this))));
25
25
Index: beta.vivid/content/content_common.gypi
26
26
===================================================================
27
 
--- beta.vivid.orig/content/content_common.gypi 2015-06-05 11:28:00.943201387 -0400
28
 
+++ beta.vivid/content/content_common.gypi      2015-06-05 11:28:00.888202108 -0400
 
27
--- beta.vivid.orig/content/content_common.gypi 2015-06-24 23:38:26.668425149 -0400
 
28
+++ beta.vivid/content/content_common.gypi      2015-06-24 23:38:26.658425297 -0400
29
29
@@ -824,7 +824,7 @@
30
30
         },
31
31
       ],
46
46
         '../third_party/libyuv/libyuv.gyp:libyuv',
47
47
Index: beta.vivid/content/content_gpu.gypi
48
48
===================================================================
49
 
--- beta.vivid.orig/content/content_gpu.gypi    2015-06-05 11:28:00.943201387 -0400
50
 
+++ beta.vivid/content/content_gpu.gypi 2015-06-05 11:28:00.889202095 -0400
 
49
--- beta.vivid.orig/content/content_gpu.gypi    2015-06-24 23:38:26.668425149 -0400
 
50
+++ beta.vivid/content/content_gpu.gypi 2015-06-24 23:38:26.658425297 -0400
51
51
@@ -36,7 +36,7 @@
52
52
         ],
53
53
       },
59
59
       ],
60
60
Index: beta.vivid/content/content_tests.gypi
61
61
===================================================================
62
 
--- beta.vivid.orig/content/content_tests.gypi  2015-06-05 11:28:00.943201387 -0400
63
 
+++ beta.vivid/content/content_tests.gypi       2015-06-05 11:28:00.890202082 -0400
 
62
--- beta.vivid.orig/content/content_tests.gypi  2015-06-24 23:38:26.668425149 -0400
 
63
+++ beta.vivid/content/content_tests.gypi       2015-06-24 23:38:26.659425282 -0400
64
64
@@ -1652,7 +1652,7 @@
65
65
           },
66
66
         ]
72
72
             'target_name': 'vaapi_jpeg_decoder_unittest',
73
73
Index: beta.vivid/content/public/common/content_switches.cc
74
74
===================================================================
75
 
--- beta.vivid.orig/content/public/common/content_switches.cc   2015-06-05 11:28:00.943201387 -0400
76
 
+++ beta.vivid/content/public/common/content_switches.cc        2015-06-05 11:28:00.891202069 -0400
77
 
@@ -957,7 +957,7 @@
 
75
--- beta.vivid.orig/content/public/common/content_switches.cc   2015-06-24 23:38:26.668425149 -0400
 
76
+++ beta.vivid/content/public/common/content_switches.cc        2015-06-24 23:38:26.661425252 -0400
 
77
@@ -960,7 +960,7 @@
78
78
 // Disable web audio API.
79
79
 const char kDisableWebAudio[]               = "disable-webaudio";
80
80
 
85
85
 
86
86
Index: beta.vivid/content/public/common/content_switches.h
87
87
===================================================================
88
 
--- beta.vivid.orig/content/public/common/content_switches.h    2015-06-05 11:28:00.943201387 -0400
89
 
+++ beta.vivid/content/public/common/content_switches.h 2015-06-05 11:28:00.892202056 -0400
90
 
@@ -272,7 +272,7 @@
 
88
--- beta.vivid.orig/content/public/common/content_switches.h    2015-06-24 23:38:26.668425149 -0400
 
89
+++ beta.vivid/content/public/common/content_switches.h 2015-06-24 23:38:26.661425252 -0400
 
90
@@ -273,7 +273,7 @@
91
91
 
92
92
 CONTENT_EXPORT extern const char kDisableWebAudio[];
93
93
 
98
98
 #endif
99
99
Index: beta.vivid/media/media.gyp
100
100
===================================================================
101
 
--- beta.vivid.orig/media/media.gyp     2015-06-05 11:28:00.943201387 -0400
102
 
+++ beta.vivid/media/media.gyp  2015-06-05 11:28:00.892202056 -0400
103
 
@@ -705,7 +705,7 @@
 
101
--- beta.vivid.orig/media/media.gyp     2015-06-24 23:38:26.668425149 -0400
 
102
+++ beta.vivid/media/media.gyp  2015-06-24 23:38:26.662425237 -0400
 
103
@@ -701,7 +701,7 @@
104
104
           ],
105
105
         }],
106
106
         # For VaapiVideoEncodeAccelerator.
111
111
             'filters/h264_bitstream_buffer.h',
112
112
Index: beta.vivid/gpu/config/software_rendering_list_json.cc
113
113
===================================================================
114
 
--- beta.vivid.orig/gpu/config/software_rendering_list_json.cc  2015-06-05 11:28:00.943201387 -0400
115
 
+++ beta.vivid/gpu/config/software_rendering_list_json.cc       2015-06-05 11:28:00.892202056 -0400
 
114
--- beta.vivid.orig/gpu/config/software_rendering_list_json.cc  2015-06-24 23:38:26.668425149 -0400
 
115
+++ beta.vivid/gpu/config/software_rendering_list_json.cc       2015-06-24 23:38:26.662425237 -0400
116
116
@@ -475,17 +475,6 @@
117
117
       ]
118
118
     },
145
145
       "features": [
146
146
Index: beta.vivid/content/common/sandbox_linux/bpf_gpu_policy_linux.cc
147
147
===================================================================
148
 
--- beta.vivid.orig/content/common/sandbox_linux/bpf_gpu_policy_linux.cc        2015-06-05 11:28:00.943201387 -0400
149
 
+++ beta.vivid/content/common/sandbox_linux/bpf_gpu_policy_linux.cc     2015-06-05 11:28:00.940201427 -0400
 
148
--- beta.vivid.orig/content/common/sandbox_linux/bpf_gpu_policy_linux.cc        2015-06-24 23:38:26.668425149 -0400
 
149
+++ beta.vivid/content/common/sandbox_linux/bpf_gpu_policy_linux.cc     2015-06-24 23:38:26.663425222 -0400
150
150
@@ -21,6 +21,8 @@
151
151
 #include "base/logging.h"
152
152
 #include "base/memory/scoped_ptr.h"
244
244
 }
245
245
Index: beta.vivid/chrome/browser/about_flags.cc
246
246
===================================================================
247
 
--- beta.vivid.orig/chrome/browser/about_flags.cc       2015-06-05 11:28:00.943201387 -0400
248
 
+++ beta.vivid/chrome/browser/about_flags.cc    2015-06-05 11:28:00.941201413 -0400
249
 
@@ -1061,7 +1061,7 @@
 
247
--- beta.vivid.orig/chrome/browser/about_flags.cc       2015-06-24 23:38:26.668425149 -0400
 
248
+++ beta.vivid/chrome/browser/about_flags.cc    2015-06-24 23:38:26.664425207 -0400
 
249
@@ -1051,7 +1051,7 @@
250
250
   { "disable-accelerated-video-decode",
251
251
     IDS_FLAGS_DISABLE_ACCELERATED_VIDEO_DECODE_NAME,
252
252
     IDS_FLAGS_DISABLE_ACCELERATED_VIDEO_DECODE_DESCRIPTION,
257
257
 #if defined(USE_ASH)
258
258
Index: beta.vivid/content/common/gpu/media/vaapi_wrapper.cc
259
259
===================================================================
260
 
--- beta.vivid.orig/content/common/gpu/media/vaapi_wrapper.cc   2015-06-05 11:28:00.943201387 -0400
261
 
+++ beta.vivid/content/common/gpu/media/vaapi_wrapper.cc        2015-06-05 11:28:00.941201413 -0400
 
260
--- beta.vivid.orig/content/common/gpu/media/vaapi_wrapper.cc   2015-06-24 23:38:26.668425149 -0400
 
261
+++ beta.vivid/content/common/gpu/media/vaapi_wrapper.cc        2015-06-24 23:38:26.665425192 -0400
262
262
@@ -146,7 +146,7 @@
263
263
     VAProfile va_profile,
264
264
     const base::Closure& report_error_to_uma_cb) {