From 6151028a8e0e63ed6967faa7c23ff56b076879df Mon Sep 17 00:00:00 2001
From: chenshijun <csj_sky@126.com>
Date: 星期五, 05 四月 2019 11:22:03 +0800
Subject: [PATCH] 解决GB28181推多路流问题
---
QiaoJiaSystem/DataManagerServer/AppPipeController.cpp | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/QiaoJiaSystem/DataManagerServer/AppPipeController.cpp b/QiaoJiaSystem/DataManagerServer/AppPipeController.cpp
index 1b7a76a..91779a0 100644
--- a/QiaoJiaSystem/DataManagerServer/AppPipeController.cpp
+++ b/QiaoJiaSystem/DataManagerServer/AppPipeController.cpp
@@ -4,11 +4,15 @@
//#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)
+ {
+ ERR("pulish.width: "<<appPref.getIntData("pulish.width") <<" Height: "<< appPref.getIntData("pulish.height"));
+ }
videoCaptureElement.registerConnector([&]{
//if(!videoPublishElement.isBusy()){
videoPublishElement.setImage(videoCaptureElement.getImage());
@@ -20,7 +24,7 @@
registerElement(videoCaptureElement);
registerElement(videoPublishElement);
- videoCaptureElement.setOutPutInterval(3);
+ //videoCaptureElement.setOutPutInterval(3);
}
std::string AppPipeController::getRtmp()
--
Gitblit v1.8.0