[windows]perfect agora capture.

xgfd3 · xgfd3 · commit c4358f90cc3b · 2022-10-25T21:58:22.000+08:00
diff --git a/windows/APIExample/APIExample/Advanced/CustomVideoCapture/CAgoraCaptureVideoDlg.cpp b/windows/APIExample/APIExample/Advanced/CustomVideoCapture/CAgoraCaptureVideoDlg.cpp
@@ -290,6 +290,7 @@ void CAgoraCaptureVideoDlg::EnableCaputre(BOOL bEnable)
 	if (bEnable == (BOOL)!m_extenalCaptureVideo)return;
 	
 	int nIndex = m_cmbVideoType.GetCurSel();
+	CString strInfo;
 	if (bEnable)
 	{
 		//select video capture type.
@@ -299,6 +300,9 @@ void CAgoraCaptureVideoDlg::EnableCaputre(BOOL bEnable)
 		//create video capture filter.
 		m_agVideoCaptureDevice.CreateCaptureFilter();
 		m_agVideoCaptureDevice.GetCurrentVideoCap(&videoInfo);
+		strInfo.Format(_T("capture-%d: %dx%d"), nIndex, videoInfo.bmiHeader.biWidth, videoInfo.bmiHeader.biHeight);
+		m_lstInfo.InsertString(m_lstInfo.GetCount(), strInfo);
+
 		config.dimensions.width = videoInfo.bmiHeader.biWidth;
 		config.dimensions.height = videoInfo.bmiHeader.biHeight;
 		m_videoFrame.stride = videoInfo.bmiHeader.biWidth;
diff --git a/windows/APIExample/APIExample/DirectShow/AGDShowVideoCapture.cpp b/windows/APIExample/APIExample/DirectShow/AGDShowVideoCapture.cpp
@@ -191,7 +191,13 @@ BOOL CAGDShowVideoCapture::OpenDevice(LPCTSTR lpDevicePath, LPCTSTR lpDeviceName
         if (hResult != S_OK)
             return FALSE;
 
-        _tcscpy_s(m_szActiveDeviceID, MAX_PATH, lpDevicePath); 
+        int nDeviceLen = _tcslen(m_szActiveDeviceID);
+        if (nDeviceLen > 0) {
+            _tcscpy_s(m_szActiveDeviceID, MAX_PATH, lpDevicePath);
+        }
+        else {
+            _tcscpy_s(m_szActiveDeviceID, MAX_PATH, lpDeviceName);
+        }
         SelectMediaCap(0);
 		return TRUE;
     }
diff --git a/windows/APIExample/APIExample/DirectShow/DShowHelper.cpp b/windows/APIExample/APIExample/DirectShow/DShowHelper.cpp
@@ -272,8 +272,8 @@ bool CDShowHelper::EnumDevice(const GUID &type, IMoniker *deviceInfo,
 		if (deviceName.bstrVal && name && wcscmp(name, deviceName.bstrVal) != 0)
             return true;
 
-		if (!devicePath.bstrVal || wcscmp(path, devicePath.bstrVal) != 0)
-			return true;
+// 		if (!devicePath.bstrVal || wcscmp(path, devicePath.bstrVal) != 0)
+// 			return true;
 
         *outfilter = filter;
         return false;
