From f1360ea0672147638e052b3ea1458b393c92422e Mon Sep 17 00:00:00 2001
From: chenshijun <chenshijun@aiotlink.com>
Date: 星期五, 15 三月 2019 15:14:35 +0800
Subject: [PATCH] Merge branch 'yw.1.2.fixbug' of ssh://192.168.1.226:29418/development/c++ into yw.1.2.fixbug
---
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 a8cf2f7..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)
{
@@ -15,7 +15,7 @@
}
videoCaptureElement.registerConnector([&]{
//if(!videoPublishElement.isBusy()){
- //videoPublishElement.setImage(videoCaptureElement.getImage());
+ videoPublishElement.setImage(videoCaptureElement.getImage());
//videoPublishElement.submit();
//}
--
Gitblit v1.8.0