去除ZLMediaKit依赖

CMakeLists.txt

@@ -9,6 +9,8 @@ project(MIVA C CXX)
 # 设置为调试版本
 set(CMAKE_BUILD_TYPE Debug)
 
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
+
 # 设置可执行文件路径
 set(EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/source/bin/)
 
@@ -29,10 +31,19 @@ option(build_Manager "build modele Manager" ON)
 option(build_Shell "build modele Shell" ON)
 option(WITH_FFMPEG "with ffmpeg" OFF) 
 option(WITH_OPENCV "with opencv" ON)
-option(WITH_ZLMediaKit "with ZLMediaKit" OFF)
 
 set(ENABLE_MYSQL ON CACHE BOOL "enable mysql")
 
+#查找mysql是否安装
+find_package(MYSQL QUIET)
+if(MYSQL_FOUND AND ENABLE_MYSQL)
+    message(STATUS "找到mysqlclient库:\"${MYSQL_INCLUDE_DIR}\",ENABLE_MYSQL宏已打开")
+    include_directories(${MYSQL_INCLUDE_DIR})
+    include_directories(${MYSQL_INCLUDE_DIR}/mysql)
+    add_definitions(-DENABLE_MYSQL)
+    list(APPEND  3RDPARTY_LIBS ${MYSQL_LIBRARIES})
+endif()
+
 
 # ---[ Google-gflags
 if(CMAKE_TOOLCHAIN_FILE)
@@ -95,60 +106,6 @@ else()
 endif()
 
 
-#FFmpeg
-# if(WITH_FFMPEG)
-#   if(CMAKE_TOOLCHAIN_FILE)
-#     if(EXISTS ${PROJECT_SOURCE_DIR}/include/libavcodec)
-#       set(FFMPEG_LIBRARIES avformat avcodec avutil swscale swresample)
-#       if (WITH_FFMPEG_AVDEVICE)
-#         list(APPEND FFMPEG_LIBRARIES avdevice)
-#       endif ()
-#       set(HAVE_FFMPEG true)
-#       set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DHAVE_FFMPEG")
-#       message(STATUS "HAVE_FFMPEG enabled")
-#       message(STATUS "ffmpeg libraries: ${FFMPEG_LIBRARIES}")
-#     else()
-#       set (HAVE_FFMPEG false)
-#     endif()
-#   else()
-#     set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
-#     find_package(FFmpeg REQUIRED)
-#     if (FFMPEG_FOUND)
-#       include_directories(${FFMPEG_INCLUDE_DIR})
-#       set(HAVE_FFMPEG true)
-#       set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DHAVE_FFMPEG")
-#       message(STATUS "HAVE_FFMPEG enabled")
-#       message(STATUS "ffmpeg include: ${FFMPEG_INCLUDE_DIR}")
-#       message(STATUS "ffmpeg libraries: ${FFMPEG_LIBRARIES}")
-#     else ()
-#       message(FATAL_ERROR "Can't find FFmpeg libs!")
-#       set (HAVE_FFMPEG false)
-#     endif ()
-#   endif()
-# else()
-#   set (HAVE_FFMPEG false)
-# endif()
-
-# -- ZLMediaKit
-if(WITH_ZLMediaKit)
-  add_subdirectory(${PROJECT_SOURCE_DIR}/3rdparty)
-endif()
-
-#查找mysql是否安装
-find_package(MYSQL QUIET)
-if(MYSQL_FOUND AND ENABLE_MYSQL)
-    message(STATUS "找到mysqlclient库:\"${MYSQL_INCLUDE_DIR}\",ENABLE_MYSQL宏已打开")
-    include_directories(${MYSQL_INCLUDE_DIR})
-    include_directories(${MYSQL_INCLUDE_DIR}/mysql)
-    add_definitions(-DENABLE_MYSQL)
-    list(APPEND  3RDPARTY_LIBS ${MYSQL_LIBRARIES})
-endif()
-
-
-#设置工程源码根目录
-set(ToolKit_Root ${PROJECT_SOURCE_DIR}/3rdparty/ZLMediaKit/3rdpart/ZLToolKit/src)
-set(MediaKit_Root ${PROJECT_SOURCE_DIR}/3rdparty/ZLMediaKit/src)
-set(MediaServer_Root ${PROJECT_SOURCE_DIR}/3rdparty/ZLMediaKit/3rdpart/media-server)
 
 # -- include
 include_directories(${PROJECT_SOURCE_DIR}/3rdparty/rapidjson/include/)
@@ -175,7 +132,7 @@ include_directories(${PROJECT_SOURCE_DIR}/3rdparty/ZLMediaKit)
 include_directories(/usr/include/gstreamer-1.0)
 include_directories(/usr/include/glib-2.0/)
 include_directories(/usr/lib/aarch64-linux-gnu/glib-2.0/include)
-include_directories(/opt/nvidia/deepstream/deepstream-5.0/sources/includes/)
+include_directories(/opt/nvidia/deepstream/deepstream/sources/includes/)
 include_directories(/usr/local/cuda-10.2/include/)
 
 # 寻找当前目录下所有源文件
@@ -185,10 +142,10 @@ aux_source_directory(./source/src DIR_SRCS)
 add_compile_options(-Wall -std=c++11 -O2 -g -DPLATFORM_TEGRA)
 
 link_directories(${PROJECT_SOURCE_DIR}/lib)
-link_directories(/opt/nvidia/deepstream/deepstream-5.0/lib/)
+link_directories(/opt/nvidia/deepstream/deepstream/lib/)
 
 
-list(APPEND Source_LINKER_LIBS mov flv mk_api mpeg zlmediakit ZLToolKit dl ${3RDPARTY_LIBS}  ${OpenCV_LIBS} ${FFMPEG_LIBRARIES} pthread)
+list(APPEND Source_LINKER_LIBS  ZLToolKit dl ${3RDPARTY_LIBS}  ${OpenCV_LIBS} ${FFMPEG_LIBRARIES} pthread)
 list(APPEND ALL_LINKER_LIBS gstreamer-1.0 gobject-2.0 glib-2.0 nvdsgst_meta nvds_meta nvdsgst_helper nvbufsurface m ${Source_LINKER_LIBS}) 
 
 add_subdirectory(${PROJECT_SOURCE_DIR}/modules)

cmake/FindMYSQL.cmake

@@ -26,11 +26,15 @@ if(WIN32)
       $ENV{ProgramW6432}/MySQL/*/include
    )
 else(WIN32)
-   find_path(MYSQL_INCLUDE_DIR mysql/mysql.h
+   #在Mac OS下, mysql.h的文件可能不是在mysql目录下
+   #可能存在/usr/local/mysql/include/mysql.h
+   find_path(MYSQL_INCLUDE_DIR mysql.h
       PATHS
       $ENV{MYSQL_INCLUDE_DIR}
       $ENV{MYSQL_DIR}/include
       /usr/local/mysql/include
+      /usr/local/mysql/include/mysql
+      /opt/mysql/mysql/include
       PATH_SUFFIXES
       mysql
    )
@@ -109,7 +113,6 @@ endif(MYSQL_EMBEDDED_LIBRARIES)
 set( CMAKE_REQUIRED_INCLUDES ${MYSQL_INCLUDE_DIR} )
 set( CMAKE_REQUIRED_LIBRARIES ${MYSQL_EMBEDDED_LIBRARIES} )
 check_cxx_source_compiles( "#include <mysql.h>\nint main() { int i = MYSQL_OPT_USE_EMBEDDED_CONNECTION; }" HAVE_MYSQL_OPT_EMBEDDED_CONNECTION )
-
 if(MYSQL_INCLUDE_DIR AND MYSQL_LIBRARIES)
    set(MYSQL_FOUND TRUE)
    message(STATUS "Found MySQL: ${MYSQL_INCLUDE_DIR}, ${MYSQL_LIBRARIES}")

modules/Cleaner/include/Cleaner.h

@@ -13,12 +13,6 @@
 
 #include "Util/logger.h"
 #include "Util/NoticeCenter.h"
-#include "Poller/EventPoller.h"
-#include "Player/PlayerProxy.h"
-#include "Rtmp/RtmpPusher.h"
-#include "Common/config.h"
-#include "Pusher/MediaPusher.h"
-#include "Extension/Frame.h"
 #include "Util/SqlPool.h"
 #include "Network/TcpClient.h"
 #include "Poller/Timer.h"

modules/HttpClient/include/HttpClient.h

@@ -4,7 +4,7 @@
  * @Autor: lishengyin
  * @Date: 2021-11-03 14:08:44
  * @LastEditors: lishengyin
- * @LastEditTime: 2022-01-06 14:33:57
+ * @LastEditTime: 2022-10-09 09:14:16
  */
 #pragma once
 
@@ -15,11 +15,6 @@
 #include "Util/logger.h"
 #include "Util/NoticeCenter.h"
 #include "Poller/EventPoller.h"
-#include "Player/PlayerProxy.h"
-#include "Rtmp/RtmpPusher.h"
-#include "Common/config.h"
-#include "Pusher/MediaPusher.h"
-#include "Extension/Frame.h"
 #include "Util/SqlPool.h"
 #include "Network/TcpClient.h"
 #include "Poller/Timer.h"

modules/Manager/include/Manager.h

@@ -4,7 +4,7 @@
  * @Autor: lishengyin
  * @Date: 2022-01-11 11:47:37
  * @LastEditors: lishengyin
- * @LastEditTime: 2022-01-18 09:58:52
+ * @LastEditTime: 2022-10-09 09:16:04
  */
 #pragma once
 
@@ -23,11 +23,6 @@
 #include "Util/logger.h"
 #include "Util/NoticeCenter.h"
 #include "Poller/EventPoller.h"
-#include "Player/PlayerProxy.h"
-#include "Rtmp/RtmpPusher.h"
-#include "Common/config.h"
-#include "Pusher/MediaPusher.h"
-#include "Extension/Frame.h"
 #include "Util/SqlPool.h"
 #include "Network/TcpClient.h"
 #include "Poller/Timer.h"

modules/TCPClient/include/TCPClient.h

@@ -4,7 +4,7 @@
  * @Autor: lishengyin
  * @Date: 2021-09-13 17:30:20
  * @LastEditors: lishengyin
- * @LastEditTime: 2021-11-18 17:48:35
+ * @LastEditTime: 2022-10-09 09:09:21
  */
 #pragma once
 #include <signal.h>
@@ -32,11 +32,6 @@ using namespace toolkit;
 #include "Util/logger.h"
 #include "Util/NoticeCenter.h"
 #include "Poller/EventPoller.h"
-#include "Player/PlayerProxy.h"
-#include "Rtmp/RtmpPusher.h"
-#include "Common/config.h"
-#include "Pusher/MediaPusher.h"
-#include "Extension/Frame.h"
 #include "Util/SqlPool.h"
 #include "Network/TcpClient.h"
 #include "Poller/Timer.h"

modules/dataType/include/NettyHttpCarInfo.h

@@ -4,7 +4,7 @@
  * @Autor: lishengyin
  * @Date: 2021-11-04 15:59:10
  * @LastEditors: lishengyin
- * @LastEditTime: 2021-11-24 15:17:42
+ * @LastEditTime: 2022-10-09 09:12:30
  */
 
 #pragma once
@@ -13,12 +13,6 @@
 
 #include "Util/logger.h"
 #include "Util/NoticeCenter.h"
-#include "Poller/EventPoller.h"
-#include "Player/PlayerProxy.h"
-#include "Rtmp/RtmpPusher.h"
-#include "Common/config.h"
-#include "Pusher/MediaPusher.h"
-#include "Extension/Frame.h"
 #include "Util/SqlPool.h"
 #include "Network/TcpClient.h"
 #include "Poller/Timer.h"
@@ -27,6 +21,7 @@
 #include "NettyHttpCarDevData.h"
 
 using namespace  std;
+using namespace toolkit;
 
 class NettyHttpCarInfo
 {

modules/dataType/include/NettyHttpCrowdingDegreeConfig.h

@@ -9,16 +9,12 @@
 #include "Util/logger.h"
 #include "Util/NoticeCenter.h"
 #include "Poller/EventPoller.h"
-#include "Player/PlayerProxy.h"
-#include "Rtmp/RtmpPusher.h"
-#include "Common/config.h"
-#include "Pusher/MediaPusher.h"
-#include "Extension/Frame.h"
 #include "Util/SqlPool.h"
 #include "Network/TcpClient.h"
 #include "Poller/Timer.h"
 
 using namespace std;
+using namespace toolkit;
 
 class NettyHttpCrowdingDegreeConfig
 {

modules/dataType/include/NettyHttpDeviceConfig.h

@@ -10,16 +10,11 @@ using namespace std;
 
 #include "Util/logger.h"
 #include "Util/NoticeCenter.h"
-#include "Poller/EventPoller.h"
-#include "Player/PlayerProxy.h"
-#include "Rtmp/RtmpPusher.h"
-#include "Common/config.h"
-#include "Pusher/MediaPusher.h"
-#include "Extension/Frame.h"
 #include "Util/SqlPool.h"
 #include "Network/TcpClient.h"
 #include "Poller/Timer.h"
 
+using namespace toolkit;
 
 class NettyHttpDeviceConfig
 {

modules/dataType/include/NettyHttpPeakValleyConfig.h

@@ -13,16 +13,11 @@ using namespace std;
 #include "Util/logger.h"
 #include "Util/NoticeCenter.h"
 #include "Poller/EventPoller.h"
-#include "Player/PlayerProxy.h"
-#include "Rtmp/RtmpPusher.h"
-#include "Common/config.h"
-#include "Pusher/MediaPusher.h"
-#include "Extension/Frame.h"
 #include "Util/SqlPool.h"
 #include "Network/TcpClient.h"
 #include "Poller/Timer.h"
 
-
+using namespace toolkit;
 
 class NettyHttpPeakValleyConfig
 {

modules/dataType/include/NettyHttpResultMsg.h

@@ -4,7 +4,7 @@
  * @Autor: lishengyin
  * @Date: 2021-11-03 15:16:14
  * @LastEditors: lishengyin
- * @LastEditTime: 2021-11-29 09:15:08
+ * @LastEditTime: 2022-10-09 09:14:53
  */
 #pragma once
 
@@ -18,19 +18,13 @@
 #include "Util/logger.h"
 #include "Util/NoticeCenter.h"
 #include "Poller/EventPoller.h"
-#include "Player/PlayerProxy.h"
-#include "Rtmp/RtmpPusher.h"
-#include "Common/config.h"
-#include "Pusher/MediaPusher.h"
-#include "Extension/Frame.h"
 #include "Util/SqlPool.h"
 #include "Network/TcpClient.h"
 #include "Poller/Timer.h"
-
-
 #include "Notices.h"
 
 using namespace std;
+using namespace toolkit;
 
 template <class T1, class T2>
 class NettyHttpResultMsg

modules/deviceState/include/deviceState.h

@@ -4,7 +4,7 @@
  * @Autor: lishengyin
  * @Date: 2022-01-11 10:44:52
  * @LastEditors: lishengyin
- * @LastEditTime: 2022-01-12 16:27:43
+ * @LastEditTime: 2022-10-09 09:15:53
  */
 #pragma once
 
@@ -23,11 +23,6 @@
 #include "Util/logger.h"
 #include "Util/NoticeCenter.h"
 #include "Poller/EventPoller.h"
-#include "Player/PlayerProxy.h"
-#include "Rtmp/RtmpPusher.h"
-#include "Common/config.h"
-#include "Pusher/MediaPusher.h"
-#include "Extension/Frame.h"
 #include "Util/SqlPool.h"
 #include "Network/TcpClient.h"
 #include "Poller/Timer.h"

modules/inference/include/inference.h

@@ -4,7 +4,7 @@
  * @Autor: lishengyin
  * @Date: 2021-10-13 09:37:51
  * @LastEditors: lishengyin
- * @LastEditTime: 2022-02-17 17:23:27
+ * @LastEditTime: 2022-10-09 09:09:53
  */
 #pragma once
 #include <iostream>
@@ -27,12 +27,6 @@
 // ZLMediaKit
 #include "Util/logger.h"
 #include "Util/NoticeCenter.h"
-#include "Poller/EventPoller.h"
-#include "Player/PlayerProxy.h"
-#include "Rtmp/RtmpPusher.h"
-#include "Common/config.h"
-#include "Pusher/MediaPusher.h"
-#include "Extension/Frame.h"
 #include "Util/SqlPool.h"
 #include "Network/TcpClient.h"
 #include "Poller/Timer.h"

modules/monitor/include/monitor.h

@@ -4,7 +4,7 @@
  * @Autor: lishengyin
  * @Date: 2022-01-10 15:01:15
  * @LastEditors: lishengyin
- * @LastEditTime: 2022-01-12 09:30:02
+ * @LastEditTime: 2022-10-09 09:15:08
  */
 #pragma once
 
@@ -21,12 +21,6 @@
 
 #include "Util/logger.h"
 #include "Util/NoticeCenter.h"
-#include "Poller/EventPoller.h"
-#include "Player/PlayerProxy.h"
-#include "Rtmp/RtmpPusher.h"
-#include "Common/config.h"
-#include "Pusher/MediaPusher.h"
-#include "Extension/Frame.h"
 #include "Util/SqlPool.h"
 #include "Network/TcpClient.h"
 #include "Poller/Timer.h"

modules/userApp/include/user_app.h

@@ -4,7 +4,7 @@
  * @Autor: lishengyin
  * @Date: 2021-10-13 09:41:50
  * @LastEditors: lishengyin
- * @LastEditTime: 2022-01-11 12:34:12
+ * @LastEditTime: 2022-10-09 09:13:55
  */
 #pragma once
 
@@ -15,11 +15,6 @@
 #include "Util/logger.h"
 #include "Util/NoticeCenter.h"
 #include "Poller/EventPoller.h"
-#include "Player/PlayerProxy.h"
-#include "Rtmp/RtmpPusher.h"
-#include "Common/config.h"
-#include "Pusher/MediaPusher.h"
-#include "Extension/Frame.h"
 #include "Util/SqlPool.h"
 #include "Network/TcpClient.h"
 #include "Poller/Timer.h"
@@ -58,7 +53,6 @@
 #include <httplib.h>
 
 using namespace toolkit;
-using namespace mediakit;
 using namespace inifile;
 
 using namespace std;