From 99221e4721a1246883465c2b52fbff14eb9aaa7a Mon Sep 17 00:00:00 2001
From: pans <pansen626@sina.com>
Date: 星期六, 30 三月 2019 12:12:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/yangwu1.3' into yangwu1.3
---
QiaoJiaSystem/VideoAnalysFromHC/main.cpp | 34 ++++++++++++++++------------------
1 files changed, 16 insertions(+), 18 deletions(-)
diff --git a/QiaoJiaSystem/VideoAnalysFromHC/main.cpp b/QiaoJiaSystem/VideoAnalysFromHC/main.cpp
index 5103ad8..6edf3bf 100644
--- a/QiaoJiaSystem/VideoAnalysFromHC/main.cpp
+++ b/QiaoJiaSystem/VideoAnalysFromHC/main.cpp
@@ -77,24 +77,22 @@
DBG("hava GB28181");
#endif
- if (argc < 4) {
+ if (argc < 10) {
assert("t_value.size()");
}
- int arg1 = atoi(argv[1]);
-
- int gindx = abs(arg1) % 2;
- int GB28181_Enable = arg1 < 0 ? gindx : -1;
- DBG(gindx);
- appPref.setIntData("GB28181_Enable", GB28181_Enable);
-
- appPref.setLongData("gpu.index", gindx);
- appPref.setIntData("show.image", 0);
-
//todo
- appPref.setIntData("CamStart", atoi(argv[1]));
- appPref.setIntData("CamStep", atoi(argv[2]));
- appPref.setIntData("RpcServerPort", atoi(argv[3]));
+ appPref.setIntData("GB28181_Enable", atoi(argv[1]));
+ appPref.setIntData("gpu.index", atoi(argv[2]));
+ appPref.setIntData("CamStartNO", atoi(argv[3]));
+ appPref.setIntData("CamEndNO", atoi(argv[4]));
+ appPref.setIntData("RpcYOLOPort", atoi(argv[5]));
+ appPref.setIntData("RpcFDPort", atoi(argv[6]));
+ appPref.setIntData("RpcFEPort", atoi(argv[7]));
+ appPref.setIntData("RpcFSPort", atoi(argv[8]));
+ appPref.setIntData("RpcVTIMPort", atoi(argv[9]));//瑙﹀彂褰曞儚
+
+ appPref.setIntData("show.image", 0);
//#todo get from config File
// appPref.setStringData("ipAdd", "192.168.1.185");
@@ -107,7 +105,7 @@
appPref.setStringData("yolo.proxy", "yoloServer");
//#todo
appPref.setStringData("yolo.ip", "");
- appPref.setIntData("yolo.port", 10003);
+ appPref.setIntData("yolo.port", appPref.getIntData("RpcYOLOPort"));
// rpcClient(appPref.getStringData("yolo.proxy"), appPref.getStringData("yolo.ip"), appPref.getLongData("yolo.port"),"tcp"),
@@ -115,7 +113,7 @@
appPref.setStringData("faceDete.proxy", "faceServer");
//#todo
appPref.setStringData("faceDete.ip", "");
- appPref.setIntData("faceDete.port", 10002);
+ appPref.setIntData("faceDete.port", appPref.getIntData("RpcFDPort"));
//rpcClient(appPref.getStringData("faceDete.proxy"), appPref.getStringData("faceDete.ip"), appPref.getLongData("faceDete.port"),"tcp"),
// rpcClient("faceServer","",10002,"tcp"),
@@ -124,7 +122,7 @@
appPref.setStringData("faceExte.proxy", "faceExtractServer");
//#todo
appPref.setStringData("faceExte.ip", "");
- appPref.setIntData("faceExte.port", 10008);
+ appPref.setIntData("faceExte.port", appPref.getIntData("RpcFEPort"));
//rpcClient(appPref.getStringData("faceExte.proxy"), appPref.getStringData("faceExte.ip"), appPref.getLongData("faceExte.port"),"tcp"),
// "faceExtractServer", "", 10008, "tcp"),//浜鸿劯鐗瑰緛鎻愬彇 淇敼鎴愮偣瀵圭偣閫氳
@@ -132,7 +130,7 @@
//face search server
appPref.setStringData("faceSear.proxy", "faceCmServer");
appPref.setStringData("faceSear.ip", "");
- appPref.setIntData("faceSear.port", 10004);
+ appPref.setIntData("faceSear.port", appPref.getIntData("RpcFSPort"));
//rpcClient(appPref.getStringData("faceSear.proxy"), appPref.getStringData("faceSear.ip"), appPref.getLongData("faceSear.port"),"tcp"),
// faceSearchRpcClient("faceCmServer", "", 10004, "tcp")
--
Gitblit v1.8.0