potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-31 00:03:03 +04:00
Code Packages Releases Wiki Activity

Merge pull request #17568 from alalek:cleanup_17527

Browse Source
This commit is contained in:
Alexander Alekhin
2020-06-18 07:38:16 +00:00
parent b10ab79743 d01cbe9320
commit 42a4c3fba6
6 changed files with 6 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/cudacodec/src/cuvid_video_source.hpp
+1 -9
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
{
modules/cudacodec/src/frame_queue.hpp
+1 -9
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
{
modules/cudacodec/src/video_decoder.hpp
+1 -11
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
{
modules/cudacodec/src/video_parser.hpp
+1 -10
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
{
modules/cudacodec/src/video_source.hpp
+1 -4
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;