From 23bd97eaa5626ad96ca3f5d3e97e93d14705ca6d Mon Sep 17 00:00:00 2001
From: chenshijun <csj_sky@126.com>
Date: 星期六, 30 三月 2019 17:50:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/yangwu1.3' into 1.3nsq
---
QiaoJiaSystem/VideoToImageMulth/pushStream/PushStreamAppPipeController.cpp | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/QiaoJiaSystem/VideoToImageMulth/pushStream/PushStreamAppPipeController.cpp b/QiaoJiaSystem/VideoToImageMulth/pushStream/PushStreamAppPipeController.cpp
index 553a451..2bf9968 100644
--- a/QiaoJiaSystem/VideoToImageMulth/pushStream/PushStreamAppPipeController.cpp
+++ b/QiaoJiaSystem/VideoToImageMulth/pushStream/PushStreamAppPipeController.cpp
@@ -13,12 +13,12 @@
videoPublishElement(nullptr) {
string path = appConfig.getStringProperty("srsAddr") + "cam" + chanPubID + ".flv";
- cv::Size size_(appPref.getIntData("pulish.width"), appPref.getIntData("pulish.height"));
- int gupIdx = appPref.getLongData("gpu.index");
+ cv::Size size_(appConfig.getIntProperty("pulish.width"), appConfig.getIntProperty("pulish.height"));
+ int gupIdx = appPref.getIntData("gpu.index");
videoPublishElement = new ffmpeg::VideoPublishElement(path, size_, "flv", 25, gupIdx);
- if (appPref.getIntData("pulish.width") < 0 || appPref.getIntData("pulish.height") < 0) {
- ERR("pulish.width: " << appPref.getIntData("pulish.width") << " Height: "
- << appPref.getIntData("pulish.height"));
+ if (appConfig.getIntProperty("pulish.width") < 0 || appConfig.getIntProperty("pulish.height") < 0) {
+ ERR("pulish.width: " << appConfig.getIntProperty("pulish.width") << " Height: "
+ << appConfig.getIntProperty("pulish.height"));
}
videoCaptureElement.registerConnector([&] {
//if(!videoPublishElement.isBusy()){
--
Gitblit v1.8.0