From 2cf69b4bbe56fc379c7f433037e043d0dba42493 Mon Sep 17 00:00:00 2001
From: miyanhui <dennismi1024@gmail.com>
Date: 星期五, 15 二月 2019 15:58:59 +0800
Subject: [PATCH] Merge branch 'ywv1.2' of http://192.168.1.226:10010/r/development/c++ into ywv1.2
---
QiaoJiaSystem/VideoAnalysFromHC/RtspAnalysElement.cpp | 29 +++++++++++++++++++----------
1 files changed, 19 insertions(+), 10 deletions(-)
diff --git a/QiaoJiaSystem/VideoAnalysFromHC/RtspAnalysElement.cpp b/QiaoJiaSystem/VideoAnalysFromHC/RtspAnalysElement.cpp
index 828dc70..25b961b 100644
--- a/QiaoJiaSystem/VideoAnalysFromHC/RtspAnalysElement.cpp
+++ b/QiaoJiaSystem/VideoAnalysFromHC/RtspAnalysElement.cpp
@@ -85,20 +85,29 @@
rule.second.strAddr = item.str_addr;
rule.second.weekRuleVec = m_lDBTool->searchCameraWeekRuleByCamId(item.str_cam_dev_id, rule.first);
- if(rule.second.nSdkType == FaceSdk) continue;
+ if(rule.second.nSdkType == PerStaticSdk)
+ {
+ float temp=1-(float)(rule.second.nThreshold)/100;
+ rule.second.fSensitivity=(75+25*temp)/100;
- if (rule.second.nThreshold < 5 )
- {
- rule.second.fSensitivity=0.95;
}
- else if(rule.second.nThreshold > 95)
+ else if(rule.second.nSdkType != FaceSdk)
{
- rule.second.fSensitivity=0.05;
+ float temp=1-(float)(rule.second.nThreshold)/100;
+ rule.second.fSensitivity=(5+90*temp)/100;
}
- else
- {
- rule.second.fSensitivity = 1-(float) (rule.second.nThreshold) / 100;
- }
+// if (rule.second.nThreshold < 5 )
+// {
+// rule.second.fSensitivity=0.95;
+// }
+// else if(rule.second.nThreshold > 95)
+// {
+// rule.second.fSensitivity=0.05;
+// }
+// else
+// {
+// rule.second.fSensitivity = 1-(float) (rule.second.nThreshold) / 100;
+// }
DBG("fSensitivity" << rule.second.fSensitivity);
}
--
Gitblit v1.8.0