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/VideoToImageMulth/main.cpp | 40 ++++++++++++++++++++++++++--------------
1 files changed, 26 insertions(+), 14 deletions(-)
diff --git a/QiaoJiaSystem/VideoToImageMulth/main.cpp b/QiaoJiaSystem/VideoToImageMulth/main.cpp
index 4f96c52..c467cc2 100644
--- a/QiaoJiaSystem/VideoToImageMulth/main.cpp
+++ b/QiaoJiaSystem/VideoToImageMulth/main.cpp
@@ -59,30 +59,42 @@
ENABLEGLOG(GET_STR_CONFIG("logPath").c_str());
#endif
- if (argc < 4) {
+ if (argc < 6) {
assert("t_value.size()");
}
{
// std::string rtmpAddr = appConfig.getStringProperty("srsAddr");
// std::string publish_basepath = rtmpAddr + "" ;
// appPref.setStringData("publish.basepath", publish_basepath);
- appPref.setIntData("pulish.width", 640);
- appPref.setIntData("pulish.height", 360);
+// appPref.setIntData("pulish.width", 640);
+// appPref.setIntData("pulish.height", 360);
+ appPref.setIntData("pulish.width", 1920);
+ appPref.setIntData("pulish.height", 1080);
}
- 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 +163,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);
--
Gitblit v1.8.0