From ed7186f89434ff9a19a5abdce8252d69460677ee Mon Sep 17 00:00:00 2001
From: chenshijun <chenshijun@aiotlink.com>
Date: 星期五, 15 三月 2019 13:50:04 +0800
Subject: [PATCH] 将算法的进程以多进程方式启动
---
QiaoJiaSystem/VideoAnalysFromHC/RtspAnalysElement.cpp | 6
QiaoJiaSystem/StructureApp/PerimeterElement.cpp | 2
QiaoJiaSystem/DataManagerServer/AppPipeController.cpp | 4
QiaoJiaSystem/VideoToImageMulth/main.cpp | 34 +++++---
QiaoJiaSystem/VideoAnalysFromHC/main.cpp | 34 ++++----
QiaoJiaSystem/StructureApp/JudgmentRetrogradeTool.h | 2
QiaoJiaSystem/VideoToImageMulth/RtspAnalysManager.cpp | 8 +-
QiaoJiaSystem/YoloServer/main.cpp | 28 ++++--
QiaoJiaSystem/DataManagerServer/demo.cpp | 2
QiaoJiaSystem/StructureApp/JudgmentRetrogradeTool.cpp | 2
QiaoJiaSystem/VideoToImage/main.cpp | 2
QiaoJiaSystem/FaceSearchServer/main.cpp | 17 ++-
QiaoJiaSystem/StructureApp/PerimeterElement.h | 2
QiaoJiaSystem/FaceDetectServer/main.cpp | 4
QiaoJiaSystem/FaceDetectServer/FaceExtractServerI.cpp | 4
QiaoJiaSystem/FaceSearchServer/CasiaFaceWrapper/CasiaFaceWrapperN.cpp | 4
QiaoJiaSystem/StructureApp/main.cpp | 2
QiaoJiaSystem/FaceDetectServer/main_extract.cpp | 18 ++-
QiaoJiaSystem/PerimeterAlarm/main.cpp | 2
QiaoJiaSystem/VideoToImageMulth/pushStream/PushStreamAppPipeController.cpp | 2
QiaoJiaSystem/DataManagerServer/main.cpp | 4
QiaoJiaSystem/PerimeterAlarm/AppPaController.cpp | 2
QiaoJiaSystem/StructureApp/AppPipeController.cpp | 14 +-
QiaoJiaSystem/FaceDetectServer/FaceDetectServerI.cpp | 4
QiaoJiaSystem/RapidStructureApp/RapidAppPipeController.cpp | 2
QiaoJiaSystem/StructureApp/AppPipeControllerTest.cpp | 2
QiaoJiaSystem/FaceDetectServer/main_detect.cpp | 18 ++-
QiaoJiaSystem/FaceSearchServer/Cleint.cpp | 2
QiaoJiaSystem/VideoAnalysFromHC/CMakeLists.txt | 2
QiaoJiaSystem/StructureApp/FaceExtractElement.cpp | 2
30 files changed, 130 insertions(+), 101 deletions(-)
diff --git a/QiaoJiaSystem/DataManagerServer/AppPipeController.cpp b/QiaoJiaSystem/DataManagerServer/AppPipeController.cpp
index 8d00d0e..91779a0 100644
--- a/QiaoJiaSystem/DataManagerServer/AppPipeController.cpp
+++ b/QiaoJiaSystem/DataManagerServer/AppPipeController.cpp
@@ -4,10 +4,10 @@
//#include <sstream>
#include <algorithm>
AppPipeController::AppPipeController(int index, const Json::Value &json):
- videoCaptureElement(json["rtsp"].asString(), 25,3000,appPref.getLongData("gpu.index")),
+ videoCaptureElement(json["rtsp"].asString(), 25,3000,appPref.getIntData("gpu.index")),
index(index), videoPublishElement(appPref.getStringData("publish.basepath")+".flv",
cv::Size(appPref.getIntData("pulish.width"),appPref.getIntData("pulish.height")),
- "flv", 25, appPref.getLongData("gpu.index"))
+ "flv", 25, appPref.getIntData("gpu.index"))
{
if(appPref.getIntData("pulish.width") < 0 || appPref.getIntData("pulish.height") < 0)
{
diff --git a/QiaoJiaSystem/DataManagerServer/demo.cpp b/QiaoJiaSystem/DataManagerServer/demo.cpp
index 8907a69..4217194 100644
--- a/QiaoJiaSystem/DataManagerServer/demo.cpp
+++ b/QiaoJiaSystem/DataManagerServer/demo.cpp
@@ -12,7 +12,7 @@
// json["rtsp"] = "rtsp://admin:a1234567@192.168.1.201:554/h264/ch1/main/av_stream";
//
// std::string publish_basepath = "rtmp://localhost:1934/live/cam" + std::to_string(554);
-// appPref.setLongData("gpu.index", 0);
+// appPref.setIntData("gpu.index", 0);
// appPref.setStringData("publish.basepath", publish_basepath);
// appPref.setIntData("pulish.width", 640);
// appPref.setIntData("pulish.height", 360);
diff --git a/QiaoJiaSystem/DataManagerServer/main.cpp b/QiaoJiaSystem/DataManagerServer/main.cpp
index dc83e28..42fa8c7 100644
--- a/QiaoJiaSystem/DataManagerServer/main.cpp
+++ b/QiaoJiaSystem/DataManagerServer/main.cpp
@@ -18,8 +18,8 @@
// GetGateWay("enp1s0", gateway_addr);
// SetGateWay("enp1s0", (char *)gateway_addr, "192.168.1.1");
- appPref.setLongData("gpu.index", 0);//gpu
- appPref.setLongData("thread.max", 20);//sdk
+ appPref.setIntData("gpu.index", 0);//gpu
+ appPref.setIntData("thread.max", 20);//sdk
int port = appConfig.getIntProperty("webPort");
devHttpServer_c _devHttpServer("0.0.0.0", port, 20);//webserver thread
diff --git a/QiaoJiaSystem/FaceDetectServer/FaceDetectServerI.cpp b/QiaoJiaSystem/FaceDetectServer/FaceDetectServerI.cpp
index b9206a9..0c42a6d 100644
--- a/QiaoJiaSystem/FaceDetectServer/FaceDetectServerI.cpp
+++ b/QiaoJiaSystem/FaceDetectServer/FaceDetectServerI.cpp
@@ -7,8 +7,8 @@
#include <THFaceProperty_i.h>
FaceDetectServerI::FaceDetectServerI() {
- long threadMax = appPref.getLongData("thread.max");
- long gpuIndex = appPref.getLongData("gpu.index");
+ long threadMax = appPref.getIntData("thread.max");
+ long gpuIndex = appPref.getIntData("gpu.index");
for (int i = 0; i < threadMax; i++) {
detectResourcesManager.pushResource(i);
}
diff --git a/QiaoJiaSystem/FaceDetectServer/FaceExtractServerI.cpp b/QiaoJiaSystem/FaceDetectServer/FaceExtractServerI.cpp
index 0c82dfc..0485c6a 100644
--- a/QiaoJiaSystem/FaceDetectServer/FaceExtractServerI.cpp
+++ b/QiaoJiaSystem/FaceDetectServer/FaceExtractServerI.cpp
@@ -6,8 +6,8 @@
#include <THFeature_i.h>
FaceExtractServerI::FaceExtractServerI() {
- long threadMax = appPref.getLongData("thread.max");
- long gpuIndex = appPref.getLongData("gpu.index");
+ long threadMax = appPref.getIntData("thread.max");
+ long gpuIndex = appPref.getIntData("gpu.index");
for (int i = 0; i < threadMax; i++) {
extractResourcesManager.pushResource(i);
}
diff --git a/QiaoJiaSystem/FaceDetectServer/main.cpp b/QiaoJiaSystem/FaceDetectServer/main.cpp
index 425bdde..f2820dc 100644
--- a/QiaoJiaSystem/FaceDetectServer/main.cpp
+++ b/QiaoJiaSystem/FaceDetectServer/main.cpp
@@ -29,8 +29,8 @@
int threadMax = atol(ich->getProperties()->getProperty("user.thread.max").c_str());
#endif
ich->getProperties()->setProperty("Ice.ThreadPool.Server.SizeMax",to_string(threadMax));
- appPref.setLongData("gpu.index",atol(gpuIndex.c_str()));
- appPref.setLongData("thread.max", threadMax);
+ appPref.setIntData("gpu.index",atol(gpuIndex.c_str()));
+ appPref.setIntData("thread.max", threadMax);
auto adapter = ich->createObjectAdapter(adapterName);
adapter->add(new FaceDetectServerI(), Ice::stringToIdentity(identity));
diff --git a/QiaoJiaSystem/FaceDetectServer/main_detect.cpp b/QiaoJiaSystem/FaceDetectServer/main_detect.cpp
index dabd089..bf9f733 100644
--- a/QiaoJiaSystem/FaceDetectServer/main_detect.cpp
+++ b/QiaoJiaSystem/FaceDetectServer/main_detect.cpp
@@ -31,8 +31,8 @@
int threadMax = atol(ich->getProperties()->getProperty("user.thread.max").c_str());
#endif
ich->getProperties()->setProperty("Ice.ThreadPool.Server.SizeMax", std::to_string(threadMax));
- appPref.setLongData("gpu.index", atol(gpuIndex.c_str()));
- appPref.setLongData("thread.max", threadMax);
+ appPref.setIntData("gpu.index", atol(gpuIndex.c_str()));
+ appPref.setIntData("thread.max", threadMax);
auto adapter = ich->createObjectAdapter(adapterName);
adapter->add(new FaceDetectServerI(), Ice::stringToIdentity(identity));
@@ -47,13 +47,17 @@
ENABLEGLOG(GET_STR_CONFIG("logPath").c_str());
auto ich = Ice::initialize(argc, argv);
- appPref.setLongData("gpu.index", 0);
- appPref.setLongData("thread.max", 32);
+ if (argc < 4) {
+ assert("t_value.size()");
+ }
+ appPref.setIntData("gpu.index", atoi(argv[1]));
+ appPref.setIntData("RpcFDPort", atoi(argv[2]));
+ appPref.setIntData("thread.max", atoi(argv[3]));//绾跨▼姹犲ぇ灏�
- IceRpcServer<FaceDetectServerI> server("faceServer", 10002, "tcp");
+ IceRpcServer<FaceDetectServerI> server("faceServer", appPref.getIntData("RpcFDPort"), "tcp");
server.setMessageSizeMax(1024 * 1024 * 50);
- server.setPoolInitSize(10);
- server.setPoolMaxSize(32);
+ server.setPoolInitSize(appPref.getIntData("thread.max"));
+ server.setPoolMaxSize(appPref.getIntData("thread.max"));
server.runWaitShutDown();
return 0;
}
diff --git a/QiaoJiaSystem/FaceDetectServer/main_extract.cpp b/QiaoJiaSystem/FaceDetectServer/main_extract.cpp
index a71d8f5..712f421 100644
--- a/QiaoJiaSystem/FaceDetectServer/main_extract.cpp
+++ b/QiaoJiaSystem/FaceDetectServer/main_extract.cpp
@@ -31,8 +31,8 @@
int threadMax = atol(ich->getProperties()->getProperty("user.thread.max").c_str());
#endif
ich->getProperties()->setProperty("Ice.ThreadPool.Server.SizeMax", std::to_string(threadMax));
- appPref.setLongData("gpu.index", atol(gpuIndex.c_str()));
- appPref.setLongData("thread.max", threadMax);
+ appPref.setIntData("gpu.index", atol(gpuIndex.c_str()));
+ appPref.setIntData("thread.max", threadMax);
auto adapter = ich->createObjectAdapter(adapterName);
adapter->add(new FaceExtractServerI(), Ice::stringToIdentity(identity));
@@ -48,13 +48,17 @@
ENABLEGLOG(GET_STR_CONFIG("logPath").c_str());
auto ich = Ice::initialize(argc, argv);
- appPref.setLongData("gpu.index", 0);
- appPref.setLongData("thread.max", 32);
+ if (argc < 4) {
+ assert("t_value.size()");
+ }
+ appPref.setIntData("gpu.index", atoi(argv[1]));
+ appPref.setIntData("RpcFEPort", atoi(argv[2]));
+ appPref.setIntData("thread.max", atoi(argv[3]));//绾跨▼姹犲ぇ灏�
- IceRpcServer<FaceExtractServerI> server("faceExtractServer", 10008, "tcp");
+ IceRpcServer<FaceExtractServerI> server("faceExtractServer", appPref.getIntData("RpcFEPort"), "tcp");
server.setMessageSizeMax(1024 * 1024 * 50);
- server.setPoolInitSize(10);
- server.setPoolMaxSize(32);
+ server.setPoolInitSize(appPref.getIntData("thread.max"));
+ server.setPoolMaxSize(appPref.getIntData("thread.max"));
server.runWaitShutDown();
return 0;
}
diff --git a/QiaoJiaSystem/FaceSearchServer/CasiaFaceWrapper/CasiaFaceWrapperN.cpp b/QiaoJiaSystem/FaceSearchServer/CasiaFaceWrapper/CasiaFaceWrapperN.cpp
index 9b9fe3a..fa5f80a 100644
--- a/QiaoJiaSystem/FaceSearchServer/CasiaFaceWrapper/CasiaFaceWrapperN.cpp
+++ b/QiaoJiaSystem/FaceSearchServer/CasiaFaceWrapper/CasiaFaceWrapperN.cpp
@@ -13,8 +13,8 @@
std::atomic_int CasiaFaceWrapperN::instanceCount(0);
CasiaFaceWrapperN::CasiaFaceWrapperN() {
- threadMax = appPref.getLongData("thread.max");
-// long gpuIndex = appPref.getLongData("gpu.index");
+ threadMax = appPref.getIntData("thread.max");
+// long gpuIndex = appPref.getIntData("gpu.index");
// for(int i = 0;i<threadMax;i++){
// resourcesManager.pushResource(i);
// }
diff --git a/QiaoJiaSystem/FaceSearchServer/Cleint.cpp b/QiaoJiaSystem/FaceSearchServer/Cleint.cpp
index 7c6a16e..031cd56 100644
--- a/QiaoJiaSystem/FaceSearchServer/Cleint.cpp
+++ b/QiaoJiaSystem/FaceSearchServer/Cleint.cpp
@@ -205,7 +205,7 @@
// return 0;
- appPref.setLongData("thread.max", 1);
+ appPref.setIntData("thread.max", 1);
CasiaFaceWrapperN t_CasiaFaceWapper;
// string test1 = "http://192.168.1.65:8888/group1/M00/04/52/wKgBQVr5J-WAJ4lQAAAObkm3j38169.jpg";
// string test2 = "http://192.168.1.65:8888/group1/M00/04/52/wKgBQVr5JGOAXmx9AAAK0Xp3QhA271.jpg";
diff --git a/QiaoJiaSystem/FaceSearchServer/main.cpp b/QiaoJiaSystem/FaceSearchServer/main.cpp
index fa14be5..054bd16 100644
--- a/QiaoJiaSystem/FaceSearchServer/main.cpp
+++ b/QiaoJiaSystem/FaceSearchServer/main.cpp
@@ -21,17 +21,20 @@
DBG("\n\n\nstart\n\n");
- appPref.setLongData("thread.max", 16);
- //#todo
+// appPref.setIntData("thread.max", 16);
-// appPref.setStringData("ipAdd", "192.168.1.185");
-// appPref.setIntData("ipPort", 9200);
+ if (argc < 3) {
+ assert("t_value.size()");
+ }
+ appPref.setIntData("RpcFSPort", atoi(argv[1]));
+ appPref.setIntData("thread.max", atoi(argv[2]));//绾跨▼姹犲ぇ灏�
+
appPref.setStringData("ipAdd", appConfig.getStringProperty("ES_IP"));
appPref.setIntData("ipPort", appConfig.getIntProperty("ES_PORT"));
- IceRpcServer<FaceFeatureSearchServerI> server("faceCmServer", 10004, "tcp");
+ IceRpcServer<FaceFeatureSearchServerI> server("faceCmServer", appPref.getIntData("RpcFSPort"), "tcp");
server.setMessageSizeMax(1024 * 1024 * 50);
- server.setPoolInitSize(10);
- server.setPoolMaxSize(32);
+ server.setPoolInitSize(appPref.getIntData("thread.max"));
+ server.setPoolMaxSize(appPref.getIntData("thread.max"));
server.runWaitShutDown();
}
\ No newline at end of file
diff --git a/QiaoJiaSystem/PerimeterAlarm/AppPaController.cpp b/QiaoJiaSystem/PerimeterAlarm/AppPaController.cpp
index de80896..a9d330d 100644
--- a/QiaoJiaSystem/PerimeterAlarm/AppPaController.cpp
+++ b/QiaoJiaSystem/PerimeterAlarm/AppPaController.cpp
@@ -9,7 +9,7 @@
AppPaController:: AppPaController(int index, const ControllerConfig& cfg ):
- videoCaptureElement(cfg.camInfo.strRtsp, 25, 3000, appPref.getLongData("gpu.index"), true),
+ videoCaptureElement(cfg.camInfo.strRtsp, 25, 3000, appPref.getIntData("gpu.index"), true),
m_index(index),
fdfsClient(nullptr),
yoloRpcElement(to_string(index) + "yoloRpc"),
diff --git a/QiaoJiaSystem/PerimeterAlarm/main.cpp b/QiaoJiaSystem/PerimeterAlarm/main.cpp
index a615147..868ca18 100644
--- a/QiaoJiaSystem/PerimeterAlarm/main.cpp
+++ b/QiaoJiaSystem/PerimeterAlarm/main.cpp
@@ -18,7 +18,7 @@
std::string src_path = "/home/basic/瑙嗛/test";
- appPref.setLongData("gpu.index", 0);
+ appPref.setIntData("gpu.index", 0);
appPref.setIntData("show.image", 1);
//yolo server
diff --git a/QiaoJiaSystem/RapidStructureApp/RapidAppPipeController.cpp b/QiaoJiaSystem/RapidStructureApp/RapidAppPipeController.cpp
index 599012f..45d27ea 100644
--- a/QiaoJiaSystem/RapidStructureApp/RapidAppPipeController.cpp
+++ b/QiaoJiaSystem/RapidStructureApp/RapidAppPipeController.cpp
@@ -6,7 +6,7 @@
#include <algorithm>
RapidAppPipeController::RapidAppPipeController(int index, const Json::Value &json, const std::string &outPath) :
- videoCaptureElement(json["rtsp"].asString(), outPath, 25, -1, 0),//appPref.getLongData("gpu.index")
+ videoCaptureElement(json["rtsp"].asString(), outPath, 25, -1, 0),//appPref.getIntData("gpu.index")
index(index), bUp(false), m_json(json),
/*yoloRpcElement(to_string(index)+"yoloRpc"),*/triggerElement(0, 3) {
videoCaptureElement.registerConnector([&] {
diff --git a/QiaoJiaSystem/StructureApp/AppPipeController.cpp b/QiaoJiaSystem/StructureApp/AppPipeController.cpp
index 710118b..c2d8a16 100644
--- a/QiaoJiaSystem/StructureApp/AppPipeController.cpp
+++ b/QiaoJiaSystem/StructureApp/AppPipeController.cpp
@@ -9,7 +9,7 @@
#include <basic/pipe_element/ffmpeg/basic_struct_for_video_image.h>
//AppPipeController::AppPipeController(std::string folderPath, const Json::Value &json) :
-// videoCaptureElement("filePath", 25, -1, appPref.getLongData("gpu.index")), m_index(0),
+// videoCaptureElement("filePath", 25, -1, appPref.getIntData("gpu.index")), m_index(0),
// m_folderPath(folderPath),
// m_json(json), fdfsClient(nullptr), yoloRpcElement(folderPath + "yoloRpc"), faceRpcElement(folderPath + "faceRpc"),
// faceExtractElement(folderPath + "faceExtract"), triggerElement(25, 10),
@@ -19,8 +19,8 @@
//}
AppPipeController::AppPipeController(std::string folderPath, const SdkRuleMap &ruleMap) :
- m_rpcClient("RtspAnalysServer", "127.0.0.1",appPref.getIntData("RpcServerPort"),"tcp"),
- videoCaptureElement("filePath", 25, -1, appPref.getLongData("gpu.index")),
+ m_rpcClient("RtspAnalysServer", "127.0.0.1",appPref.getIntData("RpcVTIMPort"),"tcp"),
+ videoCaptureElement("filePath", 25, -1, appPref.getIntData("gpu.index")),
// videoCaptureElement(40),
m_index(0),
m_folderPath(folderPath),
@@ -40,7 +40,7 @@
}
//AppPipeController::AppPipeController(int index, const Json::Value &json, bool RecordVideoEnable) :
-// videoCaptureElement(json["rtsp"].asString(), 25, 3000, appPref.getLongData("gpu.index"), RecordVideoEnable),
+// videoCaptureElement(json["rtsp"].asString(), 25, 3000, appPref.getIntData("gpu.index"), RecordVideoEnable),
// m_index(index), fdfsClient(nullptr), yoloRpcElement(to_string(index) + "yoloRpc"),
// faceRpcElement(to_string(index) + "faceRpc"), m_json(json), faceExtractElement(to_string(index) + "faceExtract"),
// triggerElement(25, 4), recordVideoElement(index, json["rtsp"].asString()), bRecordVideoEnable(RecordVideoEnable) {
@@ -49,7 +49,7 @@
//AppPipeController::AppPipeController(std::string camId, const Json::Value &json, bool RecordVideoEnable) :
-// videoCaptureElement(json["rtsp"].asString(), 25, 3000, appPref.getLongData("gpu.index")),
+// videoCaptureElement(json["rtsp"].asString(), 25, 3000, appPref.getIntData("gpu.index")),
// m_index(0),
// m_camId(camId),
// fdfsClient(nullptr),
@@ -70,8 +70,8 @@
// intKeepRight();
//}
AppPipeController::AppPipeController(std::string camId, const SdkRuleMap &ruleMap, bool RecordVideoEnable) :
- m_rpcClient("RtspAnalysServer", "127.0.0.1",appPref.getIntData("RpcServerPort"),"tcp"),
- videoCaptureElement(appPref.getStringData(camId + "rtsp"), 25, 3000, appPref.getLongData("gpu.index")),
+ m_rpcClient("RtspAnalysServer", "127.0.0.1",appPref.getIntData("RpcVTIMPort"),"tcp"),
+ videoCaptureElement(appPref.getStringData(camId + "rtsp"), 25, 3000, appPref.getIntData("gpu.index")),
// videoCaptureElement(40),
m_index(0),
m_camId(camId),
diff --git a/QiaoJiaSystem/StructureApp/AppPipeControllerTest.cpp b/QiaoJiaSystem/StructureApp/AppPipeControllerTest.cpp
index 2bc4af0..2256516 100644
--- a/QiaoJiaSystem/StructureApp/AppPipeControllerTest.cpp
+++ b/QiaoJiaSystem/StructureApp/AppPipeControllerTest.cpp
@@ -15,7 +15,7 @@
// pManagerEsDB.faceResInsert("facedb","6666666","{\"test222\":\"sdfasdf\"}");
- appPref.setLongData("gpu.index", 0);
+ appPref.setIntData("gpu.index", 0);
appPref.setIntData("show.image", 1);
//yolo server
diff --git a/QiaoJiaSystem/StructureApp/FaceExtractElement.cpp b/QiaoJiaSystem/StructureApp/FaceExtractElement.cpp
index a8aa27e..85c5d4b 100644
--- a/QiaoJiaSystem/StructureApp/FaceExtractElement.cpp
+++ b/QiaoJiaSystem/StructureApp/FaceExtractElement.cpp
@@ -38,7 +38,7 @@
appPref.getIntData("faceSear.port"), "tcp"),
// faceSearchRpcClient("faceCmServer", "", 10004, "tcp")
m_sdkRule(rule),
- m_rpcClient("RtspAnalysServer", "127.0.0.1", appPref.getIntData("RpcServerPort"), "tcp") {
+ m_rpcClient("RtspAnalysServer", "127.0.0.1", appPref.getIntData("RpcVTIMPort"), "tcp") {
sharedMemory = new QSharedMemory(QString(shareMemoryName.c_str()));
if (!sharedMemory->create(4608 * 2592 * 4)) {
sharedMemory->attach();
diff --git a/QiaoJiaSystem/StructureApp/JudgmentRetrogradeTool.cpp b/QiaoJiaSystem/StructureApp/JudgmentRetrogradeTool.cpp
index 476883e..4742672 100644
--- a/QiaoJiaSystem/StructureApp/JudgmentRetrogradeTool.cpp
+++ b/QiaoJiaSystem/StructureApp/JudgmentRetrogradeTool.cpp
@@ -16,7 +16,7 @@
m_bSetWH(false),
pointArray(nullptr),
npts(0),
- m_rpcClient("RtspAnalysServer", "127.0.0.1",appPref.getIntData("RpcServerPort"),"tcp")
+ m_rpcClient("RtspAnalysServer", "127.0.0.1",appPref.getIntData("RpcVTIMPort"),"tcp")
{
pManagerEsDB = new EsDBTool(appPref.getStringData("ipAdd"), appPref.getIntData("ipPort"));
}
diff --git a/QiaoJiaSystem/StructureApp/JudgmentRetrogradeTool.h b/QiaoJiaSystem/StructureApp/JudgmentRetrogradeTool.h
index e48fda6..08de8ba 100644
--- a/QiaoJiaSystem/StructureApp/JudgmentRetrogradeTool.h
+++ b/QiaoJiaSystem/StructureApp/JudgmentRetrogradeTool.h
@@ -55,7 +55,7 @@
class JudgmentRetrogradeTool : public basic::PipeElement{
public:
- JudgmentRetrogradeTool():m_rpcClient("RtspAnalysServer", "127.0.0.1",appPref.getIntData("RpcServerPort"),"tcp") {}
+ JudgmentRetrogradeTool():m_rpcClient("RtspAnalysServer", "127.0.0.1",appPref.getIntData("RpcVTIMPort"),"tcp") {}
JudgmentRetrogradeTool(const SdkRule &rule);
//JudgmentRetrogradeTool(const SdkRule &rule,SaveVideoRpcClient_t& rpcClient);
diff --git a/QiaoJiaSystem/StructureApp/PerimeterElement.cpp b/QiaoJiaSystem/StructureApp/PerimeterElement.cpp
index a88ed9f..c637c6d 100644
--- a/QiaoJiaSystem/StructureApp/PerimeterElement.cpp
+++ b/QiaoJiaSystem/StructureApp/PerimeterElement.cpp
@@ -25,7 +25,7 @@
m_bIsMask(true),
m_bSetWH(false),
pointArray(nullptr),
- m_rpcClient("RtspAnalysServer", "127.0.0.1",appPref.getIntData("RpcServerPort"),"tcp")
+ m_rpcClient("RtspAnalysServer", "127.0.0.1",appPref.getIntData("RpcVTIMPort"),"tcp")
{
pManagerEsDB = new EsDBTool(appPref.getStringData("ipAdd"), appPref.getIntData("ipPort"));
diff --git a/QiaoJiaSystem/StructureApp/PerimeterElement.h b/QiaoJiaSystem/StructureApp/PerimeterElement.h
index 7f90643..df6deca 100644
--- a/QiaoJiaSystem/StructureApp/PerimeterElement.h
+++ b/QiaoJiaSystem/StructureApp/PerimeterElement.h
@@ -17,7 +17,7 @@
class PerimeterElement : public basic::PipeElement
{
public:
- PerimeterElement():m_rpcClient("RtspAnalysServer", "127.0.0.1",appPref.getIntData("RpcServerPort"),"tcp"){}
+ PerimeterElement():m_rpcClient("RtspAnalysServer", "127.0.0.1",appPref.getIntData("RpcVTIMPort"),"tcp"){}
PerimeterElement(const SdkRule& rule);
public:
~PerimeterElement();
diff --git a/QiaoJiaSystem/StructureApp/main.cpp b/QiaoJiaSystem/StructureApp/main.cpp
index 449e7a7..7d62bc9 100644
--- a/QiaoJiaSystem/StructureApp/main.cpp
+++ b/QiaoJiaSystem/StructureApp/main.cpp
@@ -18,7 +18,7 @@
std::string src_path = "/home/basic/瑙嗛/test";
- appPref.setLongData("gpu.index", 0);
+ appPref.setIntData("gpu.index", 0);
appPref.setIntData("show.image", 0);
//yolo server
diff --git a/QiaoJiaSystem/VideoAnalysFromHC/CMakeLists.txt b/QiaoJiaSystem/VideoAnalysFromHC/CMakeLists.txt
index 0d4e6e6..1afbdbf 100644
--- a/QiaoJiaSystem/VideoAnalysFromHC/CMakeLists.txt
+++ b/QiaoJiaSystem/VideoAnalysFromHC/CMakeLists.txt
@@ -9,7 +9,7 @@
set(CMAKE_BUILD_TYPE debug)
add_compile_options(-fPIC)
add_definitions(-DGLOG)
-add_definitions(-DGB28181)
+#add_definitions(-DGB28181)
add_definitions(-DDEBUG_ERR -DDEBUG_INFO -fpermissive)
SET(SOURCES
diff --git a/QiaoJiaSystem/VideoAnalysFromHC/RtspAnalysElement.cpp b/QiaoJiaSystem/VideoAnalysFromHC/RtspAnalysElement.cpp
index be430a9..faa86f6 100644
--- a/QiaoJiaSystem/VideoAnalysFromHC/RtspAnalysElement.cpp
+++ b/QiaoJiaSystem/VideoAnalysFromHC/RtspAnalysElement.cpp
@@ -117,14 +117,14 @@
} else {
- auto lst = m_lDBTool->searchCamDevTableAll();
+ auto lst = m_lDBTool->searchCamDevTableByType(0);
appPref.setIntData("n_cut_max_duration", lst_dev.n_cut_max_duration);
appPref.setIntData("n_cut_min_duration", lst_dev.n_cut_min_duration);
if (lst.size() > 0) {
Json::Value json;
- int startCamNO = appPref.getIntData("CamStart") * appPref.getIntData("CamStep");
- int CamCount = appPref.getIntData("CamStep");
+ int startCamNO = appPref.getIntData("CamStartNO");
+ int CamCount = appPref.getIntData("CamEndNO") - appPref.getIntData("CamStartNO") + 1;
auto itor = lst.begin();
if (startCamNO >= lst.size()) {
diff --git a/QiaoJiaSystem/VideoAnalysFromHC/main.cpp b/QiaoJiaSystem/VideoAnalysFromHC/main.cpp
index 39abc9a..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 ? 1 : -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")
diff --git a/QiaoJiaSystem/VideoToImage/main.cpp b/QiaoJiaSystem/VideoToImage/main.cpp
index e481224..31fee0b 100644
--- a/QiaoJiaSystem/VideoToImage/main.cpp
+++ b/QiaoJiaSystem/VideoToImage/main.cpp
@@ -32,7 +32,7 @@
ENABLEGLOG(GET_STR_CONFIG("logPath").c_str());
#endif
- appPref.setLongData("gpu.index", 0);
+ appPref.setIntData("gpu.index", 0);
appPref.setIntData("show.image", 0);
diff --git a/QiaoJiaSystem/VideoToImageMulth/RtspAnalysManager.cpp b/QiaoJiaSystem/VideoToImageMulth/RtspAnalysManager.cpp
index a49c256..9eee39c 100644
--- a/QiaoJiaSystem/VideoToImageMulth/RtspAnalysManager.cpp
+++ b/QiaoJiaSystem/VideoToImageMulth/RtspAnalysManager.cpp
@@ -64,16 +64,16 @@
}
} else {
- auto lst = m_lDBTool->searchCamDevTableAll();
+ auto lst = m_lDBTool->searchCamDevTableByType(0);
Record_Config lst_dev = m_lDBTool->searchConfigTableWithinServerInfo();
//璁剧疆瑙嗛鐨勬渶闀垮拰鏈�鐭椂闂撮棿闅�
appPref.setIntData("n_cut_max_duration", lst_dev.n_cut_max_duration);
appPref.setIntData("n_cut_min_duration", lst_dev.n_cut_min_duration);
if (lst.size() > 0) {
- int startCamNO = appPref.getIntData("CamStart") * appPref.getIntData("CamStep");
- int CamCount = appPref.getIntData("CamStep");
- INFO("StartCamNO: " << startCamNO << " CamStep: " << CamCount);
+ int startCamNO = appPref.getIntData("CamStartNO");
+ int CamCount = appPref.getIntData("CamEndNO") - appPref.getIntData("CamStartNO") + 1;
+ INFO("StartCamNO: " << startCamNO << " CamCount: " << CamCount);
auto itor = lst.begin();
if (startCamNO >= lst.size()) {
diff --git a/QiaoJiaSystem/VideoToImageMulth/main.cpp b/QiaoJiaSystem/VideoToImageMulth/main.cpp
index 4f96c52..cc8e031 100644
--- a/QiaoJiaSystem/VideoToImageMulth/main.cpp
+++ b/QiaoJiaSystem/VideoToImageMulth/main.cpp
@@ -59,7 +59,7 @@
ENABLEGLOG(GET_STR_CONFIG("logPath").c_str());
#endif
- if (argc < 4) {
+ if (argc < 6) {
assert("t_value.size()");
}
{
@@ -69,20 +69,30 @@
appPref.setIntData("pulish.width", 640);
appPref.setIntData("pulish.height", 360);
}
- int arg1 = atoi(argv[1]);
+// int arg1 = atoi(argv[1]);
+//
+// int gindx = abs(arg1) % 2;
+// int GB28181_Enable = arg1 < 0 ? 1 : 0;
+//
+// DBG(gindx);
+// appPref.setIntData("GB28181_Enable", GB28181_Enable);
+// appPref.setIntData("gpu.index", gindx);
+//
+//
+// //todo
+// appPref.setIntData("CamStart", arg1);
+// appPref.setIntData("CamStep", atoi(argv[2]));
+// appPref.setIntData("RpcVTIMPort", atoi(argv[3]));
- int gindx = abs(arg1) % 2;
- int GB28181_Enable = arg1 < 0 ? 1 : 0;
+ 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("RpcVTIMPort", atoi(argv[5]));//瑙﹀彂褰曞儚
- DBG(gindx);
- appPref.setIntData("GB28181_Enable", GB28181_Enable);
- appPref.setLongData("gpu.index", gindx);
appPref.setIntData("show.image", 0);
- //todo
- appPref.setIntData("CamStart", arg1);
- appPref.setIntData("CamStep", atoi(argv[2]));
- appPref.setIntData("RpcServerPort", atoi(argv[3]));
+ int GB28181_Enable = appPref.getIntData("GB28181_Enable");
if (GB28181_Enable) {
//#todo search from db
MysqlDBServerCfg mysqlDBServerCfg;
@@ -151,7 +161,7 @@
DBG("test start");
appPref.setStringData("user.loop.absolute.path", appConfig.getStringProperty("cutPath"));
- IceRpcServer<RtspAnalysManager> server("RtspAnalysServer", appPref.getIntData("RpcServerPort"), "tcp");
+ IceRpcServer<RtspAnalysManager> server("RtspAnalysServer", appPref.getIntData("RpcVTIMPort"), "tcp");
server.setMessageSizeMax(1024 * 1024 * 50);
server.setPoolInitSize(1);
server.setPoolMaxSize(1);
diff --git a/QiaoJiaSystem/VideoToImageMulth/pushStream/PushStreamAppPipeController.cpp b/QiaoJiaSystem/VideoToImageMulth/pushStream/PushStreamAppPipeController.cpp
index 553a451..06191c5 100644
--- a/QiaoJiaSystem/VideoToImageMulth/pushStream/PushStreamAppPipeController.cpp
+++ b/QiaoJiaSystem/VideoToImageMulth/pushStream/PushStreamAppPipeController.cpp
@@ -14,7 +14,7 @@
string path = appConfig.getStringProperty("srsAddr") + "cam" + chanPubID + ".flv";
cv::Size size_(appPref.getIntData("pulish.width"), appPref.getIntData("pulish.height"));
- int gupIdx = appPref.getLongData("gpu.index");
+ int gupIdx = appPref.getIntData("gpu.index");
videoPublishElement = new ffmpeg::VideoPublishElement(path, size_, "flv", 25, gupIdx);
if (appPref.getIntData("pulish.width") < 0 || appPref.getIntData("pulish.height") < 0) {
ERR("pulish.width: " << appPref.getIntData("pulish.width") << " Height: "
diff --git a/QiaoJiaSystem/YoloServer/main.cpp b/QiaoJiaSystem/YoloServer/main.cpp
index 68b22b9..ff7aac0 100644
--- a/QiaoJiaSystem/YoloServer/main.cpp
+++ b/QiaoJiaSystem/YoloServer/main.cpp
@@ -30,18 +30,28 @@
// return -1;
// }
- int gpuindex = 0;
- int poolNum = 1;
- int portNum = 10003;
+// int gpuindex = 0;
+// int poolNum = 1;
+// int portNum = 10003;
+//
+// appPref.setIntData("gpu.index", gpuindex);
+// appPref.setFloatData("thresh.detect", 0.85);
+// appPref.setIntData("poolNum", poolNum);
- appPref.setIntData("gpu.index", gpuindex);
- appPref.setFloatData("thresh.detect", 0.85);
- appPref.setIntData("poolNum", poolNum);
+ if (argc < 4) {
+ assert("t_value.size()");
+ }
+ appPref.setIntData("gpu.index", atoi(argv[1]));
+ appPref.setIntData("RpcYOLOPort", atoi(argv[2]));
+ appPref.setFloatData("thresh.detect", atof(argv[3]));
- IceRpcServer<YoloDetectServerI> server("yoloServer", portNum, "tcp");
+// appPref.setIntData("poolNum", 1);//YOlO涓嶈兘澶氱嚎绋嬶紝瀹规槗宕╂簝
+
+
+ IceRpcServer<YoloDetectServerI> server("yoloServer", appPref.getIntData("RpcYOLOPort"), "tcp");
server.setMessageSizeMax(1024 * 1024 * 50);
- server.setPoolInitSize(1);
- server.setPoolMaxSize(1);
+ server.setPoolInitSize(1);//YOlO涓嶈兘澶氱嚎绋嬶紝瀹规槗宕╂簝
+ server.setPoolMaxSize(1);//YOlO涓嶈兘澶氱嚎绋嬶紝瀹规槗宕╂簝
server.runWaitShutDown();
return 0;
}
--
Gitblit v1.8.0