virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-04-02 20:35:37 +02:00
Code Issues Releases Activity

configure: fix check for opencl_vaapi_intel_media.

Browse Source 
opencl_vaapi_intel_media doesn't depend on libmfx, OpenCL™ Drivers
and Runtimes for Intel® Architectureis is a standalone release, more
information can be found in the link:
https://software.intel.com/en-us/articles/opencl-drivers.

Signed-off-by: Jun Zhao <mypopydev@gmail.com>
This commit is contained in:
Jun Zhao 2018-06-02 11:06:50 +08:00 committed by Jun Zhao
parent 08b1d1d812
commit 2730a0fdf4
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure vendored
View File

@ -6336,11 +6336,9 @@ fi
if enabled_all opencl vaapi ; then if enabled_all opencl vaapi ; then
enabled opencl_drm_beignet && enable opencl_vaapi_beignet enabled opencl_drm_beignet && enable opencl_vaapi_beignet
if enabled libmfx ; then
check_type "CL/cl.h CL/va_ext.h" "clCreateFromVA_APIMediaSurfaceINTEL_fn" && check_type "CL/cl.h CL/va_ext.h" "clCreateFromVA_APIMediaSurfaceINTEL_fn" &&
enable opencl_vaapi_intel_media enable opencl_vaapi_intel_media
fi fi
fi
if enabled_all opencl dxva2 ; then if enabled_all opencl dxva2 ; then
check_type "CL/cl_dx9_media_sharing.h" cl_dx9_surface_info_khr && check_type "CL/cl_dx9_media_sharing.h" cl_dx9_surface_info_khr &&

7
libavutil/hwcontext_opencl.c
View File

@ -46,7 +46,9 @@
#endif #endif
#if HAVE_OPENCL_VAAPI_INTEL_MEDIA #if HAVE_OPENCL_VAAPI_INTEL_MEDIA
#if CONFIG_LIBMFX
#include <mfx/mfxstructures.h> #include <mfx/mfxstructures.h>
#endif
#include <va/va.h> #include <va/va.h>
#include <CL/va_ext.h> #include <CL/va_ext.h>
#include "hwcontext_vaapi.h" #include "hwcontext_vaapi.h"
@ -2245,10 +2247,13 @@ static int opencl_map_from_qsv(AVHWFramesContext *dst_fc, AVFrame *dst,
cl_int cle; cl_int cle;
int err, p; int err, p;
#if CONFIG_LIBMFX
if (src->format == AV_PIX_FMT_QSV) { if (src->format == AV_PIX_FMT_QSV) {
mfxFrameSurface1 *mfx_surface = (mfxFrameSurface1*)src->data[3]; mfxFrameSurface1 *mfx_surface = (mfxFrameSurface1*)src->data[3];
va_surface = *(VASurfaceID*)mfx_surface->Data.MemId; va_surface = *(VASurfaceID*)mfx_surface->Data.MemId;
} else if (src->format == AV_PIX_FMT_VAAPI) { } else
#endif
if (src->format == AV_PIX_FMT_VAAPI) {
va_surface = (VASurfaceID)(uintptr_t)src->data[3]; va_surface = (VASurfaceID)(uintptr_t)src->data[3];
} else { } else {
return AVERROR(ENOSYS); return AVERROR(ENOSYS);