整合c++ver1.3的修改代码进入该分支

chenshijun

2019-04-15 a2ea58c567a078bb97a9e45a56fe50df41438d22

 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,7 +98,7 @@
                    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);
                }
                /*********/

@@ -162,7 +162,7 @@
                        } 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();
@@ -285,7 +285,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);