From 439a23896bda9c4e954092816354914e645579b6 Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期一, 10 六月 2019 09:37:13 +0800
Subject: [PATCH] 替换这个文件

---
 QiaoJiaSystem/GB28181DecoderModel/VideoCaptureElementWithRtp.cpp |   43 +++++++++----------------------------------
 1 files changed, 9 insertions(+), 34 deletions(-)

diff --git a/QiaoJiaSystem/GB28181DecoderModel/VideoCaptureElementWithRtp.cpp b/QiaoJiaSystem/GB28181DecoderModel/VideoCaptureElementWithRtp.cpp
index 2524d1d..9aedc2d 100644
--- a/QiaoJiaSystem/GB28181DecoderModel/VideoCaptureElementWithRtp.cpp
+++ b/QiaoJiaSystem/GB28181DecoderModel/VideoCaptureElementWithRtp.cpp
@@ -53,6 +53,9 @@
 #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) {
@@ -60,12 +63,12 @@
                             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::VideoPublishElement(path, size_, "flv", 25, gupIdx);
+                            p_this->videoPublishElement = new ffmpeg::PipeVideoPublishElement(path, size_, "flv", 25, gupIdx);
                             p_this->videoPublishElement->start();
                         } else {
-//                            DBG("videoPublishElement->setImage() : " << p_this->m_chanPubID);
                             if (!p_this->m_image.empty()) {
                                 p_this->videoPublishElement->setImage(p_this->m_image);
+                                p_this->videoPublishElement->submit();
                             } else {
                                 ERR("m_image.empty()");
                             }
@@ -92,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);
                     p_this->m_pManager->SaveImageToRedis(p_this->m_chanPubID, imageName, copyMat);
                 }
-                /*********/
 
                 p_this->submit();
             }
@@ -155,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, reopenTime:" << reopenTime);
+                            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;
                         }
@@ -234,32 +235,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();
 }

--
Gitblit v1.8.0