opencv/opencv_contrib
1
0
Fork 0
mirror of https://github.com/opencv/opencv_contrib.git synced 2025-10-18 08:44:11 +08:00
Code Issues Releases Wiki Activity

[moved from opencv] cudacodec(build): fix detection in CMake, cleanup duplicate includes

Browse Source 
original commit: d01cbe9320
This commit is contained in:
Alexander Alekhin
2020-06-16 02:14:04 +00:00
parent 6ca24c818f
commit 58f9a9e4da
5 changed files with 5 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
modules/cudacodec/src/cuvid_video_source.hpp
View File

@@ -44,17 +44,9 @@
#ifndef __CUVID_VIDEO_SOURCE_HPP__
#define __CUVID_VIDEO_SOURCE_HPP__
#if defined(HAVE_DYNLINK_NVCUVID_HEADER)
#include <dynlink_nvcuvid.h>
#elif defined(HAVE_NVCUVID_HEADER)
#include <nvcuvid.h>
#endif
#include "opencv2/core/private.cuda.hpp"
#include "opencv2/cudacodec.hpp"
#include "video_source.hpp"
namespace cv { namespace cudacodec { namespace detail
{
namespace cv { namespace cudacodec { namespace detail {
class CuvidVideoSource : public VideoSource
{

10
modules/cudacodec/src/frame_queue.hpp
View File

@@ -45,16 +45,8 @@
#define __FRAME_QUEUE_HPP__
#include "opencv2/core/utility.hpp"
#include "opencv2/core/private.cuda.hpp"
#if defined(HAVE_DYNLINK_NVCUVID_HEADER)
#include <dynlink_nvcuvid.h>
#elif defined(HAVE_NVCUVID_HEADER)
#include <nvcuvid.h>
#endif
namespace cv { namespace cudacodec { namespace detail
{
namespace cv { namespace cudacodec { namespace detail {
class FrameQueue
{

12
modules/cudacodec/src/video_decoder.hpp
View File

@@ -44,17 +44,7 @@
#ifndef __VIDEO_DECODER_HPP__
#define __VIDEO_DECODER_HPP__
#if defined(HAVE_DYNLINK_NVCUVID_HEADER)
#include <dynlink_nvcuvid.h>
#elif defined(HAVE_NVCUVID_HEADER)
#include <nvcuvid.h>
#endif
#include "opencv2/core/private.cuda.hpp"
#include "opencv2/cudacodec.hpp"
namespace cv { namespace cudacodec { namespace detail
{
namespace cv { namespace cudacodec { namespace detail {
class VideoDecoder
{

11
modules/cudacodec/src/video_parser.hpp
View File

@@ -44,19 +44,10 @@
#ifndef __VIDEO_PARSER_HPP__
#define __VIDEO_PARSER_HPP__
#if defined(HAVE_DYNLINK_NVCUVID_HEADER)
#include <dynlink_nvcuvid.h>
#elif defined(HAVE_NVCUVID_HEADER)
#include <nvcuvid.h>
#endif
#include "opencv2/core/private.cuda.hpp"
#include "opencv2/cudacodec.hpp"
#include "frame_queue.hpp"
#include "video_decoder.hpp"
namespace cv { namespace cudacodec { namespace detail
{
namespace cv { namespace cudacodec { namespace detail {
class VideoParser
{

5
modules/cudacodec/src/video_source.hpp
View File

@@ -44,12 +44,9 @@
#ifndef __CUDACODEC_VIDEO_SOURCE_H__
#define __CUDACODEC_VIDEO_SOURCE_H__
#include "opencv2/core/private.cuda.hpp"
#include "opencv2/cudacodec.hpp"
#include "thread.hpp"
namespace cv { namespace cudacodec { namespace detail
{
namespace cv { namespace cudacodec { namespace detail {
class VideoParser;