[opencv] 29/98: fixed to use NVCUVID in 'cudacodec' module.

[Mattia Rizzolo]

This is an automated email from the git hooks/post-receive script.

mattia pushed a commit to annotated tag 2.4.13
in repository opencv.

commit 69eaa89e22185dba0c16bbce6e200426c7c566e9
Author: atinfinity <dandelion1124 at gmail.com>
Date:   Sun Jan 31 01:56:45 2016 +0900

    fixed to use NVCUVID in 'cudacodec' module.
---
 cmake/OpenCVDetectCUDA.cmake     | 13 ++++++++++++-
 modules/gpu/CMakeLists.txt       |  9 ++++++---
 modules/gpu/src/precomp.hpp      |  4 +++-
 modules/gpu/src/video_writer.cpp |  2 +-
 4 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/cmake/OpenCVDetectCUDA.cmake b/cmake/OpenCVDetectCUDA.cmake
index cca1250..d2548f9 100644
--- a/cmake/OpenCVDetectCUDA.cmake
+++ b/cmake/OpenCVDetectCUDA.cmake
@@ -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})
diff --git a/modules/gpu/CMakeLists.txt b/modules/gpu/CMakeLists.txt
index 6de3e0e..caec0ef 100644
--- a/modules/gpu/CMakeLists.txt
+++ b/modules/gpu/CMakeLists.txt
@@ -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)
diff --git a/modules/gpu/src/precomp.hpp b/modules/gpu/src/precomp.hpp
index 785783b..a4f75db 100644
--- a/modules/gpu/src/precomp.hpp
+++ b/modules/gpu/src/precomp.hpp
@@ -98,7 +98,9 @@
         #include <nvcuvid.h>
 
         #ifdef WIN32
-            #include <NVEncoderAPI.h>
+            #ifdef HAVE_NVCUVENC
+                #include <NVEncoderAPI.h>
+            #endif
         #endif
     #endif
 
diff --git a/modules/gpu/src/video_writer.cpp b/modules/gpu/src/video_writer.cpp
index 0937ad1..bf51c25 100644
--- a/modules/gpu/src/video_writer.cpp
+++ b/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
 {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/opencv.git