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/GB28181DecoderModel/GB28181Server.h | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/QiaoJiaSystem/GB28181DecoderModel/GB28181Server.h b/QiaoJiaSystem/GB28181DecoderModel/GB28181Server.h
index ee5e6fd..515d716 100644
--- a/QiaoJiaSystem/GB28181DecoderModel/GB28181Server.h
+++ b/QiaoJiaSystem/GB28181DecoderModel/GB28181Server.h
@@ -17,6 +17,7 @@
#include <stdlib.h>
#include <time.h>
#include <string.h>
+#include <VideoToImageMulth/RtspAnalysManager.h>
#include "28181SDK.h"
#include "SpinLock.hpp"
@@ -80,10 +81,20 @@
//鎵撳嵃浜嬩欢鍥炶皟淇℃伅
static void enventcallback(int eventtype, int eventparam, int datalen, char *data) {
printf("eventtype:%d, eventparam:%d, datalen:%d, data:%s\n", eventtype, eventparam, datalen, data);
- if (eventtype == 2) {
+ if (eventtype == EVENT_DEVICE_CATALOG) {
// GB28181Server::bGetLoaclRes = true;
- } else if (eventtype == 1 && eventparam == 1) {
+ } else if (eventtype == EVENT_REGISTER_STATUS && eventparam == 1) {
C_GetResource(NULL);
+ } else if (eventtype == EVENT_VIDEO_EXCEPTION){
+ if(gRtspAnalysManagerCamera) {
+ auto cameraHandlePtr = (RtspAnalysManager *) gRtspAnalysManagerCamera;
+ ERR("gRtspAnalysManagerCamera ADDR:" << gRtspAnalysManagerCamera);
+ string camID(data, datalen);
+ ERR("EVENT_VIDEO_EXCEPTION reopen camID:" << camID);
+ cameraHandlePtr->addCamera(camID, camID);
+ }else{
+ ERR("gRtspAnalysManagerCamera is nullptr");
+ }
}
}
--
Gitblit v1.8.0