From 17ae0cd78c16f55d38dc3f9ad6b27688f445aee3 Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期三, 03 四月 2019 09:57:19 +0800
Subject: [PATCH] Merge branch 'yangwu1.3' into 1.3nsq
---
QiaoJiaSystem/DataManagerServer/AppPipeController.cpp | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/QiaoJiaSystem/DataManagerServer/AppPipeController.cpp b/QiaoJiaSystem/DataManagerServer/AppPipeController.cpp
index 8d00d0e..13df05b 100644
--- a/QiaoJiaSystem/DataManagerServer/AppPipeController.cpp
+++ b/QiaoJiaSystem/DataManagerServer/AppPipeController.cpp
@@ -1,17 +1,18 @@
#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")),
+ 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"))
+ cv::Size(appConfig.getIntProperty("pulish.width"),appConfig.getIntProperty("pulish.height")),
+ "flv", 25, appPref.getIntData("gpu.index"))
{
- if(appPref.getIntData("pulish.width") < 0 || appPref.getIntData("pulish.height") < 0)
+ if(appConfig.getIntProperty("pulish.width") < 0 || appConfig.getIntProperty("pulish.height") < 0)
{
- ERR("pulish.width: "<<appPref.getIntData("pulish.width") <<" Height: "<< appPref.getIntData("pulish.height"));
+ ERR("pulish.width: "<<appConfig.getIntProperty("pulish.width") <<" Height: "<< appConfig.getIntProperty("pulish.height"));
}
videoCaptureElement.registerConnector([&]{
//if(!videoPublishElement.isBusy()){
--
Gitblit v1.8.0