From 979bc003bce710bf300bc2bd87a8278585678763 Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期四, 07 三月 2019 14:47:14 +0800
Subject: [PATCH] GB28181集成完成。录像bug暂未解决，已注释
---
QiaoJiaSystem/VideoAnalysFromHC/CMakeLists.txt | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/QiaoJiaSystem/VideoAnalysFromHC/CMakeLists.txt b/QiaoJiaSystem/VideoAnalysFromHC/CMakeLists.txt
index 7c531d3..0d4e6e6 100644
--- a/QiaoJiaSystem/VideoAnalysFromHC/CMakeLists.txt
+++ b/QiaoJiaSystem/VideoAnalysFromHC/CMakeLists.txt
@@ -9,6 +9,7 @@
set(CMAKE_BUILD_TYPE debug)
add_compile_options(-fPIC)
add_definitions(-DGLOG)
+add_definitions(-DGB28181)
add_definitions(-DDEBUG_ERR -DDEBUG_INFO -fpermissive)
SET(SOURCES
@@ -57,12 +58,15 @@
../StructureApp/NewEncodeVideoManager.cpp
../StructureApp/NewEncodeVideo.cpp
../StructureApp/HiredisTool.cpp
+ ../StructureApp/PersonElement.cpp
+ ../StructureApp/PerStaticElement.cpp
+ ../StructureApp/IntAreaCalcUtil.cpp
../YoloServer/rpc/YoloServer.cpp
../FaceDetectServer/rpc/FaceServer.cpp
../FaceSearchServer/rpc/FaceSearchServer.cpp
../RecordVideo/rpc/RecordVideo.cpp
-
+ ../VideoToImage/rpc/RtspAnalysServer.cpp
#閫氱敤妯″潡
../../../BasicPlatForm/basic/io/io.cpp
@@ -77,6 +81,7 @@
../../../BasicPlatForm/basic/pipe_element/ImageFactoryElement.cpp
../../../BasicPlatForm/basic/util/BASE64/Base64.cpp
../../../BasicPlatForm/basic/util/fastdfs/FastdfsClient.cpp
+ ../../../BasicPlatForm/basic/timer_counter/Clocktimer.cpp
#绾跨▼姹�
myThread.cpp
@@ -157,7 +162,7 @@
# cudart
# cublas
opencv_world
- jsoncpp
+# jsoncpp
curl
uuid
pthread
@@ -178,6 +183,7 @@
../YoloServer/rpc
../FaceDetectServer/rpc
../FaceSearchServer/rpc
+ ../VideoToImage/rpc
../../../BasicPlatForm/
@@ -221,7 +227,7 @@
../../../BasicPlatForm/libs/hcTool/HCNetSDK64/lib/
../../../BasicPlatForm/libs/hcTool/HCNetSDK64/lib/HCNetSDKCom/
../../../BasicPlatForm/libs/libboost/lib
- ../../BasicPlatForm/libs/hiredis-master/lib
+ ../../../BasicPlatForm/libs/hiredis-master/lib/
)
add_executable(${PROJECT_NAME}
--
Gitblit v1.8.0