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/VideoToImageMulth/CMakeLists.txt |   51 +++++++++++++++++++++++++++++++++++----------------
 1 files changed, 35 insertions(+), 16 deletions(-)

diff --git a/QiaoJiaSystem/VideoToImageMulth/CMakeLists.txt b/QiaoJiaSystem/VideoToImageMulth/CMakeLists.txt
index f8df435..d484908 100644
--- a/QiaoJiaSystem/VideoToImageMulth/CMakeLists.txt
+++ b/QiaoJiaSystem/VideoToImageMulth/CMakeLists.txt
@@ -5,6 +5,7 @@
 set(CMAKE_BUILD_TYPE debug)
 add_compile_options(-fPIC)
 add_definitions(-DGLOG)
+add_definitions(-DGB28181)
 add_definitions(-DDEBUG_ERR -DDEBUG_INFO -fpermissive)
 add_definitions(-Wall -Wextra)
 SET(LIBS
@@ -12,7 +13,7 @@
     Ice
 
     crypto
-
+    mysqlpp
 
     #ffmpeg
     avformat
@@ -35,9 +36,12 @@
     jsoncpp
     pthread
     hiredis
+    28181sdk
+    mysqlclient
+    StreamParse
+
     )
 include_directories(
-
     #glog
     ../../../BasicPlatForm/libs/glog/include
     ./rpc
@@ -46,11 +50,14 @@
     ../VideoServer/QiaoJia/DB
     ../VideoServer/QiaoJia/dispatchTool
     ../StructureApp/
+    ../GB28181DecoderModel
+    ../VideoToImageMulth
 
+    ../../../BasicPlatForm/basic/pipe_element/ffmpeg/
+    ../../../BasicPlatForm/basic/debug/
     ../../../BasicPlatForm/
 
     ../../../BasicPlatForm/basic/pipe/
-
 
 
     ../../../BasicPlatForm/libs/opencv/include
@@ -66,9 +73,14 @@
 
     ../../BasicPlatForm/libs/hiredis-master/include
     ../../../BasicPlatForm/basic/timer_counter/
+    ../../../BasicPlatForm/libs/GB28181/include
+
+    ../../../BasicPlatForm/libs/mysqlpp/include
+    ../../../BasicPlatForm/libs/mysql/include/mysql/
 )
 
 link_directories(
+    ../../../BasicPlatForm/libs/GB28181/libs
     #glog
     ../../../BasicPlatForm/libs/glog/lib
     ../../../BasicPlatForm/libs/openssl/lib
@@ -76,26 +88,33 @@
     ../../../BasicPlatForm/libs/ffmpeg/lib
     ../../../BasicPlatForm/libs/jsoncpp/lib
 
-#   ../../../BasicPlatForm/libs/libuuid/lib
+    #   ../../../BasicPlatForm/libs/libuuid/lib
     ../../../BasicPlatForm/libs/Ice-3.7.0/lib64
 
     ../../../BasicPlatForm/libs/hiredis-master/lib
+    ../../../BasicPlatForm/libs/mysqlpp/lib
 )
 
 add_executable(${PROJECT_NAME}
-      ../../../BasicPlatForm/basic/pipe_element/ffmpeg/VideoChangeScore.cpp
+
+    ./pushStream/PushStreamAppPipeController.cpp
+    ../GB28181DecoderModel/FFmpegDecoderJPG.cpp
+    ../GB28181DecoderModel/GB28181Server.cpp
+    ../GB28181DecoderModel/VideoCaptureElementWithRtp.cpp
+    #    ../../../BasicPlatForm/basic/pipe_element/ffmpeg/VideoChangeScore.cpp
     ../../../BasicPlatForm/basic/util/BASE64/Base64.cpp
-#       ../../../BasicPlatForm/basic/pipe_element/ffmpeg/FfmpegElement.cpp
-       ../VideoServer/QiaoJia/DB/LDBTool.cpp
-       ./rpc/RtspAnalysServer.cpp
-        RtspCaptureElement.cpp
-        RtspAnalysManager.cpp
-       ../StructureApp/HiredisTool.cpp
-       ../../../BasicPlatForm/basic/timer_counter/Clocktimer.h
-       ../../../BasicPlatForm/basic/timer_counter/Clocktimer.cpp
-        ./RtspImageRedis.h
-        ./RtspImageRedis.cpp
-       main.cpp
+#        ../../../BasicPlatForm/basic/pipe_element/ffmpeg/FfmpegElement.cpp
+    ../VideoServer/QiaoJia/DB/LDBTool.cpp
+    ./rpc/RtspAnalysServer.cpp
+    RtspCaptureElement.cpp
+    RtspAnalysManager.cpp
+    ../StructureApp/HiredisTool.cpp
+    ../../../BasicPlatForm/basic/timer_counter/Clocktimer.h
+    ../../../BasicPlatForm/basic/timer_counter/Clocktimer.cpp
+    ../../../BasicPlatForm/basic/util/net_config/net_config.cpp
+    ./RtspImageRedis.h
+    ./RtspImageRedis.cpp
+    main.cpp
     )
 target_link_libraries(${PROJECT_NAME}
     ${LIBS}

--
Gitblit v1.8.0