potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-21 19:33:03 +04:00
Code Packages Releases Wiki Activity

Merge pull request #29502 from asmorkalov:as/msmf_audio

Browse Source 
videoio(MSMF): fix audio sample-rate validation and dropped last frame
This commit is contained in:
Alexander Smorkalov
2026-07-12 17:11:55 +03:00
committed by GitHub
parent 87af90b847 4533beab85
commit 7f9f6acb83
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/videoio/src/cap_msmf.cpp
+4 -3
View File
@@ -1427,10 +1427,11 @@ bool CvCapture_MSMF::setAudioProperties(const cv::VideoCaptureParameters& params
}
if (params.has(CAP_PROP_AUDIO_SAMPLES_PER_SECOND))
{
static const int MSMF_MAX_AUDIO_SAMPLES_PER_SECOND = 384000; // highest rate used by real PCM audio hardware
int value = params.get<int>(CAP_PROP_AUDIO_SAMPLES_PER_SECOND);
if (value < 0)
if (value < 0 || value > MSMF_MAX_AUDIO_SAMPLES_PER_SECOND)
{
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 value is invalid/unsupported: " << value);
return false;
}
else
@@ -1727,7 +1728,7 @@ bool CvCapture_MSMF::grabAudioFrame()
else if (flags & MF_SOURCE_READERF_ENDOFSTREAM)
{
aEOS = true;
if (videoStream != -1 && !vEOS)
if (videoStream != -1)
returnFlag = true;
if (videoStream == -1)
audioSamplePos += chunkLengthOfBytes/((captureAudioFormat.bit_per_sample/8)*captureAudioFormat.nChannels);
modules/videoio/test/test_audio.cpp
+1 -1
View File
@@ -40,7 +40,7 @@ protected:
for (unsigned int nCh = 0; nCh < audioData.size(); nCh++)
{
#ifdef _WIN32
if (audioData[nCh].size() == 132924 && numberOfSamples == 131819 && fileName == "test_audio.mp4")
if ((audioData[nCh].size() == 132924 || audioData[nCh].size() == 133104) && numberOfSamples == 131819 && fileName == "test_audio.mp4")
throw SkipTestException("Detected failure observed on legacy Windows versions. SKIP");
#endif
ASSERT_EQ(numberOfSamples, audioData[nCh].size()) << "nCh=" << nCh;