Merge pull request #6037 from atinfinity:pullreq/160130-enable-nvcuvid-2.4

cmake/OpenCVDetectCUDA.cmake

@@ -35,9 +35,20 @@ if(CUDA_FOUND)
 
   if(WITH_NVCUVID)
     find_cuda_helper_libs(nvcuvid)
+
+    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})
 
   set(_generations "Fermi" "Kepler")

cmake/templates/cvconfig.h.in

@@ -109,6 +109,9 @@
 /* NVidia Video Decoding API*/
 #cmakedefine HAVE_NVCUVID
 
+/* NVidia Video Encoding API*/
+#cmakedefine HAVE_NVCUVENC
+
 /* OpenCL Support */
 #cmakedefine HAVE_OPENCL
 #cmakedefine HAVE_OPENCL_STATIC

modules/gpu/CMakeLists.txt

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

modules/gpu/src/precomp.hpp

@@ -98,9 +98,11 @@
         #include <nvcuvid.h>
 
         #ifdef WIN32
+            #ifdef HAVE_NVCUVENC
                 #include <NVEncoderAPI.h>
             #endif
         #endif
+    #endif
 
     #include "internal_shared.hpp"
     #include "opencv2/gpu/stream_accessor.hpp"

modules/gpu/src/video_writer.cpp

@@ -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
 {