From adb08adc83dfe9dc5d6170c2322952d77a93c510 Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期三, 03 四月 2019 09:54:33 +0800
Subject: [PATCH] Merge branch 'yw.1.2' into yangwu1.3
---
QiaoJiaSystem/VideoAnalysFromHC/main.cpp | 47 +++++++++++++++++++++++++++++++++++++----------
1 files changed, 37 insertions(+), 10 deletions(-)
diff --git a/QiaoJiaSystem/VideoAnalysFromHC/main.cpp b/QiaoJiaSystem/VideoAnalysFromHC/main.cpp
index 98df593..6edf3bf 100644
--- a/QiaoJiaSystem/VideoAnalysFromHC/main.cpp
+++ b/QiaoJiaSystem/VideoAnalysFromHC/main.cpp
@@ -9,6 +9,7 @@
#include "DBManageClass.h"
#include "RtspAnalysElement.h"
#include <basic/debug/Debug.h>
+#include "StructureApp/NewEncodeVideoManager.h"
//#include "PerimeterAlarmManager.h"
//#include "KeepRightManager.h"
//"192.168.1.4", 8000, "admin", "basic123"
@@ -41,6 +42,8 @@
static void startRtspAnalysElement(LDBTool *_dbTool) {
RtspAnalysElement rtspAnalysElement(_dbTool);
+// NewEncodeVideoManager newEncodeVideoManager;
+// newEncodeVideoManager.start();
while (1) {
sleep(1 * 60 * 60 * 12);
}
@@ -63,9 +66,32 @@
int main(int argc, char **argv) {
SAVE_APP_ARGS
+ std::cout << __DATE__ << " " << __TIME__ << std::endl;
+#ifdef GLOG
ENABLEGLOG(GET_STR_CONFIG("logPath").c_str());
+#endif
- appPref.setLongData("gpu.index", 0);
+#ifndef GB28181
+ DBG("no GB28181");
+#else
+ DBG("hava GB28181");
+#endif
+
+ if (argc < 10) {
+ assert("t_value.size()");
+ }
+
+ //todo
+ 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
@@ -79,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"),
@@ -87,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"),
@@ -96,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"),//浜鸿劯鐗瑰緛鎻愬彇 淇敼鎴愮偣瀵圭偣閫氳
@@ -104,15 +130,15 @@
//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")
//loopRecord server
- appPref.setStringData("loopRecord.proxy", "LoopRecordVideoServer");
- //#todo
- appPref.setStringData("loopRecord.ip", "");
- appPref.setIntData("loopRecord.port", 10010);
+// appPref.setStringData("loopRecord.proxy", "LoopRecordVideoServer");
+// //#todo
+// appPref.setStringData("loopRecord.ip", "");
+// appPref.setIntData("loopRecord.port", 10010);
//rpcClient(appPref.getStringData("loopRecord.proxy"), appPref.getStringData("loopRecord.ip"), appPref.getLongData("loopRecord.port"),"tcp"),
LDBTool _dbTool;
@@ -123,11 +149,12 @@
appPref.setStringData("fxDevID", rec.dev_id.toStdString());
appPref.setStringData("fxDevNAME", rec.dev_name.toStdString());
appPref.setStringData("user.loop.absolute.path", appConfig.getStringProperty("cutPath"));
-
+ appPref.setStringData("clusterID", appConfig.getStringProperty("clusterID"));
bool loopRet = true;
while (loopRet) {
switch (_dbTool.searchDevTypeFromConfigTable()) {
+
case 0: {
DBG("case 0");
sleep(5);
--
Gitblit v1.8.0