From cc5c2760081b856374229fdf8ea32904edcf698b Mon Sep 17 00:00:00 2001 From: cudawarped <12133430+cudawarped@users.noreply.github.com> Date: Thu, 22 Jun 2023 11:23:58 +0300 Subject: [PATCH] cudacodec::VideoReader - fix cudart defines --- modules/cudacodec/src/video_decoder.cpp | 4 ++-- modules/cudacodec/src/video_reader.cpp | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/cudacodec/src/video_decoder.cpp b/modules/cudacodec/src/video_decoder.cpp index 470c402108..23a349c3b2 100644 --- a/modules/cudacodec/src/video_decoder.cpp +++ b/modules/cudacodec/src/video_decoder.cpp @@ -97,10 +97,10 @@ void cv::cudacodec::detail::VideoDecoder::create(const FormatInfo& videoFormat) cudaVideoCodec_UYVY == _codec; #if defined (HAVE_CUDA) -#if (CUDART_VERSION >= 6500) +#if (CUDART_VERSION >= 6050) codecSupported |= cudaVideoCodec_HEVC == _codec; #endif -#if ((CUDART_VERSION == 7500) || (CUDART_VERSION >= 9000)) +#if ((CUDART_VERSION == 7050) || (CUDART_VERSION >= 9000)) codecSupported |= cudaVideoCodec_VP8 == _codec || cudaVideoCodec_VP9 == _codec || cudaVideoCodec_AV1 == _codec || diff --git a/modules/cudacodec/src/video_reader.cpp b/modules/cudacodec/src/video_reader.cpp index 5b231f2294..cf47d8399a 100644 --- a/modules/cudacodec/src/video_reader.cpp +++ b/modules/cudacodec/src/video_reader.cpp @@ -67,14 +67,14 @@ void cvtFromNv12(const GpuMat& decodedFrame, GpuMat& outFrame, int width, int he outFrame.create(height, width, CV_8UC3); Npp8u* pSrc[2] = { decodedFrame.data, &decodedFrame.data[decodedFrame.step * height] }; NppiSize oSizeROI = { width,height }; -#if (CUDART_VERSION < 10100) +#if (CUDART_VERSION < 10010) cv::cuda::NppStreamHandler h(stream); if (videoFullRangeFlag) nppSafeCall(nppiNV12ToBGR_709HDTV_8u_P2C3R(pSrc, decodedFrame.step, outFrame.data, outFrame.step, oSizeROI)); else { nppSafeCall(nppiNV12ToBGR_8u_P2C3R(pSrc, decodedFrame.step, outFrame.data, outFrame.step, oSizeROI)); } -#elif (CUDART_VERSION >= 10100) +#elif (CUDART_VERSION >= 10010) NppStreamContext nppStreamCtx; nppSafeCall(nppGetStreamContext(&nppStreamCtx)); nppStreamCtx.hStream = StreamAccessor::getStream(stream); @@ -316,7 +316,7 @@ namespace bool VideoReaderImpl::set(const ColorFormat colorFormat_) { if (!ValidColorFormat(colorFormat_)) return false; if (colorFormat_ == ColorFormat::BGR) { -#if (CUDART_VERSION < 9200) +#if (CUDART_VERSION < 9020) CV_LOG_DEBUG(NULL, "ColorFormat::BGR is not supported until CUDA 9.2, use default ColorFormat::BGRA."); return false; #elif (CUDART_VERSION < 11000)