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

Merge branch 4.x

Browse Source
This commit is contained in:
Alexander Smorkalov
2026-06-01 13:21:19 +03:00
parent 61d49e12f6 ebb46d5f17
commit 4d0b381f03
30 changed files with 1245 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/videoio/src/cap_msmf.cpp
+3 -1
View File
@@ -1633,7 +1633,9 @@ bool CvCapture_MSMF::configureAudioFrame()
chunkLengthOfBytes = bufferAudioData.size();
audioSamplePos += chunkLengthOfBytes/bytesPerSample;
}
CV_Check((double)chunkLengthOfBytes, chunkLengthOfBytes >= INT_MIN || chunkLengthOfBytes <= INT_MAX, "MSMF: The chunkLengthOfBytes is out of the allowed range");
if ((LONGLONG)bufferAudioData.size() < chunkLengthOfBytes)
chunkLengthOfBytes = (LONGLONG)bufferAudioData.size();
CV_Check((double)chunkLengthOfBytes, chunkLengthOfBytes >= INT_MIN && chunkLengthOfBytes <= INT_MAX, "MSMF: The chunkLengthOfBytes is out of the allowed range");
copy(bufferAudioData.begin(), bufferAudioData.begin() + (int)chunkLengthOfBytes, std::back_inserter(audioDataInUse));
bufferAudioData.erase(bufferAudioData.begin(), bufferAudioData.begin() + (int)chunkLengthOfBytes);
if (audioFrame.empty())