From b64e83af6e9e5b56e2af97560c5535816b8b94bd Mon Sep 17 00:00:00 2001 From: xuxiuxi <554325746@qq.com> Date: 星期五, 08 三月 2019 12:58:02 +0800 Subject: [PATCH] Merge branch 'yw.1.2.fixbug' of http://192.168.1.226:10010/r/development/c++ into yw.1.2.fixbug --- QiaoJiaSystem/VideoToImageMulth/RtspAnalysManager.cpp | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/QiaoJiaSystem/VideoToImageMulth/RtspAnalysManager.cpp b/QiaoJiaSystem/VideoToImageMulth/RtspAnalysManager.cpp index 8eafe6d..a49c256 100644 --- a/QiaoJiaSystem/VideoToImageMulth/RtspAnalysManager.cpp +++ b/QiaoJiaSystem/VideoToImageMulth/RtspAnalysManager.cpp @@ -165,9 +165,12 @@ m_imgRedisCRwLock.unlock(); //VideoCaptureElementWithRtp(std::string &chanPubID, int fps, int streamTransType, int gpuIdx = -1) - m_controllers_videoCapElem[index] = new BASICGB28181::VideoCaptureElementWithRtp( - const_cast<string &>(index), - 25, 0, 0, this); +// m_controllers_videoCapElem[index] = new BASICGB28181::VideoCaptureElementWithRtp( +// const_cast<string &>(index), +// 25, 0, 0, this); + + m_controllers_videoCapElem[index] = new PushStreamAppPipeController(const_cast<string &>(index), + 25, 0, 0, this); m_controllers_videoCapElem[index]->SetVideoMinMaxSeconds(lst_dev.n_cut_min_duration, lst_dev.n_cut_max_duration); m_controllers_videoCapElem[index]->start(); @@ -310,7 +313,7 @@ auto pCaptureElem = m_controllers_videoCapElem.find(nameSt.m_camId); if (pCaptureElem != m_controllers_videoCapElem.end()) { //#todo ~~~~~~!!!!!!! 杩欓噷鏈塨ug 闇�瑕佹斁寮�璋冭瘯 -// pCaptureElem->second->SaveVideo(name); + pCaptureElem->second->SaveVideo(name); } else { ERR("Can not Find CamId " << nameSt.m_camId); } -- Gitblit v1.8.0