From 80aaa6049be55bbe3e112e1f4c7554d1b17f6d41 Mon Sep 17 00:00:00 2001
From: chenshijun <csj_sky@126.com>
Date: 星期一, 15 四月 2019 17:16:32 +0800
Subject: [PATCH] 增加一些注释
---
QiaoJiaSystem/VideoAnalysFromHC/RtspAnalysElement.cpp | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/QiaoJiaSystem/VideoAnalysFromHC/RtspAnalysElement.cpp b/QiaoJiaSystem/VideoAnalysFromHC/RtspAnalysElement.cpp
index ef06eb9..a0bac2a 100644
--- a/QiaoJiaSystem/VideoAnalysFromHC/RtspAnalysElement.cpp
+++ b/QiaoJiaSystem/VideoAnalysFromHC/RtspAnalysElement.cpp
@@ -104,7 +104,13 @@
//#todo 浣跨敤绛栫暐妯″紡?鍙戦�佺澶氫釜鎸囦护绱Н鍚庡彂閫�?
if (itor_json->isString() && reader.parse(itor_json->asString(), cfg_val)) {
if (itor_json.name() == "cam_edit" || itor_json.name() == "editSdkRule") {
- string cam_idx = cfg_val["str_cam_dev_id"].asString();
+ string cam_idx = "";
+ if(itor_json.name() == "cam_edit"){
+ cam_idx = cfg_val["str_cam_dev_id"].asString();
+ } else {
+ cam_idx = cfg_val["strCamId"].asString();
+ }
+
if (pthis->controllers.find(cam_idx) != pthis->controllers.end()) {
if (pthis->m_GB28181_Enable) {
auto lst = pthis->m_lDBTool->searchCamDevTableByType(1);
@@ -257,8 +263,9 @@
rule.second.weekRuleVec = m_lDBTool->searchCameraWeekRuleByCamId(item.str_cam_dev_id, rule.first);
if (rule.second.nSdkType == PerStaticSdk) {
- float temp = 1 - (float) (rule.second.nThreshold) / 100;
- rule.second.fSensitivity = (75 + 25 * temp) / 100;
+ float temp = (float)1 - (float) (rule.second.nThreshold) / 100;
+ rule.second.fSensitivity = (temp * 50 + 50) / 100;
+// rule.second.fSensitivity = (temp * 25 + 75) / 100;
} else if (rule.second.nSdkType != FaceSdk) {
float temp = 1 - (float) (rule.second.nThreshold) / 100;
--
Gitblit v1.8.0