From 291dbcd9331cd0df41addef74defa4654ee034fb Mon Sep 17 00:00:00 2001
From: chenshijun <csj_sky@126.com>
Date: 星期一, 22 四月 2019 15:59:20 +0800
Subject: [PATCH] 增加人员异常的参数处理

---
 QiaoJiaSystem/GB28181DecoderModel/VideoCaptureElementWithRtp.cpp |   61 +++++++++++++++++++-----------
 1 files changed, 39 insertions(+), 22 deletions(-)

diff --git a/QiaoJiaSystem/GB28181DecoderModel/VideoCaptureElementWithRtp.cpp b/QiaoJiaSystem/GB28181DecoderModel/VideoCaptureElementWithRtp.cpp
index 9b7b775..9aedc2d 100644
--- a/QiaoJiaSystem/GB28181DecoderModel/VideoCaptureElementWithRtp.cpp
+++ b/QiaoJiaSystem/GB28181DecoderModel/VideoCaptureElementWithRtp.cpp
@@ -53,6 +53,39 @@
 #ifdef TestCode
                 DBG("waitSignal(\"DecoderImageOK\") after");
 #endif
+                //            浠巉fmpeg瑙g爜绫讳腑鑾峰彇鍥剧墖
+                p_this->m_fFmpegDecoderJPG.getImage().copyTo(p_this->m_image);
+
+                {
+                    if (p_this->m_publishVideoRet) {
+                        if (p_this->videoPublishElement == nullptr) {
+                            string path = appConfig.getStringProperty("srsAddr") + "cam" + p_this->m_chanPubID + ".flv";
+                            cv::Size size_(appConfig.getIntProperty("pulish.width"), appConfig.getIntProperty("pulish.height"));
+                            int gupIdx = appPref.getIntData("gpu.index");
+                            DBG("videoPublishpath: "  << p_this->m_chanPubID << path << " h:" << size_.height);
+                            p_this->videoPublishElement = new ffmpeg::PipeVideoPublishElement(path, size_, "flv", 25, gupIdx);
+                            p_this->videoPublishElement->start();
+                        } else {
+                            if (!p_this->m_image.empty()) {
+                                p_this->videoPublishElement->setImage(p_this->m_image);
+                                p_this->videoPublishElement->submit();
+                            } else {
+                                ERR("m_image.empty()");
+                            }
+                        }
+                    } else {
+                        if (p_this->videoPublishElement != nullptr) {
+                            DBG("videoPublishElement->stop() :"  << p_this->m_chanPubID);
+                            p_this->videoPublishElement->stop();
+                            p_this->videoPublishElement->wait();
+                            delete p_this->videoPublishElement;
+                            p_this->videoPublishElement = nullptr;
+                        }else{
+//                            DBG("videoPublishElement null :" << p_this->m_chanPubID);
+                        }
+                    }
+                }
+
                 /****褰曞儚妯″潡浠g爜*****/
                 p_this->m_picCount++;
                 //鍑犲紶閫変竴寮犳斁鍏edis
@@ -62,15 +95,12 @@
                     p_this->m_picCount.store(0);
                 }
 
-//            浠巉fmpeg瑙g爜绫讳腑鑾峰彇鍥剧墖
-                p_this->m_fFmpegDecoderJPG.getImage().copyTo(p_this->m_image);
                 {
                     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();
             }
@@ -125,18 +155,19 @@
                     } else {
 
                         // 鏍规嵁reopenTime鍒ゆ柇鏄惁闇�瑕侀噸鍚�
-                        if (reopenTime < 0) {
+                        if (p_this->reopenTime < 0) {
                             p_this->m_running = false;
                             stop();
                             INFO("grabFrame faild, element stopping");
                         } else {
                             //todo 涓氬姟姝婚攣
-                            usleep((6 - reopenTime--) * 1000000);
-                            INFO("grabFrame faild, try reopen video: ");
+                            usleep((6 - p_this->reopenTime--) * 1000000);
+                            INFO("grabFrame faild, try reopen video, reopenTime:" << p_this->reopenTime);
 
                             //鍏抽棴ffmpeg瑙g爜妯″潡
                             p_this->m_fFmpegDecoderJPG.stopThd();
                             //鍚姩ffmpeg瑙g爜妯″潡
+                            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;
                         }
@@ -205,20 +236,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");
-            videoPublishElement = new ffmpeg::VideoPublishElement(path, size_, "flv", 25, gupIdx);
-        } else {
-            videoPublishElement->stop();
-            videoPublishElement->wait();
-            delete videoPublishElement;
-            videoPublishElement = nullptr;
-        }
-    }
-
     fireConnectors();
 }
 
@@ -243,7 +260,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