From 6540a2a9d69432c4cc475e3b32eae11e9e0ace73 Mon Sep 17 00:00:00 2001
From: chenshijun <csj_sky@126.com>
Date: 星期四, 11 四月 2019 20:28:10 +0800
Subject: [PATCH] 1.srs的分辨率在config.json配置 2.单播推流控制，国标摄像机差一个关闭测试 3. 底库字段添加
---
QiaoJiaSystem/EncodeServer/CMakeLists.txt | 25 +++++++++++++------------
1 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/QiaoJiaSystem/EncodeServer/CMakeLists.txt b/QiaoJiaSystem/EncodeServer/CMakeLists.txt
index 146deb4..660085b 100644
--- a/QiaoJiaSystem/EncodeServer/CMakeLists.txt
+++ b/QiaoJiaSystem/EncodeServer/CMakeLists.txt
@@ -56,12 +56,10 @@
../../../BasicPlatForm/basic/pipe/
-
../../../BasicPlatForm/libs/opencv/include
../../../BasicPlatForm/libs/ffmpeg/include
../../../BasicPlatForm/libs/jsoncpp/include
-
/usr/include/x86_64-linux-gnu/qt5
@@ -77,22 +75,25 @@
../../../BasicPlatForm/libs/openssl/lib
../../../BasicPlatForm/libs/opencv/lib
../../../BasicPlatForm/libs/ffmpeg/lib
-# ../../../BasicPlatForm/libs/jsoncpp/lib
+ ../../../BasicPlatForm/libs/jsoncpp/lib
-# ../../../BasicPlatForm/libs/libuuid/lib
+ # ../../../BasicPlatForm/libs/libuuid/lib
- ../../BasicPlatForm/libs/hiredis-master/lib
+ ../../../BasicPlatForm/libs/hiredis-master/lib
)
add_executable(${PROJECT_NAME}
- ../../../BasicPlatForm/basic/pipe_element/ffmpeg/VideoChangeScore.cpp
- ../../../BasicPlatForm/basic/pipe_element/ffmpeg/FfmpegElement.cpp
- ../StructureApp/NewRecordVideoElement.cpp
- EncodeVideoManager.cpp
- EncodeVideo.cpp
- ../StructureApp/HiredisTool.cpp
- main.cpp
+ ../../../BasicPlatForm/basic/pipe_element/ffmpeg/VideoChangeScore.cpp
+ ../../../BasicPlatForm/basic/pipe_element/ffmpeg/FfmpegElement.cpp
+ ../StructureApp/NewRecordVideoElement.cpp
+ ../../../BasicPlatForm/basic/timer_counter/TimerRecorder.cpp
+ ../../../BasicPlatForm/basic/util/BASE64/Base64.cpp
+
+ EncodeVideoManager.cpp
+ EncodeVideo.cpp
+ ../StructureApp/HiredisTool.cpp
+ main.cpp
)
target_link_libraries(${PROJECT_NAME}
${LIBS}
--
Gitblit v1.8.0