From 9224e5d90a1021c5a3b0135d4e2e39350a0f3ce1 Mon Sep 17 00:00:00 2001 From: Kumataro Date: Sun, 8 Feb 2026 06:36:54 +0900 Subject: [PATCH] videoio(msmf): replace unnecessary get() usage with integer types --- modules/videoio/src/cap_msmf.cpp | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/modules/videoio/src/cap_msmf.cpp b/modules/videoio/src/cap_msmf.cpp index 751279d2b1..a79cb19716 100644 --- a/modules/videoio/src/cap_msmf.cpp +++ b/modules/videoio/src/cap_msmf.cpp @@ -1388,9 +1388,9 @@ bool CvCapture_MSMF::configureStreams(const cv::VideoCaptureParameters& params) { if (params.has(CAP_PROP_VIDEO_STREAM)) { - double value = params.get(CAP_PROP_VIDEO_STREAM); + int value = params.get(CAP_PROP_VIDEO_STREAM); if (value == -1 || value == 0) - videoStream = static_cast(value); + videoStream = value; else { 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)) { - double value = params.get(CAP_PROP_AUDIO_STREAM); - if (value == -1 || value > -1) + int value = params.get(CAP_PROP_AUDIO_STREAM); + if (value == -1 || value >= 0) audioStream = static_cast(value); else { @@ -1414,7 +1414,7 @@ bool CvCapture_MSMF::setAudioProperties(const cv::VideoCaptureParameters& params { if (params.has(CAP_PROP_AUDIO_DATA_DEPTH)) { - int value = static_cast(params.get(CAP_PROP_AUDIO_DATA_DEPTH)); + int value = params.get(CAP_PROP_AUDIO_DATA_DEPTH); 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); @@ -1427,7 +1427,7 @@ bool CvCapture_MSMF::setAudioProperties(const cv::VideoCaptureParameters& params } if (params.has(CAP_PROP_AUDIO_SAMPLES_PER_SECOND)) { - int value = static_cast(params.get(CAP_PROP_AUDIO_SAMPLES_PER_SECOND)); + int value = params.get(CAP_PROP_AUDIO_SAMPLES_PER_SECOND); if (value < 0) { 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)) { - int value = static_cast(params.get(CAP_PROP_AUDIO_SYNCHRONIZE)); - syncLastFrame = (value != 0) ? true : false; + syncLastFrame = params.get(CAP_PROP_AUDIO_SYNCHRONIZE); } return true; }