浏览代码

1、注释高频TRACE打印,减少对DebugView的日志查找影响;
2、根据厂家建议,在QCAP_REGISTER_NO_SIGNAL_DETECTED_CALLBACK回调触发后,进行切换信源,可以No Signal时切换回正常画面;

scbc.sat2 5 年之前
父节点
当前提交
628cdb79f3
共有 3 个文件被更改,包括 32 次插入24 次删除
  1. 11 11
      SATHelper/SATHelper/IOCPModel.cpp
  2. 13 13
      SATHelper/SATHelper/SATClient.cpp
  3. 8 0
      SATHelper/SATHelper/UB530View.cpp

+ 11 - 11
SATHelper/SATHelper/IOCPModel.cpp

@@ -777,7 +777,7 @@ void CIOCPModel::_RecvProcess(PER_SOCKET_CONTEXT* pSocketContext, PER_IO_CONTEXT
 		// 꼇璃관庫;
 		if (PAK_LEN > pIoContext->m_Overlapped.InternalHigh)
 		{
-			OutputDebugString("A:꼇璃관庫;\n");
+			//OutputDebugString("A:꼇璃관庫;\n");
 			pSocketContext->lastData.append(pIoContext->m_wsaBuf.buf, pIoContext->m_Overlapped.InternalHigh);
 		}
 		else
@@ -787,19 +787,19 @@ void CIOCPModel::_RecvProcess(PER_SOCKET_CONTEXT* pSocketContext, PER_IO_CONTEXT
 			// 供憐돨관;
 			if (phead->len == pIoContext->m_Overlapped.InternalHigh)
 			{
-				OutputDebugString("A:供憐돨관;\n");
+				//OutputDebugString("A:供憐돨관;\n");
 				_TaskProcess(pIoContext, (ProPackage*)pIoContext->m_wsaBuf.buf);
 			}
 			// 鬼관;
 			else if (phead->len > pIoContext->m_Overlapped.InternalHigh)
 			{
-				OutputDebugString("A:鬼관;\n");
+				//OutputDebugString("A:鬼관;\n");
 				pSocketContext->lastData.append(pIoContext->m_wsaBuf.buf, pIoContext->m_Overlapped.InternalHigh);
 			}
 			// 낚관;
 			else if (phead->len < pIoContext->m_Overlapped.InternalHigh)
 			{
-				OutputDebugString("A:낚관;\n");
+				//OutputDebugString("A:낚관;\n");
 				pSocketContext->lastData.append(pIoContext->m_wsaBuf.buf + phead->len, pIoContext->m_Overlapped.InternalHigh - phead->len);
 				_TaskProcess(pIoContext, (ProPackage*)pIoContext->m_wsaBuf.buf);
 			}
@@ -815,7 +815,7 @@ void CIOCPModel::_RecvProcess(PER_SOCKET_CONTEXT* pSocketContext, PER_IO_CONTEXT
 			{
 				if ( phead->len <= pSocketContext->lastData.size() )
 				{
-					OutputDebugString("C:낚관;\n");
+					//OutputDebugString("C:낚관;\n");
 					// 供憐관;
 					_TaskProcess(pIoContext, (ProPackage*)pSocketContext->lastData.substr(0, phead->len).data());
 
@@ -824,7 +824,7 @@ void CIOCPModel::_RecvProcess(PER_SOCKET_CONTEXT* pSocketContext, PER_IO_CONTEXT
 				}
 				else
 				{
-					OutputDebugString("D:낚관;\n");
+					//OutputDebugString("D:낚관;\n");
 					lastlen = pSocketContext->lastData.size() + pIoContext->m_Overlapped.InternalHigh - phead->len;
 					pSocketContext->lastData.append(pIoContext->m_wsaBuf.buf, pIoContext->m_Overlapped.InternalHigh - lastlen);
 					// 供憐관;
@@ -837,7 +837,7 @@ void CIOCPModel::_RecvProcess(PER_SOCKET_CONTEXT* pSocketContext, PER_IO_CONTEXT
 			}
 			else
 			{
-				OutputDebugString("C:휄꼇璃寧몸관;\n");
+				//OutputDebugString("C:휄꼇璃寧몸관;\n");
 				pSocketContext->lastData.append(pIoContext->m_wsaBuf.buf, pIoContext->m_Overlapped.InternalHigh);
 			}
 		}
@@ -848,7 +848,7 @@ void CIOCPModel::_RecvProcess(PER_SOCKET_CONTEXT* pSocketContext, PER_IO_CONTEXT
 			// 휄꼇璃寧몸관庫;
 			if ( diflen > pIoContext->m_Overlapped.InternalHigh )
 			{
-				OutputDebugString("B:휄꼇璃寧몸관庫;\n");
+				//OutputDebugString("B:휄꼇璃寧몸관庫;\n");
 				pSocketContext->lastData.append(pIoContext->m_wsaBuf.buf, pIoContext->m_Overlapped.InternalHigh);
 			}
 			else
@@ -860,7 +860,7 @@ void CIOCPModel::_RecvProcess(PER_SOCKET_CONTEXT* pSocketContext, PER_IO_CONTEXT
 				// 供憐관;
 				if ( phead->len == PAK_LEN + pIoContext->m_Overlapped.InternalHigh - diflen )
 				{
-					OutputDebugString("B:供憐관;\n");
+					//OutputDebugString("B:供憐관;\n");
 					pSocketContext->lastData.append(pIoContext->m_wsaBuf.buf + diflen, pIoContext->m_Overlapped.InternalHigh - diflen);
 					_TaskProcess(pIoContext, (ProPackage*)pSocketContext->lastData.data());
 					pSocketContext->lastData.clear();
@@ -868,13 +868,13 @@ void CIOCPModel::_RecvProcess(PER_SOCKET_CONTEXT* pSocketContext, PER_IO_CONTEXT
 				// 鬼관;
 				else if ( phead->len > PAK_LEN + pIoContext->m_Overlapped.InternalHigh - diflen)
 				{
-					OutputDebugString("B:鬼관;\n");
+					//OutputDebugString("B:鬼관;\n");
 					pSocketContext->lastData.append(pIoContext->m_wsaBuf.buf + diflen, pIoContext->m_Overlapped.InternalHigh - diflen);
 				}
 				// 낚관;
 				else if (phead->len < PAK_LEN + pIoContext->m_Overlapped.InternalHigh - diflen)
 				{
-					OutputDebugString("B:낚관;\n");
+					//OutputDebugString("B:낚관;\n");
 					// 莉供냥관;
 					pSocketContext->lastData.append(pIoContext->m_wsaBuf.buf + diflen, phead->len - PAK_LEN);
 					_TaskProcess(pIoContext, (ProPackage*)pSocketContext->lastData.data());

+ 13 - 13
SATHelper/SATHelper/SATClient.cpp

@@ -90,13 +90,13 @@ bool CSATClient::OnSend(const byte* pData, int nLen, BOOL bShowGif)
 			dlg.DoModal();
 		}
 		
-		OutputDebugString(_T("发送数据成功!\n"));
+		//OutputDebugString(_T("发送数据成功!\n"));
 		return true;
 	}
 	else
 	{
 		g_pDlgProBar = NULL;
-		OutputDebugString(_T("发送数据失败!\n"));
+		//OutputDebugString(_T("发送数据失败!\n"));
 	}
 
 	return false;
@@ -111,7 +111,7 @@ bool CSATClient::OnReceive(const byte* pData, int nLen)
 		// 不足包头;
 		if (PAK_LEN > nLen)
 		{
-			OutputDebugString("A:不足包头;\n");
+			//OutputDebugString("A:不足包头;\n");
 			lastData.append((char*)pData, nLen);
 		}
 		else
@@ -122,19 +122,19 @@ bool CSATClient::OnReceive(const byte* pData, int nLen)
 			// 完整的包;
 			if (phead->len == nLen)
 			{
-				OutputDebugString("A:完整的包;\n");
+				//OutputDebugString("A:完整的包;\n");
 				TaskProcess((SATPROTO::Package*)pData);
 			}
 			// 小包;
 			else if (phead->len > nLen)
 			{
-				OutputDebugString("A:小包;\n");
+				//OutputDebugString("A:小包;\n");
 				lastData.append((char*)pData, nLen);
 			}
 			// 超包;
 			else if (phead->len < nLen)
 			{
-				OutputDebugString("A:超包;\n");
+				//OutputDebugString("A:超包;\n");
 				lastData.append((char*)pData + phead->len, nLen - phead->len);
 				TaskProcess((SATPROTO::Package*)pData);
 			}
@@ -150,7 +150,7 @@ bool CSATClient::OnReceive(const byte* pData, int nLen)
 			{
 				if (phead->len <= lastData.size())
 				{
-					OutputDebugString("C:超包;\n");
+					//OutputDebugString("C:超包;\n");
 					// 完整包;
 					TaskProcess((SATPROTO::Package*)lastData.substr(0, phead->len).data());
 
@@ -159,7 +159,7 @@ bool CSATClient::OnReceive(const byte* pData, int nLen)
 				}
 				else
 				{
-					OutputDebugString("D:超包;\n");
+					//OutputDebugString("D:超包;\n");
 					lastlen = lastData.size() + nLen - phead->len;
 					lastData.append((char*)pData, nLen - lastlen);
 					// 完整包;
@@ -172,7 +172,7 @@ bool CSATClient::OnReceive(const byte* pData, int nLen)
 			}
 			else
 			{
-				OutputDebugString("C:仍不足一个包;\n");
+				//OutputDebugString("C:仍不足一个包;\n");
 				lastData.append((char*)pData, nLen);
 			}
 		}
@@ -183,7 +183,7 @@ bool CSATClient::OnReceive(const byte* pData, int nLen)
 			// 仍不足一个包头;
 			if (diflen > nLen)
 			{
-				OutputDebugString("B:仍不足一个包头;\n");
+				//OutputDebugString("B:仍不足一个包头;\n");
 				lastData.append((char*)pData, nLen);
 			}
 			else
@@ -195,7 +195,7 @@ bool CSATClient::OnReceive(const byte* pData, int nLen)
 				// 完整包;
 				if (phead->len == PAK_LEN + nLen - diflen)
 				{
-					OutputDebugString("B:完整包;\n");
+					//OutputDebugString("B:完整包;\n");
 					lastData.append((char*)pData + diflen, nLen - diflen);
 					TaskProcess((SATPROTO::Package*)lastData.data());
 					lastData.clear();
@@ -203,13 +203,13 @@ bool CSATClient::OnReceive(const byte* pData, int nLen)
 				// 小包;
 				else if (phead->len > PAK_LEN + nLen - diflen)
 				{
-					OutputDebugString("B:小包;\n");
+					//OutputDebugString("B:小包;\n");
 					lastData.append((char*)pData + diflen, nLen - diflen);
 				}
 				// 超包;
 				else if (phead->len < PAK_LEN + nLen - diflen)
 				{
-					OutputDebugString("B:超包;\n");
+					//OutputDebugString("B:超包;\n");
 					// 组完成包;
 					lastData.append((char*)pData + diflen, phead->len - PAK_LEN);
 					TaskProcess((SATPROTO::Package*)lastData.data());

+ 8 - 0
SATHelper/SATHelper/UB530View.cpp

@@ -108,8 +108,16 @@ QRETURN on_process_no_signal_detected2(PVOID pDevice, ULONG nVideoInput, ULONG n
 	if (pView->GetSafeHwnd() == NULL) { return QCAP_RT_OK; }
 
 	//pView->SetRibbonStatusBarText("当前采集卡无信号。", ID_STATUSBAR_PANE1);
+	OutputDebugString(CTime::GetCurrentTime().Format(_T("%Y-%m-%d %H:%M:%S")) + "当前采集卡无信号\n");
 	::SendMessage(g_pMainFrame->m_hWnd, MSG_STATUS_BAR, (WPARAM)&CString("当前采集卡无信号"), ID_STATUSBAR_PANE1);
 
+	// 切换到HDMI->Auto
+	if (pView->m_hVideoDevice != NULL) {
+		QCAP_SET_VIDEO_INPUT(pView->m_hVideoDevice, QCAP_INPUT_TYPE_HDMI);
+		QCAP_SET_VIDEO_INPUT(pView->m_hVideoDevice, QCAP_INPUT_TYPE_AUTO);
+		OutputDebugString("【SATHelper】进行信源切换:HDMI->AUTO");
+	}
+
 	pView->m_bNoSignal = TRUE;
 	pView->SetTimer(0x00000000, 1, NULL);