update ffmpeg hunterizations (see detect_ffmpeg.cmake)

Akhil Kumar · rbsheth · commit bf48d65d96ae · 2022-02-23T16:03:57.000-06:00
fix ffmpeg build test

find eigen3 dependecy automatically

fixed broken if

got rid of CHECK_MODULE and ALIASOF
diff --git a/cmake/OpenCVFindLibsVideo.cmake b/cmake/OpenCVFindLibsVideo.cmake
@@ -1,280 +1,3 @@
-# ----------------------------------------------------------------------------
-#  Detect 3rd-party video IO libraries
-# ----------------------------------------------------------------------------
-
-# --- GStreamer ---
-ocv_clear_vars(HAVE_GSTREAMER)
-# try to find gstreamer 1.x first if 0.10 was not requested
-if(WITH_GSTREAMER AND NOT WITH_GSTREAMER_0_10)
-  if(WIN32)
-    SET(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH};${CMAKE_CURRENT_LIST_DIR}")
-    FIND_PACKAGE(GstreamerWindows)
-    IF(GSTREAMER_gstbase_LIBRARY AND GSTREAMER_gstvideo_LIBRARY AND GSTREAMER_gstapp_LIBRARY AND GSTREAMER_gstpbutils_LIBRARY AND GSTREAMER_gstriff_LIBRARY)
-      set(HAVE_GSTREAMER TRUE)
-      set(GSTREAMER_BASE_VERSION 1.0)
-      set(GSTREAMER_VIDEO_VERSION 1.0)
-      set(GSTREAMER_APP_VERSION 1.0)
-      set(GSTREAMER_RIFF_VERSION 1.0)
-      set(GSTREAMER_PBUTILS_VERSION 1.0)
-    ENDIF(GSTREAMER_gstbase_LIBRARY AND GSTREAMER_gstvideo_LIBRARY AND GSTREAMER_gstapp_LIBRARY AND GSTREAMER_gstpbutils_LIBRARY AND GSTREAMER_gstriff_LIBRARY)
-
-  else(WIN32)
-    CHECK_MODULE(gstreamer-base-1.0 HAVE_GSTREAMER_BASE VIDEOIO)
-    CHECK_MODULE(gstreamer-video-1.0 HAVE_GSTREAMER_VIDEO VIDEOIO)
-    CHECK_MODULE(gstreamer-app-1.0 HAVE_GSTREAMER_APP VIDEOIO)
-    CHECK_MODULE(gstreamer-riff-1.0 HAVE_GSTREAMER_RIFF VIDEOIO)
-    CHECK_MODULE(gstreamer-pbutils-1.0 HAVE_GSTREAMER_PBUTILS VIDEOIO)
-
-    if(HAVE_GSTREAMER_BASE AND HAVE_GSTREAMER_VIDEO AND HAVE_GSTREAMER_APP AND HAVE_GSTREAMER_RIFF AND HAVE_GSTREAMER_PBUTILS)
-      set(HAVE_GSTREAMER TRUE)
-      set(GSTREAMER_BASE_VERSION ${ALIASOF_gstreamer-base-1.0_VERSION})
-      set(GSTREAMER_VIDEO_VERSION ${ALIASOF_gstreamer-video-1.0_VERSION})
-      set(GSTREAMER_APP_VERSION ${ALIASOF_gstreamer-app-1.0_VERSION})
-      set(GSTREAMER_RIFF_VERSION ${ALIASOF_gstreamer-riff-1.0_VERSION})
-      set(GSTREAMER_PBUTILS_VERSION ${ALIASOF_gstreamer-pbutils-1.0_VERSION})
-    endif()
-  endif(WIN32)
-endif(WITH_GSTREAMER AND NOT WITH_GSTREAMER_0_10)
-
-# if gstreamer 1.x was not found, or we specified we wanted 0.10, try to find it
-if(WITH_GSTREAMER AND NOT HAVE_GSTREAMER OR WITH_GSTREAMER_0_10)
-  CHECK_MODULE(gstreamer-base-0.10 HAVE_GSTREAMER_BASE VIDEOIO)
-  CHECK_MODULE(gstreamer-video-0.10 HAVE_GSTREAMER_VIDEO VIDEOIO)
-  CHECK_MODULE(gstreamer-app-0.10 HAVE_GSTREAMER_APP VIDEOIO)
-  CHECK_MODULE(gstreamer-riff-0.10 HAVE_GSTREAMER_RIFF VIDEOIO)
-  CHECK_MODULE(gstreamer-pbutils-0.10 HAVE_GSTREAMER_PBUTILS VIDEOIO)
-
-  if(HAVE_GSTREAMER_BASE AND HAVE_GSTREAMER_VIDEO AND HAVE_GSTREAMER_APP AND HAVE_GSTREAMER_RIFF AND HAVE_GSTREAMER_PBUTILS)
-      set(HAVE_GSTREAMER TRUE)
-      set(GSTREAMER_BASE_VERSION ${ALIASOF_gstreamer-base-0.10_VERSION})
-      set(GSTREAMER_VIDEO_VERSION ${ALIASOF_gstreamer-video-0.10_VERSION})
-      set(GSTREAMER_APP_VERSION ${ALIASOF_gstreamer-app-0.10_VERSION})
-      set(GSTREAMER_RIFF_VERSION ${ALIASOF_gstreamer-riff-0.10_VERSION})
-      set(GSTREAMER_PBUTILS_VERSION ${ALIASOF_gstreamer-pbutils-0.10_VERSION})
-  endif()
-endif(WITH_GSTREAMER AND NOT HAVE_GSTREAMER OR WITH_GSTREAMER_0_10)
-
-# --- PvApi ---
-ocv_clear_vars(HAVE_PVAPI)
-if(WITH_PVAPI)
-  find_path(PVAPI_INCLUDE_PATH "PvApi.h"
-            PATHS /usr/local /opt /usr ENV ProgramFiles ENV ProgramW6432
-            PATH_SUFFIXES include "Allied Vision Technologies/GigESDK/inc-pc" "AVT GigE SDK/inc-pc" "GigESDK/inc-pc"
-            DOC "The path to PvAPI header")
-
-  if(PVAPI_INCLUDE_PATH)
-    if(X86 AND NOT WIN32)
-      set(PVAPI_SDK_SUBDIR x86)
-    elseif(X86_64)
-      set(PVAPI_SDK_SUBDIR x64)
-    elseif(ARM)
-      set(PVAPI_SDK_SUBDIR arm)
-    endif()
-
-    get_filename_component(_PVAPI_LIBRARY_HINT "${PVAPI_INCLUDE_PATH}/../lib-pc" ABSOLUTE)
-
-    find_library(PVAPI_LIBRARY NAMES "PvAPI" PATHS "${_PVAPI_LIBRARY_HINT}")
-
-    if(PVAPI_LIBRARY)
-      if(WIN32)
-        if(MINGW)
-          set(PVAPI_DEFINITIONS "-DPVDECL=__stdcall")
-        endif(MINGW)
-      endif()
-      set(HAVE_PVAPI TRUE)
-    endif()
-  endif(PVAPI_INCLUDE_PATH)
-endif(WITH_PVAPI)
-
-# --- GigEVisionSDK ---
-ocv_clear_vars(HAVE_GIGE_API)
-if(WITH_GIGEAPI)
-  find_path(GIGEAPI_INCLUDE_PATH "GigEVisionSDK.h"
-            PATHS /usr/local /var /opt /usr ENV ProgramFiles ENV ProgramW6432
-            PATH_SUFFIXES include "Smartek Vision Technologies/GigEVisionSDK/gige_cpp" "GigEVisionSDK/gige_cpp" "GigEVisionSDK/gige_c"
-            DOC "The path to Smartek GigEVisionSDK header")
-  FIND_LIBRARY(GIGEAPI_LIBRARIES NAMES GigEVisionSDK)
-  if(GIGEAPI_LIBRARIES AND GIGEAPI_INCLUDE_PATH)
-    set(HAVE_GIGE_API TRUE)
-  endif()
-endif(WITH_GIGEAPI)
-
-# --- Aravis SDK ---
-ocv_clear_vars(HAVE_ARAVIS_API)
-if(WITH_ARAVIS)
-  check_module(glib-2.0 HAVE_ARAVIS_GLIB VIDEOIO)
-  if(HAVE_ARAVIS_GLIB)
-    find_path(ARAVIS_INCLUDE_PATH "arv.h"
-              PATHS /usr/local /var /opt /usr ENV ProgramFiles ENV ProgramW6432
-              PATH_SUFFIXES include "aravis-0.6" "aravis-0.4"
-              DOC "The path to Aravis SDK headers")
-    find_library(ARAVIS_LIBRARIES NAMES "aravis-0.6" "aravis-0.4" )
-    if(ARAVIS_LIBRARIES AND ARAVIS_INCLUDE_PATH)
-      set(HAVE_ARAVIS_API TRUE)
-    endif()
-  else()
-    message("Can not build Aravis support without glib2")
-  endif()
-endif(WITH_ARAVIS)
-
-# --- Dc1394 ---
-ocv_clear_vars(HAVE_DC1394 HAVE_DC1394_2)
-if(WITH_1394)
-  if(WIN32 AND MINGW)
-      find_path(CMU1394_INCLUDE_PATH "/1394common.h"
-                PATH_SUFFIXES include
-                DOC "The path to cmu1394 headers")
-      find_path(DC1394_2_INCLUDE_PATH "/dc1394/dc1394.h"
-                PATH_SUFFIXES include
-                DOC "The path to DC1394 2.x headers")
-      if(CMU1394_INCLUDE_PATH AND DC1394_2_INCLUDE_PATH)
-        set(CMU1394_LIB_DIR  "${CMU1394_INCLUDE_PATH}/../lib"  CACHE PATH "Full path of CMU1394 library directory")
-        set(DC1394_2_LIB_DIR "${DC1394_2_INCLUDE_PATH}/../lib" CACHE PATH "Full path of DC1394 2.x library directory")
-        if(EXISTS "${CMU1394_LIB_DIR}/lib1394camera.a" AND EXISTS "${DC1394_2_LIB_DIR}/libdc1394.a")
-          set(HAVE_DC1394_2 TRUE)
-        endif()
-      endif()
-      if(HAVE_DC1394_2)
-        ocv_parse_pkg("libdc1394-2" "${DC1394_2_LIB_DIR}/pkgconfig" "")
-        ocv_include_directories(${DC1394_2_INCLUDE_PATH})
-        set(VIDEOIO_LIBRARIES ${VIDEOIO_LIBRARIES}
-            "${DC1394_2_LIB_DIR}/libdc1394.a"
-            "${CMU1394_LIB_DIR}/lib1394camera.a")
-      endif(HAVE_DC1394_2)
-  else(WIN32 AND MINGW)
-    CHECK_MODULE(libdc1394-2 HAVE_DC1394_2 VIDEOIO)
-    if(NOT HAVE_DC1394_2)
-      CHECK_MODULE(libdc1394 HAVE_DC1394 VIDEOIO)
-    endif()
-  endif(WIN32 AND MINGW)
-endif(WITH_1394)
-
-# --- xine ---
-ocv_clear_vars(HAVE_XINE)
-if(WITH_XINE)
-  CHECK_MODULE(libxine HAVE_XINE VIDEOIO)
-endif(WITH_XINE)
-
-# --- V4L ---
-ocv_clear_vars(HAVE_CAMV4L2 HAVE_VIDEOIO)
-if(WITH_V4L)
-  CHECK_INCLUDE_FILE(linux/videodev2.h HAVE_CAMV4L2)
-  CHECK_INCLUDE_FILE(sys/videoio.h HAVE_VIDEOIO)
-endif(WITH_V4L)
-
-# --- OpenNI ---
-ocv_clear_vars(HAVE_OPENNI HAVE_OPENNI_PRIME_SENSOR_MODULE)
-if(WITH_OPENNI)
-  include("${OpenCV_SOURCE_DIR}/cmake/OpenCVFindOpenNI.cmake")
-endif(WITH_OPENNI)
-
-ocv_clear_vars(HAVE_OPENNI2)
-if(WITH_OPENNI2)
-  include("${OpenCV_SOURCE_DIR}/cmake/OpenCVFindOpenNI2.cmake")
-endif(WITH_OPENNI2)
-
-# --- XIMEA ---
-ocv_clear_vars(HAVE_XIMEA)
-if(WITH_XIMEA)
-  include("${OpenCV_SOURCE_DIR}/cmake/OpenCVFindXimea.cmake")
-  if(XIMEA_FOUND)
-    set(HAVE_XIMEA TRUE)
-  endif()
-endif(WITH_XIMEA)
-
-# --- FFMPEG ---
-ocv_clear_vars(HAVE_FFMPEG)
-if(WITH_FFMPEG)  # try FFmpeg autodetection
-  if(OPENCV_FFMPEG_USE_FIND_PACKAGE)
-    if(NOT HUNTER_ENABLED)
-
-    if(OPENCV_FFMPEG_USE_FIND_PACKAGE STREQUAL "1" OR OPENCV_FFMPEG_USE_FIND_PACKAGE STREQUAL "ON")
-      set(OPENCV_FFMPEG_USE_FIND_PACKAGE "FFMPEG")
-    endif()
-    find_package(${OPENCV_FFMPEG_USE_FIND_PACKAGE}) # Required components: AVCODEC AVFORMAT AVUTIL SWSCALE
-    if(FFMPEG_FOUND OR FFmpeg_FOUND)
-      set(HAVE_FFMPEG TRUE)
-    else()
-      message(STATUS "Can't find FFmpeg via find_package(${OPENCV_FFMPEG_USE_FIND_PACKAGE})")
-    endif()
-
-    else(HUNTER_ENABLED)
-      hunter_add_package(ffmpeg)
-      find_package(ffmpeg CONFIG REQUIRED)
-
-      set(FFMPEG_FOUND TRUE)
-      set(HAVE_FFMPEG TRUE)
-      foreach(lib avcodec avformat avutil swresample swscale)
-        get_target_property(
-          ${lib}_INCLUDE_DIR
-          ffmpeg::${lib}
-          INTERFACE_INCLUDE_DIRECTORIES
-          )
-        list(APPEND FFMPEG_INCLUDE_DIRS "${${lib}_INCLUDE_DIR}")
-        list(APPEND FFMPEG_LIBRARIES "ffmpeg::${lib}")
-        set(FFMPEG_lib${lib}_FOUND TRUE)
-      endforeach()
-      list(REMOVE_DUPLICATES FFMPEG_INCLUDE_DIRS)
-    endif()
-  elseif(WIN32 AND NOT ARM AND NOT OPENCV_FFMPEG_SKIP_DOWNLOAD)
-    include("${OpenCV_SOURCE_DIR}/3rdparty/ffmpeg/ffmpeg.cmake")
-    download_win_ffmpeg(FFMPEG_CMAKE_SCRIPT)
-    if(FFMPEG_CMAKE_SCRIPT)
-      set(HAVE_FFMPEG TRUE)
-      set(HAVE_FFMPEG_WRAPPER 1)
-      include("${FFMPEG_CMAKE_SCRIPT}")
-    endif()
-  elseif(PKG_CONFIG_FOUND)
-    ocv_check_modules(FFMPEG libavcodec libavformat libavutil libswscale)
-    ocv_check_modules(FFMPEG_libavresample libavresample)
-    if(FFMPEG_libavresample_FOUND)
-      ocv_append_build_options(FFMPEG FFMPEG_libavresample)
-    endif()
-  else()
-    message(STATUS "Can't find ffmpeg - 'pkg-config' utility is missing")
-  endif()
-endif()
-if(HAVE_FFMPEG
-    AND NOT HAVE_FFMPEG_WRAPPER
-)
-  try_compile(__VALID_FFMPEG
-      "${OpenCV_BINARY_DIR}"
-      "${OpenCV_SOURCE_DIR}/cmake/checks/ffmpeg_test.cpp"
-      CMAKE_FLAGS "-DINCLUDE_DIRECTORIES:STRING=${FFMPEG_INCLUDE_DIRS}"
-      LINK_LIBRARIES ${FFMPEG_LIBRARIES}
-      OUTPUT_VARIABLE TRY_OUT
-  )
-  if(NOT __VALID_FFMPEG)
-    #message(FATAL_ERROR "FFMPEG: test check build log:\n${TRY_OUT}")
-    message(STATUS "WARNING: Can't build ffmpeg test code")
-    set(HAVE_FFMPEG FALSE)
-  else()
-    ocv_append_build_options(VIDEOIO FFMPEG)
-  endif()
-endif()
-
-# --- VideoInput/DirectShow ---
-if(WITH_DSHOW)
-  if(MSVC_VERSION GREATER 1499)
-    set(HAVE_DSHOW 1)
-  elseif(NOT HAVE_DSHOW)
-    check_include_file(DShow.h HAVE_DSHOW)
-  endif()
-endif(WITH_DSHOW)
-
-# --- VideoInput/Microsoft Media Foundation ---
-ocv_clear_vars(HAVE_MSMF)
-if(WITH_MSMF)
-  check_include_file(Mfapi.h HAVE_MSMF)
-  check_include_file(D3D11.h D3D11_found)
-  check_include_file(D3d11_4.h D3D11_4_found)
-  if(D3D11_found AND D3D11_4_found)
-    set(HAVE_DXVA YES)
-  else()
-    set(HAVE_DXVA NO)
-  endif()
-endif(WITH_MSMF)
-
 # --- Extra HighGUI and VideoIO libs on Windows ---
 if(WIN32)
   list(APPEND HIGHGUI_LIBRARIES comctl32 gdi32 ole32 setupapi ws2_32)
diff --git a/cmake/templates/OpenCVConfig.cmake.in b/cmake/templates/OpenCVConfig.cmake.in
@@ -384,6 +384,10 @@ if("@WEBP_FOUND@")
   find_dependency(WebP CONFIG)
 endif()
 
+if("@Eigen3_FOUND@")
+  find_dependency(Eigen3 CONFIG)
+endif()
+
 if("@WITH_FFMPEG@")
   find_dependency(ffmpeg CONFIG)
 endif()
diff --git a/modules/java/CMakeLists.txt b/modules/java/CMakeLists.txt
@@ -4,7 +4,7 @@ if(OPENCV_INITIAL_PASS)
 endif()
 
 if(APPLE_FRAMEWORK OR WINRT OR NOT PYTHON_DEFAULT_AVAILABLE OR NOT (ANT_EXECUTABLE OR ANDROID_PROJECTS_BUILD_TYPE STREQUAL "GRADLE")
-    OR NOT (JNI_FOUND OR (ANDROID AND (NOT DEFINED CMAKE_SYSTEM_VERSION OR CMAKE_SYSTEM_VERSION 7)))
+    OR NOT (JNI_FOUND OR (ANDROID AND (NOT DEFINED CMAKE_SYSTEM_VERSION OR CMAKE_SYSTEM_VERSION  GREATER 7)))
     OR BUILD_opencv_world
     )
   ocv_module_disable(java)
diff --git a/modules/videoio/cmake/detect_ffmpeg.cmake b/modules/videoio/cmake/detect_ffmpeg.cmake
@@ -1,12 +1,32 @@
 # --- FFMPEG ---
 if(NOT HAVE_FFMPEG AND OPENCV_FFMPEG_USE_FIND_PACKAGE)
+  if(NOT HUNTER_ENABLED) ### NO INDENT
   if(OPENCV_FFMPEG_USE_FIND_PACKAGE STREQUAL "1" OR OPENCV_FFMPEG_USE_FIND_PACKAGE STREQUAL "ON")
     set(OPENCV_FFMPEG_USE_FIND_PACKAGE "FFMPEG")
   endif()
   find_package(${OPENCV_FFMPEG_USE_FIND_PACKAGE}) # Required components: AVCODEC AVFORMAT AVUTIL SWSCALE
   if(FFMPEG_FOUND OR FFmpeg_FOUND)
     set(HAVE_FFMPEG TRUE)
   endif()
+
+  else(HUNTER_ENABLED) ### NO INDENT
+    hunter_add_package(ffmpeg)
+    find_package(ffmpeg CONFIG REQUIRED)
+
+    set(FFMPEG_FOUND TRUE)
+    set(HAVE_FFMPEG TRUE)
+    foreach(lib avcodec avformat avutil swresample swscale)
+      get_target_property(
+        ${lib}_INCLUDE_DIR
+        ffmpeg::${lib}
+        INTERFACE_INCLUDE_DIRECTORIES
+      )
+      list(APPEND FFMPEG_INCLUDE_DIRS "${${lib}_INCLUDE_DIR}")
+      list(APPEND FFMPEG_LIBRARIES "ffmpeg::${lib}")
+      set(FFMPEG_lib${lib}_FOUND TRUE)
+    endforeach()
+    list(REMOVE_DUPLICATES FFMPEG_INCLUDE_DIRS)
+  endif()  
 endif()
 
 if(NOT HAVE_FFMPEG AND WIN32 AND NOT ARM AND NOT OPENCV_FFMPEG_SKIP_DOWNLOAD)
@@ -76,7 +96,7 @@ if(HAVE_FFMPEG AND NOT HAVE_FFMPEG_WRAPPER AND NOT OPENCV_FFMPEG_SKIP_BUILD_CHEC
       "${OpenCV_BINARY_DIR}"
       "${OpenCV_SOURCE_DIR}/cmake/checks/ffmpeg_test.cpp"
       CMAKE_FLAGS "-DINCLUDE_DIRECTORIES:STRING=${FFMPEG_INCLUDE_DIRS}"
-                  "-DLINK_LIBRARIES:STRING=${FFMPEG_LIBRARIES}"
+      LINK_LIBRARIES ${FFMPEG_LIBRARIES}
       OUTPUT_VARIABLE TRY_OUT
   )
   if(NOT __VALID_FFMPEG)

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ if(OPENCV_INITIAL_PASS)`
`4`	`4`	`endif()`
`5`	`5`
`6`	`6`	`if(APPLE_FRAMEWORK OR WINRT OR NOT PYTHON_DEFAULT_AVAILABLE OR NOT (ANT_EXECUTABLE OR ANDROID_PROJECTS_BUILD_TYPE STREQUAL "GRADLE")`
`7`		`- OR NOT (JNI_FOUND OR (ANDROID AND (NOT DEFINED CMAKE_SYSTEM_VERSION OR CMAKE_SYSTEM_VERSION 7)))`
	`7`	`+ OR NOT (JNI_FOUND OR (ANDROID AND (NOT DEFINED CMAKE_SYSTEM_VERSION OR CMAKE_SYSTEM_VERSION GREATER 7)))`
`8`	`8`	`OR BUILD_opencv_world`
`9`	`9`	`)`
`10`	`10`	`ocv_module_disable(java)`