[chromium-freeworld/f29] Add relax libva version check patch

commit 928e8862b7ecaf53dfd7c431268b3af05247f385 Author: Akarshan Biswas <akarshanbiswas(a)akarshan-desk.biswasab.org&gt; Date: Tue Dec 11 12:42:50 2018 +0530 Add relax libva version check patch Signed-off-by: Akarshan Biswas <akarshan.biswas(a)gmail.com&gt; relax-libva-version.patch | 56 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) --- diff --git a/relax-libva-version.patch b/relax-libva-version.patch new file mode 100644 index 0000000..e297fd6 --- /dev/null +++ b/relax-libva-version.patch @@ -0,0 +1,56 @@ +From 6f1309ef8fe10965e4d0018b4f1b80ac6deccdaa Mon Sep 17 00:00:00 2001 +From: Azhar Shaikh <azhar.shaikh(a)intel.com&gt; +Date: Fri, 30 Nov 2018 23:11:57 +0000 +Subject: [PATCH] media/gpu/vaapi: Relax the version check for VA-API + +Since the newer versions of VA-API are ABI compatible, relax the +version checks for VA-API, by using VA_CHECK_VERSION(). +This will help in updating the libva to the latest releases, +while still supporting the old versions, till the new version of +libva is merged and picked by the builds. Thus ensuring that +hardware accleration is not broken while updating the libva. + +Bug: 905814 +TEST=libva-2.3.0 and libva-2.1.0 are able to do hardware acceleration. + +Suggested-by: Alexandre Courbot <acourbot(a)chromium.org&gt; +Signed-off-by: Azhar Shaikh <azhar.shaikh(a)intel.com&gt; +Change-Id: I510549f72290d20676927eeeeb89a87199c062af +Reviewed-on: https://chromium-review.googlesource.com/c/1352519 +Reviewed-by: Alexandre Courbot <acourbot(a)chromium.org&gt; +Reviewed-by: Hirokazu Honda <hiroh(a)chromium.org&gt; +Commit-Queue: Miguel Casas <mcasas(a)chromium.org&gt; +Cr-Commit-Position: refs/heads/master@{#612832} +--- + +diff --git a/AUTHORS b/AUTHORS +index 567fe15..ff42fc5 100644 +--- a/AUTHORS ++++ b/AUTHORS +@@ -103,6 +103,7 @@ + Attila Dusnoki <dati91(a)gmail.com&gt; + Avinaash Doreswamy <avi.nitk(a)samsung.com&gt; + Ayush Khandelwal <k.ayush(a)samsung.com&gt; ++Azhar Shaikh <azhar.shaikh(a)intel.com&gt; + Balazs Kelemen <b.kelemen(a)samsung.com&gt; + Baul Eun <baul.eun(a)samsung.com&gt; + Behara Mani Shyam Patro <behara.ms(a)samsung.com&gt; +diff --git a/media/gpu/vaapi/vaapi_wrapper.cc b/media/gpu/vaapi/vaapi_wrapper.cc +index b415642..053384d 100644 +--- a/media/gpu/vaapi/vaapi_wrapper.cc ++++ b/media/gpu/vaapi/vaapi_wrapper.cc +@@ -333,7 +333,13 @@ + DVLOG(1) << "VAAPI version: " << major_version << "." << minor_version << " " + << va_vendor_string_; + +- if (major_version != VA_MAJOR_VERSION || minor_version != VA_MINOR_VERSION) { ++ // The VAAPI version is determined from what is loaded on the system by ++ // calling vaInitialize(). We want a runtime evaluation of libva version, ++ // of what is loaded on the system, with, what browser is compiled with. ++ // Also since the libva is now ABI-compatible, relax the version check ++ // which helps in upgrading the libva, without breaking any existing ++ // functionality. ++ if (!VA_CHECK_VERSION(major_version, minor_version, 0)) { + LOG(ERROR) << "This build of Chromium requires VA-API version " + << VA_MAJOR_VERSION << "." << VA_MINOR_VERSION + << ", system version: " << major_version << "." << minor_version;