From d3b7bbe7102cd089680a828f5d8f6402c8cf6342 Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期四, 07 三月 2019 14:43:28 +0800
Subject: [PATCH] GB28181集成完成,集成推流模块
---
QiaoJiaSystem/VideoAnalysFromHC/main.cpp | 35 ++++++++++++++++++++++++++++++-----
1 files changed, 30 insertions(+), 5 deletions(-)
diff --git a/QiaoJiaSystem/VideoAnalysFromHC/main.cpp b/QiaoJiaSystem/VideoAnalysFromHC/main.cpp
index cfb0eba..9755c39 100644
--- a/QiaoJiaSystem/VideoAnalysFromHC/main.cpp
+++ b/QiaoJiaSystem/VideoAnalysFromHC/main.cpp
@@ -42,8 +42,8 @@
static void startRtspAnalysElement(LDBTool *_dbTool) {
RtspAnalysElement rtspAnalysElement(_dbTool);
- NewEncodeVideoManager newEncodeVideoManager;
- newEncodeVideoManager.start();
+// NewEncodeVideoManager newEncodeVideoManager;
+// newEncodeVideoManager.start();
while (1) {
sleep(1 * 60 * 60 * 12);
}
@@ -66,10 +66,35 @@
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 < 4) {
+ 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]));
//#todo get from config File
// appPref.setStringData("ipAdd", "192.168.1.185");
@@ -126,11 +151,11 @@
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()) {
+ switch (_dbTool.searchDevTypeFromConfigTable()) {
case 0: {
DBG("case 0");
--
Gitblit v1.8.0