From f946a62d3921e86b44ff8e2973138304b9cd53cd Mon Sep 17 00:00:00 2001
From: chenshijun <csj_sky@126.com>
Date: 星期二, 16 四月 2019 16:36:32 +0800
Subject: [PATCH] 解决修改参数和推流画面跳跃问题
---
QiaoJiaSystem/DataManagerServer/CMakeLists.txt | 219 +++++++++++++++++++++++++++++++-----------------------
1 files changed, 127 insertions(+), 92 deletions(-)
diff --git a/QiaoJiaSystem/DataManagerServer/CMakeLists.txt b/QiaoJiaSystem/DataManagerServer/CMakeLists.txt
index dd5cd26..77fd0e8 100644
--- a/QiaoJiaSystem/DataManagerServer/CMakeLists.txt
+++ b/QiaoJiaSystem/DataManagerServer/CMakeLists.txt
@@ -16,31 +16,31 @@
#
../LocalDBTool/
- ../../BasicPlatForm/basic/db/sqlite/
- ../../BasicPlatForm/basic/db/sqlite/sqlite-v-3220000/
+ ../../../BasicPlatForm/basic/db/sqlite/
+ ../../../BasicPlatForm/basic/db/sqlite/sqlite-v-3220000/
- ../../BasicPlatForm
- ../../BasicPlatForm/libs/opencv/include
- ../../BasicPlatForm/libs/Ice-3.7.0/include
- ../../BasicPlatForm/libs/Casia_Face/FaceSdk/include
- ../../BasicPlatForm/libs/jsoncpp/include
- ../../BasicPlatForm/libs/crul/include
- ../../BasicPlatForm/libs/FastDFS/include
- ../../BasicPlatForm/libs/FastDFS/include/fastdfs
- ../../BasicPlatForm/libs/FastDFS/include/fastcommon
- ../../BasicPlatForm/libs/ffmpeg/include
+ ../../../BasicPlatForm
+ ../../../BasicPlatForm/libs/opencv/include
+ ../../../BasicPlatForm/libs/Ice-3.7.0/include
+ ../../../BasicPlatForm/libs/Casia_Face/FaceSdk/include
+ ../../../BasicPlatForm/libs/jsoncpp/include
+ ../../../BasicPlatForm/libs/crul/include
+ ../../../BasicPlatForm/libs/FastDFS/include
+ ../../../BasicPlatForm/libs/FastDFS/include/fastdfs
+ ../../../BasicPlatForm/libs/FastDFS/include/fastcommon
+ ../../../BasicPlatForm/libs/ffmpeg/include
- ../../BasicPlatForm/basic/util/fastdfs/
- ../../BasicPlatForm/basic/util/curl/
- ../../BasicPlatForm/basic/http_server/
- ../../BasicPlatForm/libs/libuuid/include
- ../../BasicPlatForm/libs/uniview/include
+ ../../../BasicPlatForm/basic/util/fastdfs/
+ ../../../BasicPlatForm/basic/util/curl/
+ ../../../BasicPlatForm/basic/http_server/
+ ../../../BasicPlatForm/libs/libuuid/include
+ ../../../BasicPlatForm/libs/uniview/include
- ../../../Erlang/syncDBTool
+ ../../syncDBTool
- ../../BasicPlatForm/libs/hcTool/HCNetSDK64/incCn
+ ../../../BasicPlatForm/libs/hcTool/HCNetSDK64/incCn
- ../../BasicPlatForm/libs/libboost/include
+ ../../../BasicPlatForm/libs/libboost/include
/usr/include/x86_64-linux-gnu/qt5
/usr/include/x86_64-linux-gnu/qt5/QtCore/
@@ -48,34 +48,49 @@
#glog
- ../../BasicPlatForm/libs/glog/include
+ ../../../BasicPlatForm/libs/glog/include
+ ../../../BasicPlatForm/libs/mysqlpp/include
+ ../../../BasicPlatForm/libs/mysql/include/mysql/
+ ../../../BasicPlatForm/basic/util/app/
+
+ #nsq
+ ../../../BasicPlatForm/libs/EvnsqTool/
+ ../../../BasicPlatForm/libs/EvnsqTool/include
+ ../../../BasicPlatForm/libs/libevent/include
+
)
link_directories(
#glog
- ../../BasicPlatForm/libs/glog/lib
+ ../../../BasicPlatForm/libs/glog/lib
/usr/lib/erlang/lib/erl_interface-3.8.2/lib/
/usr/local/cuda/lib64
- ../../BasicPlatForm/libs/opencv/lib
- ../../BasicPlatForm/libs/Casia_Face/FaceSdk/lib/cpu
- ../../BasicPlatForm/libs/crul/lib
- ../../BasicPlatForm/libs/FastDFS/lib
- ../../BasicPlatForm/libs/jsoncpp/lib
- ../../BasicPlatForm/libs/ffmpeg/lib
- ../../BasicPlatForm/libs/libuuid/lib
+ ../../../BasicPlatForm/libs/opencv/lib
+ ../../../BasicPlatForm/libs/Casia_Face/FaceSdk/lib/cpu
+ ../../../BasicPlatForm/libs/crul/lib
+ ../../../BasicPlatForm/libs/FastDFS/lib
+ ../../../BasicPlatForm/libs/jsoncpp/lib
+ ../../../BasicPlatForm/libs/ffmpeg/lib
+ ../../../BasicPlatForm/libs/libuuid/lib
- ../../BasicPlatForm/libs/hcTool/HCNetSDK64/lib/
- ../../BasicPlatForm/libs/hcTool/HCNetSDK64/lib/HCNetSDKCom/
- ../../BasicPlatForm/libs/uniview/lib
+ ../../../BasicPlatForm/libs/hcTool/HCNetSDK64/lib/
+ ../../../BasicPlatForm/libs/hcTool/HCNetSDK64/lib/HCNetSDKCom/
+ ../../../BasicPlatForm/libs/uniview/lib
- ../../BasicPlatForm/libs/libboost/lib
+ ../../../BasicPlatForm/libs/libboost/lib
- ../../BasicPlatForm/basic/db/sqlite/
- ../../BasicPlatForm/basic/db/sqlite/sqlite-v-3220000
+ ../../../BasicPlatForm/basic/db/sqlite/
+ ../../../BasicPlatForm/basic/db/sqlite/sqlite-v-3220000
+ ../../../BasicPlatForm/libs/mysqlpp/lib
+ ../../../BasicPlatForm/libs/mysql/lib
+
+ #nsq
+ ../../../BasicPlatForm/libs/EvnsqTool/lib
+ ../../../BasicPlatForm/libs/libevent/lib
)
add_executable(DataWebServer
@@ -89,21 +104,23 @@
./AppPipeController.cpp
./AppPipeController.h
- ../../BasicPlatForm/basic/util/opencv/CvUtil.cpp
- ../../BasicPlatForm/basic/util/BASE64/Base64.cpp
- ../../BasicPlatForm/basic/util/fastdfs/FastdfsClient.cpp
+ ../../../BasicPlatForm/basic/util/opencv/CvUtil.cpp
+ ../../../BasicPlatForm/basic/util/BASE64/Base64.cpp
+ ../../../BasicPlatForm/basic/util/fastdfs/FastdfsClient.cpp
../FaceSearchServer/CasiaFaceWrapper/CasiaFaceWrapperN.cpp
../FaceSearchServer/CasiaFaceWrapper/CasiaFaceWrapperN.h
- ../../BasicPlatForm/basic/pipe_element/ffmpeg/FfmpegElement.cpp
- ../../BasicPlatForm/basic/pipe_element/ffmpeg/VideoChangeScore.cpp
+ ../../../BasicPlatForm/basic/pipe_element/ffmpeg/FfmpegElement.cpp
+ ../../../BasicPlatForm/basic/pipe_element/ffmpeg/VideoChangeScore.cpp
+ ../../../BasicPlatForm/basic/timer_counter/Clocktimer.cpp
- ../../../Erlang/syncDBTool/ErlangDbTool.cpp
+ ../../syncDBTool/ErlangDbTool.cpp
#
../LocalDBTool/GetUUId.cpp
../LocalDBTool/SqliteFaceEncap.cpp
- ../../BasicPlatForm/basic/db/sqlite/sqliteEncapsulation.cpp
- ../../BasicPlatForm/basic/db/sqlite/sqliteEncapsulation.h
+ ../../../BasicPlatForm/basic/db/sqlite/sqliteEncapsulation.cpp
+ ../../../BasicPlatForm/basic/db/sqlite/sqliteEncapsulation.h
+ vss/dao/BaseDao.cpp
)
target_link_libraries(DataWebServer
@@ -148,55 +165,73 @@
HCCore
hcnetsdk
pthread
+ mysqlpp
+ mysqlclient
+
+ #mq
+ event
+ evnsq
+ evpp_concurrentqueue
)
-#add_executable(Apptest
-# demo.cpp
-# ./AppPipeController.cpp
-# ./AppPipeController.h
-#
-# ../../BasicPlatForm/basic/util/opencv/CvUtil.cpp
-# ../../BasicPlatForm/basic/util/BASE64/Base64.cpp
-# ../../BasicPlatForm/basic/util/fastdfs/FastdfsClient.cpp
-# ../FaceSearchServer/CasiaFaceWrapper/CasiaFaceWrapperN.cpp
-# ../FaceSearchServer/CasiaFaceWrapper/CasiaFaceWrapperN.h
-# ../../BasicPlatForm/basic/pipe_element/ffmpeg/FfmpegElement.cpp
-# ../../BasicPlatForm/basic/pipe_element/ffmpeg/VideoChangeScore.cpp
-# )
-#
-#target_link_libraries(Apptest
-# boost_system
-# boost_thread
-# boost_filesystem
-# ei
-# erl_interface_st
-# ei_st
-# erl_interface
-# # uuid
-# rt
-# pthread
-# avformat
-# avcodec
-# swresample
-# swscale
-# avutil
-# bz2 dl z
-#
-# opencv_world
-# THFaceImage
-# THFeature
-# THFaceProperty
-#
-# curl
-# fastcommon
-# fdfsclient
-#
-# Qt5Core
-# Qt5Sql
-#
-# jsoncpp
-#
-# HCCore
-# hcnetsdk
-# )
+add_executable(demo
+ demo.cpp
+ ./AppPipeController.cpp
+ ./AppPipeController.h
+ ../../../BasicPlatForm/basic/util/opencv/CvUtil.cpp
+ ../../../BasicPlatForm/basic/pipe_element/ffmpeg/FfmpegElement.cpp
+ ../../../BasicPlatForm/basic/pipe_element/ffmpeg/VideoChangeScore.cpp
+ ../../../BasicPlatForm/basic/timer_counter/Clocktimer.cpp
+ )
+
+target_link_libraries(demo
+ glog
+ boost_system
+ boost_thread
+ boost_filesystem
+ ei
+ erl_interface_st
+ ei_st
+ erl_interface
+ uuid
+ rt
+ avformat
+ avcodec
+ swresample
+ swscale
+ avutil
+ bz2 dl z
+
+ opencv_world
+ THFaceImage
+ THFeature
+ THFaceProperty
+
+ curl
+ fastcommon
+ fdfsclient
+
+ Qt5Core
+ Qt5Sql
+ sqlite3
+
+ jsoncpp
+
+ imos_mw_sdk
+ mw_sdk_player
+ mw_sdk_ipc
+ mw_sdk_bp
+ mw_sdk_rm
+
+ HCCore
+ hcnetsdk
+ pthread
+ mysqlpp
+ mysqlclient
+
+ #mq
+ event
+ evnsq
+ evpp_concurrentqueue
+ )
--
Gitblit v1.8.0