[FFmpeg-devel,1/5] lavu/opencl: replace va_ext.h with standard name

Submitted by Ruiling Song on Jan. 22, 2019, 7:15 a.m.

Details

Message ID 1548141337-32109-1-git-send-email-ruiling.song@intel.com
State Accepted
Commit 61cb505d18b8a335bd118d88c05b9daf40eb5f9b
Headers show

Commit Message

Ruiling Song Jan. 22, 2019, 7:15 a.m.
Khronos OpenCL header (https://github.com/KhronosGroup/OpenCL-Headers)
uses cl_va_api_media_sharing_intel.h. And Intel's official OpenCL driver
for Intel GPU (https://github.com/intel/compute-runtime) was compiled
against Khronos OpenCL header. So it's better to align with Khronos.

Signed-off-by: Ruiling Song <ruiling.song@intel.com>
---
 configure                    | 2 +-
 libavutil/hwcontext_opencl.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Comments

Ruiling Song March 13, 2019, 7:25 a.m.
> -----Original Message-----
> From: Song, Ruiling
> Sent: Tuesday, January 22, 2019 3:16 PM
> To: ffmpeg-devel@ffmpeg.org
> Cc: Song, Ruiling <ruiling.song@intel.com>
> Subject: [PATCH 1/5] lavu/opencl: replace va_ext.h with standard name
> 
> Khronos OpenCL header (https://github.com/KhronosGroup/OpenCL-Headers)
> uses cl_va_api_media_sharing_intel.h. And Intel's official OpenCL driver
> for Intel GPU (https://github.com/intel/compute-runtime) was compiled
> against Khronos OpenCL header. So it's better to align with Khronos.
> 
> Signed-off-by: Ruiling Song <ruiling.song@intel.com>
> ---
>  configure                    | 2 +-
>  libavutil/hwcontext_opencl.c | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
ping?
If nobody against, I will push the patchset next week.

Ruiling

Patch hide | download patch | download mbox

diff --git a/configure b/configure
index c2b8fac..48fdc8e 100755
--- a/configure
+++ b/configure
@@ -6427,7 +6427,7 @@  fi
 
 if enabled_all opencl vaapi ; then
     enabled opencl_drm_beignet && enable opencl_vaapi_beignet
-    check_type "CL/cl.h CL/va_ext.h" "clCreateFromVA_APIMediaSurfaceINTEL_fn" &&
+    check_type "CL/cl.h CL/cl_va_api_media_sharing_intel.h" "clCreateFromVA_APIMediaSurfaceINTEL_fn" &&
         enable opencl_vaapi_intel_media
 fi
 
diff --git a/libavutil/hwcontext_opencl.c b/libavutil/hwcontext_opencl.c
index d3df622..b116c5b 100644
--- a/libavutil/hwcontext_opencl.c
+++ b/libavutil/hwcontext_opencl.c
@@ -50,7 +50,7 @@ 
 #include <mfx/mfxstructures.h>
 #endif
 #include <va/va.h>
-#include <CL/va_ext.h>
+#include <CL/cl_va_api_media_sharing_intel.h>
 #include "hwcontext_vaapi.h"
 #endif