mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-01-19 06:53:50 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #22395 from hzcyf:infinite_loop_fix

Browse Source
This commit is contained in:
Alexander Smorkalov 2022-08-19 07:11:09 +00:00
commit 0702685e7e
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
modules/videoio/src/cap_obsensor/obsensor_stream_channel_msmf.cpp
View File

@ -25,6 +25,7 @@
#include "obsensor_stream_channel_msmf.hpp" #include "obsensor_stream_channel_msmf.hpp"
#include <shlwapi.h> // QISearch #include <shlwapi.h> // QISearch
#include <Mferror.h>
#pragma warning(disable : 4503) #pragma warning(disable : 4503)
#pragma comment(lib, "mfplat") #pragma comment(lib, "mfplat")
@ -98,7 +99,7 @@ bool parseUvcDeviceSymbolicLink(const std::string& symbolicLink, uint16_t& vid,
std::string lowerStr = symbolicLink; std::string lowerStr = symbolicLink;
for (size_t i = 0; i < lowerStr.length(); i++) for (size_t i = 0; i < lowerStr.length(); i++)
{ {
lowerStr[i] = (char)tolower(lowerStr[i]); lowerStr[i] = (char)tolower(lowerStr[i]);
} }
auto tokens = stringSplit(lowerStr, '#'); auto tokens = stringSplit(lowerStr, '#');
if (tokens.size() < 1 || (tokens[0] != R"(\\?\usb)" && tokens[0] != R"(\\?\hid)")) if (tokens.size() < 1 || (tokens[0] != R"(\\?\usb)" && tokens[0] != R"(\\?\hid)"))
@ -317,8 +318,12 @@ void MSMFStreamChannel::start(const StreamProfile& profile, FrameCallback frameC
{ {
for (uint32_t k = 0;; k++) for (uint32_t k = 0;; k++)
{ {
HR_FAILED_EXEC(streamReader_->GetNativeMediaType(index, k, &mediaType), { continue; }) auto hr = streamReader_->GetNativeMediaType(index, k, &mediaType);
GUID subtype; if(hr == MF_E_INVALIDSTREAMNUMBER || hr == MF_E_NO_MORE_TYPES){
break;
}
HR_FAILED_EXEC(hr, { continue; })
GUID subtype;
HR_FAILED_RETURN(mediaType->GetGUID(MF_MT_SUBTYPE, &subtype)); HR_FAILED_RETURN(mediaType->GetGUID(MF_MT_SUBTYPE, &subtype));
HR_FAILED_RETURN(MFGetAttributeSize(mediaType.Get(), MF_MT_FRAME_SIZE, &width, &height)); HR_FAILED_RETURN(MFGetAttributeSize(mediaType.Get(), MF_MT_FRAME_SIZE, &width, &height));
HR_FAILED_RETURN(MFGetAttributeRatio(mediaType.Get(), MF_MT_FRAME_RATE_RANGE_MIN, &frameRateMin.numerator, &frameRateMin.denominator)); HR_FAILED_RETURN(MFGetAttributeRatio(mediaType.Get(), MF_MT_FRAME_RATE_RANGE_MIN, &frameRateMin.numerator, &frameRateMin.denominator));