fixed to use NVCUVID in 'cudacodec' module.

pull/6037/head
atinfinity 9 years ago
parent e835878661
commit 69eaa89e22
  1. 13
      cmake/OpenCVDetectCUDA.cmake
  2. 9
      modules/gpu/CMakeLists.txt
  3. 4
      modules/gpu/src/precomp.hpp
  4. 2
      modules/gpu/src/video_writer.cpp

@ -35,7 +35,18 @@ if(CUDA_FOUND)
if(WITH_NVCUVID)
find_cuda_helper_libs(nvcuvid)
set(HAVE_NVCUVID 1)
if(WIN32)
find_cuda_helper_libs(nvcuvenc)
endif()
if(CUDA_nvcuvid_LIBRARY)
set(HAVE_NVCUVID 1)
endif()
if(CUDA_nvcuvenc_LIBRARY)
set(HAVE_NVCUVENC 1)
endif()
endif()
message(STATUS "CUDA detected: " ${CUDA_VERSION})

@ -54,11 +54,14 @@ if(HAVE_CUDA)
endif()
if(WITH_NVCUVID)
set(cuda_link_libs ${cuda_link_libs} ${CUDA_CUDA_LIBRARY} ${CUDA_nvcuvid_LIBRARY})
if(HAVE_NVCUVID)
set(cuda_link_libs ${cuda_link_libs} ${CUDA_CUDA_LIBRARY} ${CUDA_nvcuvid_LIBRARY})
endif()
if(WIN32)
find_cuda_helper_libs(nvcuvenc)
set(cuda_link_libs ${cuda_link_libs} ${CUDA_nvcuvenc_LIBRARY})
if(HAVE_NVCUVENC)
set(cuda_link_libs ${cuda_link_libs} ${CUDA_nvcuvenc_LIBRARY})
endif()
endif()
if(WITH_FFMPEG)

@ -98,7 +98,9 @@
#include <nvcuvid.h>
#ifdef WIN32
#include <NVEncoderAPI.h>
#ifdef HAVE_NVCUVENC
#include <NVEncoderAPI.h>
#endif
#endif
#endif

@ -42,7 +42,7 @@
#include "precomp.hpp"
#if !defined(HAVE_CUDA) || defined(CUDA_DISABLER) || !defined(HAVE_NVCUVID) || !defined(WIN32)
#if !defined(HAVE_CUDA) || defined(CUDA_DISABLER) || !defined(HAVE_NVCUVENC) || !defined(WIN32)
class cv::gpu::VideoWriter_GPU::Impl
{

Loading…
Cancel
Save