From 91fbc7bca400b7ce958e306f09133e4cfc6db63b Mon Sep 17 00:00:00 2001
From: chenshijun <csj_sky@126.com>
Date: 星期三, 03 四月 2019 11:23:25 +0800
Subject: [PATCH] Merge branch 'yangwu1.3' of ssh://192.168.1.226:29418/development/c++ into yangwu1.3
---
QiaoJiaSystem/GB28181DecoderModel/VideoCaptureElementWithRtp.cpp | 140 +++++++++++++++++++++++++++++++++-------------
1 files changed, 101 insertions(+), 39 deletions(-)
diff --git a/QiaoJiaSystem/GB28181DecoderModel/VideoCaptureElementWithRtp.cpp b/QiaoJiaSystem/GB28181DecoderModel/VideoCaptureElementWithRtp.cpp
index 77862e7..2f7010f 100644
--- a/QiaoJiaSystem/GB28181DecoderModel/VideoCaptureElementWithRtp.cpp
+++ b/QiaoJiaSystem/GB28181DecoderModel/VideoCaptureElementWithRtp.cpp
@@ -6,18 +6,17 @@
#include <qt5/QtCore/QDateTime>
#include <basic/util/app/AppPreference.hpp>
#include "VideoCaptureElementWithRtp.h"
+#include <VideoToImageMulth/RtspAnalysManager.h>
//std::string BASICGB28181::VideoCaptureElementWithRtp::m_chanPubID;
//BASICGB28181::FFmpegDecoderJPG BASICGB28181::VideoCaptureElementWithRtp::m_fFmpegDecoderJPG;
BASICGB28181::VideoCaptureElementWithRtp::VideoCaptureElementWithRtp(std::string &chanPubID, int fps,
int streamTransType,
- int gpuIdx) : m_chanPubID(chanPubID), m_fps(fps),
- m_running(false),
- m_waitSignal(false),
- m_streamTransType(streamTransType),
- m_gpuIdx(gpuIdx),
- m_userdata((long) this) {
+ int gpuIdx, RtspAnalysManager *manager)
+ : m_chanPubID(chanPubID), m_fps(fps), m_running(false),
+ m_waitSignal(false), m_streamTransType(streamTransType),
+ m_gpuIdx(gpuIdx), m_userdata((long) this), m_pManager(manager) {
// m_chanPubID = chanPubID;
m_cutPath = appPref.getStringData("user.loop.absolute.path");
@@ -36,8 +35,53 @@
bool BASICGB28181::VideoCaptureElementWithRtp::startRtpStream(int streamTransType) {
+ if(!m_waitSignalrunning) {
+ DBG("std::thread waitSignalAndEmit create New!!");
+ //绛夊緟涓嬪眰ffmpeg灏唕tp鍖呰В鐮佹垚涓哄浘鐗囧悗瑙﹀彂淇″彿,鐒跺悗瑙﹀彂褰撳墠绫荤殑submit
+ std::thread waitSignalAndEmit([&](BASICGB28181::VideoCaptureElementWithRtp *p_this) {
+ p_this->m_waitSignal = true;
+ p_this->m_waitSignalrunning = true;
+ //寰幆锛岀敱鎴愬憳鍙橀噺鏉ョ淮鎶よ繖涓嚎绋嬬殑杩愯鐘舵��
+ while (p_this->m_waitSignal) {
+//#TODO wait test
+#ifdef TestCode
+ DBG("waitSignal(\"DecoderImageOK\") begin");
+#endif
+ //绛夊緟淇″彿瑙﹀彂
+ gSignalLock.waitSignal(p_this->m_chanPubID + "DecoderImageOK");
+#ifdef TestCode
+ DBG("waitSignal(\"DecoderImageOK\") after");
+#endif
+ /****褰曞儚妯″潡浠ｇ爜*****/
+ p_this->m_picCount++;
+ //鍑犲紶閫変竴寮犳斁鍏edis
+ if (p_this->m_picCount % m_nPicsPickOne != 0) {
+ continue;
+ } else {
+ p_this->m_picCount.store(0);
+ }
+
+// 浠巉fmpeg瑙ｇ爜绫讳腑鑾峰彇鍥剧墖
+ 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->submit();
+ }
+ p_this->m_waitSignalrunning = false;
+ INFO("waitSignalAndEmit is exit...");
+ }, this);
+ waitSignalAndEmit.detach();
+ }
+
TryCath(
//--------------鍥芥爣璁惧鎴栧垯鍥芥爣涓嬬骇骞冲彴蹇呴』鏀寔GB28181-2016----------------------------------------------
+ //瑙ｇ爜绾跨▼锛屽彂璧风偣鎾姹傦紝鍚姩ffmpeg瑙ｇ爜妯″潡
std::thread videoCaptureElementThd([&](VideoCaptureElementWithRtp *p_this, int streamType) {
DBG("videoCaptureElementThd start...");
StreamTransType_E etype;
@@ -62,23 +106,57 @@
}
DBG("C_RealVideoStart start... m_chanPubID is " << p_this->m_chanPubID << " etype is " << etype
<< " m_userdata is " << m_userdata);
+ //寮�濮嬬偣鎾棰�
long lrealhandle = C_RealVideoStart(const_cast<char *>(p_this->m_chanPubID.c_str()), etype,
p_this->streamcallback, m_userdata);
if (lrealhandle != -1) {
+ //鐐规挱鎴愬姛
DBG(p_this->m_chanPubID << " C_RealVideoStart ok ... type is " << etype);
p_this->m_running = true;
+ //鍚姩ffmpeg瑙ｇ爜妯″潡
p_this->m_fFmpegDecoderJPG.startThd(p_this->m_chanPubID, p_this->m_fps, p_this->m_gpuIdx);
+ usleep(1000000);
+ //闃诲绾跨▼锛岀瓑寰呭閮ㄨЕ鍙戝叧闂偣鎾�
while (p_this->m_running) {
- usleep(300000);
+ if(p_this->m_fFmpegDecoderJPG.getRunning()) {
+ usleep(300000);
+ } else {
+
+ // 鏍规嵁reopenTime鍒ゆ柇鏄惁闇�瑕侀噸鍚�
+ if (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: ");
+
+ //鍏抽棴ffmpeg瑙ｇ爜妯″潡
+ p_this->m_fFmpegDecoderJPG.stopThd();
+ //鍚姩ffmpeg瑙ｇ爜妯″潡
+ p_this->m_fFmpegDecoderJPG.startThd(p_this->m_chanPubID, p_this->m_fps, p_this->m_gpuIdx);
+ continue;
+ }
+ }
}
DBG("videoCaptureElementThd stop ...");
+ //鍋滄鐐规挱
C_RealVideoStop(lrealhandle);
+ //灏唚aitSignalAndEmit 绾跨▼閫�鍑�
+ p_this->m_waitSignal = false;
DBG("videoCaptureElementThd stop ok...");
} else {
+ //鐐规挱澶辫触
+ p_this->m_waitSignal = false;
p_this->m_running = false;
+
+ //鍏抽棴ffmpeg瑙ｇ爜妯″潡
p_this->m_fFmpegDecoderJPG.stopThd();
ERR(p_this->m_chanPubID << " C_RealVideoStart is error lrealhandle is " << lrealhandle);
+
+ p_this->startRtpStream(p_this->m_streamTransType);
}
}, this, streamTransType);
@@ -119,48 +197,32 @@
// fwrite(data, sizeof(char), datalen, fp11);
}
#endif
-
+ //灏嗗簳灞傜粍濂界殑rtp鍖咃紝瀛樺叆ffmpeg涓殑缂撳瓨闃熷垪
CHKDBG(p_this->m_fFmpegDecoderJPG.pushInfo(data, datalen, p_this->m_chanPubID), true,
"pushInfo is error !! handle is " << handle << " datatype is " << datatype << " frametype is " << frametype);
}
void BASICGB28181::VideoCaptureElementWithRtp::threadFunc() {
+
+// if ((!m_running) || (!m_waitSignal)) {
+//// 鏍规嵁reopenTime鍒ゆ柇鏄惁闇�瑕侀噸鍚�
+// if (reopenTime < 0) {
+// stop();
+// INFO("grabFrame faild, element stopping");
+// return;
+// } else {
+// //todo 涓氬姟姝婚攣
+// usleep(reopenTime * 1000);
+// INFO("grabFrame faild, try reopen video: ");
+// startRtpStream(m_streamTransType);
+// return;
+// }
+// }
fireConnectors();
}
void BASICGB28181::VideoCaptureElementWithRtp::threadInitial() {
- std::thread waitSignalAndEmit([&](BASICGB28181::VideoCaptureElementWithRtp *p_this) {
- p_this->m_waitSignal = true;
- while (p_this->m_waitSignal) {
-//#TODO wait test
-#ifdef TestCode
- DBG("waitSignal(\"DecoderImageOK\") begin");
-#endif
- gSignalLock.waitSignal(p_this->m_chanPubID + "DecoderImageOK");
-#ifdef TestCode
- DBG("waitSignal(\"DecoderImageOK\") after");
-#endif
- p_this->m_picCount++;
- //鍑犲紶閫変竴寮犳斁鍏edis
- if (p_this->m_picCount % m_nPicsPickOne != 0) {
- continue;
- } else {
- p_this->m_picCount.store(0);
- }
-
- 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(m_camId, imageName, copyMat);
- }
- p_this->submit();
- }
- INFO("waitSignalAndEmit is exit...");
- }, this);
- waitSignalAndEmit.detach();
startRtpStream(m_streamTransType);
}
--
Gitblit v1.8.0