From f76e6f73d57015a04272f05a48c27bfd42b14015 Mon Sep 17 00:00:00 2001
From: miyanhui <dennismi1024@gmail.com>
Date: 星期三, 13 二月 2019 17:33:27 +0800
Subject: [PATCH] Merge branch 'ywv1.2' of http://192.168.1.226:10010/r/development/c++ into ywv1.2
---
QiaoJiaSystem/DataManagerServer/AppPipeController.cpp | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/QiaoJiaSystem/DataManagerServer/AppPipeController.cpp b/QiaoJiaSystem/DataManagerServer/AppPipeController.cpp
index 1b7a76a..140fa89 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());
--
Gitblit v1.8.0