NotificationsYou must be signed in to change notification settings
Fork56.4k
Star85.3k

Commit42a4c3f

committed

Merge pull request#17568 from alalek:cleanup_17527

2 parentsb10ab79 +d01cbe9 commit42a4c3fCopy full SHA for 42a4c3f

File tree

6 files changed

-43

lines changed

cmake
- OpenCVDetectCUDA.cmake
modules/cudacodec/src

6 files changed

-43

lines changed

`‎cmake/OpenCVDetectCUDA.cmake‎`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -53,6 +53,7 @@ if(CUDA_FOUND)`
`53`	`53`	`else()`
`54`	`54`	`set(${_result} 1)`
`55`	`55`	`endif()`
	`56`	`+ unset(_header_resultCACHE)`
`56`	`57`	`endmacro()`
`57`	`58`	`SEARCH_NVCUVID_HEADER("nvcuvid.h" HAVE_NVCUVID_HEADER)`
`58`	`59`	`SEARCH_NVCUVID_HEADER("dynlink_nvcuvid.h" HAVE_DYNLINK_NVCUVID_HEADER)`

`‎modules/cudacodec/src/cuvid_video_source.hpp‎`

Lines changed: 1 addition & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -44,17 +44,9 @@`
`44`	`44`	`#ifndef __CUVID_VIDEO_SOURCE_HPP__`
`45`	`45`	`#define__CUVID_VIDEO_SOURCE_HPP__`
`46`	`46`
`47`		`-#if defined(HAVE_DYNLINK_NVCUVID_HEADER)`
`48`		`- #include<dynlink_nvcuvid.h>`
`49`		`-#elif defined(HAVE_NVCUVID_HEADER)`
`50`		`- #include<nvcuvid.h>`
`51`		`-#endif`
`52`		`-#include"opencv2/core/private.cuda.hpp"`
`53`		`-#include"opencv2/cudacodec.hpp"`
`54`	`47`	`#include"video_source.hpp"`
`55`	`48`
`56`		`-namespacecv {namespacecudacodec {namespacedetail`
`57`		`-{`
	`49`	`+namespacecv {namespacecudacodec {namespacedetail {`
`58`	`50`
`59`	`51`	`classCuvidVideoSource :publicVideoSource`
`60`	`52`	`{`

`‎modules/cudacodec/src/frame_queue.hpp‎`

Lines changed: 1 addition & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -45,16 +45,8 @@`
`45`	`45`	`#define__FRAME_QUEUE_HPP__`
`46`	`46`
`47`	`47`	`#include"opencv2/core/utility.hpp"`
`48`		`-#include"opencv2/core/private.cuda.hpp"`
`49`	`48`
`50`		`-#if defined(HAVE_DYNLINK_NVCUVID_HEADER)`
`51`		`- #include<dynlink_nvcuvid.h>`
`52`		`-#elif defined(HAVE_NVCUVID_HEADER)`
`53`		`- #include<nvcuvid.h>`
`54`		`-#endif`
`55`		`-`
`56`		`-namespacecv {namespacecudacodec {namespacedetail`
`57`		`-{`
	`49`	`+namespacecv {namespacecudacodec {namespacedetail {`
`58`	`50`
`59`	`51`	`classFrameQueue`
`60`	`52`	`{`

`‎modules/cudacodec/src/video_decoder.hpp‎`

Lines changed: 1 addition & 11 deletions

Original file line number	Diff line number	Diff line change
`@@ -44,17 +44,7 @@`
`44`	`44`	`#ifndef __VIDEO_DECODER_HPP__`
`45`	`45`	`#define__VIDEO_DECODER_HPP__`
`46`	`46`
`47`		`-#if defined(HAVE_DYNLINK_NVCUVID_HEADER)`
`48`		`- #include<dynlink_nvcuvid.h>`
`49`		`-#elif defined(HAVE_NVCUVID_HEADER)`
`50`		`- #include<nvcuvid.h>`
`51`		`-#endif`
`52`		`-`
`53`		`-#include"opencv2/core/private.cuda.hpp"`
`54`		`-#include"opencv2/cudacodec.hpp"`
`55`		`-`
`56`		`-namespacecv {namespacecudacodec {namespacedetail`
`57`		`-{`
	`47`	`+namespacecv {namespacecudacodec {namespacedetail {`
`58`	`48`
`59`	`49`	`classVideoDecoder`
`60`	`50`	`{`

`‎modules/cudacodec/src/video_parser.hpp‎`

Lines changed: 1 addition & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -44,19 +44,10 @@`
`44`	`44`	`#ifndef __VIDEO_PARSER_HPP__`
`45`	`45`	`#define__VIDEO_PARSER_HPP__`
`46`	`46`
`47`		`-#if defined(HAVE_DYNLINK_NVCUVID_HEADER)`
`48`		`- #include<dynlink_nvcuvid.h>`
`49`		`-#elif defined(HAVE_NVCUVID_HEADER)`
`50`		`- #include<nvcuvid.h>`
`51`		`-#endif`
`52`		`-`
`53`		`-#include"opencv2/core/private.cuda.hpp"`
`54`		`-#include"opencv2/cudacodec.hpp"`
`55`	`47`	`#include"frame_queue.hpp"`
`56`	`48`	`#include"video_decoder.hpp"`
`57`	`49`
`58`		`-namespacecv {namespacecudacodec {namespacedetail`
`59`		`-{`
	`50`	`+namespacecv {namespacecudacodec {namespacedetail {`
`60`	`51`
`61`	`52`	`classVideoParser`
`62`	`53`	`{`

`‎modules/cudacodec/src/video_source.hpp‎`

Lines changed: 1 addition & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -44,12 +44,9 @@`
`44`	`44`	`#ifndef __CUDACODEC_VIDEO_SOURCE_H__`
`45`	`45`	`#define__CUDACODEC_VIDEO_SOURCE_H__`
`46`	`46`
`47`		`-#include"opencv2/core/private.cuda.hpp"`
`48`		`-#include"opencv2/cudacodec.hpp"`
`49`	`47`	`#include"thread.hpp"`
`50`	`48`
`51`		`-namespacecv {namespacecudacodec {namespacedetail`
`52`		`-{`
	`49`	`+namespacecv {namespacecudacodec {namespacedetail {`
`53`	`50`
`54`	`51`	`classVideoParser;`
`55`	`52`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commit42a4c3f

File tree

6 files changed

6 files changed

`‎cmake/OpenCVDetectCUDA.cmake‎`

`‎modules/cudacodec/src/cuvid_video_source.hpp‎`

`‎modules/cudacodec/src/frame_queue.hpp‎`

`‎modules/cudacodec/src/video_decoder.hpp‎`

`‎modules/cudacodec/src/video_parser.hpp‎`

`‎modules/cudacodec/src/video_source.hpp‎`

0 commit comments