mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-27 20:50:25 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #26034 from Octopus136:issue-26033

Browse Source 
Fix: reduce redundant code by optimizing device name retrieval
This commit is contained in:
Alexander Smorkalov 2024-08-19 19:06:16 +03:00 committed by GitHub
commit ae4a11b0c0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
modules/videoio/src/cap_dshow.cpp
View File

@ -1382,14 +1382,11 @@ int videoInput::listDevices(bool silent){
// Find the description or friendly name.
VARIANT varName;
VariantInit(&varName);
hr = pPropBag->Read(L"Description", &varName, 0);
hr = pPropBag->Read(L"FriendlyName", &varName, 0);
if (FAILED(hr)) hr = pPropBag->Read(L"FriendlyName", &varName, 0);
if (FAILED(hr)) hr = pPropBag->Read(L"Description", &varName, 0);
if (SUCCEEDED(hr)){
hr = pPropBag->Read(L"FriendlyName", &varName, 0);
int count = 0;
int maxLen = sizeof(deviceNames[0])/sizeof(deviceNames[0][0]) - 2;
while( varName.bstrVal[count] != 0x00 && count < maxLen) {