From 6e1fff143f2669f7771301d583fff99de7995cdd Mon Sep 17 00:00:00 2001
From: xuxiuxi <554325746@qq.com>
Date: 星期二, 05 三月 2019 09:21:02 +0800
Subject: [PATCH] Merge branch 'yw.1.2.fixbug' of http://192.168.1.226:10010/r/development/c++ into yw.1.2.fixbug
---
QiaoJiaSystem/DataManagerServer/AppPipeController.cpp | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/QiaoJiaSystem/DataManagerServer/AppPipeController.cpp b/QiaoJiaSystem/DataManagerServer/AppPipeController.cpp
index 1b7a76a..8d00d0e 100644
--- a/QiaoJiaSystem/DataManagerServer/AppPipeController.cpp
+++ b/QiaoJiaSystem/DataManagerServer/AppPipeController.cpp
@@ -9,6 +9,10 @@
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());
@@ -20,7 +24,7 @@
registerElement(videoCaptureElement);
registerElement(videoPublishElement);
- videoCaptureElement.setOutPutInterval(3);
+ //videoCaptureElement.setOutPutInterval(3);
}
std::string AppPipeController::getRtmp()
--
Gitblit v1.8.0