fallback path & sample timing implemented

fixed trailing whitespaces
renamed files *vaapi* to *va_intel*
changed names vaapi* to va_intel*

cmake/OpenCVFindLibsVideo.cmake

@@ -318,10 +318,18 @@ if(WITH_GPHOTO2)
   CHECK_MODULE(libgphoto2 HAVE_GPHOTO2)
 endif(WITH_GPHOTO2)
 
-# --- VA-API ---
-if(WITH_VAAPI)
-  include("${OpenCV_SOURCE_DIR}/cmake/OpenCVFindVAAPI.cmake")
-  if(VAAPI_IOCL_INCLUDE_DIR)
-    ocv_include_directories(${VAAPI_IOCL_INCLUDE_DIR})
+# --- VA & VA_INTEL ---
+if(WITH_VA_INTEL)
+  include("${OpenCV_SOURCE_DIR}/cmake/OpenCVFindVA_INTEL.cmake")
+  if(VA_INTEL_IOCL_INCLUDE_DIR)
+    ocv_include_directories(${VA_INTEL_IOCL_INCLUDE_DIR})
   endif()
-endif(WITH_VAAPI)
+  set(WITH_VA YES)
+endif(WITH_VA_INTEL)
+
+if(WITH_VA)
+  include("${OpenCV_SOURCE_DIR}/cmake/OpenCVFindVA.cmake")
+  if(VA_INCLUDE_DIR)
+    ocv_include_directories(${VA_INCLUDE_DIR})
+  endif()
+endif(WITH_VA)

cmake/OpenCVFindVA.cmake

@@ -0,0 +1,19 @@
+# Main variables:
+# HAVE_VA for conditional compilation OpenCV with/without libva
+
+if(UNIX AND NOT ANDROID)
+    find_path(
+    VA_INCLUDE_DIR
+    NAMES va/va.h
+    PATHS "/usr/include"
+    PATH_SUFFIXES include
+    DOC "Path to libva headers")
+endif()
+
+if(VA_INCLUDE_DIR)
+    set(HAVE_VA TRUE)
+    set(VA_LIBRARIES "-lva")
+else()
+    set(HAVE_VA FALSE)
+    message(WARNING "libva installation is not found.")
+endif()

cmake/OpenCVFindVAAPI.cmake

@@ -1,44 +0,0 @@
-# Main variables:
-# VAAPI_MSDK_INCLUDE_DIR and VAAPI_IOCL_INCLUDE_DIR to use VAAPI
-# HAVE_VAAPI for conditional compilation OpenCV with/without VAAPI
-
-# VAAPI_MSDK_ROOT - root of Intel MSDK installation
-# VAAPI_IOCL_ROOT - root of Intel OCL installation
-
-if(UNIX AND NOT ANDROID)
-    if($ENV{VAAPI_MSDK_ROOT})
-        set(VAAPI_MSDK_ROOT $ENV{VAAPI_MSDK_ROOT})
-    else()
-        set(VAAPI_MSDK_ROOT "/opt/intel/mediasdk")
-    endif()
-
-    if($ENV{VAAPI_IOCL_ROOT})
-        set(VAAPI_IOCL_ROOT $ENV{VAAPI_IOCL_ROOT})
-    else()
-        set(VAAPI_IOCL_ROOT "/opt/intel/opencl")
-    endif()
-
-    find_path(
-    VAAPI_MSDK_INCLUDE_DIR
-    NAMES mfxdefs.h
-    PATHS ${VAAPI_MSDK_ROOT}
-    PATH_SUFFIXES include
-    DOC "Path to Intel MSDK headers")
-
-    find_path(
-    VAAPI_IOCL_INCLUDE_DIR
-    NAMES CL/va_ext.h
-    PATHS ${VAAPI_IOCL_ROOT}
-    PATH_SUFFIXES include
-    DOC "Path to Intel OpenCL headers")
-endif()
-
-if(VAAPI_MSDK_INCLUDE_DIR AND VAAPI_IOCL_INCLUDE_DIR)
-    set(HAVE_VAAPI TRUE)
-    set(VAAPI_EXTRA_LIBS "-lva" "-lva-drm")
-else()
-    set(HAVE_VAAPI FALSE)
-    message(WARNING "Intel MSDK & OpenCL installation is not found.")
-endif()
-
-mark_as_advanced(FORCE VAAPI_MSDK_INCLUDE_DIR VAAPI_IOCL_INCLUDE_DIR)

cmake/OpenCVFindVA_INTEL.cmake

@@ -0,0 +1,44 @@
+# Main variables:
+# VA_INTEL_MSDK_INCLUDE_DIR and VA_INTEL_IOCL_INCLUDE_DIR to use VA_INTEL
+# HAVE_VA_INTEL for conditional compilation OpenCV with/without VA_INTEL
+
+# VA_INTEL_MSDK_ROOT - root of Intel MSDK installation
+# VA_INTEL_IOCL_ROOT - root of Intel OCL installation
+
+if(UNIX AND NOT ANDROID)
+    if($ENV{VA_INTEL_MSDK_ROOT})
+        set(VA_INTEL_MSDK_ROOT $ENV{VA_INTEL_MSDK_ROOT})
+    else()
+        set(VA_INTEL_MSDK_ROOT "/opt/intel/mediasdk")
+    endif()
+
+    if($ENV{VA_INTEL_IOCL_ROOT})
+        set(VA_INTEL_IOCL_ROOT $ENV{VA_INTEL_IOCL_ROOT})
+    else()
+        set(VA_INTEL_IOCL_ROOT "/opt/intel/opencl")
+    endif()
+
+    find_path(
+    VA_INTEL_MSDK_INCLUDE_DIR
+    NAMES mfxdefs.h
+    PATHS ${VA_INTEL_MSDK_ROOT}
+    PATH_SUFFIXES include
+    DOC "Path to Intel MSDK headers")
+
+    find_path(
+    VA_INTEL_IOCL_INCLUDE_DIR
+    NAMES CL/va_ext.h
+    PATHS ${VA_INTEL_IOCL_ROOT}
+    PATH_SUFFIXES include
+    DOC "Path to Intel OpenCL headers")
+endif()
+
+if(VA_INTEL_MSDK_INCLUDE_DIR AND VA_INTEL_IOCL_INCLUDE_DIR)
+    set(HAVE_VA_INTEL TRUE)
+    set(VA_INTEL_LIBRARIES "-lva" "-lva-drm")
+else()
+    set(HAVE_VA_INTEL FALSE)
+    message(WARNING "Intel MSDK & OpenCL installation is not found.")
+endif()
+
+mark_as_advanced(FORCE VA_INTEL_MSDK_INCLUDE_DIR VA_INTEL_IOCL_INCLUDE_DIR)

cmake/templates/cvconfig.h.in

@@ -189,5 +189,8 @@
 /* gPhoto2 library */
 #cmakedefine HAVE_GPHOTO2
 
-/* Intel VA-API */
-#cmakedefine HAVE_VAAPI
+/* VA library (libva) */
+#cmakedefine HAVE_VA
+
+/* Intel VA-API/OpenCL */
+#cmakedefine HAVE_VA_INTEL