From 23bd97eaa5626ad96ca3f5d3e97e93d14705ca6d Mon Sep 17 00:00:00 2001
From: chenshijun <csj_sky@126.com>
Date: 星期六, 30 三月 2019 17:50:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/yangwu1.3' into 1.3nsq
---
QiaoJiaSystem/VideoToImageMulth/RtspAnalysManager.h | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/QiaoJiaSystem/VideoToImageMulth/RtspAnalysManager.h b/QiaoJiaSystem/VideoToImageMulth/RtspAnalysManager.h
index fbd73ba..c17270a 100644
--- a/QiaoJiaSystem/VideoToImageMulth/RtspAnalysManager.h
+++ b/QiaoJiaSystem/VideoToImageMulth/RtspAnalysManager.h
@@ -15,11 +15,14 @@
#include <QiaoJia/DB/LDBTool.h>
#include <basic/util/app/AppPreference.hpp>
#include "RtspAnalysServer.h"
+
+#include "NsqMsgTool.hpp"
//#include <GB28181DecoderModel/VideoCaptureElementWithRtp.h>
//#include <VideoToImageMulth/rpc/RtspAnalysServer.h>
//using BASICGB28181::VideoCaptureElementWithRtp;
-
+//澶栭儴浣跨敤鐨勫叏灞�鎸囬拡
+extern void *gRtspAnalysManagerCamera;
//鐢ㄦ潵瀹炵幇recordVideo鐨凴PC鐨勬帴鍙ｇ被
class RtspAnalysManager : public ::RtspAnalys::RtspAnalysServer {
@@ -28,6 +31,13 @@
RtspAnalysManager() : m_maxCount(50), m_currentCount(0) {
m_lDBTool = new LDBTool;
init();
+
+ //nsq set callback func
+ DBG("NsqMsgConsumer Init");
+ nsqMsgConsumer = new BasicMsg::Nsq::NsqMsgConsumer("127.0.0.1", "4150", "cut_dura_edit", to_string(appPref.getIntData("RpcVTIMPort")));
+ nsqMsgConsumer->setMessageCallback(std::bind(&OnMsgFunc, std::placeholders::_1, this));
+ nsqMsgConsumer->init();
+ DBG("NsqMsgConsumer Init END!!");
}
RtspAnalysManager(LDBTool *_dbTool);
@@ -51,9 +61,13 @@
private:
void init();
+ static void OnMsgFunc(void *msgPtr, void *pThisPtr);
private:
+ //nsq
+ BasicMsg::Nsq::NsqMsgConsumer *nsqMsgConsumer;
+
RWLock m_imgRedisCRwLock;
LDBTool *m_lDBTool;
--
Gitblit v1.8.0