From 91fbc7bca400b7ce958e306f09133e4cfc6db63b Mon Sep 17 00:00:00 2001
From: chenshijun <csj_sky@126.com>
Date: 星期三, 03 四月 2019 11:23:25 +0800
Subject: [PATCH] Merge branch 'yangwu1.3' of ssh://192.168.1.226:29418/development/c++ into yangwu1.3
---
QiaoJiaSystem/DataManagerServer/AppPipeController.cpp | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/QiaoJiaSystem/DataManagerServer/AppPipeController.cpp b/QiaoJiaSystem/DataManagerServer/AppPipeController.cpp
index 140fa89..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)
{
@@ -24,7 +24,7 @@
registerElement(videoCaptureElement);
registerElement(videoPublishElement);
- videoCaptureElement.setOutPutInterval(3);
+ //videoCaptureElement.setOutPutInterval(3);
}
std::string AppPipeController::getRtmp()
--
Gitblit v1.8.0