Unverified Commit fe7301ea authored by LinkeyLeo's avatar LinkeyLeo Committed by GitHub

add cuda 10 support for opencv_nvcuvid

nvidia video codec sdk need to be installed separately (https://developer.nvidia.com/nvidia-video-codec-sdk#Download)
only Samples/NvCodec/NvDecoder/nvcuvid.h and Samples/NvCodec/NvDecoder/cuviddec.h is necessary
parent fd34389a
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
#ifndef __CUVID_VIDEO_SOURCE_HPP__ #ifndef __CUVID_VIDEO_SOURCE_HPP__
#define __CUVID_VIDEO_SOURCE_HPP__ #define __CUVID_VIDEO_SOURCE_HPP__
#if CUDA_VERSION >= 9000 #if CUDA_VERSION >= 9000 && CUDA_VERSION < 10000
#include <dynlink_nvcuvid.h> #include <dynlink_nvcuvid.h>
#else #else
#include <nvcuvid.h> #include <nvcuvid.h>
......
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
#include "opencv2/core/utility.hpp" #include "opencv2/core/utility.hpp"
#include "opencv2/core/private.cuda.hpp" #include "opencv2/core/private.cuda.hpp"
#if CUDA_VERSION >= 9000 #if CUDA_VERSION >= 9000 && CUDA_VERSION < 10000
#include <dynlink_nvcuvid.h> #include <dynlink_nvcuvid.h>
#else #else
#include <nvcuvid.h> #include <nvcuvid.h>
......
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
#include "opencv2/core/private.cuda.hpp" #include "opencv2/core/private.cuda.hpp"
#ifdef HAVE_NVCUVID #ifdef HAVE_NVCUVID
#if CUDA_VERSION >= 9000 #if CUDA_VERSION >= 9000 && CUDA_VERSION < 10000
#include <dynlink_nvcuvid.h> #include <dynlink_nvcuvid.h>
#else #else
#include <nvcuvid.h> #include <nvcuvid.h>
......
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
#ifndef __VIDEO_DECODER_HPP__ #ifndef __VIDEO_DECODER_HPP__
#define __VIDEO_DECODER_HPP__ #define __VIDEO_DECODER_HPP__
#if CUDA_VERSION >= 9000 #if CUDA_VERSION >= 9000 && CUDA_VERSION < 10000
#include <dynlink_nvcuvid.h> #include <dynlink_nvcuvid.h>
#else #else
#include <nvcuvid.h> #include <nvcuvid.h>
......
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
#ifndef __VIDEO_PARSER_HPP__ #ifndef __VIDEO_PARSER_HPP__
#define __VIDEO_PARSER_HPP__ #define __VIDEO_PARSER_HPP__
#if CUDA_VERSION >= 9000 #if CUDA_VERSION >= 9000 && CUDA_VERSION < 10000
#include <dynlink_nvcuvid.h> #include <dynlink_nvcuvid.h>
#else #else
#include <nvcuvid.h> #include <nvcuvid.h>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment