Merge pull request #11314 from terfendail:msmf_camera

pull/11419/head
Alexander Alekhin 7 years ago committed by GitHub
commit e7adce851c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 7
      cmake/OpenCVFindLibsVideo.cmake
  2. 3
      modules/videoio/CMakeLists.txt
  3. 5150
      modules/videoio/src/cap_msmf.cpp
  4. 3113
      modules/videoio/src/cap_msmf.hpp

@ -261,6 +261,13 @@ endif(WITH_DSHOW)
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 ---

@ -86,6 +86,9 @@ endif()
if (WIN32 AND HAVE_MSMF)
list(APPEND videoio_srcs ${CMAKE_CURRENT_LIST_DIR}/src/cap_msmf.hpp)
list(APPEND videoio_srcs ${CMAKE_CURRENT_LIST_DIR}/src/cap_msmf.cpp)
if (HAVE_DXVA)
add_definitions(-DHAVE_DXVA)
endif()
endif()
if (WIN32 AND HAVE_VFW)

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff
Loading…
Cancel
Save