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

cmake/OpenCVDetectCUDA.cmake

@@ -33,7 +33,12 @@ if(CUDA_FOUND)
     if(WIN32)
       find_cuda_helper_libs(nvcuvenc)
     endif()
-    set(HAVE_NVCUVID 1)
+    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})

cmake/templates/cvconfig.h.in

@@ -120,6 +120,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/cudacodec/CMakeLists.txt

@@ -15,7 +15,9 @@ set(extra_libs "")
 
 if(HAVE_NVCUVID)
   list(APPEND extra_libs ${CUDA_CUDA_LIBRARY} ${CUDA_nvcuvid_LIBRARY})
+endif()
 
+if(HAVE_NVCUVENC)
   if(WIN32)
     list(APPEND extra_libs ${CUDA_nvcuvenc_LIBRARY})
   endif()

modules/cudacodec/src/precomp.hpp

@@ -61,7 +61,9 @@
     #ifdef WIN32
         #define NOMINMAX
         #include <windows.h>
-        #include <NVEncoderAPI.h>
+        #ifdef HAVE_NVCUVENC
+            #include <NVEncoderAPI.h>
+        #endif
     #else
         #include <pthread.h>
         #include <unistd.h>

modules/cudacodec/src/video_writer.cpp

@@ -47,7 +47,7 @@ using namespace cv;
 using namespace cv::cuda;
 using namespace cv::cudacodec;
 
-#if !defined(HAVE_NVCUVID) || !defined(WIN32)
+#if !defined(HAVE_NVCUVENC) || !defined(WIN32)
 
 cv::cudacodec::EncoderParams::EncoderParams() { throw_no_cuda(); }
 cv::cudacodec::EncoderParams::EncoderParams(const String&) { throw_no_cuda(); }
@@ -60,7 +60,7 @@ Ptr<VideoWriter> cv::cudacodec::createVideoWriter(const String&, Size, double, c
 Ptr<VideoWriter> cv::cudacodec::createVideoWriter(const Ptr<EncoderCallBack>&, Size, double, SurfaceFormat) { throw_no_cuda(); return Ptr<VideoWriter>(); }
 Ptr<VideoWriter> cv::cudacodec::createVideoWriter(const Ptr<EncoderCallBack>&, Size, double, const EncoderParams&, SurfaceFormat) { throw_no_cuda(); return Ptr<VideoWriter>(); }
 
-#else // !defined HAVE_CUDA || !defined WIN32
+#else // !defined HAVE_NVCUVENC || !defined WIN32
 
 void RGB_to_YV12(const GpuMat& src, GpuMat& dst);
 
@@ -913,4 +913,4 @@ Ptr<VideoWriter> cv::cudacodec::createVideoWriter(const Ptr<EncoderCallBack>& en
     return makePtr<VideoWriterImpl>(encoderCallback, frameSize, fps, params, format);
 }
 
-#endif // !defined HAVE_CUDA || !defined WIN32
+#endif // !defined HAVE_NVCUVENC || !defined WIN32