Administrator/opencv-MIRROR
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-09-13 05:42:51 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #28504 from Kumataro:fix28498_msmf

Browse Source 
videoio(msmf): replace unnecessary get<double>() usage with integer types
This commit is contained in:
Alexander Smorkalov
2026-02-09 14:41:53 +03:00
committed by GitHub
parent 8e84acad95 9224e5d90a
commit 284c48bbe6
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
modules/videoio/src/cap_msmf.cpp
View File

@@ -1388,9 +1388,9 @@ bool CvCapture_MSMF::configureStreams(const cv::VideoCaptureParameters& params)
{ {
if (params.has(CAP_PROP_VIDEO_STREAM)) if (params.has(CAP_PROP_VIDEO_STREAM))
{ {
double value = params.get<double>(CAP_PROP_VIDEO_STREAM); int value = params.get<int>(CAP_PROP_VIDEO_STREAM);
if (value == -1 || value == 0) if (value == -1 || value == 0)
videoStream = static_cast<int>(value); videoStream = value;
else else
{ {
CV_LOG_ERROR(NULL, "VIDEOIO/MSMF: CAP_PROP_VIDEO_STREAM parameter value is invalid/unsupported: " << value); CV_LOG_ERROR(NULL, "VIDEOIO/MSMF: CAP_PROP_VIDEO_STREAM parameter value is invalid/unsupported: " << value);
@@ -1399,8 +1399,8 @@ bool CvCapture_MSMF::configureStreams(const cv::VideoCaptureParameters& params)
} }
if (params.has(CAP_PROP_AUDIO_STREAM)) if (params.has(CAP_PROP_AUDIO_STREAM))
{ {
double value = params.get<double>(CAP_PROP_AUDIO_STREAM); int value = params.get<int>(CAP_PROP_AUDIO_STREAM);
if (value == -1 || value > -1) if (value == -1 || value >= 0)
audioStream = static_cast<int>(value); audioStream = static_cast<int>(value);
else else
{ {
@@ -1414,7 +1414,7 @@ bool CvCapture_MSMF::setAudioProperties(const cv::VideoCaptureParameters& params
{ {
if (params.has(CAP_PROP_AUDIO_DATA_DEPTH)) if (params.has(CAP_PROP_AUDIO_DATA_DEPTH))
{ {
int value = static_cast<int>(params.get<double>(CAP_PROP_AUDIO_DATA_DEPTH)); int value = params.get<int>(CAP_PROP_AUDIO_DATA_DEPTH);
if (value != CV_8S && value != CV_16S && value != CV_32S && value != CV_32F) if (value != CV_8S && value != CV_16S && value != CV_32S && value != CV_32F)
{ {
CV_LOG_ERROR(NULL, "VIDEOIO/MSMF: CAP_PROP_AUDIO_DATA_DEPTH parameter value is invalid/unsupported: " << value); CV_LOG_ERROR(NULL, "VIDEOIO/MSMF: CAP_PROP_AUDIO_DATA_DEPTH parameter value is invalid/unsupported: " << value);
@@ -1427,7 +1427,7 @@ bool CvCapture_MSMF::setAudioProperties(const cv::VideoCaptureParameters& params
} }
if (params.has(CAP_PROP_AUDIO_SAMPLES_PER_SECOND)) if (params.has(CAP_PROP_AUDIO_SAMPLES_PER_SECOND))
{ {
int value = static_cast<int>(params.get<double>(CAP_PROP_AUDIO_SAMPLES_PER_SECOND)); int value = params.get<int>(CAP_PROP_AUDIO_SAMPLES_PER_SECOND);
if (value < 0) if (value < 0)
{ {
CV_LOG_ERROR(NULL, "VIDEOIO/MSMF: CAP_PROP_AUDIO_SAMPLES_PER_SECOND parameter can't be negative: " << value); CV_LOG_ERROR(NULL, "VIDEOIO/MSMF: CAP_PROP_AUDIO_SAMPLES_PER_SECOND parameter can't be negative: " << value);
@@ -1440,8 +1440,7 @@ bool CvCapture_MSMF::setAudioProperties(const cv::VideoCaptureParameters& params
} }
if (params.has(CAP_PROP_AUDIO_SYNCHRONIZE)) if (params.has(CAP_PROP_AUDIO_SYNCHRONIZE))
{ {
int value = static_cast<UINT32>(params.get<double>(CAP_PROP_AUDIO_SYNCHRONIZE)); syncLastFrame = params.get<bool>(CAP_PROP_AUDIO_SYNCHRONIZE);
syncLastFrame = (value != 0) ? true : false;
} }
return true; return true;
} }