Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

cudacodec::VideoWriter add flag for writing full range luma chroma video #3868

Merged
merged 1 commit into from
Jan 16, 2025
+30 −6
Merged

cudacodec::VideoWriter add flag for writing full range luma chroma video #3868

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion modules/cudacodec/include/opencv2/cudacodec.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ struct CV_EXPORTS_W_SIMPLE EncoderParams
public:
CV_WRAP EncoderParams() : nvPreset(ENC_PRESET_P3), tuningInfo(ENC_TUNING_INFO_HIGH_QUALITY), encodingProfile(ENC_CODEC_PROFILE_AUTOSELECT),
rateControlMode(ENC_PARAMS_RC_VBR), multiPassEncoding(ENC_MULTI_PASS_DISABLED), constQp({ 0,0,0 }), averageBitRate(0), maxBitRate(0),
targetQuality(30), gopLength(250), idrPeriod(250) {};
targetQuality(30), gopLength(250), idrPeriod(250), videoFullRangeFlag(false){};
CV_PROP_RW EncodePreset nvPreset;
CV_PROP_RW EncodeTuningInfo tuningInfo;
CV_PROP_RW EncodeProfile encodingProfile;
Expand All @@ -198,6 +198,7 @@ struct CV_EXPORTS_W_SIMPLE EncoderParams
CV_PROP_RW uint8_t targetQuality; //!< value 0 - 51 where video quality decreases as targetQuality increases, used with \ref ENC_PARAMS_RC_VBR.
CV_PROP_RW int gopLength; //!< the number of pictures in one GOP, ensuring \ref idrPeriod >= \ref gopLength.
CV_PROP_RW int idrPeriod; //!< IDR interval, ensuring \ref idrPeriod >= \ref gopLength.
CV_PROP_RW bool videoFullRangeFlag;//!< Indicates if the black level, luma and chroma of the source are represented using the full or limited range (AKA TV or "analogue" range) of values as defined in Annex E of the ITU-T Specification.
};
CV_EXPORTS bool operator==(const EncoderParams& lhs, const EncoderParams& rhs);

Expand Down
25 changes: 23 additions & 2 deletions modules/cudacodec/src/video_writer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,6 +315,13 @@ GUID EncodingPresetGuid(const EncodePreset nvPreset) {
CV_Error(Error::StsUnsupportedFormat, msg);
}

std::string GetVideoCodecString(const GUID codec) {
if (codec == NV_ENC_CODEC_H264_GUID) return "AVC/H.264";
else if (codec == NV_ENC_CODEC_HEVC_GUID) return "H.265/HEVC";
else if (codec == NV_ENC_CODEC_AV1_GUID) return "AV1";
else return "Unknown";
}

void VideoWriterImpl::InitializeEncoder(const GUID codec, const double fps)
{
NV_ENC_INITIALIZE_PARAMS initializeParams = {};
Expand All @@ -334,10 +341,24 @@ void VideoWriterImpl::InitializeEncoder(const GUID codec, const double fps)
if (initializeParams.encodeConfig->frameIntervalP > 1) {
CV_Assert(encoderCallback->setFrameIntervalP(initializeParams.encodeConfig->frameIntervalP));
}
if (codec == NV_ENC_CODEC_H264_GUID)
if (codec == NV_ENC_CODEC_H264_GUID) {
initializeParams.encodeConfig->encodeCodecConfig.h264Config.idrPeriod = encoderParams.idrPeriod;
else if (codec == NV_ENC_CODEC_HEVC_GUID)
if (encoderParams.videoFullRangeFlag) {
initializeParams.encodeConfig->encodeCodecConfig.h264Config.h264VUIParameters.videoFullRangeFlag = 1;
initializeParams.encodeConfig->encodeCodecConfig.h264Config.h264VUIParameters.videoSignalTypePresentFlag = 1;
}
}
else if (codec == NV_ENC_CODEC_HEVC_GUID) {
initializeParams.encodeConfig->encodeCodecConfig.hevcConfig.idrPeriod = encoderParams.idrPeriod;
if (encoderParams.videoFullRangeFlag) {
initializeParams.encodeConfig->encodeCodecConfig.hevcConfig.hevcVUIParameters.videoFullRangeFlag = 1;
initializeParams.encodeConfig->encodeCodecConfig.hevcConfig.hevcVUIParameters.videoSignalTypePresentFlag = 1;
}
}
asmorkalov marked this conversation as resolved.
Show resolved Hide resolved
else {
std::string msg = "videoFullRangeFlag is not supported by codec: " + GetVideoCodecString(codec);
CV_LOG_WARNING(NULL, msg);
}
pEnc->CreateEncoder(&initializeParams);
}

Expand Down
8 changes: 5 additions & 3 deletions modules/cudacodec/test/test_video.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1060,7 +1060,7 @@ CUDA_TEST_P(H264ToH265, Transcode)
INSTANTIATE_TEST_CASE_P(CUDA_Codec, H264ToH265, ALL_DEVICES);

CV_ENUM(YuvColorFormats, cudacodec::ColorFormat::NV_YUV444, cudacodec::ColorFormat::NV_YUV420_10BIT, cudacodec::ColorFormat::NV_YUV444_10BIT)
PARAM_TEST_CASE(YUVFormats, cv::cuda::DeviceInfo, YuvColorFormats)
PARAM_TEST_CASE(YUVFormats, cv::cuda::DeviceInfo, YuvColorFormats, bool)
{
};

Expand All @@ -1069,6 +1069,7 @@ CUDA_TEST_P(YUVFormats, Transcode)
cv::cuda::setDevice(GET_PARAM(0).deviceID());
const std::string inputFile = std::string(cvtest::TS::ptr()->get_data_path()) + "../highgui/video/big_buck_bunny.h265";
const cv::cudacodec::ColorFormat writerColorFormat = static_cast<cudacodec::ColorFormat>(static_cast<int>(GET_PARAM(1)));
const bool fullRange = GET_PARAM(2);
constexpr double fps = 25;
const cudacodec::Codec codec = cudacodec::Codec::HEVC;
const std::string ext = ".mp4";
Expand All @@ -1082,6 +1083,7 @@ CUDA_TEST_P(YUVFormats, Transcode)
cv::cudacodec::EncoderParams params;
params.tuningInfo = cv::cudacodec::EncodeTuningInfo::ENC_TUNING_INFO_LOSSLESS;
params.rateControlMode = cv::cudacodec::EncodeParamsRcMode::ENC_PARAMS_RC_CONSTQP;
params.videoFullRangeFlag = fullRange;
for (int i = 0; i < nFrames; ++i) {
ASSERT_TRUE(cap.read(frame));
ASSERT_FALSE(frame.empty());
Expand All @@ -1095,7 +1097,7 @@ CUDA_TEST_P(YUVFormats, Transcode)
yuvFormat = cudacodec::SurfaceFormat::SF_P016;
bitDepth = cudacodec::BitDepth::SIXTEEN;
}
generateTestImages(frame, yuv, bgr, yuvFormat, cudacodec::ColorFormat::BGR, bitDepth, false);
generateTestImages(frame, yuv, bgr, yuvFormat, cudacodec::ColorFormat::BGR, bitDepth, false, fullRange);
bgrGs.push_back(bgr.clone());
if (writer.empty())
writer = cv::cudacodec::createVideoWriter(outputFile, frame.size(), codec, fps, writerColorFormat, params);
Expand All @@ -1119,7 +1121,7 @@ CUDA_TEST_P(YUVFormats, Transcode)
ASSERT_EQ(0, remove(outputFile.c_str()));
}

INSTANTIATE_TEST_CASE_P(CUDA_Codec, YUVFormats, testing::Combine(ALL_DEVICES, YuvColorFormats::all()));
INSTANTIATE_TEST_CASE_P(CUDA_Codec, YUVFormats, testing::Combine(ALL_DEVICES, YuvColorFormats::all(), testing::Bool()));
#endif

#if defined(HAVE_NVCUVENC)
Expand Down