Commit a00763be authored by Mark Thompson's avatar Mark Thompson

configure: Use pkgconfig for VAAPI

Set the minimum version to 0.35.0 (libva 1.3.0) and remove redundant
configure tests.  This also allows the proprietary libmfx fork of libva,
which always shows the version number 0.99.0 (independent of the actual
version).
parent 009597ca
...@@ -2896,7 +2896,7 @@ vc1_vdpau_hwaccel_deps="vdpau" ...@@ -2896,7 +2896,7 @@ vc1_vdpau_hwaccel_deps="vdpau"
vc1_vdpau_hwaccel_select="vc1_decoder" vc1_vdpau_hwaccel_select="vc1_decoder"
vp8_nvdec_hwaccel_deps="nvdec" vp8_nvdec_hwaccel_deps="nvdec"
vp8_nvdec_hwaccel_select="vp8_decoder" vp8_nvdec_hwaccel_select="vp8_decoder"
vp8_vaapi_hwaccel_deps="vaapi VAPictureParameterBufferVP8" vp8_vaapi_hwaccel_deps="vaapi"
vp8_vaapi_hwaccel_select="vp8_decoder" vp8_vaapi_hwaccel_select="vp8_decoder"
vp9_d3d11va_hwaccel_deps="d3d11va DXVA_PicParams_VP9" vp9_d3d11va_hwaccel_deps="d3d11va DXVA_PicParams_VP9"
vp9_d3d11va_hwaccel_select="vp9_decoder" vp9_d3d11va_hwaccel_select="vp9_decoder"
...@@ -2951,7 +2951,6 @@ h264_qsv_decoder_select="h264_mp4toannexb_bsf h264_parser qsvdec" ...@@ -2951,7 +2951,6 @@ h264_qsv_decoder_select="h264_mp4toannexb_bsf h264_parser qsvdec"
h264_qsv_encoder_select="qsvenc" h264_qsv_encoder_select="qsvenc"
h264_rkmpp_decoder_deps="rkmpp" h264_rkmpp_decoder_deps="rkmpp"
h264_rkmpp_decoder_select="h264_mp4toannexb_bsf" h264_rkmpp_decoder_select="h264_mp4toannexb_bsf"
h264_vaapi_encoder_deps="VAEncPictureParameterBufferH264"
h264_vaapi_encoder_select="cbs_h264 vaapi_encode" h264_vaapi_encoder_select="cbs_h264 vaapi_encode"
h264_v4l2m2m_decoder_deps="v4l2_m2m h264_v4l2_m2m" h264_v4l2m2m_decoder_deps="v4l2_m2m h264_v4l2_m2m"
h264_v4l2m2m_encoder_deps="v4l2_m2m h264_v4l2_m2m" h264_v4l2m2m_encoder_deps="v4l2_m2m h264_v4l2_m2m"
...@@ -2982,7 +2981,6 @@ mpeg2_mmal_decoder_deps="mmal" ...@@ -2982,7 +2981,6 @@ mpeg2_mmal_decoder_deps="mmal"
mpeg2_mediacodec_decoder_deps="mediacodec" mpeg2_mediacodec_decoder_deps="mediacodec"
mpeg2_qsv_decoder_select="qsvdec mpegvideo_parser" mpeg2_qsv_decoder_select="qsvdec mpegvideo_parser"
mpeg2_qsv_encoder_select="qsvenc" mpeg2_qsv_encoder_select="qsvenc"
mpeg2_vaapi_encoder_deps="VAEncPictureParameterBufferMPEG2"
mpeg2_vaapi_encoder_select="cbs_mpeg2 vaapi_encode" mpeg2_vaapi_encoder_select="cbs_mpeg2 vaapi_encode"
mpeg2_v4l2m2m_decoder_deps="v4l2_m2m mpeg2_v4l2_m2m" mpeg2_v4l2m2m_decoder_deps="v4l2_m2m mpeg2_v4l2_m2m"
mpeg4_crystalhd_decoder_select="crystalhd" mpeg4_crystalhd_decoder_select="crystalhd"
...@@ -3371,7 +3369,7 @@ deconvolve_filter_select="fft" ...@@ -3371,7 +3369,7 @@ deconvolve_filter_select="fft"
deinterlace_qsv_filter_deps="libmfx" deinterlace_qsv_filter_deps="libmfx"
deinterlace_vaapi_filter_deps="vaapi" deinterlace_vaapi_filter_deps="vaapi"
delogo_filter_deps="gpl" delogo_filter_deps="gpl"
denoise_vaapi_filter_deps="vaapi VAProcPipelineParameterBuffer" denoise_vaapi_filter_deps="vaapi"
deshake_filter_select="pixelutils" deshake_filter_select="pixelutils"
dilation_opencl_filter_deps="opencl" dilation_opencl_filter_deps="opencl"
drawtext_filter_deps="libfreetype" drawtext_filter_deps="libfreetype"
...@@ -3419,7 +3417,7 @@ phase_filter_deps="gpl" ...@@ -3419,7 +3417,7 @@ phase_filter_deps="gpl"
pp7_filter_deps="gpl" pp7_filter_deps="gpl"
pp_filter_deps="gpl postproc" pp_filter_deps="gpl postproc"
prewitt_opencl_filter_deps="opencl" prewitt_opencl_filter_deps="opencl"
procamp_vaapi_filter_deps="vaapi VAProcPipelineParameterBuffer" procamp_vaapi_filter_deps="vaapi"
program_opencl_filter_deps="opencl" program_opencl_filter_deps="opencl"
pullup_filter_deps="gpl" pullup_filter_deps="gpl"
removelogo_filter_deps="avcodec avformat swscale" removelogo_filter_deps="avcodec avformat swscale"
...@@ -3432,7 +3430,7 @@ scale2ref_filter_deps="swscale" ...@@ -3432,7 +3430,7 @@ scale2ref_filter_deps="swscale"
scale_filter_deps="swscale" scale_filter_deps="swscale"
scale_qsv_filter_deps="libmfx" scale_qsv_filter_deps="libmfx"
select_filter_select="pixelutils" select_filter_select="pixelutils"
sharpness_vaapi_filter_deps="vaapi VAProcPipelineParameterBuffer" sharpness_vaapi_filter_deps="vaapi"
showcqt_filter_deps="avcodec avformat swscale" showcqt_filter_deps="avcodec avformat swscale"
showcqt_filter_suggest="libfontconfig libfreetype" showcqt_filter_suggest="libfontconfig libfreetype"
showcqt_filter_select="fft" showcqt_filter_select="fft"
...@@ -3471,7 +3469,7 @@ libvmaf_filter_deps="libvmaf pthreads" ...@@ -3471,7 +3469,7 @@ libvmaf_filter_deps="libvmaf pthreads"
zmq_filter_deps="libzmq" zmq_filter_deps="libzmq"
zoompan_filter_deps="swscale" zoompan_filter_deps="swscale"
zscale_filter_deps="libzimg const_nan" zscale_filter_deps="libzimg const_nan"
scale_vaapi_filter_deps="vaapi VAProcPipelineParameterBuffer" scale_vaapi_filter_deps="vaapi"
vpp_qsv_filter_deps="libmfx" vpp_qsv_filter_deps="libmfx"
vpp_qsv_filter_select="qsvvpp" vpp_qsv_filter_select="qsvvpp"
...@@ -5954,13 +5952,9 @@ check_type "windows.h d3d11.h" "ID3D11VideoContext" ...@@ -5954,13 +5952,9 @@ check_type "windows.h d3d11.h" "ID3D11VideoContext"
check_type "d3d9.h dxva2api.h" DXVA2_ConfigPictureDecode -D_WIN32_WINNT=0x0602 check_type "d3d9.h dxva2api.h" DXVA2_ConfigPictureDecode -D_WIN32_WINNT=0x0602
check_type "va/va.h va/va_dec_hevc.h" "VAPictureParameterBufferHEVC" check_type "va/va.h va/va_dec_hevc.h" "VAPictureParameterBufferHEVC"
check_type "va/va.h va/va_dec_vp8.h" "VAPictureParameterBufferVP8"
check_struct "va/va.h" "VADecPictureParameterBufferVP9" bit_depth check_struct "va/va.h" "VADecPictureParameterBufferVP9" bit_depth
check_type "va/va.h va/va_vpp.h" "VAProcPipelineParameterBuffer"
check_type "va/va.h va/va_enc_h264.h" "VAEncPictureParameterBufferH264"
check_type "va/va.h va/va_enc_hevc.h" "VAEncPictureParameterBufferHEVC" check_type "va/va.h va/va_enc_hevc.h" "VAEncPictureParameterBufferHEVC"
check_type "va/va.h va/va_enc_jpeg.h" "VAEncPictureParameterBufferJPEG" check_type "va/va.h va/va_enc_jpeg.h" "VAEncPictureParameterBufferJPEG"
check_type "va/va.h va/va_enc_mpeg2.h" "VAEncPictureParameterBufferMPEG2"
check_type "va/va.h va/va_enc_vp8.h" "VAEncPictureParameterBufferVP8" check_type "va/va.h va/va_enc_vp8.h" "VAEncPictureParameterBufferVP8"
check_type "va/va.h va/va_enc_vp9.h" "VAEncPictureParameterBufferVP9" check_type "va/va.h va/va_enc_vp9.h" "VAEncPictureParameterBufferVP9"
...@@ -6378,18 +6372,17 @@ test_cpp <<EOF && enable uwp && d3d11va_extralibs="-ldxgi -ld3d11" ...@@ -6378,18 +6372,17 @@ test_cpp <<EOF && enable uwp && d3d11va_extralibs="-ldxgi -ld3d11"
EOF EOF
enabled vaapi && enabled vaapi &&
check_lib vaapi va/va.h vaInitialize -lva check_pkg_config vaapi "libva >= 0.35.0" "va/va.h" vaInitialize
enabled vaapi &&
check_cc vaapi "va/va.h" "vaCreateSurfaces(0, 0, 0, 0, 0, 0, 0, 0)"
if enabled vaapi; then if enabled vaapi; then
check_lib vaapi_drm "va/va.h va/va_drm.h" vaGetDisplayDRM -lva -lva-drm check_pkg_config vaapi_drm "libva-drm" "va/va_drm.h" vaGetDisplayDRM
check_lib vaapi_x11 "va/va.h va/va_x11.h" vaGetDisplay -lva -lva-x11 -lX11
fi if enabled xlib; then
check_pkg_config vaapi_x11 "libva-x11" "va/va_x11.h" vaGetDisplay
fi
enabled vaapi &&
check_cpp_condition vaapi_1 "va/va.h" "VA_CHECK_VERSION(1, 0, 0)" check_cpp_condition vaapi_1 "va/va.h" "VA_CHECK_VERSION(1, 0, 0)"
fi
if enabled_all opencl libdrm ; then if enabled_all opencl libdrm ; then
check_type "CL/cl_intel.h" "clCreateImageFromFdINTEL_fn" && check_type "CL/cl_intel.h" "clCreateImageFromFdINTEL_fn" &&
......
...@@ -389,9 +389,7 @@ static const struct { ...@@ -389,9 +389,7 @@ static const struct {
MAP(VC1, VC1_MAIN, VC1Main ), MAP(VC1, VC1_MAIN, VC1Main ),
MAP(VC1, VC1_COMPLEX, VC1Advanced ), MAP(VC1, VC1_COMPLEX, VC1Advanced ),
MAP(VC1, VC1_ADVANCED, VC1Advanced ), MAP(VC1, VC1_ADVANCED, VC1Advanced ),
#if VA_CHECK_VERSION(0, 35, 0)
MAP(VP8, UNKNOWN, VP8Version0_3 ), MAP(VP8, UNKNOWN, VP8Version0_3 ),
#endif
#if VA_CHECK_VERSION(0, 38, 0) #if VA_CHECK_VERSION(0, 38, 0)
MAP(VP9, VP9_0, VP9Profile0 ), MAP(VP9, VP9_0, VP9Profile0 ),
#endif #endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment