From 291dbcd9331cd0df41addef74defa4654ee034fb Mon Sep 17 00:00:00 2001
From: chenshijun <csj_sky@126.com>
Date: 星期一, 22 四月 2019 15:59:20 +0800
Subject: [PATCH] 增加人员异常的参数处理
---
QiaoJiaSystem/DataManagerServer/AppPipeController.cpp | 38 +++++++++++++++++++-------------------
1 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/QiaoJiaSystem/DataManagerServer/AppPipeController.cpp b/QiaoJiaSystem/DataManagerServer/AppPipeController.cpp
index 8d00d0e..30e114b 100644
--- a/QiaoJiaSystem/DataManagerServer/AppPipeController.cpp
+++ b/QiaoJiaSystem/DataManagerServer/AppPipeController.cpp
@@ -1,37 +1,37 @@
#include "AppPipeController.h"
#include <basic/util/app/AppPreference.hpp>
+#include <basic/util/app/AppConfig.h>
#include <basic/util/app/AppUtil.h>
//#include <sstream>
#include <algorithm>
-AppPipeController::AppPipeController(int index, const Json::Value &json):
- videoCaptureElement(json["rtsp"].asString(), 25,3000,appPref.getLongData("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"))
-{
- if(appPref.getIntData("pulish.width") < 0 || appPref.getIntData("pulish.height") < 0)
- {
- ERR("pulish.width: "<<appPref.getIntData("pulish.width") <<" Height: "<< appPref.getIntData("pulish.height"));
- }
- videoCaptureElement.registerConnector([&]{
- //if(!videoPublishElement.isBusy()){
- videoPublishElement.setImage(videoCaptureElement.getImage());
- //videoPublishElement.submit();
- //}
+AppPipeController::AppPipeController(int index, const Json::Value &json) :
+ videoCaptureElement(json["rtsp"].asString(), 25, 3000, appPref.getIntData("gpu.index")),
+ index(index), videoPublishElement(appPref.getStringData("publish.basepath") + ".flv",
+ cv::Size(appConfig.getIntProperty("pulish.width"),
+ appConfig.getIntProperty("pulish.height")),
+ "flv", 25, appPref.getIntData("gpu.index")) {
+ if (appConfig.getIntProperty("pulish.width") < 0 || appConfig.getIntProperty("pulish.height") < 0) {
+ ERR("pulish.width: " << appConfig.getIntProperty("pulish.width") << " Height: "
+ << appConfig.getIntProperty("pulish.height"));
+ }
+ videoCaptureElement.registerConnector([&] {
+ //if(!videoPublishElement.isBusy()){
+ videoPublishElement.setImage(videoCaptureElement.getImage());
+// videoPublishElement.submit();
+ //}
});
registerElement(videoCaptureElement);
- registerElement(videoPublishElement);
+// registerElement(videoPublishElement);
//videoCaptureElement.setOutPutInterval(3);
}
-std::string AppPipeController::getRtmp()
-{
+std::string AppPipeController::getRtmp() {
std::string ret = videoPublishElement.getPath();
size_t pos = ret.find(".flv");
- ret = ret.substr(0,pos);
+ ret = ret.substr(0, pos);
INFO(ret);
return ret;
}
--
Gitblit v1.8.0