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

Merge pull request #22347 from bu3w:filter-camera-streaming-by-format

Browse Source 
select correct MediaType in MSMF backend.
This commit is contained in:
Alexander Smorkalov 2022-08-26 12:49:47 +03:00 committed by GitHub
commit 560eba91e5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -348,6 +348,12 @@ struct MediaType
} }
return false; return false;
} }
bool VideoIsAvailable() const
{
return ((subType == MFVideoFormat_RGB32) ||
(subType == MFVideoFormat_RGB24) ||
(subType == MFVideoFormat_YUY2));
}
}; };
void printFormat(std::ostream& out, const GUID& fmt) void printFormat(std::ostream& out, const GUID& fmt)
@ -628,7 +634,7 @@ public:
{ {
if (i->second.majorType == MFMediaType_Video) if (i->second.majorType == MFMediaType_Video)
{ {
if (best.second.isEmpty() || i->second.VideoIsBetterThan(best.second, newType)) if (best.second.isEmpty() || (i->second.VideoIsBetterThan(best.second, newType) && i->second.VideoIsAvailable()))
{ {
best = *i; best = *i;
} }