From 80aaa6049be55bbe3e112e1f4c7554d1b17f6d41 Mon Sep 17 00:00:00 2001
From: chenshijun <csj_sky@126.com>
Date: 星期一, 15 四月 2019 17:16:32 +0800
Subject: [PATCH] 增加一些注释
---
QiaoJiaSystem/GB28181DecoderModel/VideoCaptureElementWithRtp.cpp | 38 ++++++--------------------------------
1 files changed, 6 insertions(+), 32 deletions(-)
diff --git a/QiaoJiaSystem/GB28181DecoderModel/VideoCaptureElementWithRtp.cpp b/QiaoJiaSystem/GB28181DecoderModel/VideoCaptureElementWithRtp.cpp
index 40b3a8c..9712880 100644
--- a/QiaoJiaSystem/GB28181DecoderModel/VideoCaptureElementWithRtp.cpp
+++ b/QiaoJiaSystem/GB28181DecoderModel/VideoCaptureElementWithRtp.cpp
@@ -63,7 +63,7 @@
p_this->videoPublishElement = new ffmpeg::VideoPublishElement(path, size_, "flv", 25, gupIdx);
p_this->videoPublishElement->start();
} else {
- DBG("videoPublishElement->setImage() : " << p_this->m_chanPubID);
+// DBG("videoPublishElement->setImage() : " << p_this->m_chanPubID);
if (!p_this->m_image.empty()) {
p_this->videoPublishElement->setImage(p_this->m_image);
} else {
@@ -78,7 +78,7 @@
delete p_this->videoPublishElement;
p_this->videoPublishElement = nullptr;
}else{
- DBG("videoPublishElement null :" << p_this->m_chanPubID);
+// DBG("videoPublishElement null :" << p_this->m_chanPubID);
}
}
}
@@ -98,9 +98,8 @@
cv::Mat copyMat;
std::string imageName = p_this->m_fFmpegDecoderJPG.GetImageName();
p_this->m_image.copyTo(copyMat);
- m_pManager->SaveImageToRedis(p_this->m_chanPubID, imageName, copyMat);
+ p_this->m_pManager->SaveImageToRedis(p_this->m_chanPubID, imageName, copyMat);
}
- /*********/
p_this->submit();
}
@@ -162,11 +161,12 @@
} else {
//todo 涓氬姟姝婚攣
usleep((6 - reopenTime--) * 1000000);
- INFO("grabFrame faild, try reopen video: ");
+ INFO("grabFrame faild, try reopen video, reopenTime:" << reopenTime);
//鍏抽棴ffmpeg瑙ｇ爜妯″潡
p_this->m_fFmpegDecoderJPG.stopThd();
//鍚姩ffmpeg瑙ｇ爜妯″潡
+ DBG("m_chanPubID:"<<p_this->m_chanPubID << " m_fps:" << p_this->m_fps);
p_this->m_fFmpegDecoderJPG.startThd(p_this->m_chanPubID, p_this->m_fps, p_this->m_gpuIdx);
continue;
}
@@ -234,32 +234,6 @@
}
void BASICGB28181::VideoCaptureElementWithRtp::threadFunc() {
-// {
-// if (m_publishVideoRet) {
-// if (videoPublishElement == nullptr) {
-// string path = appConfig.getStringProperty("srsAddr") + "cam" + m_chanPubID + ".flv";
-// cv::Size size_(appConfig.getIntProperty("pulish.width"), appConfig.getIntProperty("pulish.height"));
-// int gupIdx = appPref.getIntData("gpu.index");
-// DBG("videoPublishpath:" << path << " h:" << size_.height << " w:" << size_.width);
-// videoPublishElement = new ffmpeg::VideoPublishElement(path, size_, "flv", 25, gupIdx);
-// videoPublishElement->start();
-// } else {
-// if (!m_image.empty()) {
-// videoPublishElement->setImage(m_image);
-// } else {
-// ERR("m_image.empty()");
-// }
-// }
-// } else {
-// if (videoPublishElement != nullptr) {
-// DBG("videoPublishElement->stop()");
-// videoPublishElement->stop();
-// videoPublishElement->wait();
-// delete videoPublishElement;
-// videoPublishElement = nullptr;
-// }
-// }
-// }
fireConnectors();
}
@@ -285,7 +259,7 @@
void BASICGB28181::VideoCaptureElementWithRtp::SaveVideo(const std::string &strImageName) {
- INFO("SaveVideo: " << strImageName);
+// INFO("SaveVideo: " << strImageName);
std::string strTimeStamp = AppUtil::getTimeUSecString();
std::string strPath = MakeDir(strTimeStamp);
m_fFmpegDecoderJPG.SaveVideoByImageName(strPath, strImageName);
--
Gitblit v1.8.0