vaapi: bump the minimum vaapi version requirement to 0.39.0

And reduce unnecessary API version and structures check as well.

https://gitlab.freedesktop.org/gstreamer/gstreamer-vaapi/issues/108

1 files changed, 5 insertions, 53 deletions

diff --git a/meson.build b/meson.build
index 1cfb72c5..070387cd 100644
--- a/meson.build
+++ b/meson.build
@@ -15,7 +15,7 @@ else
   gst_version_nano = 0
 endif
 
-libva_req = ['>= 0.30.4', '!= 0.99.0']
+libva_req = ['>= 0.39.0', '!= 0.99.0']
 glib_req = '>= 2.40.0'
 gst_req = '>= @0@.@1@.0'.format(gst_version_major, gst_version_minor)
 
@@ -54,9 +54,9 @@ gstgl_dep = dependency('gstreamer-gl-1.0', version : gst_req,
 gmodule_dep = dependency('gmodule-2.0', required: false)
 libva_dep = dependency('libva', version: libva_req)
 
-libva_drm_dep = dependency('libva-drm', version: '>= 0.33.0', required: false)
-libva_wayland_dep = dependency('libva-wayland', version: '>= 0.33.0', required: false)
-libva_x11_dep = dependency('libva-x11', version: '>= 0.31.0', required: false)
+libva_drm_dep = dependency('libva-drm', version: libva_req, required: false)
+libva_wayland_dep = dependency('libva-wayland', version: libva_req, required: false)
+libva_x11_dep = dependency('libva-x11', version: libva_req, required: false)
 libdrm_dep = dependency('libdrm', required: false)
 libudev_dep = dependency('libudev', required: false)
 egl_dep = dependency('egl', required: false)
@@ -84,18 +84,9 @@ if glesv2_dep.found()
   endif
 endif
 
-USE_ENCODERS = libva_dep.version().version_compare('>= 0.34.0') and get_option('with_encoders') != 'no'
-USE_H265_DECODER = cc.has_header('va/va_dec_hevc.h', dependencies: libva_dep, prefix: '#include <va/va.h>')
-USE_H265_ENCODER = USE_ENCODERS and cc.has_header('va/va_enc_hevc.h', dependencies: libva_dep, prefix: '#include <va/va.h>')
-USE_JPEG_DECODER = cc.has_header('va/va_dec_jpeg.h', dependencies: libva_dep, prefix: '#include <va/va.h>')
-USE_JPEG_ENCODER = USE_ENCODERS and cc.has_header('va/va_enc_jpeg.h', dependencies: libva_dep, prefix: '#include <va/va.h>')
-USE_VP8_DECODER = cc.has_header('va/va_dec_vp8.h', dependencies: libva_dep, prefix: '#include <va/va.h>')
-USE_VP8_ENCODER = USE_ENCODERS and cc.has_header('va/va_enc_vp8.h', dependencies: libva_dep, prefix: '#include <va/va.h>')
-USE_VP9_DECODER = cc.has_header('va/va_dec_vp9.h', dependencies: libva_dep, prefix: '#include <va/va.h>')
+USE_ENCODERS = get_option('with_encoders') != 'no'
 USE_VP9_ENCODER = USE_ENCODERS and cc.has_header('va/va_enc_vp9.h', dependencies: libva_dep, prefix: '#include <va/va.h>')
 
-USE_VPP = cc.has_header('va/va_vpp.h', dependencies: libva_dep, prefix: '#include <va/va_vpp.h>')
-
 USE_DRM = libva_drm_dep.found() and libdrm_dep.found() and libudev_dep.found() and get_option('with_drm') != 'no'
 USE_EGL = gmodule_dep.found() and egl_dep.found() and GLES_VERSION_MASK != 0 and get_option('with_egl') != 'no'
 USE_GLX = libva_x11_dep.found() and x11_dep.found() and gl_dep.found() and libdl_dep.found() and get_option('with_glx') != 'no'
@@ -120,54 +111,15 @@ cdata.set10('USE_DRM', USE_DRM)
 cdata.set10('USE_EGL', USE_EGL)
 cdata.set10('USE_ENCODERS', USE_ENCODERS)
 cdata.set10('USE_GLX', USE_GLX)
-cdata.set10('USE_H265_DECODER', USE_H265_DECODER)
-cdata.set10('USE_H265_ENCODER', USE_H265_ENCODER)
-cdata.set10('USE_JPEG_DECODER', USE_JPEG_DECODER)
-cdata.set10('USE_JPEG_ENCODER', USE_JPEG_ENCODER)
-cdata.set10('USE_VP8_DECODER', USE_VP8_DECODER)
-cdata.set10('USE_VP8_ENCODER', USE_VP8_ENCODER)
-cdata.set10('USE_VP9_DECODER', USE_VP9_DECODER)
 cdata.set10('USE_VP9_ENCODER', USE_VP9_ENCODER)
 cdata.set10('USE_WAYLAND', USE_WAYLAND)
 cdata.set10('USE_X11', USE_X11)
 cdata.set10('HAVE_XKBLIB', cc.has_header('X11/XKBlib.h', dependencies: x11_dep))
 cdata.set10('HAVE_XRANDR', xrandr_dep.found())
 cdata.set10('HAVE_XRENDER', xrender_dep.found())
-cdata.set10('USE_VA_VPP', USE_VPP)
 cdata.set10('USE_GST_GL_HELPERS', gstgl_dep.found())
 cdata.set('USE_GLES_VERSION_MASK', GLES_VERSION_MASK)
 
-if libva_dep.version().version_compare('< 0.38.0')
-  check_headers = [
-    [USE_H265_DECODER, 'HAVE_VA_VA_DEC_HEVC_H'],
-    [USE_H265_ENCODER, 'HAVE_VA_VA_ENC_HEVC_H'],
-    [USE_JPEG_DECODER, 'HAVE_VA_VA_DEC_JPEG_H'],
-    [USE_JPEG_ENCODER, 'HAVE_VA_VA_ENC_JPEG_H'],
-    [USE_VP8_DECODER, 'HAVE_VA_VA_DEC_VP8_H'],
-    [USE_VP8_ENCODER, 'HAVE_VA_VA_ENC_VP8_H'],
-    [USE_VP9_DECODER, 'HAVE_VA_VA_DEC_VP9_H'],
-    [USE_VP9_ENCODER, 'HAVE_VA_VA_DEC_VP9_H'],
-    [USE_VPP, 'HAVE_VA_VA_VPP_H'],
-  ]
-  foreach h : check_headers
-    if h.get(0)
-      cdata.set(h.get(1), 1)
-    endif
-  endforeach
-
-  if USE_ENCODERS
-    check_headers = [
-      ['HAVE_VA_VA_ENC_MPEG2_H', 'va/va_enc_mpeg2.h'],
-      ['HAVE_VA_VA_ENC_H264_H', 'va/va_enc_h264.h'],
-    ]
-    foreach h : check_headers
-      if cc.has_header(h.get(1), dependencies: libva_dep, prefix: '#include <va/va.h>')
-        cdata.set(h.get(0), 1)
-      endif
-    endforeach
-  endif
-endif
-
 api_version = '1.0'
 soversion = 0
 # maintaining compatibility with the previous libtool versioning