From 12879769af38a00425309e292b2c167afc6612c1 Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期四, 04 四月 2019 11:27:38 +0800
Subject: [PATCH] 增加点播功能
---
QiaoJiaSystem/VideoToImageMulth/pushStream/PushStreamAppPipeController.cpp | 42 ++++++++++++++++++++++++++----------------
1 files changed, 26 insertions(+), 16 deletions(-)
diff --git a/QiaoJiaSystem/VideoToImageMulth/pushStream/PushStreamAppPipeController.cpp b/QiaoJiaSystem/VideoToImageMulth/pushStream/PushStreamAppPipeController.cpp
index 2bf9968..1c01b86 100644
--- a/QiaoJiaSystem/VideoToImageMulth/pushStream/PushStreamAppPipeController.cpp
+++ b/QiaoJiaSystem/VideoToImageMulth/pushStream/PushStreamAppPipeController.cpp
@@ -12,29 +12,30 @@
index(chanPubID),
videoPublishElement(nullptr) {
- string path = appConfig.getStringProperty("srsAddr") + "cam" + chanPubID + ".flv";
- 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 (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()){
- videoPublishElement->setImage(videoCaptureElement.getImage());
- //videoPublishElement.submit();
- //}
- });
+// string path = appConfig.getStringProperty("srsAddr") + "cam" + chanPubID + ".flv";
+// 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 (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()){
+// videoPublishElement->setImage(videoCaptureElement.getImage());
+// //videoPublishElement.submit();
+// //}
+// });
registerElement(videoCaptureElement);
- registerElement(*videoPublishElement);
+// registerElement(*videoPublishElement);
// videoCaptureElement.setOutPutInterval(3);
}
std::string PushStreamAppPipeController::getRtmp() {
- std::string ret = videoPublishElement->getPath();
+ //#todo videoPublishElement is nullptr
+ std::string ret = "";// videoPublishElement->getPath();
size_t pos = ret.find(".flv");
ret = ret.substr(0, pos);
INFO(ret);
@@ -48,3 +49,12 @@
void PushStreamAppPipeController::SetVideoMinMaxSeconds(const int minSeconds, const int maxSeconds) {
videoCaptureElement.SetVideoMinMaxSeconds(minSeconds, maxSeconds);
}
+
+void PushStreamAppPipeController::startPublishVideo() {
+ videoCaptureElement.startPublishVideo();
+}
+
+void PushStreamAppPipeController::stopPublishVideo() {
+
+ videoCaptureElement.stopPublishVideo();
+}
--
Gitblit v1.8.0