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 | 101 ++++++++++++++++++++++++++++----------------------
1 files changed, 56 insertions(+), 45 deletions(-)
diff --git a/QiaoJiaSystem/VideoAnalysFromHC/CMakeLists.txt b/QiaoJiaSystem/VideoAnalysFromHC/CMakeLists.txt
index 9654ae7..0d4e6e6 100644
--- a/QiaoJiaSystem/VideoAnalysFromHC/CMakeLists.txt
+++ b/QiaoJiaSystem/VideoAnalysFromHC/CMakeLists.txt
@@ -9,11 +9,12 @@
set(CMAKE_BUILD_TYPE debug)
add_compile_options(-fPIC)
add_definitions(-DGLOG)
+add_definitions(-DGB28181)
add_definitions(-DDEBUG_ERR -DDEBUG_INFO -fpermissive)
SET(SOURCES
#
- ../../BasicPlatForm/basic/db/Elasticsearch/EsDBTool.cpp
+ ../../../BasicPlatForm/basic/db/Elasticsearch/EsDBTool.cpp
#浠诲姟璋冨害妯″潡
../VideoServer/QiaoJia/DB/LDBTool.cpp
@@ -54,27 +55,33 @@
../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
- ../../BasicPlatForm/basic/io/io.h
- ../../BasicPlatForm/basic/pipe/TimerElement.cpp
- ../../BasicPlatForm/basic/pipe/PipeElement.cpp
- ../../BasicPlatForm/basic/pipe/PipeElement.h
- ../../BasicPlatForm/basic/pipe_element/ffmpeg/ffmpegRecoder/FileRecorder.cpp
- ../../BasicPlatForm/basic/pipe_element/ffmpeg/ffmpegRecoder/FileRecorder.h
+ ../../../BasicPlatForm/basic/io/io.cpp
+ ../../../BasicPlatForm/basic/io/io.h
+ ../../../BasicPlatForm/basic/pipe/TimerElement.cpp
+ ../../../BasicPlatForm/basic/pipe/PipeElement.cpp
+ ../../../BasicPlatForm/basic/pipe/PipeElement.h
+ ../../../BasicPlatForm/basic/pipe_element/ffmpeg/ffmpegRecoder/FileRecorder.cpp
+ ../../../BasicPlatForm/basic/pipe_element/ffmpeg/ffmpegRecoder/FileRecorder.h
#todo fix bug
# ../../BasicPlatForm/basic/pipe_element/ffmpeg/FfmpegElement.cpp
- ../../BasicPlatForm/basic/pipe_element/ImageFactoryElement.cpp
- ../../BasicPlatForm/basic/util/BASE64/Base64.cpp
- ../../BasicPlatForm/basic/util/fastdfs/FastdfsClient.cpp
- ../../BasicPlatForm/basic/db/ES/es/ManagerEsDB.cpp
+ ../../../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
@@ -99,8 +106,7 @@
RtspAnalysElement.cpp
-
- ../../BasicPlatForm/basic/util/net_config/net_config.cpp
+ ../../../BasicPlatForm/basic/util/net_config/net_config.cpp
main.cpp
DBManageClass.cpp DBManageClass.h
@@ -156,15 +162,16 @@
# cudart
# cublas
opencv_world
- jsoncpp
+# jsoncpp
curl
uuid
pthread
+ hiredis
)
include_directories(
#glog
- ../../BasicPlatForm/libs/glog/include
+ ../../../BasicPlatForm/libs/glog/include
./
../VideoServer
../RapidStructureApp
@@ -176,47 +183,51 @@
../YoloServer/rpc
../FaceDetectServer/rpc
../FaceSearchServer/rpc
+ ../VideoToImage/rpc
- ../../BasicPlatForm/
+ ../../../BasicPlatForm/
- ../../BasicPlatForm/basic/pipe/
- ../../BasicPlatForm/basic/util/fastdfs
- ../../BasicPlatForm/basic/util/curl/
+ ../../../BasicPlatForm/basic/pipe/
+ ../../../BasicPlatForm/basic/util/fastdfs
+ ../../../BasicPlatForm/basic/util/curl/
#webServer
- ../../BasicPlatForm/basic/http_server/
- ../../BasicPlatForm/basic/util/net_config/
+ ../../../BasicPlatForm/basic/http_server/
+ ../../../BasicPlatForm/basic/util/net_config/
- ../../BasicPlatForm/libs/FastDFS/include/fastdfs
- ../../BasicPlatForm/libs/FastDFS/include/fastcommon
- ../../BasicPlatForm/libs/opencv/include
- ../../BasicPlatForm/libs/Ice-3.7.0/include
- ../../BasicPlatForm/libs/ffmpeg/include
- ../../BasicPlatForm/libs/jsoncpp/include
- ../../BasicPlatForm/libs/crul/include
- ../../BasicPlatForm/libs/libuuid/include
- ../../BasicPlatForm/libs/hcTool/HCNetSDK64/incCn
- ../../BasicPlatForm/libs/libboost/include
+ ../../../BasicPlatForm/libs/FastDFS/include/fastdfs
+ ../../../BasicPlatForm/libs/FastDFS/include/fastcommon
+ ../../../BasicPlatForm/libs/opencv/include
+ ../../../BasicPlatForm/libs/Ice-3.7.0/include
+ ../../../BasicPlatForm/libs/ffmpeg/include
+ ../../../BasicPlatForm/libs/jsoncpp/include
+ ../../../BasicPlatForm/libs/crul/include
+ ../../../BasicPlatForm/libs/libuuid/include
+ ../../../BasicPlatForm/libs/hcTool/HCNetSDK64/incCn
+ ../../../BasicPlatForm/libs/libboost/include
/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(
#glog
- ../../BasicPlatForm/libs/glog/lib
- ../../BasicPlatForm/libs/Ice-3.7.0/lib64
- ../../BasicPlatForm/libs/openssl/lib
- ../../BasicPlatForm/libs/opencv/lib
- ../../BasicPlatForm/libs/ffmpeg/lib
- ../../BasicPlatForm/libs/jsoncpp/lib
- ../../BasicPlatForm/libs/crul/lib
- ../../BasicPlatForm/libs/libuuid/lib
- ../../BasicPlatForm/libs/FastDFS/lib
- ../../BasicPlatForm/libs/hcTool/HCNetSDK64/lib/
- ../../BasicPlatForm/libs/hcTool/HCNetSDK64/lib/HCNetSDKCom/
- ../../BasicPlatForm/libs/libboost/lib
+ ../../../BasicPlatForm/libs/glog/lib
+ ../../../BasicPlatForm/libs/Ice-3.7.0/lib64
+ ../../../BasicPlatForm/libs/openssl/lib
+ ../../../BasicPlatForm/libs/opencv/lib
+ ../../../BasicPlatForm/libs/ffmpeg/lib
+ ../../../BasicPlatForm/libs/jsoncpp/lib
+ ../../../BasicPlatForm/libs/crul/lib
+ ../../../BasicPlatForm/libs/libuuid/lib
+ ../../../BasicPlatForm/libs/FastDFS/lib
+ ../../../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