5:48 a.m.
commit 48d78cd06edf87e042120c0e52c60353c2ee9406
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Tue Nov 27 16:40:18 2018 -0500
fix patch
Signed-off-by: Akarshan Biswas <akarshan.biswas(a)gmail.com>
enable-vaapi.patch | 492 ++++++-----------------------------------------------
1 file changed, 54 insertions(+), 438 deletions(-)
---
diff --git a/enable-vaapi.patch b/enable-vaapi.patch
index 4f94214..16aa3b0 100644
--- a/enable-vaapi.patch
+++ b/enable-vaapi.patch
@@ -1,373 +1,7 @@
-<!DOCTYPE html>
-<html lang='en'>
-<head>
-<title>enable-vaapi.patch - free/chromium-vaapi.git - chromium-vaapi</title>
-<meta name='generator' content='cgit v1.1'/>
-<meta name='robots' content='index, nofollow'/>
-<link rel='stylesheet' type='text/css'
href='/cgit-data/cgit.css'/>
-<link rel='shortcut icon' href='/favicon.ico'/>
-<link rel='alternate' title='Atom feed'
href='https://pkgs.rpmfusion.org/cgit/free/chromium-vaapi.git/atom/en...
type='application/atom+xml'/>
-<link rel='vcs-git'
href='ssh://pkgs.rpmfusion.org/free/chromium-vaapi.git'
title='free/chromium-vaapi.git Git repository'/>
-<link rel='vcs-git'
href='https://pkgs.rpmfusion.org/git/free/chromium-vaapi.git'
title='free/chromium-vaapi.git Git repository'/>
-</head>
-<body>
-<script
src="https://apps.fedoraproject.org/fedmenu/js/jquery-1.11.2.min.js&...
-<script
src="https://apps.fedoraproject.org/fedmenu/js/fedmenu.js">&...
-
-<script>
- var base = 'https://apps.fedoraproject.org/';
- var tokens = window.location.href.split('/');
- var repo = null;
- if (tokens.length > 4 && tokens[4] != '') {
- repo = tokens[4].split('.')[0];
- }
- fedmenu({
- 'url': base + 'js/data.js',
- 'mimeType': 'application/javascript',
- 'position': 'bottom-right',
- 'package': repo,
- });
-</script>
-<div id='cgit'><table id='header'>
-<tr>
-<td class='logo' rowspan='2'><a href='/cgit/'><img
src='/cgit-data/cgit.png' alt='cgit logo'/></a></td>
-<td class='main'><a href='/cgit/'>index</a> : <a
title='free/chromium-vaapi.git'
href='/cgit/free/chromium-vaapi.git/'>free/chromium-vaapi.git</a></td><td
class='form'><form method='get'>
-<select name='h' onchange='this.form.submit();'>
-<option value='f28'>f28</option>
-<option value='f29'>f29</option>
-<option value='master' selected='selected'>master</option>
-</select> <input type='submit'
value='switch'/></form></td></tr>
-<tr><td class='sub'>chromium-vaapi</td><td class='sub
right'>Leigh Scott</td></tr></table>
-<table class='tabs'><tr><td>
-<a href='/cgit/free/chromium-vaapi.git/'>summary</a><a
href='/cgit/free/chromium-vaapi.git/refs/'>refs</a><a
href='/cgit/free/chromium-vaapi.git/log/enable-vaapi.patch'>log</a><a
class='active'
href='/cgit/free/chromium-vaapi.git/tree/enable-vaapi.patch'>tree</a><a
href='/cgit/free/chromium-vaapi.git/commit/enable-vaapi.patch'>commit</a><a
href='/cgit/free/chromium-vaapi.git/diff/enable-vaapi.patch'>diff</a><a
href='/cgit/free/chromium-vaapi.git/stats/enable-vaapi.patch'>stats</a></td><td
class='form'><form class='right' method='get'
action='/cgit/free/chromium-vaapi.git/log/enable-vaapi.patch'>
-<select name='qt'>
-<option value='grep'>log msg</option>
-<option value='author'>author</option>
-<option value='committer'>committer</option>
-<option value='range'>range</option>
-</select>
-<input class='txt' type='text' size='10' name='q'
value=''/>
-<input type='submit' value='search'/>
-</form>
-</td></tr></table>
-<div class='path'>path: <a
href='/cgit/free/chromium-vaapi.git/tree/'>root</a>/<a
href='/cgit/free/chromium-vaapi.git/tree/enable-vaapi.patch'>enable-vaapi.patch</a></div><div
class='content'>blob: 6211000401f259d82599ee2bef4f255dabf0cd32 (<a
href='/cgit/free/chromium-vaapi.git/plain/enable-vaapi.patch'>plain</a>)
-<table summary='blob content' class='blob'>
-<tr><td class='linenumbers'><pre><a id='n1'
href='#n1'>1</a>
-<a id='n2' href='#n2'>2</a>
-<a id='n3' href='#n3'>3</a>
-<a id='n4' href='#n4'>4</a>
-<a id='n5' href='#n5'>5</a>
-<a id='n6' href='#n6'>6</a>
-<a id='n7' href='#n7'>7</a>
-<a id='n8' href='#n8'>8</a>
-<a id='n9' href='#n9'>9</a>
-<a id='n10' href='#n10'>10</a>
-<a id='n11' href='#n11'>11</a>
-<a id='n12' href='#n12'>12</a>
-<a id='n13' href='#n13'>13</a>
-<a id='n14' href='#n14'>14</a>
-<a id='n15' href='#n15'>15</a>
-<a id='n16' href='#n16'>16</a>
-<a id='n17' href='#n17'>17</a>
-<a id='n18' href='#n18'>18</a>
-<a id='n19' href='#n19'>19</a>
-<a id='n20' href='#n20'>20</a>
-<a id='n21' href='#n21'>21</a>
-<a id='n22' href='#n22'>22</a>
-<a id='n23' href='#n23'>23</a>
-<a id='n24' href='#n24'>24</a>
-<a id='n25' href='#n25'>25</a>
-<a id='n26' href='#n26'>26</a>
-<a id='n27' href='#n27'>27</a>
-<a id='n28' href='#n28'>28</a>
-<a id='n29' href='#n29'>29</a>
-<a id='n30' href='#n30'>30</a>
-<a id='n31' href='#n31'>31</a>
-<a id='n32' href='#n32'>32</a>
-<a id='n33' href='#n33'>33</a>
-<a id='n34' href='#n34'>34</a>
-<a id='n35' href='#n35'>35</a>
-<a id='n36' href='#n36'>36</a>
-<a id='n37' href='#n37'>37</a>
-<a id='n38' href='#n38'>38</a>
-<a id='n39' href='#n39'>39</a>
-<a id='n40' href='#n40'>40</a>
-<a id='n41' href='#n41'>41</a>
-<a id='n42' href='#n42'>42</a>
-<a id='n43' href='#n43'>43</a>
-<a id='n44' href='#n44'>44</a>
-<a id='n45' href='#n45'>45</a>
-<a id='n46' href='#n46'>46</a>
-<a id='n47' href='#n47'>47</a>
-<a id='n48' href='#n48'>48</a>
-<a id='n49' href='#n49'>49</a>
-<a id='n50' href='#n50'>50</a>
-<a id='n51' href='#n51'>51</a>
-<a id='n52' href='#n52'>52</a>
-<a id='n53' href='#n53'>53</a>
-<a id='n54' href='#n54'>54</a>
-<a id='n55' href='#n55'>55</a>
-<a id='n56' href='#n56'>56</a>
-<a id='n57' href='#n57'>57</a>
-<a id='n58' href='#n58'>58</a>
-<a id='n59' href='#n59'>59</a>
-<a id='n60' href='#n60'>60</a>
-<a id='n61' href='#n61'>61</a>
-<a id='n62' href='#n62'>62</a>
-<a id='n63' href='#n63'>63</a>
-<a id='n64' href='#n64'>64</a>
-<a id='n65' href='#n65'>65</a>
-<a id='n66' href='#n66'>66</a>
-<a id='n67' href='#n67'>67</a>
-<a id='n68' href='#n68'>68</a>
-<a id='n69' href='#n69'>69</a>
-<a id='n70' href='#n70'>70</a>
-<a id='n71' href='#n71'>71</a>
-<a id='n72' href='#n72'>72</a>
-<a id='n73' href='#n73'>73</a>
-<a id='n74' href='#n74'>74</a>
-<a id='n75' href='#n75'>75</a>
-<a id='n76' href='#n76'>76</a>
-<a id='n77' href='#n77'>77</a>
-<a id='n78' href='#n78'>78</a>
-<a id='n79' href='#n79'>79</a>
-<a id='n80' href='#n80'>80</a>
-<a id='n81' href='#n81'>81</a>
-<a id='n82' href='#n82'>82</a>
-<a id='n83' href='#n83'>83</a>
-<a id='n84' href='#n84'>84</a>
-<a id='n85' href='#n85'>85</a>
-<a id='n86' href='#n86'>86</a>
-<a id='n87' href='#n87'>87</a>
-<a id='n88' href='#n88'>88</a>
-<a id='n89' href='#n89'>89</a>
-<a id='n90' href='#n90'>90</a>
-<a id='n91' href='#n91'>91</a>
-<a id='n92' href='#n92'>92</a>
-<a id='n93' href='#n93'>93</a>
-<a id='n94' href='#n94'>94</a>
-<a id='n95' href='#n95'>95</a>
-<a id='n96' href='#n96'>96</a>
-<a id='n97' href='#n97'>97</a>
-<a id='n98' href='#n98'>98</a>
-<a id='n99' href='#n99'>99</a>
-<a id='n100' href='#n100'>100</a>
-<a id='n101' href='#n101'>101</a>
-<a id='n102' href='#n102'>102</a>
-<a id='n103' href='#n103'>103</a>
-<a id='n104' href='#n104'>104</a>
-<a id='n105' href='#n105'>105</a>
-<a id='n106' href='#n106'>106</a>
-<a id='n107' href='#n107'>107</a>
-<a id='n108' href='#n108'>108</a>
-<a id='n109' href='#n109'>109</a>
-<a id='n110' href='#n110'>110</a>
-<a id='n111' href='#n111'>111</a>
-<a id='n112' href='#n112'>112</a>
-<a id='n113' href='#n113'>113</a>
-<a id='n114' href='#n114'>114</a>
-<a id='n115' href='#n115'>115</a>
-<a id='n116' href='#n116'>116</a>
-<a id='n117' href='#n117'>117</a>
-<a id='n118' href='#n118'>118</a>
-<a id='n119' href='#n119'>119</a>
-<a id='n120' href='#n120'>120</a>
-<a id='n121' href='#n121'>121</a>
-<a id='n122' href='#n122'>122</a>
-<a id='n123' href='#n123'>123</a>
-<a id='n124' href='#n124'>124</a>
-<a id='n125' href='#n125'>125</a>
-<a id='n126' href='#n126'>126</a>
-<a id='n127' href='#n127'>127</a>
-<a id='n128' href='#n128'>128</a>
-<a id='n129' href='#n129'>129</a>
-<a id='n130' href='#n130'>130</a>
-<a id='n131' href='#n131'>131</a>
-<a id='n132' href='#n132'>132</a>
-<a id='n133' href='#n133'>133</a>
-<a id='n134' href='#n134'>134</a>
-<a id='n135' href='#n135'>135</a>
-<a id='n136' href='#n136'>136</a>
-<a id='n137' href='#n137'>137</a>
-<a id='n138' href='#n138'>138</a>
-<a id='n139' href='#n139'>139</a>
-<a id='n140' href='#n140'>140</a>
-<a id='n141' href='#n141'>141</a>
-<a id='n142' href='#n142'>142</a>
-<a id='n143' href='#n143'>143</a>
-<a id='n144' href='#n144'>144</a>
-<a id='n145' href='#n145'>145</a>
-<a id='n146' href='#n146'>146</a>
-<a id='n147' href='#n147'>147</a>
-<a id='n148' href='#n148'>148</a>
-<a id='n149' href='#n149'>149</a>
-<a id='n150' href='#n150'>150</a>
-<a id='n151' href='#n151'>151</a>
-<a id='n152' href='#n152'>152</a>
-<a id='n153' href='#n153'>153</a>
-<a id='n154' href='#n154'>154</a>
-<a id='n155' href='#n155'>155</a>
-<a id='n156' href='#n156'>156</a>
-<a id='n157' href='#n157'>157</a>
-<a id='n158' href='#n158'>158</a>
-<a id='n159' href='#n159'>159</a>
-<a id='n160' href='#n160'>160</a>
-<a id='n161' href='#n161'>161</a>
-<a id='n162' href='#n162'>162</a>
-<a id='n163' href='#n163'>163</a>
-<a id='n164' href='#n164'>164</a>
-<a id='n165' href='#n165'>165</a>
-<a id='n166' href='#n166'>166</a>
-<a id='n167' href='#n167'>167</a>
-<a id='n168' href='#n168'>168</a>
-<a id='n169' href='#n169'>169</a>
-<a id='n170' href='#n170'>170</a>
-<a id='n171' href='#n171'>171</a>
-<a id='n172' href='#n172'>172</a>
-<a id='n173' href='#n173'>173</a>
-<a id='n174' href='#n174'>174</a>
-<a id='n175' href='#n175'>175</a>
-<a id='n176' href='#n176'>176</a>
-<a id='n177' href='#n177'>177</a>
-<a id='n178' href='#n178'>178</a>
-<a id='n179' href='#n179'>179</a>
-<a id='n180' href='#n180'>180</a>
-<a id='n181' href='#n181'>181</a>
-<a id='n182' href='#n182'>182</a>
-<a id='n183' href='#n183'>183</a>
-<a id='n184' href='#n184'>184</a>
-<a id='n185' href='#n185'>185</a>
-<a id='n186' href='#n186'>186</a>
-<a id='n187' href='#n187'>187</a>
-<a id='n188' href='#n188'>188</a>
-<a id='n189' href='#n189'>189</a>
-<a id='n190' href='#n190'>190</a>
-<a id='n191' href='#n191'>191</a>
-<a id='n192' href='#n192'>192</a>
-<a id='n193' href='#n193'>193</a>
-<a id='n194' href='#n194'>194</a>
-<a id='n195' href='#n195'>195</a>
-<a id='n196' href='#n196'>196</a>
-<a id='n197' href='#n197'>197</a>
-<a id='n198' href='#n198'>198</a>
-<a id='n199' href='#n199'>199</a>
-<a id='n200' href='#n200'>200</a>
-<a id='n201' href='#n201'>201</a>
-<a id='n202' href='#n202'>202</a>
-<a id='n203' href='#n203'>203</a>
-<a id='n204' href='#n204'>204</a>
-<a id='n205' href='#n205'>205</a>
-<a id='n206' href='#n206'>206</a>
-<a id='n207' href='#n207'>207</a>
-<a id='n208' href='#n208'>208</a>
-<a id='n209' href='#n209'>209</a>
-<a id='n210' href='#n210'>210</a>
-<a id='n211' href='#n211'>211</a>
-<a id='n212' href='#n212'>212</a>
-<a id='n213' href='#n213'>213</a>
-<a id='n214' href='#n214'>214</a>
-<a id='n215' href='#n215'>215</a>
-<a id='n216' href='#n216'>216</a>
-<a id='n217' href='#n217'>217</a>
-<a id='n218' href='#n218'>218</a>
-<a id='n219' href='#n219'>219</a>
-<a id='n220' href='#n220'>220</a>
-<a id='n221' href='#n221'>221</a>
-<a id='n222' href='#n222'>222</a>
-<a id='n223' href='#n223'>223</a>
-<a id='n224' href='#n224'>224</a>
-<a id='n225' href='#n225'>225</a>
-<a id='n226' href='#n226'>226</a>
-<a id='n227' href='#n227'>227</a>
-<a id='n228' href='#n228'>228</a>
-<a id='n229' href='#n229'>229</a>
-<a id='n230' href='#n230'>230</a>
-<a id='n231' href='#n231'>231</a>
-<a id='n232' href='#n232'>232</a>
-<a id='n233' href='#n233'>233</a>
-<a id='n234' href='#n234'>234</a>
-<a id='n235' href='#n235'>235</a>
-<a id='n236' href='#n236'>236</a>
-<a id='n237' href='#n237'>237</a>
-<a id='n238' href='#n238'>238</a>
-<a id='n239' href='#n239'>239</a>
-<a id='n240' href='#n240'>240</a>
-<a id='n241' href='#n241'>241</a>
-<a id='n242' href='#n242'>242</a>
-<a id='n243' href='#n243'>243</a>
-<a id='n244' href='#n244'>244</a>
-<a id='n245' href='#n245'>245</a>
-<a id='n246' href='#n246'>246</a>
-<a id='n247' href='#n247'>247</a>
-<a id='n248' href='#n248'>248</a>
-<a id='n249' href='#n249'>249</a>
-<a id='n250' href='#n250'>250</a>
-<a id='n251' href='#n251'>251</a>
-<a id='n252' href='#n252'>252</a>
-<a id='n253' href='#n253'>253</a>
-<a id='n254' href='#n254'>254</a>
-<a id='n255' href='#n255'>255</a>
-<a id='n256' href='#n256'>256</a>
-<a id='n257' href='#n257'>257</a>
-<a id='n258' href='#n258'>258</a>
-<a id='n259' href='#n259'>259</a>
-<a id='n260' href='#n260'>260</a>
-<a id='n261' href='#n261'>261</a>
-<a id='n262' href='#n262'>262</a>
-<a id='n263' href='#n263'>263</a>
-<a id='n264' href='#n264'>264</a>
-<a id='n265' href='#n265'>265</a>
-<a id='n266' href='#n266'>266</a>
-<a id='n267' href='#n267'>267</a>
-<a id='n268' href='#n268'>268</a>
-<a id='n269' href='#n269'>269</a>
-<a id='n270' href='#n270'>270</a>
-<a id='n271' href='#n271'>271</a>
-<a id='n272' href='#n272'>272</a>
-<a id='n273' href='#n273'>273</a>
-<a id='n274' href='#n274'>274</a>
-<a id='n275' href='#n275'>275</a>
-<a id='n276' href='#n276'>276</a>
-<a id='n277' href='#n277'>277</a>
-<a id='n278' href='#n278'>278</a>
-<a id='n279' href='#n279'>279</a>
-<a id='n280' href='#n280'>280</a>
-<a id='n281' href='#n281'>281</a>
-<a id='n282' href='#n282'>282</a>
-<a id='n283' href='#n283'>283</a>
-<a id='n284' href='#n284'>284</a>
-<a id='n285' href='#n285'>285</a>
-<a id='n286' href='#n286'>286</a>
-<a id='n287' href='#n287'>287</a>
-<a id='n288' href='#n288'>288</a>
-<a id='n289' href='#n289'>289</a>
-<a id='n290' href='#n290'>290</a>
-<a id='n291' href='#n291'>291</a>
-<a id='n292' href='#n292'>292</a>
-</pre></td>
-<td class='lines'><pre><code>From
9eef10b939b9eee6e7bb58c4ca3a8e119df518c1 Mon Sep 17 00:00:00 2001
-From: Akarshan Biswas &lt;akarshan.biswas(a)gmail.com&gt;
-Date: Sun, 4 Nov 2018 20:26:54 +0530
-Subject: [PATCH] Enable vaapi on Linux
-
----
- chrome/browser/about_flags.cc | 14 +++++++------
- chrome/browser/flag_descriptions.cc | 22 +++++++++++++-------
- chrome/browser/flag_descriptions.h | 16 +++++++++-----
- components/viz/service/main/viz_main_impl.cc | 2 +-
- content/gpu/BUILD.gn | 6 ++++++
- content/gpu/gpu_main.cc | 4 ++--
- gpu/config/software_rendering_list.json | 11 ----------
- media/base/media_switches.cc | 2 +-
- media/filters/BUILD.gn | 3 ++-
- media/gpu/BUILD.gn | 7 +++++++
- 10 files changed, 52 insertions(+), 35 deletions(-)
-
-diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
-index d029d0648..39df8d6cf 100644
---- a/chrome/browser/about_flags.cc
-+++ b/chrome/browser/about_flags.cc
-@@ -1775,7 +1775,7 @@ const FeatureEntry kFeatureEntries[] = {
+diff -up chromium-70.0.3538.110/chrome/browser/about_flags.cc.vaapi
chromium-70.0.3538.110/chrome/browser/about_flags.cc
+--- chromium-70.0.3538.110/chrome/browser/about_flags.cc.vaapi 2018-11-19
13:55:02.000000000 -0500
++++ chromium-70.0.3538.110/chrome/browser/about_flags.cc 2018-11-27 16:32:03.917049560
-0500
+@@ -1776,7 +1776,7 @@ const FeatureEntry kFeatureEntries[] = {
"disable-accelerated-video-decode",
flag_descriptions::kAcceleratedVideoDecodeName,
flag_descriptions::kAcceleratedVideoDecodeDescription,
@@ -376,7 +10,7 @@ index d029d0648..39df8d6cf 100644
SINGLE_DISABLE_VALUE_TYPE(switches::kDisableAcceleratedVideoDecode),
},
#if defined(OS_WIN)
-@@ -2457,12 +2457,12 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -2458,12 +2458,12 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(features::kOpenVR)},
#endif // ENABLE_OPENVR
#endif // ENABLE_VR
@@ -392,7 +26,7 @@ index d029d0648..39df8d6cf 100644
{"v8-cache-options", flag_descriptions::kV8CacheOptionsName,
flag_descriptions::kV8CacheOptionsDescription, kOsAll,
MULTI_VALUE_TYPE(kV8CacheOptionsChoices)},
-@@ -4444,12 +4444,14 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -4449,12 +4449,14 @@ const FeatureEntry kFeatureEntries[] = {
"AutofillDropdownLayout")},
#endif // OS_ANDROID
@@ -409,11 +43,10 @@ index d029d0648..39df8d6cf 100644
{"enable-home-launcher-gestures",
flag_descriptions::kEnableHomeLauncherGesturesName,
flag_descriptions::kEnableHomeLauncherGesturesDescription, kOsCrOS,
-diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
-index 0cb812619..df8ecb24e 100644
---- a/chrome/browser/flag_descriptions.cc
-+++ b/chrome/browser/flag_descriptions.cc
-@@ -3053,9 +3053,9 @@ const char kTextSuggestionsTouchBarDescription[] =
+diff -up chromium-70.0.3538.110/chrome/browser/flag_descriptions.cc.vaapi
chromium-70.0.3538.110/chrome/browser/flag_descriptions.cc
+--- chromium-70.0.3538.110/chrome/browser/flag_descriptions.cc.vaapi 2018-11-19
13:55:03.000000000 -0500
++++ chromium-70.0.3538.110/chrome/browser/flag_descriptions.cc 2018-11-27
16:32:03.917049560 -0500
+@@ -3053,9 +3053,9 @@ const char kTextSuggestionsTouchBarDescr
#endif
@@ -421,11 +54,11 @@ index 0cb812619..df8ecb24e 100644
+// Chrome OS and Linux
-------------------------------------------------------------------
-#if defined(OS_CHROMEOS)
-+#if defined(OS_CHROMEOS) || (defined(OS_LINUX) && !defined(OS_ANDROID))
++#if defined(OS_CHROMEOS) || (defined(OS_LINUX) && !defined(OS_ANDROID))
const char kAcceleratedMjpegDecodeName[] =
"Hardware-accelerated mjpeg decode for captured frame";
-@@ -3063,6 +3063,18 @@ const char kAcceleratedMjpegDecodeDescription[] =
+@@ -3063,6 +3063,18 @@ const char kAcceleratedMjpegDecodeDescri
"Enable hardware-accelerated mjpeg decode for captured frame where "
"available.";
@@ -444,7 +77,7 @@ index 0cb812619..df8ecb24e 100644
const char kAllowTouchpadThreeFingerClickName[] = "Touchpad
three-finger-click";
const char kAllowTouchpadThreeFingerClickDescription[] =
"Enables touchpad three-finger-click as middle button.";
-@@ -3564,12 +3576,6 @@ const char kUseMonitorColorSpaceDescription[] =
+@@ -3570,12 +3582,6 @@ const char kUseMonitorColorSpaceDescript
"Enables Chrome to use the color space information provided by the
monitor"
" instead of the default sRGB color space.";
@@ -457,11 +90,10 @@ index 0cb812619..df8ecb24e 100644
const char kVideoPlayerChromecastSupportName[] =
"Experimental Chromecast support for Video Player";
const char kVideoPlayerChromecastSupportDescription[] =
-diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
-index b3c5e5691..14d7e33e9 100644
---- a/chrome/browser/flag_descriptions.h
-+++ b/chrome/browser/flag_descriptions.h
-@@ -1846,13 +1846,22 @@ extern const char
kPermissionPromptPersistenceToggleDescription[];
+diff -up chromium-70.0.3538.110/chrome/browser/flag_descriptions.h.vaapi
chromium-70.0.3538.110/chrome/browser/flag_descriptions.h
+--- chromium-70.0.3538.110/chrome/browser/flag_descriptions.h.vaapi 2018-11-19
13:55:03.000000000 -0500
++++ chromium-70.0.3538.110/chrome/browser/flag_descriptions.h 2018-11-27
16:32:03.918049538 -0500
+@@ -1846,13 +1846,22 @@ extern const char kPermissionPromptPersi
#endif // defined(OS_MACOSX)
@@ -469,7 +101,7 @@ index b3c5e5691..14d7e33e9 100644
+// Chrome OS and Linux
------------------------------------------------------------------
-#if defined(OS_CHROMEOS)
-+#if defined(OS_CHROMEOS) || (defined(OS_LINUX) &&
!defined(OS_ANDROID))
++#if defined(OS_CHROMEOS) || (defined(OS_LINUX) && !defined(OS_ANDROID))
extern const char kAcceleratedMjpegDecodeName[];
extern const char kAcceleratedMjpegDecodeDescription[];
@@ -486,7 +118,7 @@ index b3c5e5691..14d7e33e9 100644
extern const char kAllowTouchpadThreeFingerClickName[];
extern const char kAllowTouchpadThreeFingerClickDescription[];
-@@ -2158,9 +2167,6 @@ extern const char kUseMashDescription[];
+@@ -2161,9 +2170,6 @@ extern const char kUseMashDescription[];
extern const char kUseMonitorColorSpaceName[];
extern const char kUseMonitorColorSpaceDescription[];
@@ -496,11 +128,10 @@ index b3c5e5691..14d7e33e9 100644
extern const char kVideoPlayerChromecastSupportName[];
extern const char kVideoPlayerChromecastSupportDescription[];
-diff --git a/components/viz/service/main/viz_main_impl.cc
b/components/viz/service/main/viz_main_impl.cc
-index 2196abef4..b4e0a1ae1 100644
---- a/components/viz/service/main/viz_main_impl.cc
-+++ b/components/viz/service/main/viz_main_impl.cc
-@@ -41,7 +41,7 @@ std::unique_ptr<base::Thread> CreateAndStartIOThread() {
+diff -up chromium-70.0.3538.110/components/viz/service/main/viz_main_impl.cc.vaapi
chromium-70.0.3538.110/components/viz/service/main/viz_main_impl.cc
+--- chromium-70.0.3538.110/components/viz/service/main/viz_main_impl.cc.vaapi 2018-11-19
13:55:07.000000000 -0500
++++ chromium-70.0.3538.110/components/viz/service/main/viz_main_impl.cc 2018-11-27
16:32:03.918049538 -0500
+@@ -41,7 +41,7 @@ std::unique_ptr<base::Thread> CreateAndS
// It should be possible to use |main_task_runner_| for doing IO tasks.
base::Thread::Options thread_options(base::MessageLoop::TYPE_IO, 0);
thread_options.priority = base::ThreadPriority::NORMAL;
@@ -509,10 +140,9 @@ index 2196abef4..b4e0a1ae1 100644
// TODO(reveman): Remove this in favor of setting it explicitly for each
// type of process.
thread_options.priority = base::ThreadPriority::DISPLAY;
-diff --git a/content/gpu/BUILD.gn b/content/gpu/BUILD.gn
-index 8974e441d..d7eba85a9 100644
---- a/content/gpu/BUILD.gn
-+++ b/content/gpu/BUILD.gn
+diff -up chromium-70.0.3538.110/content/gpu/BUILD.gn.vaapi
chromium-70.0.3538.110/content/gpu/BUILD.gn
+--- chromium-70.0.3538.110/content/gpu/BUILD.gn.vaapi 2018-11-19 13:55:07.000000000
-0500
++++ chromium-70.0.3538.110/content/gpu/BUILD.gn 2018-11-27 16:32:03.926049365 -0500
@@ -6,6 +6,7 @@ import("//build/config/jumbo.gni")
import("//build/config/ui.gni")
import("//gpu/vulkan/features.gni")
@@ -521,21 +151,20 @@ index 8974e441d..d7eba85a9 100644
import("//ui/ozone/ozone.gni")
# See //content/BUILD.gn for how this works.
-@@ -134,4 +135,9 @@ target(link_target_type, "gpu_sources") {
+@@ -134,4 +135,9 @@ target(link_target_type, "gpu_sources")
(!is_chromecast || is_cast_desktop_build)) {
configs += [ "//build/config/linux/dri" ]
}
+
+ # Use vaapi on desktop Linux builds when use_vaapi is set
-+ if (is_desktop_linux && use_vaapi) {
++ if (is_desktop_linux && use_vaapi) {
+ public_configs = [ "//media/gpu:libva_config" ]
+ }
}
-diff --git a/content/gpu/gpu_main.cc b/content/gpu/gpu_main.cc
-index f589d015d..03fd1b44a 100644
---- a/content/gpu/gpu_main.cc
-+++ b/content/gpu/gpu_main.cc
-@@ -283,7 +283,7 @@ int GpuMain(const MainFunctionParams& parameters) {
+diff -up chromium-70.0.3538.110/content/gpu/gpu_main.cc.vaapi
chromium-70.0.3538.110/content/gpu/gpu_main.cc
+--- chromium-70.0.3538.110/content/gpu/gpu_main.cc.vaapi 2018-11-19 13:55:07.000000000
-0500
++++ chromium-70.0.3538.110/content/gpu/gpu_main.cc 2018-11-27 16:33:26.059266401 -0500
+@@ -283,7 +283,7 @@ int GpuMain(const MainFunctionParams& pa
base::PlatformThread::SetName("CrGpuMain");
@@ -544,8 +173,8 @@ index f589d015d..03fd1b44a 100644
// Set thread priority before sandbox initialization.
base::PlatformThread::SetCurrentThreadPriority(base::ThreadPriority::DISPLAY);
#endif
-@@ -316,7 +316,7 @@ int GpuMain(const MainFunctionParams& parameters) {
- GetContentClient()->SetGpuInfo(gpu_init->gpu_info());
+@@ -316,7 +316,7 @@ int GpuMain(const MainFunctionParams& pa
+ GetContentClient()->SetGpuInfo(gpu_init->gpu_info());
base::ThreadPriority io_thread_priority = base::ThreadPriority::NORMAL;
-#if defined(OS_ANDROID) || defined(OS_CHROMEOS)
@@ -553,15 +182,13 @@ index f589d015d..03fd1b44a 100644
io_thread_priority = base::ThreadPriority::DISPLAY;
#endif
-diff --git a/gpu/config/software_rendering_list.json
b/gpu/config/software_rendering_list.json
-index 445953a64..0aac9ddb6 100644
---- a/gpu/config/software_rendering_list.json
-+++ b/gpu/config/software_rendering_list.json
-@@ -373,17 +373,6 @@
- "all"
+diff -up chromium-70.0.3538.110/gpu/config/software_rendering_list.json.vaapi
chromium-70.0.3538.110/gpu/config/software_rendering_list.json
+--- chromium-70.0.3538.110/gpu/config/software_rendering_list.json.vaapi 2018-11-19
13:55:08.000000000 -0500
++++ chromium-70.0.3538.110/gpu/config/software_rendering_list.json 2018-11-27
16:32:03.936049148 -0500
+@@ -374,17 +374,6 @@
]
},
-- {
+ {
- "id": 48,
- "description": "Accelerated video decode is unavailable on
Linux",
- "cr_bugs": [137247],
@@ -572,14 +199,14 @@ index 445953a64..0aac9ddb6 100644
- "accelerated_video_decode"
- ]
- },
- {
+- {
"id": 50,
"description": "Disable VMware software renderer on older
Mesa",
-diff --git a/media/base/media_switches.cc b/media/base/media_switches.cc
-index 684c1d5cf..e887e60bb 100644
---- a/media/base/media_switches.cc
-+++ b/media/base/media_switches.cc
-@@ -468,7 +468,7 @@ bool IsVideoCaptureAcceleratedJpegDecodingEnabled() {
+ "cr_bugs": [145531, 332596, 571899, 629434],
+diff -up chromium-70.0.3538.110/media/base/media_switches.cc.vaapi
chromium-70.0.3538.110/media/base/media_switches.cc
+--- chromium-70.0.3538.110/media/base/media_switches.cc.vaapi 2018-11-19
13:55:09.000000000 -0500
++++ chromium-70.0.3538.110/media/base/media_switches.cc 2018-11-27 16:32:03.937049127
-0500
+@@ -468,7 +468,7 @@ bool IsVideoCaptureAcceleratedJpegDecodi
switches::kUseFakeJpegDecodeAccelerator)) {
return true;
}
@@ -588,10 +215,9 @@ index 684c1d5cf..e887e60bb 100644
return true;
#endif
return false;
-diff --git a/media/filters/BUILD.gn b/media/filters/BUILD.gn
-index ab6215152..b8d1ee896 100644
---- a/media/filters/BUILD.gn
-+++ b/media/filters/BUILD.gn
+diff -up chromium-70.0.3538.110/media/filters/BUILD.gn.vaapi
chromium-70.0.3538.110/media/filters/BUILD.gn
+--- chromium-70.0.3538.110/media/filters/BUILD.gn.vaapi 2018-11-19 13:55:09.000000000
-0500
++++ chromium-70.0.3538.110/media/filters/BUILD.gn 2018-11-27 16:34:43.272581693 -0500
@@ -5,6 +5,7 @@
import("//build/config/jumbo.gni")
import("//media/media_options.gni")
@@ -604,16 +230,15 @@ index ab6215152..b8d1ee896 100644
deps += [ "//media/base/android" ]
}
-- if (current_cpu != "arm" && is_linux) {
-+ if (use_vaapi && is_linux) {
+- if (current_cpu != "arm" && is_linux) {
++ if (use_vaapi && is_linux) {
sources += [
"h264_bitstream_buffer.cc",
"h264_bitstream_buffer.h",
-diff --git a/media/gpu/BUILD.gn b/media/gpu/BUILD.gn
-index 9ef4730a4..0c3a06c24 100644
---- a/media/gpu/BUILD.gn
-+++ b/media/gpu/BUILD.gn
-@@ -501,6 +501,12 @@ if (use_v4l2_codec || use_vaapi || is_mac || is_win) {
+diff -up chromium-70.0.3538.110/media/gpu/BUILD.gn.vaapi
chromium-70.0.3538.110/media/gpu/BUILD.gn
+--- chromium-70.0.3538.110/media/gpu/BUILD.gn.vaapi 2018-11-19 13:55:09.000000000 -0500
++++ chromium-70.0.3538.110/media/gpu/BUILD.gn 2018-11-27 16:32:03.937049127 -0500
+@@ -501,6 +501,12 @@ if (use_v4l2_codec || use_vaapi || is_ma
}
}
@@ -634,12 +259,3 @@ index 9ef4730a4..0c3a06c24 100644
}
}
---
-2.19.1
-
-</code></pre></td></tr></table>
-</div> <!-- class=content -->
-<div class='footer'>generated by <a
href='https://git.zx2c4.com/cgit/about/'>cgit v1.1</a> at 2018-11-27
21:05:03 +0000</div>
-</div> <!-- id=cgit -->
-</body>
-</html>