From d3b7bbe7102cd089680a828f5d8f6402c8cf6342 Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期四, 07 三月 2019 14:43:28 +0800
Subject: [PATCH] GB28181集成完成,集成推流模块

---
 QiaoJiaSystem/VideoAnalysFromHC/CMakeLists.txt |   17 +++++++++++++++--
 1 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/QiaoJiaSystem/VideoAnalysFromHC/CMakeLists.txt b/QiaoJiaSystem/VideoAnalysFromHC/CMakeLists.txt
index 1d8f81c..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
 
@@ -54,12 +55,18 @@
     ../StructureApp/PerimeterElement.cpp
 
     ../StructureApp/NewRecordVideoElement.cpp
+    ../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
@@ -74,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
@@ -154,10 +162,11 @@
     #    cudart
     #    cublas
     opencv_world
-    jsoncpp
+#    jsoncpp
     curl
     uuid
     pthread
+    hiredis
     )
 include_directories(
 
@@ -174,6 +183,7 @@
     ../YoloServer/rpc
     ../FaceDetectServer/rpc
     ../FaceSearchServer/rpc
+    ../VideoToImage/rpc
 
     ../../../BasicPlatForm/
 
@@ -199,6 +209,8 @@
     /usr/include/x86_64-linux-gnu/qt5
     /usr/include/x86_64-linux-gnu/qt5/QtCore/
     /usr/include/x86_64-linux-gnu/qt5/QtSql/
+
+    ../../BasicPlatForm/libs/hiredis-master/include
 )
 
 link_directories(
@@ -215,6 +227,7 @@
     ../../../BasicPlatForm/libs/hcTool/HCNetSDK64/lib/
     ../../../BasicPlatForm/libs/hcTool/HCNetSDK64/lib/HCNetSDKCom/
     ../../../BasicPlatForm/libs/libboost/lib
+    ../../../BasicPlatForm/libs/hiredis-master/lib/
 )
 
 add_executable(${PROJECT_NAME}

--
Gitblit v1.8.0