@@ -67,14 +67,14 @@ void cvtFromNv12(const GpuMat& decodedFrame, GpuMat& outFrame, int width, int he
67
67
outFrame.create (height, width, CV_8UC3);
68
68
Npp8u* pSrc[2 ] = { decodedFrame.data , &decodedFrame.data [decodedFrame.step * height] };
69
69
NppiSize oSizeROI = { width,height };
70
- #if (CUDART_VERSION < 10100 )
70
+ #if (CUDART_VERSION < 10010 )
71
71
cv::cuda::NppStreamHandler h (stream);
72
72
if (videoFullRangeFlag)
73
73
nppSafeCall (nppiNV12ToBGR_709HDTV_8u_P2C3R (pSrc, decodedFrame.step , outFrame.data , outFrame.step , oSizeROI));
74
74
else {
75
75
nppSafeCall (nppiNV12ToBGR_8u_P2C3R (pSrc, decodedFrame.step , outFrame.data , outFrame.step , oSizeROI));
76
76
}
77
- #elif (CUDART_VERSION >= 10100 )
77
+ #elif (CUDART_VERSION >= 10010 )
78
78
NppStreamContext nppStreamCtx;
79
79
nppSafeCall (nppGetStreamContext (&nppStreamCtx));
80
80
nppStreamCtx.hStream = StreamAccessor::getStream (stream);
@@ -316,7 +316,7 @@ namespace
316
316
bool VideoReaderImpl::set (const ColorFormat colorFormat_) {
317
317
if (!ValidColorFormat (colorFormat_)) return false ;
318
318
if (colorFormat_ == ColorFormat::BGR) {
319
- #if (CUDART_VERSION < 9200 )
319
+ #if (CUDART_VERSION < 9020 )
320
320
CV_LOG_DEBUG (NULL , " ColorFormat::BGR is not supported until CUDA 9.2, use default ColorFormat::BGRA." );
321
321
return false ;
322
322
#elif (CUDART_VERSION < 11000)
0 commit comments