jp9000
/
obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

win-dshow: Fix "Highest FPS" algorithm 

MatcherClosestFrameRateSelector updates best_match as a side effect of
visiting every VideoInfo instance, but CapsMatch uses std::any_of,
which will stop iterating prematurely on first match. This means that
the highest FPS is not selected.

This change switches to a for loop that doesn't exit early.
master
James Park 2019-03-03 10:05:09 -08:00
parent eadeaeb3e6
commit b3c2e74d0f
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
plugins/win-dshow/win-dshow.cpp
View File

@ -671,12 +671,12 @@ static inline bool CapsMatch(const VideoInfo &info, F&& f, Fs ... fs)
template <typename ... F>
static bool CapsMatch(const VideoDevice &dev, F ... fs)
{
auto matcher = [&](const VideoInfo &info)
{
return CapsMatch(info, fs ...);
};
return any_of(begin(dev.caps), end(dev.caps), matcher);
// no early exit, trigger all side effects.
bool match = false;
for (const VideoInfo &info : dev.caps)
if (CapsMatch(info, fs ...))
match = true;
return match;
}
static inline bool MatcherMatchVideoFormat(VideoFormat format,