Fix for erronously always returning formats for first camera on syste…

…ms with more than one camera.
sskodje · May 24, 2024 · a046fae · a046fae
1 parent 614f0f0
commit a046fae
Showing 1 changed file with 11 additions and 0 deletions.
diff --git a/ScreenRecorderLib/Recorder.cpp b/ScreenRecorderLib/Recorder.cpp
@@ -560,10 +560,21 @@ List<VideoCaptureFormat^>^ ScreenRecorderLib::Recorder::GetSupportedVideoCapture
 	MeasureExecutionTime measure(L"GetSupportedVideoCaptureFormatsForDevice");
 	std::vector<IMFActivate*> captureDevices;
 	HRESULT hr = EnumVideoCaptureDevices(&captureDevices);
+	std::wstring devicePathWstring = msclr::interop::marshal_as<std::wstring>(DevicePath);
+
+
 	if (SUCCEEDED(hr))
 	{
 		ReleaseVectorOnExit release(captureDevices);
 		for (auto const& pDevice : captureDevices) {
+			// Get the device path
+			WCHAR* symbolicLink = NULL;
+			UINT32 cchSymbolicLink;
+			hr = pDevice->GetAllocatedString(MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE_VIDCAP_SYMBOLIC_LINK, &symbolicLink, &cchSymbolicLink);
+			CoTaskMemFreeOnExit freeSymbolicLink(symbolicLink);
+			if (FAILED(hr) || symbolicLink == NULL || (!devicePathWstring.empty() && devicePathWstring != symbolicLink)) {
+				continue;
+			}
 
 			CComPtr<IMFMediaSource> pSource = nullptr;
 			CONTINUE_ON_BAD_HR(hr = pDevice->ActivateObject(__uuidof(IMFMediaSource), (void**)&pSource));