Browse Source

添加Mysql数据库

lishengyin 3 years ago
parent
commit
41244958e6
41 changed files with 333 additions and 182 deletions
  1. 1 0
      3rdparty/ZLMediaKit
  2. 0 1
      CMakeLists.txt
  3. 21 1
      build/CMakeCache.txt
  4. 21 0
      build/CMakeFiles/CMakeError.log
  5. 2 0
      build/CMakeFiles/Makefile.cmake
  6. 3 3
      build/CMakeFiles/Makefile2
  7. 66 2
      build/CMakeFiles/main.dir/CXX.includecache
  8. 6 0
      build/CMakeFiles/main.dir/DependInfo.cmake
  9. 2 0
      build/CMakeFiles/main.dir/build.make
  10. 13 0
      build/CMakeFiles/main.dir/depend.internal
  11. 13 0
      build/CMakeFiles/main.dir/depend.make
  12. 2 2
      build/CMakeFiles/main.dir/flags.make
  13. 1 1
      build/CMakeFiles/main.dir/link.txt
  14. BIN
      build/CMakeFiles/main.dir/source/src/main.cpp.o
  15. 1 1
      build/CMakeFiles/progress.marks
  16. 6 11
      build/compile_commands.json
  17. 66 10
      build/modules/CMakeFiles/modules.dir/CXX.includecache
  18. 6 2
      build/modules/CMakeFiles/modules.dir/DependInfo.cmake
  19. 4 29
      build/modules/CMakeFiles/modules.dir/build.make
  20. 0 1
      build/modules/CMakeFiles/modules.dir/cmake_clean.cmake
  21. 26 3
      build/modules/CMakeFiles/modules.dir/depend.internal
  22. 26 3
      build/modules/CMakeFiles/modules.dir/depend.make
  23. 2 2
      build/modules/CMakeFiles/modules.dir/flags.make
  24. BIN
      build/modules/CMakeFiles/modules.dir/inference/src/inference.cpp.o
  25. 1 1
      build/modules/CMakeFiles/modules.dir/link.txt
  26. 0 1
      build/modules/CMakeFiles/modules.dir/progress.make
  27. BIN
      build/modules/CMakeFiles/modules.dir/sqlHelper/src/sqlHelper.cpp.o
  28. BIN
      build/modules/CMakeFiles/modules.dir/userApp/src/user_app.cpp.o
  29. 1 1
      build/modules/CMakeFiles/progress.marks
  30. 0 30
      build/modules/Makefile
  31. 0 4
      build/modules/cmake_install.cmake
  32. BIN
      lib/libmodules.so
  33. 0 4
      modules/CMakeLists.txt
  34. 0 17
      modules/sqlHelper/include/sqlHelper.h
  35. 0 13
      modules/sqlHelper/src/sqlHelper.cpp
  36. 8 9
      modules/userApp/include/user_app.h
  37. 29 25
      modules/userApp/src/user_app.cpp
  38. BIN
      source/bin/main
  39. BIN
      source/bin/yolov5s.engine
  40. 5 4
      source/config/config.ini
  41. 1 1
      source/src/main.cpp

+ 1 - 0
3rdparty/ZLMediaKit

@@ -0,0 +1 @@
+Subproject commit 8fd9853bc95a34bd64eead03890caad3a05ac765

+ 0 - 1
CMakeLists.txt

@@ -18,7 +18,6 @@ option(build_decoder "build module decoder" ON)
 option(build_inifile "build module inifile" ON)
 option(build_dataType "build module dataType" ON)
 option(build_md5 "build module md5" ON)
-option(build_sqlHelper "build module sqlHelper" ON)
 option(build_userApp "build module userApp" ON)
 option(build_TCPClient "build module TCPClient" ON)
 option(WITH_FFMPEG "with ffmpeg" ON)

+ 21 - 1
build/CMakeCache.txt

@@ -330,6 +330,9 @@ Demo_BINARY_DIR:STATIC=/home/nvidia/work/VIA/build
 //Value Computed by CMake
 Demo_SOURCE_DIR:STATIC=/home/nvidia/work/VIA
 
+//enable mysql
+ENABLE_MYSQL:BOOL=ON
+
 //Path to a file.
 FFMPEG_AVCODEC_INCLUDE_DIR:PATH=/usr/local/include
 
@@ -372,6 +375,15 @@ GLOG_LIBRARY:FILEPATH=GLOG_LIBRARY-NOTFOUND
 //Folder contains Google glog
 GLOG_ROOT_DIR:PATH=
 
+//Path to a library.
+MYSQL_EMBEDDED_LIBRARIES:FILEPATH=MYSQL_EMBEDDED_LIBRARIES-NOTFOUND
+
+//Path to a file.
+MYSQL_INCLUDE_DIR:PATH=/usr/include
+
+//Path to a library.
+MYSQL_LIBRARIES:FILEPATH=/usr/lib/aarch64-linux-gnu/libmysqlclient.so
+
 //The directory containing a CMake configuration file for OpenCV.
 OpenCV_DIR:PATH=/usr/lib/cmake/opencv4
 
@@ -409,7 +421,7 @@ build_sqlHelper:BOOL=ON
 build_userApp:BOOL=ON
 
 //Dependencies for the target
-modules_LIB_DEPENDS:STATIC=general;gstreamer-1.0;general;gobject-2.0;general;glib-2.0;general;nvdsgst_meta;general;nvds_meta;general;nvdsgst_helper;general;m;general;mov;general;flv;general;mk_api;general;mpeg;general;zlmediakit;general;ZLToolKit;general;dl;general;mpeg;general;mov;general;flv;general;mk_api;general;zltoolkit;general;zlmediakit;general;opencv_imgcodecs;general;opencv_videoio;general;opencv_core;general;opencv_imgproc;general;opencv_highgui;general;opencv_features2d;general;/usr/local/lib/libavcodec.so;general;/usr/local/lib/libavformat.so;general;/usr/local/lib/libavutil.so;general;/usr/local/lib/libswscale.so;general;/usr/local/lib/libswresample.so;general;pthread;
+modules_LIB_DEPENDS:STATIC=general;gstreamer-1.0;general;gobject-2.0;general;glib-2.0;general;nvdsgst_meta;general;nvds_meta;general;nvdsgst_helper;general;m;general;mov;general;flv;general;mk_api;general;mpeg;general;zlmediakit;general;ZLToolKit;general;dl;general;mpeg;general;mov;general;flv;general;mk_api;general;zltoolkit;general;zlmediakit;general;/usr/lib/aarch64-linux-gnu/libmysqlclient.so;general;opencv_imgcodecs;general;opencv_videoio;general;opencv_core;general;opencv_imgproc;general;opencv_highgui;general;opencv_features2d;general;/usr/local/lib/libavcodec.so;general;/usr/local/lib/libavformat.so;general;/usr/local/lib/libavutil.so;general;/usr/local/lib/libswscale.so;general;/usr/local/lib/libswresample.so;general;pthread;
 
 
 ########################
@@ -660,4 +672,12 @@ CUDA_run_nvcc:INTERNAL=/usr/share/cmake-3.10/Modules/FindCUDA/run_nvcc.cmake
 FIND_PACKAGE_MESSAGE_DETAILS_CUDA:INTERNAL=[/usr/local/cuda-10.2][/usr/local/cuda-10.2/bin/nvcc][/usr/local/cuda-10.2/include][/usr/local/cuda-10.2/lib64/libcudart_static.a][v10.2(10.2)]
 //Details about finding Threads
 FIND_PACKAGE_MESSAGE_DETAILS_Threads:INTERNAL=[TRUE][v()]
+//Test HAVE_MYSQL_OPT_EMBEDDED_CONNECTION
+HAVE_MYSQL_OPT_EMBEDDED_CONNECTION:INTERNAL=
+//ADVANCED property for variable: MYSQL_EMBEDDED_LIBRARIES
+MYSQL_EMBEDDED_LIBRARIES-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: MYSQL_INCLUDE_DIR
+MYSQL_INCLUDE_DIR-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: MYSQL_LIBRARIES
+MYSQL_LIBRARIES-ADVANCED:INTERNAL=1
 

+ 21 - 0
build/CMakeFiles/CMakeError.log

@@ -54,3 +54,24 @@ Makefile:126: recipe for target 'cmTC_0adde/fast' failed
 make: *** [cmTC_0adde/fast] Error 2
 
 
+Performing C++ SOURCE FILE Test HAVE_MYSQL_OPT_EMBEDDED_CONNECTION failed with the following output:
+Change Dir: /home/nvidia/work/VIA/build/CMakeFiles/CMakeTmp
+
+Run Build Command:"/usr/bin/make" "cmTC_149d4/fast"
+/usr/bin/make -f CMakeFiles/cmTC_149d4.dir/build.make CMakeFiles/cmTC_149d4.dir/build
+make[1]: Entering directory '/home/nvidia/work/VIA/build/CMakeFiles/CMakeTmp'
+Building CXX object CMakeFiles/cmTC_149d4.dir/src.cxx.o
+/usr/bin/g++-7    -DHAVE_OPENCV -DHAVE_FFMPEG -DHAVE_MYSQL_OPT_EMBEDDED_CONNECTION   -o CMakeFiles/cmTC_149d4.dir/src.cxx.o -c /home/nvidia/work/VIA/build/CMakeFiles/CMakeTmp/src.cxx
+/home/nvidia/work/VIA/build/CMakeFiles/CMakeTmp/src.cxx:1:10: fatal error: mysql.h: No such file or directory
+ #include <mysql.h>
+          ^~~~~~~~~
+compilation terminated.
+CMakeFiles/cmTC_149d4.dir/build.make:65: recipe for target 'CMakeFiles/cmTC_149d4.dir/src.cxx.o' failed
+make[1]: *** [CMakeFiles/cmTC_149d4.dir/src.cxx.o] Error 1
+make[1]: Leaving directory '/home/nvidia/work/VIA/build/CMakeFiles/CMakeTmp'
+Makefile:126: recipe for target 'cmTC_149d4/fast' failed
+make: *** [cmTC_149d4/fast] Error 2
+
+Source file was:
+#include <mysql.h>
+int main() { int i = MYSQL_OPT_USE_EMBEDDED_CONNECTION; }

+ 2 - 0
build/CMakeFiles/Makefile.cmake

@@ -14,6 +14,7 @@ set(CMAKE_MAKEFILE_DEPENDS
   "../cmake/FindFFmpeg.cmake"
   "../cmake/FindGFlags.cmake"
   "../cmake/FindGlog.cmake"
+  "../cmake/FindMYSQL.cmake"
   "../modules/CMakeLists.txt"
   "/usr/lib/cmake/opencv4/OpenCVConfig-version.cmake"
   "/usr/lib/cmake/opencv4/OpenCVConfig.cmake"
@@ -26,6 +27,7 @@ set(CMAKE_MAKEFILE_DEPENDS
   "/usr/share/cmake-3.10/Modules/CMakeLanguageInformation.cmake"
   "/usr/share/cmake-3.10/Modules/CMakeSystemSpecificInformation.cmake"
   "/usr/share/cmake-3.10/Modules/CMakeSystemSpecificInitialize.cmake"
+  "/usr/share/cmake-3.10/Modules/CheckCXXSourceCompiles.cmake"
   "/usr/share/cmake-3.10/Modules/CheckIncludeFile.cmake"
   "/usr/share/cmake-3.10/Modules/CheckLibraryExists.cmake"
   "/usr/share/cmake-3.10/Modules/CheckSymbolExists.cmake"

+ 3 - 3
build/CMakeFiles/Makefile2

@@ -76,7 +76,7 @@ all: CMakeFiles/main.dir/all
 
 # Build rule for subdir invocation for target.
 CMakeFiles/main.dir/rule: cmake_check_build_system
-	$(CMAKE_COMMAND) -E cmake_progress_start /home/nvidia/work/VIA/build/CMakeFiles 9
+	$(CMAKE_COMMAND) -E cmake_progress_start /home/nvidia/work/VIA/build/CMakeFiles 8
 	$(MAKE) -f CMakeFiles/Makefile2 CMakeFiles/main.dir/all
 	$(CMAKE_COMMAND) -E cmake_progress_start /home/nvidia/work/VIA/build/CMakeFiles 0
 .PHONY : CMakeFiles/main.dir/rule
@@ -121,7 +121,7 @@ modules/preinstall:
 modules/CMakeFiles/modules.dir/all:
 	$(MAKE) -f modules/CMakeFiles/modules.dir/build.make modules/CMakeFiles/modules.dir/depend
 	$(MAKE) -f modules/CMakeFiles/modules.dir/build.make modules/CMakeFiles/modules.dir/build
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir=/home/nvidia/work/VIA/build/CMakeFiles --progress-num=3,4,5,6,7,8,9 "Built target modules"
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir=/home/nvidia/work/VIA/build/CMakeFiles --progress-num=3,4,5,6,7,8 "Built target modules"
 .PHONY : modules/CMakeFiles/modules.dir/all
 
 # Include target in all.
@@ -131,7 +131,7 @@ all: modules/CMakeFiles/modules.dir/all
 
 # Build rule for subdir invocation for target.
 modules/CMakeFiles/modules.dir/rule: cmake_check_build_system
-	$(CMAKE_COMMAND) -E cmake_progress_start /home/nvidia/work/VIA/build/CMakeFiles 7
+	$(CMAKE_COMMAND) -E cmake_progress_start /home/nvidia/work/VIA/build/CMakeFiles 6
 	$(MAKE) -f CMakeFiles/Makefile2 modules/CMakeFiles/modules.dir/all
 	$(CMAKE_COMMAND) -E cmake_progress_start /home/nvidia/work/VIA/build/CMakeFiles 0
 .PHONY : modules/CMakeFiles/modules.dir/rule

+ 66 - 2
build/CMakeFiles/main.dir/CXX.includecache

@@ -865,14 +865,14 @@ Network/TcpClient.h
 ../modules/userApp/include/Network/TcpClient.h
 TCPClient.h
 ../modules/userApp/include/TCPClient.h
-inference.h
-../modules/userApp/include/inference.h
 inifile.h
 ../modules/userApp/include/inifile.h
 gst/gst.h
 -
 vector
 -
+inference.h
+../modules/userApp/include/inference.h
 
 /home/nvidia/work/VIA/source/src/main.cpp
 iostream
@@ -2678,6 +2678,70 @@ gst/gst.h
 gst/video/gstvideosink.h
 -
 
+/usr/include/mysql/binary_log_types.h
+
+/usr/include/mysql/my_alloc.h
+mysql/psi/psi_memory.h
+/usr/include/mysql/mysql/psi/psi_memory.h
+
+/usr/include/mysql/my_command.h
+
+/usr/include/mysql/my_list.h
+
+/usr/include/mysql/mysql.h
+sys/types.h
+-
+windows.h
+-
+winsock2.h
+-
+mysql_version.h
+/usr/include/mysql/mysql_version.h
+mysql_com.h
+/usr/include/mysql/mysql_com.h
+mysql_time.h
+/usr/include/mysql/mysql_time.h
+my_list.h
+/usr/include/mysql/my_list.h
+mysql/client_plugin.h
+/usr/include/mysql/mysql/client_plugin.h
+typelib.h
+/usr/include/mysql/typelib.h
+my_alloc.h
+/usr/include/mysql/my_alloc.h
+
+/usr/include/mysql/mysql/client_plugin.h
+stdarg.h
+-
+stdlib.h
+-
+plugin_auth_common.h
+/usr/include/mysql/mysql/plugin_auth_common.h
+
+/usr/include/mysql/mysql/plugin_auth_common.h
+windows.h
+-
+
+/usr/include/mysql/mysql/psi/psi_base.h
+
+/usr/include/mysql/mysql/psi/psi_memory.h
+psi_base.h
+/usr/include/mysql/mysql/psi/psi_base.h
+
+/usr/include/mysql/mysql_com.h
+binary_log_types.h
+/usr/include/mysql/binary_log_types.h
+my_command.h
+/usr/include/mysql/my_command.h
+
+/usr/include/mysql/mysql_time.h
+
+/usr/include/mysql/mysql_version.h
+
+/usr/include/mysql/typelib.h
+my_alloc.h
+/usr/include/mysql/my_alloc.h
+
 /usr/lib/aarch64-linux-gnu/glib-2.0/include/glibconfig.h
 glib/gmacros.h
 -

+ 6 - 0
build/CMakeFiles/main.dir/DependInfo.cmake

@@ -8,9 +8,15 @@ set(CMAKE_DEPENDS_CHECK_CXX
   )
 set(CMAKE_CXX_COMPILER_ID "GNU")
 
+# Preprocessor definitions for this target.
+set(CMAKE_TARGET_DEFINITIONS_CXX
+  "ENABLE_MYSQL"
+  )
+
 # The include file search paths:
 set(CMAKE_CXX_TARGET_INCLUDE_PATH
   "/usr/local/include"
+  "/usr/include/mysql"
   "../3rdparty/rapidjson/include"
   "../modules/inference/include"
   "../modules/decoder/include"

+ 2 - 0
build/CMakeFiles/main.dir/build.make

@@ -90,12 +90,14 @@ main_EXTERNAL_OBJECTS =
 
 ../source/bin/main: CMakeFiles/main.dir/source/src/main.cpp.o
 ../source/bin/main: CMakeFiles/main.dir/build.make
+../source/bin/main: /usr/lib/aarch64-linux-gnu/libmysqlclient.so
 ../source/bin/main: /usr/local/lib/libavcodec.so
 ../source/bin/main: /usr/local/lib/libavformat.so
 ../source/bin/main: /usr/local/lib/libavutil.so
 ../source/bin/main: /usr/local/lib/libswscale.so
 ../source/bin/main: /usr/local/lib/libswresample.so
 ../source/bin/main: ../lib/libmodules.so
+../source/bin/main: /usr/lib/aarch64-linux-gnu/libmysqlclient.so
 ../source/bin/main: /usr/lib/libopencv_highgui.so.4.1.1
 ../source/bin/main: /usr/lib/libopencv_videoio.so.4.1.1
 ../source/bin/main: /usr/lib/libopencv_imgcodecs.so.4.1.1

+ 13 - 0
build/CMakeFiles/main.dir/depend.internal

@@ -279,6 +279,19 @@ CMakeFiles/main.dir/source/src/main.cpp.o
  /usr/include/gstreamer-1.0/gst/video/videodirection.h
  /usr/include/gstreamer-1.0/gst/video/videoorientation.h
  /usr/include/gstreamer-1.0/gst/video/videooverlay.h
+ /usr/include/mysql/binary_log_types.h
+ /usr/include/mysql/my_alloc.h
+ /usr/include/mysql/my_command.h
+ /usr/include/mysql/my_list.h
+ /usr/include/mysql/mysql.h
+ /usr/include/mysql/mysql/client_plugin.h
+ /usr/include/mysql/mysql/plugin_auth_common.h
+ /usr/include/mysql/mysql/psi/psi_base.h
+ /usr/include/mysql/mysql/psi/psi_memory.h
+ /usr/include/mysql/mysql_com.h
+ /usr/include/mysql/mysql_time.h
+ /usr/include/mysql/mysql_version.h
+ /usr/include/mysql/typelib.h
  /usr/lib/aarch64-linux-gnu/glib-2.0/include/glibconfig.h
  /usr/local/include/Network/Buffer.h
  /usr/local/include/Network/Session.h

+ 13 - 0
build/CMakeFiles/main.dir/depend.make

@@ -278,6 +278,19 @@ CMakeFiles/main.dir/source/src/main.cpp.o: /usr/include/gstreamer-1.0/gst/video/
 CMakeFiles/main.dir/source/src/main.cpp.o: /usr/include/gstreamer-1.0/gst/video/videodirection.h
 CMakeFiles/main.dir/source/src/main.cpp.o: /usr/include/gstreamer-1.0/gst/video/videoorientation.h
 CMakeFiles/main.dir/source/src/main.cpp.o: /usr/include/gstreamer-1.0/gst/video/videooverlay.h
+CMakeFiles/main.dir/source/src/main.cpp.o: /usr/include/mysql/binary_log_types.h
+CMakeFiles/main.dir/source/src/main.cpp.o: /usr/include/mysql/my_alloc.h
+CMakeFiles/main.dir/source/src/main.cpp.o: /usr/include/mysql/my_command.h
+CMakeFiles/main.dir/source/src/main.cpp.o: /usr/include/mysql/my_list.h
+CMakeFiles/main.dir/source/src/main.cpp.o: /usr/include/mysql/mysql.h
+CMakeFiles/main.dir/source/src/main.cpp.o: /usr/include/mysql/mysql/client_plugin.h
+CMakeFiles/main.dir/source/src/main.cpp.o: /usr/include/mysql/mysql/plugin_auth_common.h
+CMakeFiles/main.dir/source/src/main.cpp.o: /usr/include/mysql/mysql/psi/psi_base.h
+CMakeFiles/main.dir/source/src/main.cpp.o: /usr/include/mysql/mysql/psi/psi_memory.h
+CMakeFiles/main.dir/source/src/main.cpp.o: /usr/include/mysql/mysql_com.h
+CMakeFiles/main.dir/source/src/main.cpp.o: /usr/include/mysql/mysql_time.h
+CMakeFiles/main.dir/source/src/main.cpp.o: /usr/include/mysql/mysql_version.h
+CMakeFiles/main.dir/source/src/main.cpp.o: /usr/include/mysql/typelib.h
 CMakeFiles/main.dir/source/src/main.cpp.o: /usr/lib/aarch64-linux-gnu/glib-2.0/include/glibconfig.h
 CMakeFiles/main.dir/source/src/main.cpp.o: /usr/local/include/Network/Buffer.h
 CMakeFiles/main.dir/source/src/main.cpp.o: /usr/local/include/Network/Session.h

+ 2 - 2
build/CMakeFiles/main.dir/flags.make

@@ -4,7 +4,7 @@
 # compile CXX with /usr/bin/g++-7
 CXX_FLAGS =  -DHAVE_OPENCV -DHAVE_FFMPEG -g   -Wall -std=c++11 -O2 -g -DPLATFORM_TEGRA -std=gnu++11
 
-CXX_DEFINES = 
+CXX_DEFINES = -DENABLE_MYSQL
 
-CXX_INCLUDES = -I/usr/local/include -I/home/nvidia/work/VIA/3rdparty/rapidjson/include -I/home/nvidia/work/VIA/modules/inference/include -I/home/nvidia/work/VIA/modules/decoder/include -I/home/nvidia/work/VIA/modules/userApp/include -I/home/nvidia/work/VIA/modules/md5/include -I/home/nvidia/work/VIA/modules/inifile/include -I/home/nvidia/work/VIA/modules/TCPClient/include -I/home/nvidia/work/VIA/modules/dataType/include -I/home/nvidia/work/VIA/3rdparty/ZLMediaKit/3rdpart/ZLToolKit/src -I/home/nvidia/work/VIA/3rdparty/ZLMediaKit/src -I/home/nvidia/work/VIA/3rdparty/ZLMediaKit -I/usr/include/gstreamer-1.0 -I/usr/include/glib-2.0 -I/usr/lib/aarch64-linux-gnu/glib-2.0/include -I/opt/nvidia/deepstream/deepstream-5.0/sources/includes -isystem /usr/include/opencv4 
+CXX_INCLUDES = -I/usr/local/include -I/usr/include/mysql -I/home/nvidia/work/VIA/3rdparty/rapidjson/include -I/home/nvidia/work/VIA/modules/inference/include -I/home/nvidia/work/VIA/modules/decoder/include -I/home/nvidia/work/VIA/modules/userApp/include -I/home/nvidia/work/VIA/modules/md5/include -I/home/nvidia/work/VIA/modules/inifile/include -I/home/nvidia/work/VIA/modules/TCPClient/include -I/home/nvidia/work/VIA/modules/dataType/include -I/home/nvidia/work/VIA/3rdparty/ZLMediaKit/3rdpart/ZLToolKit/src -I/home/nvidia/work/VIA/3rdparty/ZLMediaKit/src -I/home/nvidia/work/VIA/3rdparty/ZLMediaKit -I/usr/include/gstreamer-1.0 -I/usr/include/glib-2.0 -I/usr/lib/aarch64-linux-gnu/glib-2.0/include -I/opt/nvidia/deepstream/deepstream-5.0/sources/includes -isystem /usr/include/opencv4 
 

+ 1 - 1
build/CMakeFiles/main.dir/link.txt

@@ -1 +1 @@
-/usr/bin/g++-7   -DHAVE_OPENCV -DHAVE_FFMPEG -g   CMakeFiles/main.dir/source/src/main.cpp.o  -o ../source/bin/main  -L/usr/local/cuda-10.2/lib64  -L/home/nvidia/work/VIA/lib  -L/opt/nvidia/deepstream/deepstream-5.0/lib -Wl,-rpath,/usr/local/cuda-10.2/lib64:/home/nvidia/work/VIA/lib:/opt/nvidia/deepstream/deepstream-5.0/lib:/usr/local/lib -lgstreamer-1.0 -lgobject-2.0 -lglib-2.0 -lnvdsgst_meta -lnvds_meta -lnvdsgst_helper -lm -lmov -lflv -lmk_api -lmpeg -lzlmediakit -lZLToolKit -ldl -lmpeg -lmov -lflv -lmk_api -lzltoolkit -lzlmediakit /usr/local/lib/libavcodec.so /usr/local/lib/libavformat.so /usr/local/lib/libavutil.so /usr/local/lib/libswscale.so /usr/local/lib/libswresample.so -lpthread ../lib/libmodules.so -lgstreamer-1.0 -lgobject-2.0 -lglib-2.0 -lnvdsgst_meta -lnvds_meta -lnvdsgst_helper -lm -lmov -lflv -lmk_api -lmpeg -lzlmediakit -lZLToolKit -ldl -lzltoolkit -lmov -lflv -lmk_api -lmpeg -lzlmediakit -lZLToolKit -ldl -lzltoolkit /usr/lib/libopencv_highgui.so.4.1.1 /usr/lib/libopencv_videoio.so.4.1.1 /usr/lib/libopencv_imgcodecs.so.4.1.1 /usr/lib/libopencv_features2d.so.4.1.1 /usr/lib/libopencv_imgproc.so.4.1.1 /usr/lib/libopencv_flann.so.4.1.1 /usr/lib/libopencv_core.so.4.1.1 /usr/lib/libopencv_cudev.so.4.1.1 /usr/local/lib/libavcodec.so /usr/local/lib/libavformat.so /usr/local/lib/libavutil.so /usr/local/lib/libswscale.so /usr/local/lib/libswresample.so -lpthread 
+/usr/bin/g++-7   -DHAVE_OPENCV -DHAVE_FFMPEG -g   CMakeFiles/main.dir/source/src/main.cpp.o  -o ../source/bin/main  -L/usr/local/cuda-10.2/lib64  -L/home/nvidia/work/VIA/lib  -L/opt/nvidia/deepstream/deepstream-5.0/lib -Wl,-rpath,/usr/local/cuda-10.2/lib64:/home/nvidia/work/VIA/lib:/opt/nvidia/deepstream/deepstream-5.0/lib:/usr/local/lib -lgstreamer-1.0 -lgobject-2.0 -lglib-2.0 -lnvdsgst_meta -lnvds_meta -lnvdsgst_helper -lm -lmov -lflv -lmk_api -lmpeg -lzlmediakit -lZLToolKit -ldl -lmpeg -lmov -lflv -lmk_api -lzltoolkit -lzlmediakit /usr/lib/aarch64-linux-gnu/libmysqlclient.so /usr/local/lib/libavcodec.so /usr/local/lib/libavformat.so /usr/local/lib/libavutil.so /usr/local/lib/libswscale.so /usr/local/lib/libswresample.so -lpthread ../lib/libmodules.so -lgstreamer-1.0 -lgobject-2.0 -lglib-2.0 -lnvdsgst_meta -lnvds_meta -lnvdsgst_helper -lm -lmov -lflv -lmk_api -lmpeg -lzlmediakit -lZLToolKit -ldl -lzltoolkit -lmov -lflv -lmk_api -lmpeg -lzlmediakit -lZLToolKit -ldl -lzltoolkit /usr/lib/aarch64-linux-gnu/libmysqlclient.so /usr/lib/libopencv_highgui.so.4.1.1 /usr/lib/libopencv_videoio.so.4.1.1 /usr/lib/libopencv_imgcodecs.so.4.1.1 /usr/lib/libopencv_features2d.so.4.1.1 /usr/lib/libopencv_imgproc.so.4.1.1 /usr/lib/libopencv_flann.so.4.1.1 /usr/lib/libopencv_core.so.4.1.1 /usr/lib/libopencv_cudev.so.4.1.1 /usr/local/lib/libavcodec.so /usr/local/lib/libavformat.so /usr/local/lib/libavutil.so /usr/local/lib/libswscale.so /usr/local/lib/libswresample.so -lpthread 

BIN
build/CMakeFiles/main.dir/source/src/main.cpp.o


+ 1 - 1
build/CMakeFiles/progress.marks

@@ -1 +1 @@
-9
+8

+ 6 - 11
build/compile_commands.json

@@ -1,37 +1,32 @@
 [
 {
   "directory": "/home/nvidia/work/VIA/build",
-  "command": "/usr/bin/g++-7   -I/usr/local/include -I/home/nvidia/work/VIA/3rdparty/rapidjson/include -I/home/nvidia/work/VIA/modules/inference/include -I/home/nvidia/work/VIA/modules/decoder/include -I/home/nvidia/work/VIA/modules/userApp/include -I/home/nvidia/work/VIA/modules/md5/include -I/home/nvidia/work/VIA/modules/inifile/include -I/home/nvidia/work/VIA/modules/TCPClient/include -I/home/nvidia/work/VIA/modules/dataType/include -I/home/nvidia/work/VIA/3rdparty/ZLMediaKit/3rdpart/ZLToolKit/src -I/home/nvidia/work/VIA/3rdparty/ZLMediaKit/src -I/home/nvidia/work/VIA/3rdparty/ZLMediaKit -I/usr/include/gstreamer-1.0 -I/usr/include/glib-2.0 -I/usr/lib/aarch64-linux-gnu/glib-2.0/include -I/opt/nvidia/deepstream/deepstream-5.0/sources/includes -isystem /usr/include/opencv4   -DHAVE_OPENCV -DHAVE_FFMPEG -g   -Wall -std=c++11 -O2 -g -DPLATFORM_TEGRA -std=gnu++11 -o CMakeFiles/main.dir/source/src/main.cpp.o -c /home/nvidia/work/VIA/source/src/main.cpp",
+  "command": "/usr/bin/g++-7  -DENABLE_MYSQL -I/usr/local/include -I/usr/include/mysql -I/home/nvidia/work/VIA/3rdparty/rapidjson/include -I/home/nvidia/work/VIA/modules/inference/include -I/home/nvidia/work/VIA/modules/decoder/include -I/home/nvidia/work/VIA/modules/userApp/include -I/home/nvidia/work/VIA/modules/md5/include -I/home/nvidia/work/VIA/modules/inifile/include -I/home/nvidia/work/VIA/modules/TCPClient/include -I/home/nvidia/work/VIA/modules/dataType/include -I/home/nvidia/work/VIA/3rdparty/ZLMediaKit/3rdpart/ZLToolKit/src -I/home/nvidia/work/VIA/3rdparty/ZLMediaKit/src -I/home/nvidia/work/VIA/3rdparty/ZLMediaKit -I/usr/include/gstreamer-1.0 -I/usr/include/glib-2.0 -I/usr/lib/aarch64-linux-gnu/glib-2.0/include -I/opt/nvidia/deepstream/deepstream-5.0/sources/includes -isystem /usr/include/opencv4   -DHAVE_OPENCV -DHAVE_FFMPEG -g   -Wall -std=c++11 -O2 -g -DPLATFORM_TEGRA -std=gnu++11 -o CMakeFiles/main.dir/source/src/main.cpp.o -c /home/nvidia/work/VIA/source/src/main.cpp",
   "file": "/home/nvidia/work/VIA/source/src/main.cpp"
 },
 {
   "directory": "/home/nvidia/work/VIA/build/modules",
-  "command": "/usr/bin/g++-7  -Dmodules_EXPORTS -I/usr/local/include -I/home/nvidia/work/VIA/3rdparty/rapidjson/include -I/home/nvidia/work/VIA/modules/inference/include -I/home/nvidia/work/VIA/modules/decoder/include -I/home/nvidia/work/VIA/modules/userApp/include -I/home/nvidia/work/VIA/modules/md5/include -I/home/nvidia/work/VIA/modules/inifile/include -I/home/nvidia/work/VIA/modules/TCPClient/include -I/home/nvidia/work/VIA/modules/dataType/include -I/home/nvidia/work/VIA/3rdparty/ZLMediaKit/3rdpart/ZLToolKit/src -I/home/nvidia/work/VIA/3rdparty/ZLMediaKit/src -I/home/nvidia/work/VIA/3rdparty/ZLMediaKit -I/usr/include/gstreamer-1.0 -I/usr/include/glib-2.0 -I/usr/lib/aarch64-linux-gnu/glib-2.0/include -I/opt/nvidia/deepstream/deepstream-5.0/sources/includes -isystem /usr/include/opencv4 -I/home/nvidia/work/VIA/modules -I/home/nvidia/work/VIA/modules/sqlHelper/include   -DHAVE_OPENCV -DHAVE_FFMPEG -Wno-deprecated-declarations -g -fPIC   -Wall -std=c++11 -O2 -g -DPLATFORM_TEGRA -std=gnu++11 -o CMakeFiles/modules.dir/inference/src/inference.cpp.o -c /home/nvidia/work/VIA/modules/inference/src/inference.cpp",
+  "command": "/usr/bin/g++-7  -DENABLE_MYSQL -Dmodules_EXPORTS -I/usr/local/include -I/usr/include/mysql -I/home/nvidia/work/VIA/3rdparty/rapidjson/include -I/home/nvidia/work/VIA/modules/inference/include -I/home/nvidia/work/VIA/modules/decoder/include -I/home/nvidia/work/VIA/modules/userApp/include -I/home/nvidia/work/VIA/modules/md5/include -I/home/nvidia/work/VIA/modules/inifile/include -I/home/nvidia/work/VIA/modules/TCPClient/include -I/home/nvidia/work/VIA/modules/dataType/include -I/home/nvidia/work/VIA/3rdparty/ZLMediaKit/3rdpart/ZLToolKit/src -I/home/nvidia/work/VIA/3rdparty/ZLMediaKit/src -I/home/nvidia/work/VIA/3rdparty/ZLMediaKit -I/usr/include/gstreamer-1.0 -I/usr/include/glib-2.0 -I/usr/lib/aarch64-linux-gnu/glib-2.0/include -I/opt/nvidia/deepstream/deepstream-5.0/sources/includes -isystem /usr/include/opencv4 -I/home/nvidia/work/VIA/modules   -DHAVE_OPENCV -DHAVE_FFMPEG -Wno-deprecated-declarations -g -fPIC   -Wall -std=c++11 -O2 -g -DPLATFORM_TEGRA -std=gnu++11 -o CMakeFiles/modules.dir/inference/src/inference.cpp.o -c /home/nvidia/work/VIA/modules/inference/src/inference.cpp",
   "file": "/home/nvidia/work/VIA/modules/inference/src/inference.cpp"
 },
 {
   "directory": "/home/nvidia/work/VIA/build/modules",
-  "command": "/usr/bin/g++-7  -Dmodules_EXPORTS -I/usr/local/include -I/home/nvidia/work/VIA/3rdparty/rapidjson/include -I/home/nvidia/work/VIA/modules/inference/include -I/home/nvidia/work/VIA/modules/decoder/include -I/home/nvidia/work/VIA/modules/userApp/include -I/home/nvidia/work/VIA/modules/md5/include -I/home/nvidia/work/VIA/modules/inifile/include -I/home/nvidia/work/VIA/modules/TCPClient/include -I/home/nvidia/work/VIA/modules/dataType/include -I/home/nvidia/work/VIA/3rdparty/ZLMediaKit/3rdpart/ZLToolKit/src -I/home/nvidia/work/VIA/3rdparty/ZLMediaKit/src -I/home/nvidia/work/VIA/3rdparty/ZLMediaKit -I/usr/include/gstreamer-1.0 -I/usr/include/glib-2.0 -I/usr/lib/aarch64-linux-gnu/glib-2.0/include -I/opt/nvidia/deepstream/deepstream-5.0/sources/includes -isystem /usr/include/opencv4 -I/home/nvidia/work/VIA/modules -I/home/nvidia/work/VIA/modules/sqlHelper/include   -DHAVE_OPENCV -DHAVE_FFMPEG -Wno-deprecated-declarations -g -fPIC   -Wall -std=c++11 -O2 -g -DPLATFORM_TEGRA -std=gnu++11 -o CMakeFiles/modules.dir/decoder/src/FFMpegDecoder.cpp.o -c /home/nvidia/work/VIA/modules/decoder/src/FFMpegDecoder.cpp",
+  "command": "/usr/bin/g++-7  -DENABLE_MYSQL -Dmodules_EXPORTS -I/usr/local/include -I/usr/include/mysql -I/home/nvidia/work/VIA/3rdparty/rapidjson/include -I/home/nvidia/work/VIA/modules/inference/include -I/home/nvidia/work/VIA/modules/decoder/include -I/home/nvidia/work/VIA/modules/userApp/include -I/home/nvidia/work/VIA/modules/md5/include -I/home/nvidia/work/VIA/modules/inifile/include -I/home/nvidia/work/VIA/modules/TCPClient/include -I/home/nvidia/work/VIA/modules/dataType/include -I/home/nvidia/work/VIA/3rdparty/ZLMediaKit/3rdpart/ZLToolKit/src -I/home/nvidia/work/VIA/3rdparty/ZLMediaKit/src -I/home/nvidia/work/VIA/3rdparty/ZLMediaKit -I/usr/include/gstreamer-1.0 -I/usr/include/glib-2.0 -I/usr/lib/aarch64-linux-gnu/glib-2.0/include -I/opt/nvidia/deepstream/deepstream-5.0/sources/includes -isystem /usr/include/opencv4 -I/home/nvidia/work/VIA/modules   -DHAVE_OPENCV -DHAVE_FFMPEG -Wno-deprecated-declarations -g -fPIC   -Wall -std=c++11 -O2 -g -DPLATFORM_TEGRA -std=gnu++11 -o CMakeFiles/modules.dir/decoder/src/FFMpegDecoder.cpp.o -c /home/nvidia/work/VIA/modules/decoder/src/FFMpegDecoder.cpp",
   "file": "/home/nvidia/work/VIA/modules/decoder/src/FFMpegDecoder.cpp"
 },
 {
   "directory": "/home/nvidia/work/VIA/build/modules",
-  "command": "/usr/bin/g++-7  -Dmodules_EXPORTS -I/usr/local/include -I/home/nvidia/work/VIA/3rdparty/rapidjson/include -I/home/nvidia/work/VIA/modules/inference/include -I/home/nvidia/work/VIA/modules/decoder/include -I/home/nvidia/work/VIA/modules/userApp/include -I/home/nvidia/work/VIA/modules/md5/include -I/home/nvidia/work/VIA/modules/inifile/include -I/home/nvidia/work/VIA/modules/TCPClient/include -I/home/nvidia/work/VIA/modules/dataType/include -I/home/nvidia/work/VIA/3rdparty/ZLMediaKit/3rdpart/ZLToolKit/src -I/home/nvidia/work/VIA/3rdparty/ZLMediaKit/src -I/home/nvidia/work/VIA/3rdparty/ZLMediaKit -I/usr/include/gstreamer-1.0 -I/usr/include/glib-2.0 -I/usr/lib/aarch64-linux-gnu/glib-2.0/include -I/opt/nvidia/deepstream/deepstream-5.0/sources/includes -isystem /usr/include/opencv4 -I/home/nvidia/work/VIA/modules -I/home/nvidia/work/VIA/modules/sqlHelper/include   -DHAVE_OPENCV -DHAVE_FFMPEG -Wno-deprecated-declarations -g -fPIC   -Wall -std=c++11 -O2 -g -DPLATFORM_TEGRA -std=gnu++11 -o CMakeFiles/modules.dir/inifile/src/inifile.cpp.o -c /home/nvidia/work/VIA/modules/inifile/src/inifile.cpp",
+  "command": "/usr/bin/g++-7  -DENABLE_MYSQL -Dmodules_EXPORTS -I/usr/local/include -I/usr/include/mysql -I/home/nvidia/work/VIA/3rdparty/rapidjson/include -I/home/nvidia/work/VIA/modules/inference/include -I/home/nvidia/work/VIA/modules/decoder/include -I/home/nvidia/work/VIA/modules/userApp/include -I/home/nvidia/work/VIA/modules/md5/include -I/home/nvidia/work/VIA/modules/inifile/include -I/home/nvidia/work/VIA/modules/TCPClient/include -I/home/nvidia/work/VIA/modules/dataType/include -I/home/nvidia/work/VIA/3rdparty/ZLMediaKit/3rdpart/ZLToolKit/src -I/home/nvidia/work/VIA/3rdparty/ZLMediaKit/src -I/home/nvidia/work/VIA/3rdparty/ZLMediaKit -I/usr/include/gstreamer-1.0 -I/usr/include/glib-2.0 -I/usr/lib/aarch64-linux-gnu/glib-2.0/include -I/opt/nvidia/deepstream/deepstream-5.0/sources/includes -isystem /usr/include/opencv4 -I/home/nvidia/work/VIA/modules   -DHAVE_OPENCV -DHAVE_FFMPEG -Wno-deprecated-declarations -g -fPIC   -Wall -std=c++11 -O2 -g -DPLATFORM_TEGRA -std=gnu++11 -o CMakeFiles/modules.dir/inifile/src/inifile.cpp.o -c /home/nvidia/work/VIA/modules/inifile/src/inifile.cpp",
   "file": "/home/nvidia/work/VIA/modules/inifile/src/inifile.cpp"
 },
 {
   "directory": "/home/nvidia/work/VIA/build/modules",
-  "command": "/usr/bin/g++-7  -Dmodules_EXPORTS -I/usr/local/include -I/home/nvidia/work/VIA/3rdparty/rapidjson/include -I/home/nvidia/work/VIA/modules/inference/include -I/home/nvidia/work/VIA/modules/decoder/include -I/home/nvidia/work/VIA/modules/userApp/include -I/home/nvidia/work/VIA/modules/md5/include -I/home/nvidia/work/VIA/modules/inifile/include -I/home/nvidia/work/VIA/modules/TCPClient/include -I/home/nvidia/work/VIA/modules/dataType/include -I/home/nvidia/work/VIA/3rdparty/ZLMediaKit/3rdpart/ZLToolKit/src -I/home/nvidia/work/VIA/3rdparty/ZLMediaKit/src -I/home/nvidia/work/VIA/3rdparty/ZLMediaKit -I/usr/include/gstreamer-1.0 -I/usr/include/glib-2.0 -I/usr/lib/aarch64-linux-gnu/glib-2.0/include -I/opt/nvidia/deepstream/deepstream-5.0/sources/includes -isystem /usr/include/opencv4 -I/home/nvidia/work/VIA/modules -I/home/nvidia/work/VIA/modules/sqlHelper/include   -DHAVE_OPENCV -DHAVE_FFMPEG -Wno-deprecated-declarations -g -fPIC   -Wall -std=c++11 -O2 -g -DPLATFORM_TEGRA -std=gnu++11 -o CMakeFiles/modules.dir/md5/src/md5.cpp.o -c /home/nvidia/work/VIA/modules/md5/src/md5.cpp",
+  "command": "/usr/bin/g++-7  -DENABLE_MYSQL -Dmodules_EXPORTS -I/usr/local/include -I/usr/include/mysql -I/home/nvidia/work/VIA/3rdparty/rapidjson/include -I/home/nvidia/work/VIA/modules/inference/include -I/home/nvidia/work/VIA/modules/decoder/include -I/home/nvidia/work/VIA/modules/userApp/include -I/home/nvidia/work/VIA/modules/md5/include -I/home/nvidia/work/VIA/modules/inifile/include -I/home/nvidia/work/VIA/modules/TCPClient/include -I/home/nvidia/work/VIA/modules/dataType/include -I/home/nvidia/work/VIA/3rdparty/ZLMediaKit/3rdpart/ZLToolKit/src -I/home/nvidia/work/VIA/3rdparty/ZLMediaKit/src -I/home/nvidia/work/VIA/3rdparty/ZLMediaKit -I/usr/include/gstreamer-1.0 -I/usr/include/glib-2.0 -I/usr/lib/aarch64-linux-gnu/glib-2.0/include -I/opt/nvidia/deepstream/deepstream-5.0/sources/includes -isystem /usr/include/opencv4 -I/home/nvidia/work/VIA/modules   -DHAVE_OPENCV -DHAVE_FFMPEG -Wno-deprecated-declarations -g -fPIC   -Wall -std=c++11 -O2 -g -DPLATFORM_TEGRA -std=gnu++11 -o CMakeFiles/modules.dir/md5/src/md5.cpp.o -c /home/nvidia/work/VIA/modules/md5/src/md5.cpp",
   "file": "/home/nvidia/work/VIA/modules/md5/src/md5.cpp"
 },
 {
   "directory": "/home/nvidia/work/VIA/build/modules",
-  "command": "/usr/bin/g++-7  -Dmodules_EXPORTS -I/usr/local/include -I/home/nvidia/work/VIA/3rdparty/rapidjson/include -I/home/nvidia/work/VIA/modules/inference/include -I/home/nvidia/work/VIA/modules/decoder/include -I/home/nvidia/work/VIA/modules/userApp/include -I/home/nvidia/work/VIA/modules/md5/include -I/home/nvidia/work/VIA/modules/inifile/include -I/home/nvidia/work/VIA/modules/TCPClient/include -I/home/nvidia/work/VIA/modules/dataType/include -I/home/nvidia/work/VIA/3rdparty/ZLMediaKit/3rdpart/ZLToolKit/src -I/home/nvidia/work/VIA/3rdparty/ZLMediaKit/src -I/home/nvidia/work/VIA/3rdparty/ZLMediaKit -I/usr/include/gstreamer-1.0 -I/usr/include/glib-2.0 -I/usr/lib/aarch64-linux-gnu/glib-2.0/include -I/opt/nvidia/deepstream/deepstream-5.0/sources/includes -isystem /usr/include/opencv4 -I/home/nvidia/work/VIA/modules -I/home/nvidia/work/VIA/modules/sqlHelper/include   -DHAVE_OPENCV -DHAVE_FFMPEG -Wno-deprecated-declarations -g -fPIC   -Wall -std=c++11 -O2 -g -DPLATFORM_TEGRA -std=gnu++11 -o CMakeFiles/modules.dir/sqlHelper/src/sqlHelper.cpp.o -c /home/nvidia/work/VIA/modules/sqlHelper/src/sqlHelper.cpp",
-  "file": "/home/nvidia/work/VIA/modules/sqlHelper/src/sqlHelper.cpp"
-},
-{
-  "directory": "/home/nvidia/work/VIA/build/modules",
-  "command": "/usr/bin/g++-7  -Dmodules_EXPORTS -I/usr/local/include -I/home/nvidia/work/VIA/3rdparty/rapidjson/include -I/home/nvidia/work/VIA/modules/inference/include -I/home/nvidia/work/VIA/modules/decoder/include -I/home/nvidia/work/VIA/modules/userApp/include -I/home/nvidia/work/VIA/modules/md5/include -I/home/nvidia/work/VIA/modules/inifile/include -I/home/nvidia/work/VIA/modules/TCPClient/include -I/home/nvidia/work/VIA/modules/dataType/include -I/home/nvidia/work/VIA/3rdparty/ZLMediaKit/3rdpart/ZLToolKit/src -I/home/nvidia/work/VIA/3rdparty/ZLMediaKit/src -I/home/nvidia/work/VIA/3rdparty/ZLMediaKit -I/usr/include/gstreamer-1.0 -I/usr/include/glib-2.0 -I/usr/lib/aarch64-linux-gnu/glib-2.0/include -I/opt/nvidia/deepstream/deepstream-5.0/sources/includes -isystem /usr/include/opencv4 -I/home/nvidia/work/VIA/modules -I/home/nvidia/work/VIA/modules/sqlHelper/include   -DHAVE_OPENCV -DHAVE_FFMPEG -Wno-deprecated-declarations -g -fPIC   -Wall -std=c++11 -O2 -g -DPLATFORM_TEGRA -std=gnu++11 -o CMakeFiles/modules.dir/userApp/src/user_app.cpp.o -c /home/nvidia/work/VIA/modules/userApp/src/user_app.cpp",
+  "command": "/usr/bin/g++-7  -DENABLE_MYSQL -Dmodules_EXPORTS -I/usr/local/include -I/usr/include/mysql -I/home/nvidia/work/VIA/3rdparty/rapidjson/include -I/home/nvidia/work/VIA/modules/inference/include -I/home/nvidia/work/VIA/modules/decoder/include -I/home/nvidia/work/VIA/modules/userApp/include -I/home/nvidia/work/VIA/modules/md5/include -I/home/nvidia/work/VIA/modules/inifile/include -I/home/nvidia/work/VIA/modules/TCPClient/include -I/home/nvidia/work/VIA/modules/dataType/include -I/home/nvidia/work/VIA/3rdparty/ZLMediaKit/3rdpart/ZLToolKit/src -I/home/nvidia/work/VIA/3rdparty/ZLMediaKit/src -I/home/nvidia/work/VIA/3rdparty/ZLMediaKit -I/usr/include/gstreamer-1.0 -I/usr/include/glib-2.0 -I/usr/lib/aarch64-linux-gnu/glib-2.0/include -I/opt/nvidia/deepstream/deepstream-5.0/sources/includes -isystem /usr/include/opencv4 -I/home/nvidia/work/VIA/modules   -DHAVE_OPENCV -DHAVE_FFMPEG -Wno-deprecated-declarations -g -fPIC   -Wall -std=c++11 -O2 -g -DPLATFORM_TEGRA -std=gnu++11 -o CMakeFiles/modules.dir/userApp/src/user_app.cpp.o -c /home/nvidia/work/VIA/modules/userApp/src/user_app.cpp",
   "file": "/home/nvidia/work/VIA/modules/userApp/src/user_app.cpp"
 }
 ]

+ 66 - 10
build/modules/CMakeFiles/modules.dir/CXX.includecache

@@ -862,10 +862,6 @@ cstring
 iostream
 -
 
-../modules/sqlHelper/include/sqlHelper.h
-iostream
--
-
 ../modules/userApp/include/user_app.h
 iostream
 -
@@ -893,14 +889,14 @@ Network/TcpClient.h
 ../modules/userApp/include/Network/TcpClient.h
 TCPClient.h
 ../modules/userApp/include/TCPClient.h
-inference.h
-../modules/userApp/include/inference.h
 inifile.h
 ../modules/userApp/include/inifile.h
 gst/gst.h
 -
 vector
 -
+inference.h
+../modules/userApp/include/inference.h
 
 /home/nvidia/work/VIA/modules/decoder/src/FFMpegDecoder.cpp
 FFMpegDecoder.h
@@ -926,10 +922,6 @@ md5.h
 cstdio
 -
 
-/home/nvidia/work/VIA/modules/sqlHelper/src/sqlHelper.cpp
-sqlHelper.h
-/home/nvidia/work/VIA/modules/sqlHelper/src/sqlHelper.h
-
 /home/nvidia/work/VIA/modules/userApp/src/user_app.cpp
 user_app.h
 /home/nvidia/work/VIA/modules/userApp/src/user_app.h
@@ -2728,6 +2720,70 @@ gst/gst.h
 gst/video/gstvideosink.h
 -
 
+/usr/include/mysql/binary_log_types.h
+
+/usr/include/mysql/my_alloc.h
+mysql/psi/psi_memory.h
+/usr/include/mysql/mysql/psi/psi_memory.h
+
+/usr/include/mysql/my_command.h
+
+/usr/include/mysql/my_list.h
+
+/usr/include/mysql/mysql.h
+sys/types.h
+-
+windows.h
+-
+winsock2.h
+-
+mysql_version.h
+/usr/include/mysql/mysql_version.h
+mysql_com.h
+/usr/include/mysql/mysql_com.h
+mysql_time.h
+/usr/include/mysql/mysql_time.h
+my_list.h
+/usr/include/mysql/my_list.h
+mysql/client_plugin.h
+/usr/include/mysql/mysql/client_plugin.h
+typelib.h
+/usr/include/mysql/typelib.h
+my_alloc.h
+/usr/include/mysql/my_alloc.h
+
+/usr/include/mysql/mysql/client_plugin.h
+stdarg.h
+-
+stdlib.h
+-
+plugin_auth_common.h
+/usr/include/mysql/mysql/plugin_auth_common.h
+
+/usr/include/mysql/mysql/plugin_auth_common.h
+windows.h
+-
+
+/usr/include/mysql/mysql/psi/psi_base.h
+
+/usr/include/mysql/mysql/psi/psi_memory.h
+psi_base.h
+/usr/include/mysql/mysql/psi/psi_base.h
+
+/usr/include/mysql/mysql_com.h
+binary_log_types.h
+/usr/include/mysql/binary_log_types.h
+my_command.h
+/usr/include/mysql/my_command.h
+
+/usr/include/mysql/mysql_time.h
+
+/usr/include/mysql/mysql_version.h
+
+/usr/include/mysql/typelib.h
+my_alloc.h
+/usr/include/mysql/my_alloc.h
+
 /usr/lib/aarch64-linux-gnu/glib-2.0/include/glibconfig.h
 glib/gmacros.h
 -

+ 6 - 2
build/modules/CMakeFiles/modules.dir/DependInfo.cmake

@@ -8,14 +8,19 @@ set(CMAKE_DEPENDS_CHECK_CXX
   "/home/nvidia/work/VIA/modules/inference/src/inference.cpp" "/home/nvidia/work/VIA/build/modules/CMakeFiles/modules.dir/inference/src/inference.cpp.o"
   "/home/nvidia/work/VIA/modules/inifile/src/inifile.cpp" "/home/nvidia/work/VIA/build/modules/CMakeFiles/modules.dir/inifile/src/inifile.cpp.o"
   "/home/nvidia/work/VIA/modules/md5/src/md5.cpp" "/home/nvidia/work/VIA/build/modules/CMakeFiles/modules.dir/md5/src/md5.cpp.o"
-  "/home/nvidia/work/VIA/modules/sqlHelper/src/sqlHelper.cpp" "/home/nvidia/work/VIA/build/modules/CMakeFiles/modules.dir/sqlHelper/src/sqlHelper.cpp.o"
   "/home/nvidia/work/VIA/modules/userApp/src/user_app.cpp" "/home/nvidia/work/VIA/build/modules/CMakeFiles/modules.dir/userApp/src/user_app.cpp.o"
   )
 set(CMAKE_CXX_COMPILER_ID "GNU")
 
+# Preprocessor definitions for this target.
+set(CMAKE_TARGET_DEFINITIONS_CXX
+  "ENABLE_MYSQL"
+  )
+
 # The include file search paths:
 set(CMAKE_CXX_TARGET_INCLUDE_PATH
   "/usr/local/include"
+  "/usr/include/mysql"
   "../3rdparty/rapidjson/include"
   "../modules/inference/include"
   "../modules/decoder/include"
@@ -33,7 +38,6 @@ set(CMAKE_CXX_TARGET_INCLUDE_PATH
   "/opt/nvidia/deepstream/deepstream-5.0/sources/includes"
   "/usr/include/opencv4"
   "../modules"
-  "../modules/sqlHelper/include"
   )
 
 # Targets to which this target links.

+ 4 - 29
build/modules/CMakeFiles/modules.dir/build.make

@@ -153,33 +153,9 @@ modules/CMakeFiles/modules.dir/md5/src/md5.cpp.o.provides: modules/CMakeFiles/mo
 modules/CMakeFiles/modules.dir/md5/src/md5.cpp.o.provides.build: modules/CMakeFiles/modules.dir/md5/src/md5.cpp.o
 
 
-modules/CMakeFiles/modules.dir/sqlHelper/src/sqlHelper.cpp.o: modules/CMakeFiles/modules.dir/flags.make
-modules/CMakeFiles/modules.dir/sqlHelper/src/sqlHelper.cpp.o: ../modules/sqlHelper/src/sqlHelper.cpp
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/nvidia/work/VIA/build/CMakeFiles --progress-num=$(CMAKE_PROGRESS_5) "Building CXX object modules/CMakeFiles/modules.dir/sqlHelper/src/sqlHelper.cpp.o"
-	cd /home/nvidia/work/VIA/build/modules && /usr/bin/g++-7  $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -o CMakeFiles/modules.dir/sqlHelper/src/sqlHelper.cpp.o -c /home/nvidia/work/VIA/modules/sqlHelper/src/sqlHelper.cpp
-
-modules/CMakeFiles/modules.dir/sqlHelper/src/sqlHelper.cpp.i: cmake_force
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Preprocessing CXX source to CMakeFiles/modules.dir/sqlHelper/src/sqlHelper.cpp.i"
-	cd /home/nvidia/work/VIA/build/modules && /usr/bin/g++-7 $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -E /home/nvidia/work/VIA/modules/sqlHelper/src/sqlHelper.cpp > CMakeFiles/modules.dir/sqlHelper/src/sqlHelper.cpp.i
-
-modules/CMakeFiles/modules.dir/sqlHelper/src/sqlHelper.cpp.s: cmake_force
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Compiling CXX source to assembly CMakeFiles/modules.dir/sqlHelper/src/sqlHelper.cpp.s"
-	cd /home/nvidia/work/VIA/build/modules && /usr/bin/g++-7 $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -S /home/nvidia/work/VIA/modules/sqlHelper/src/sqlHelper.cpp -o CMakeFiles/modules.dir/sqlHelper/src/sqlHelper.cpp.s
-
-modules/CMakeFiles/modules.dir/sqlHelper/src/sqlHelper.cpp.o.requires:
-
-.PHONY : modules/CMakeFiles/modules.dir/sqlHelper/src/sqlHelper.cpp.o.requires
-
-modules/CMakeFiles/modules.dir/sqlHelper/src/sqlHelper.cpp.o.provides: modules/CMakeFiles/modules.dir/sqlHelper/src/sqlHelper.cpp.o.requires
-	$(MAKE) -f modules/CMakeFiles/modules.dir/build.make modules/CMakeFiles/modules.dir/sqlHelper/src/sqlHelper.cpp.o.provides.build
-.PHONY : modules/CMakeFiles/modules.dir/sqlHelper/src/sqlHelper.cpp.o.provides
-
-modules/CMakeFiles/modules.dir/sqlHelper/src/sqlHelper.cpp.o.provides.build: modules/CMakeFiles/modules.dir/sqlHelper/src/sqlHelper.cpp.o
-
-
 modules/CMakeFiles/modules.dir/userApp/src/user_app.cpp.o: modules/CMakeFiles/modules.dir/flags.make
 modules/CMakeFiles/modules.dir/userApp/src/user_app.cpp.o: ../modules/userApp/src/user_app.cpp
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/nvidia/work/VIA/build/CMakeFiles --progress-num=$(CMAKE_PROGRESS_6) "Building CXX object modules/CMakeFiles/modules.dir/userApp/src/user_app.cpp.o"
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/nvidia/work/VIA/build/CMakeFiles --progress-num=$(CMAKE_PROGRESS_5) "Building CXX object modules/CMakeFiles/modules.dir/userApp/src/user_app.cpp.o"
 	cd /home/nvidia/work/VIA/build/modules && /usr/bin/g++-7  $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -o CMakeFiles/modules.dir/userApp/src/user_app.cpp.o -c /home/nvidia/work/VIA/modules/userApp/src/user_app.cpp
 
 modules/CMakeFiles/modules.dir/userApp/src/user_app.cpp.i: cmake_force
@@ -207,7 +183,6 @@ modules_OBJECTS = \
 "CMakeFiles/modules.dir/decoder/src/FFMpegDecoder.cpp.o" \
 "CMakeFiles/modules.dir/inifile/src/inifile.cpp.o" \
 "CMakeFiles/modules.dir/md5/src/md5.cpp.o" \
-"CMakeFiles/modules.dir/sqlHelper/src/sqlHelper.cpp.o" \
 "CMakeFiles/modules.dir/userApp/src/user_app.cpp.o"
 
 # External object files for target modules
@@ -217,9 +192,9 @@ modules_EXTERNAL_OBJECTS =
 ../lib/libmodules.so: modules/CMakeFiles/modules.dir/decoder/src/FFMpegDecoder.cpp.o
 ../lib/libmodules.so: modules/CMakeFiles/modules.dir/inifile/src/inifile.cpp.o
 ../lib/libmodules.so: modules/CMakeFiles/modules.dir/md5/src/md5.cpp.o
-../lib/libmodules.so: modules/CMakeFiles/modules.dir/sqlHelper/src/sqlHelper.cpp.o
 ../lib/libmodules.so: modules/CMakeFiles/modules.dir/userApp/src/user_app.cpp.o
 ../lib/libmodules.so: modules/CMakeFiles/modules.dir/build.make
+../lib/libmodules.so: /usr/lib/aarch64-linux-gnu/libmysqlclient.so
 ../lib/libmodules.so: /usr/lib/libopencv_highgui.so.4.1.1
 ../lib/libmodules.so: /usr/lib/libopencv_features2d.so.4.1.1
 ../lib/libmodules.so: /usr/local/lib/libavcodec.so
@@ -227,6 +202,7 @@ modules_EXTERNAL_OBJECTS =
 ../lib/libmodules.so: /usr/local/lib/libavutil.so
 ../lib/libmodules.so: /usr/local/lib/libswscale.so
 ../lib/libmodules.so: /usr/local/lib/libswresample.so
+../lib/libmodules.so: /usr/lib/aarch64-linux-gnu/libmysqlclient.so
 ../lib/libmodules.so: /usr/local/lib/libavcodec.so
 ../lib/libmodules.so: /usr/local/lib/libavformat.so
 ../lib/libmodules.so: /usr/local/lib/libavutil.so
@@ -239,7 +215,7 @@ modules_EXTERNAL_OBJECTS =
 ../lib/libmodules.so: /usr/lib/libopencv_core.so.4.1.1
 ../lib/libmodules.so: /usr/lib/libopencv_cudev.so.4.1.1
 ../lib/libmodules.so: modules/CMakeFiles/modules.dir/link.txt
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --bold --progress-dir=/home/nvidia/work/VIA/build/CMakeFiles --progress-num=$(CMAKE_PROGRESS_7) "Linking CXX shared library ../../lib/libmodules.so"
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --bold --progress-dir=/home/nvidia/work/VIA/build/CMakeFiles --progress-num=$(CMAKE_PROGRESS_6) "Linking CXX shared library ../../lib/libmodules.so"
 	cd /home/nvidia/work/VIA/build/modules && $(CMAKE_COMMAND) -E cmake_link_script CMakeFiles/modules.dir/link.txt --verbose=$(VERBOSE)
 
 # Rule to build all files generated by this target.
@@ -251,7 +227,6 @@ modules/CMakeFiles/modules.dir/requires: modules/CMakeFiles/modules.dir/inferenc
 modules/CMakeFiles/modules.dir/requires: modules/CMakeFiles/modules.dir/decoder/src/FFMpegDecoder.cpp.o.requires
 modules/CMakeFiles/modules.dir/requires: modules/CMakeFiles/modules.dir/inifile/src/inifile.cpp.o.requires
 modules/CMakeFiles/modules.dir/requires: modules/CMakeFiles/modules.dir/md5/src/md5.cpp.o.requires
-modules/CMakeFiles/modules.dir/requires: modules/CMakeFiles/modules.dir/sqlHelper/src/sqlHelper.cpp.o.requires
 modules/CMakeFiles/modules.dir/requires: modules/CMakeFiles/modules.dir/userApp/src/user_app.cpp.o.requires
 
 .PHONY : modules/CMakeFiles/modules.dir/requires

+ 0 - 1
build/modules/CMakeFiles/modules.dir/cmake_clean.cmake

@@ -3,7 +3,6 @@ file(REMOVE_RECURSE
   "CMakeFiles/modules.dir/decoder/src/FFMpegDecoder.cpp.o"
   "CMakeFiles/modules.dir/inifile/src/inifile.cpp.o"
   "CMakeFiles/modules.dir/md5/src/md5.cpp.o"
-  "CMakeFiles/modules.dir/sqlHelper/src/sqlHelper.cpp.o"
   "CMakeFiles/modules.dir/userApp/src/user_app.cpp.o"
   "../../lib/libmodules.pdb"
   "../../lib/libmodules.so"

+ 26 - 3
build/modules/CMakeFiles/modules.dir/depend.internal

@@ -335,6 +335,19 @@ modules/CMakeFiles/modules.dir/inference/src/inference.cpp.o
  /usr/include/gstreamer-1.0/gst/video/videodirection.h
  /usr/include/gstreamer-1.0/gst/video/videoorientation.h
  /usr/include/gstreamer-1.0/gst/video/videooverlay.h
+ /usr/include/mysql/binary_log_types.h
+ /usr/include/mysql/my_alloc.h
+ /usr/include/mysql/my_command.h
+ /usr/include/mysql/my_list.h
+ /usr/include/mysql/mysql.h
+ /usr/include/mysql/mysql/client_plugin.h
+ /usr/include/mysql/mysql/plugin_auth_common.h
+ /usr/include/mysql/mysql/psi/psi_base.h
+ /usr/include/mysql/mysql/psi/psi_memory.h
+ /usr/include/mysql/mysql_com.h
+ /usr/include/mysql/mysql_time.h
+ /usr/include/mysql/mysql_version.h
+ /usr/include/mysql/typelib.h
  /usr/lib/aarch64-linux-gnu/glib-2.0/include/glibconfig.h
  /usr/local/include/Network/Buffer.h
  /usr/local/include/Network/Session.h
@@ -373,9 +386,6 @@ modules/CMakeFiles/modules.dir/inifile/src/inifile.cpp.o
 modules/CMakeFiles/modules.dir/md5/src/md5.cpp.o
  ../modules/md5/include/md5.h
  /home/nvidia/work/VIA/modules/md5/src/md5.cpp
-modules/CMakeFiles/modules.dir/sqlHelper/src/sqlHelper.cpp.o
- ../modules/sqlHelper/include/sqlHelper.h
- /home/nvidia/work/VIA/modules/sqlHelper/src/sqlHelper.cpp
 modules/CMakeFiles/modules.dir/userApp/src/user_app.cpp.o
  ../3rdparty/ZLMediaKit/src/Common/Device.h
  ../3rdparty/ZLMediaKit/src/Common/MediaSink.h
@@ -654,6 +664,19 @@ modules/CMakeFiles/modules.dir/userApp/src/user_app.cpp.o
  /usr/include/gstreamer-1.0/gst/video/videodirection.h
  /usr/include/gstreamer-1.0/gst/video/videoorientation.h
  /usr/include/gstreamer-1.0/gst/video/videooverlay.h
+ /usr/include/mysql/binary_log_types.h
+ /usr/include/mysql/my_alloc.h
+ /usr/include/mysql/my_command.h
+ /usr/include/mysql/my_list.h
+ /usr/include/mysql/mysql.h
+ /usr/include/mysql/mysql/client_plugin.h
+ /usr/include/mysql/mysql/plugin_auth_common.h
+ /usr/include/mysql/mysql/psi/psi_base.h
+ /usr/include/mysql/mysql/psi/psi_memory.h
+ /usr/include/mysql/mysql_com.h
+ /usr/include/mysql/mysql_time.h
+ /usr/include/mysql/mysql_version.h
+ /usr/include/mysql/typelib.h
  /usr/lib/aarch64-linux-gnu/glib-2.0/include/glibconfig.h
  /usr/local/include/Network/Buffer.h
  /usr/local/include/Network/Session.h

+ 26 - 3
build/modules/CMakeFiles/modules.dir/depend.make

@@ -334,6 +334,19 @@ modules/CMakeFiles/modules.dir/inference/src/inference.cpp.o: /usr/include/gstre
 modules/CMakeFiles/modules.dir/inference/src/inference.cpp.o: /usr/include/gstreamer-1.0/gst/video/videodirection.h
 modules/CMakeFiles/modules.dir/inference/src/inference.cpp.o: /usr/include/gstreamer-1.0/gst/video/videoorientation.h
 modules/CMakeFiles/modules.dir/inference/src/inference.cpp.o: /usr/include/gstreamer-1.0/gst/video/videooverlay.h
+modules/CMakeFiles/modules.dir/inference/src/inference.cpp.o: /usr/include/mysql/binary_log_types.h
+modules/CMakeFiles/modules.dir/inference/src/inference.cpp.o: /usr/include/mysql/my_alloc.h
+modules/CMakeFiles/modules.dir/inference/src/inference.cpp.o: /usr/include/mysql/my_command.h
+modules/CMakeFiles/modules.dir/inference/src/inference.cpp.o: /usr/include/mysql/my_list.h
+modules/CMakeFiles/modules.dir/inference/src/inference.cpp.o: /usr/include/mysql/mysql.h
+modules/CMakeFiles/modules.dir/inference/src/inference.cpp.o: /usr/include/mysql/mysql/client_plugin.h
+modules/CMakeFiles/modules.dir/inference/src/inference.cpp.o: /usr/include/mysql/mysql/plugin_auth_common.h
+modules/CMakeFiles/modules.dir/inference/src/inference.cpp.o: /usr/include/mysql/mysql/psi/psi_base.h
+modules/CMakeFiles/modules.dir/inference/src/inference.cpp.o: /usr/include/mysql/mysql/psi/psi_memory.h
+modules/CMakeFiles/modules.dir/inference/src/inference.cpp.o: /usr/include/mysql/mysql_com.h
+modules/CMakeFiles/modules.dir/inference/src/inference.cpp.o: /usr/include/mysql/mysql_time.h
+modules/CMakeFiles/modules.dir/inference/src/inference.cpp.o: /usr/include/mysql/mysql_version.h
+modules/CMakeFiles/modules.dir/inference/src/inference.cpp.o: /usr/include/mysql/typelib.h
 modules/CMakeFiles/modules.dir/inference/src/inference.cpp.o: /usr/lib/aarch64-linux-gnu/glib-2.0/include/glibconfig.h
 modules/CMakeFiles/modules.dir/inference/src/inference.cpp.o: /usr/local/include/Network/Buffer.h
 modules/CMakeFiles/modules.dir/inference/src/inference.cpp.o: /usr/local/include/Network/Session.h
@@ -373,9 +386,6 @@ modules/CMakeFiles/modules.dir/inifile/src/inifile.cpp.o: ../modules/inifile/src
 modules/CMakeFiles/modules.dir/md5/src/md5.cpp.o: ../modules/md5/include/md5.h
 modules/CMakeFiles/modules.dir/md5/src/md5.cpp.o: ../modules/md5/src/md5.cpp
 
-modules/CMakeFiles/modules.dir/sqlHelper/src/sqlHelper.cpp.o: ../modules/sqlHelper/include/sqlHelper.h
-modules/CMakeFiles/modules.dir/sqlHelper/src/sqlHelper.cpp.o: ../modules/sqlHelper/src/sqlHelper.cpp
-
 modules/CMakeFiles/modules.dir/userApp/src/user_app.cpp.o: ../3rdparty/ZLMediaKit/src/Common/Device.h
 modules/CMakeFiles/modules.dir/userApp/src/user_app.cpp.o: ../3rdparty/ZLMediaKit/src/Common/MediaSink.h
 modules/CMakeFiles/modules.dir/userApp/src/user_app.cpp.o: ../3rdparty/ZLMediaKit/src/Common/MediaSource.h
@@ -653,6 +663,19 @@ modules/CMakeFiles/modules.dir/userApp/src/user_app.cpp.o: /usr/include/gstreame
 modules/CMakeFiles/modules.dir/userApp/src/user_app.cpp.o: /usr/include/gstreamer-1.0/gst/video/videodirection.h
 modules/CMakeFiles/modules.dir/userApp/src/user_app.cpp.o: /usr/include/gstreamer-1.0/gst/video/videoorientation.h
 modules/CMakeFiles/modules.dir/userApp/src/user_app.cpp.o: /usr/include/gstreamer-1.0/gst/video/videooverlay.h
+modules/CMakeFiles/modules.dir/userApp/src/user_app.cpp.o: /usr/include/mysql/binary_log_types.h
+modules/CMakeFiles/modules.dir/userApp/src/user_app.cpp.o: /usr/include/mysql/my_alloc.h
+modules/CMakeFiles/modules.dir/userApp/src/user_app.cpp.o: /usr/include/mysql/my_command.h
+modules/CMakeFiles/modules.dir/userApp/src/user_app.cpp.o: /usr/include/mysql/my_list.h
+modules/CMakeFiles/modules.dir/userApp/src/user_app.cpp.o: /usr/include/mysql/mysql.h
+modules/CMakeFiles/modules.dir/userApp/src/user_app.cpp.o: /usr/include/mysql/mysql/client_plugin.h
+modules/CMakeFiles/modules.dir/userApp/src/user_app.cpp.o: /usr/include/mysql/mysql/plugin_auth_common.h
+modules/CMakeFiles/modules.dir/userApp/src/user_app.cpp.o: /usr/include/mysql/mysql/psi/psi_base.h
+modules/CMakeFiles/modules.dir/userApp/src/user_app.cpp.o: /usr/include/mysql/mysql/psi/psi_memory.h
+modules/CMakeFiles/modules.dir/userApp/src/user_app.cpp.o: /usr/include/mysql/mysql_com.h
+modules/CMakeFiles/modules.dir/userApp/src/user_app.cpp.o: /usr/include/mysql/mysql_time.h
+modules/CMakeFiles/modules.dir/userApp/src/user_app.cpp.o: /usr/include/mysql/mysql_version.h
+modules/CMakeFiles/modules.dir/userApp/src/user_app.cpp.o: /usr/include/mysql/typelib.h
 modules/CMakeFiles/modules.dir/userApp/src/user_app.cpp.o: /usr/lib/aarch64-linux-gnu/glib-2.0/include/glibconfig.h
 modules/CMakeFiles/modules.dir/userApp/src/user_app.cpp.o: /usr/local/include/Network/Buffer.h
 modules/CMakeFiles/modules.dir/userApp/src/user_app.cpp.o: /usr/local/include/Network/Session.h

+ 2 - 2
build/modules/CMakeFiles/modules.dir/flags.make

@@ -4,7 +4,7 @@
 # compile CXX with /usr/bin/g++-7
 CXX_FLAGS =  -DHAVE_OPENCV -DHAVE_FFMPEG -Wno-deprecated-declarations -g -fPIC   -Wall -std=c++11 -O2 -g -DPLATFORM_TEGRA -std=gnu++11
 
-CXX_DEFINES = -Dmodules_EXPORTS
+CXX_DEFINES = -DENABLE_MYSQL -Dmodules_EXPORTS
 
-CXX_INCLUDES = -I/usr/local/include -I/home/nvidia/work/VIA/3rdparty/rapidjson/include -I/home/nvidia/work/VIA/modules/inference/include -I/home/nvidia/work/VIA/modules/decoder/include -I/home/nvidia/work/VIA/modules/userApp/include -I/home/nvidia/work/VIA/modules/md5/include -I/home/nvidia/work/VIA/modules/inifile/include -I/home/nvidia/work/VIA/modules/TCPClient/include -I/home/nvidia/work/VIA/modules/dataType/include -I/home/nvidia/work/VIA/3rdparty/ZLMediaKit/3rdpart/ZLToolKit/src -I/home/nvidia/work/VIA/3rdparty/ZLMediaKit/src -I/home/nvidia/work/VIA/3rdparty/ZLMediaKit -I/usr/include/gstreamer-1.0 -I/usr/include/glib-2.0 -I/usr/lib/aarch64-linux-gnu/glib-2.0/include -I/opt/nvidia/deepstream/deepstream-5.0/sources/includes -isystem /usr/include/opencv4 -I/home/nvidia/work/VIA/modules -I/home/nvidia/work/VIA/modules/sqlHelper/include 
+CXX_INCLUDES = -I/usr/local/include -I/usr/include/mysql -I/home/nvidia/work/VIA/3rdparty/rapidjson/include -I/home/nvidia/work/VIA/modules/inference/include -I/home/nvidia/work/VIA/modules/decoder/include -I/home/nvidia/work/VIA/modules/userApp/include -I/home/nvidia/work/VIA/modules/md5/include -I/home/nvidia/work/VIA/modules/inifile/include -I/home/nvidia/work/VIA/modules/TCPClient/include -I/home/nvidia/work/VIA/modules/dataType/include -I/home/nvidia/work/VIA/3rdparty/ZLMediaKit/3rdpart/ZLToolKit/src -I/home/nvidia/work/VIA/3rdparty/ZLMediaKit/src -I/home/nvidia/work/VIA/3rdparty/ZLMediaKit -I/usr/include/gstreamer-1.0 -I/usr/include/glib-2.0 -I/usr/lib/aarch64-linux-gnu/glib-2.0/include -I/opt/nvidia/deepstream/deepstream-5.0/sources/includes -isystem /usr/include/opencv4 -I/home/nvidia/work/VIA/modules 
 

BIN
build/modules/CMakeFiles/modules.dir/inference/src/inference.cpp.o


+ 1 - 1
build/modules/CMakeFiles/modules.dir/link.txt

@@ -1 +1 @@
-/usr/bin/g++-7 -fPIC  -DHAVE_OPENCV -DHAVE_FFMPEG -Wno-deprecated-declarations -g  -shared -Wl,-soname,libmodules.so -o ../../lib/libmodules.so CMakeFiles/modules.dir/inference/src/inference.cpp.o CMakeFiles/modules.dir/decoder/src/FFMpegDecoder.cpp.o CMakeFiles/modules.dir/inifile/src/inifile.cpp.o CMakeFiles/modules.dir/md5/src/md5.cpp.o CMakeFiles/modules.dir/sqlHelper/src/sqlHelper.cpp.o CMakeFiles/modules.dir/userApp/src/user_app.cpp.o  -L/usr/local/cuda-10.2/lib64  -L/home/nvidia/work/VIA/lib  -L/opt/nvidia/deepstream/deepstream-5.0/lib -Wl,-rpath,/usr/local/cuda-10.2/lib64:/home/nvidia/work/VIA/lib:/opt/nvidia/deepstream/deepstream-5.0/lib:/usr/local/lib -lgstreamer-1.0 -lgobject-2.0 -lglib-2.0 -lnvdsgst_meta -lnvds_meta -lnvdsgst_helper -lm -lmov -lflv -lmk_api -lmpeg -lzlmediakit -lZLToolKit -ldl -lmpeg -lmov -lflv -lmk_api -lzltoolkit -lzlmediakit /usr/lib/libopencv_highgui.so.4.1.1 /usr/lib/libopencv_features2d.so.4.1.1 /usr/local/lib/libavcodec.so /usr/local/lib/libavformat.so /usr/local/lib/libavutil.so /usr/local/lib/libswscale.so /usr/local/lib/libswresample.so -lpthread -lmov -lflv -lmk_api -lmpeg -lZLToolKit -ldl -lzltoolkit /usr/local/lib/libavcodec.so /usr/local/lib/libavformat.so /usr/local/lib/libavutil.so /usr/local/lib/libswscale.so /usr/local/lib/libswresample.so -lpthread /usr/lib/libopencv_videoio.so.4.1.1 /usr/lib/libopencv_imgcodecs.so.4.1.1 /usr/lib/libopencv_imgproc.so.4.1.1 /usr/lib/libopencv_flann.so.4.1.1 /usr/lib/libopencv_core.so.4.1.1 /usr/lib/libopencv_cudev.so.4.1.1 
+/usr/bin/g++-7 -fPIC  -DHAVE_OPENCV -DHAVE_FFMPEG -Wno-deprecated-declarations -g  -shared -Wl,-soname,libmodules.so -o ../../lib/libmodules.so CMakeFiles/modules.dir/inference/src/inference.cpp.o CMakeFiles/modules.dir/decoder/src/FFMpegDecoder.cpp.o CMakeFiles/modules.dir/inifile/src/inifile.cpp.o CMakeFiles/modules.dir/md5/src/md5.cpp.o CMakeFiles/modules.dir/userApp/src/user_app.cpp.o  -L/usr/local/cuda-10.2/lib64  -L/home/nvidia/work/VIA/lib  -L/opt/nvidia/deepstream/deepstream-5.0/lib -Wl,-rpath,/usr/local/cuda-10.2/lib64:/home/nvidia/work/VIA/lib:/opt/nvidia/deepstream/deepstream-5.0/lib:/usr/local/lib -lgstreamer-1.0 -lgobject-2.0 -lglib-2.0 -lnvdsgst_meta -lnvds_meta -lnvdsgst_helper -lm -lmov -lflv -lmk_api -lmpeg -lzlmediakit -lZLToolKit -ldl -lmpeg -lmov -lflv -lmk_api -lzltoolkit -lzlmediakit /usr/lib/aarch64-linux-gnu/libmysqlclient.so /usr/lib/libopencv_highgui.so.4.1.1 /usr/lib/libopencv_features2d.so.4.1.1 /usr/local/lib/libavcodec.so /usr/local/lib/libavformat.so /usr/local/lib/libavutil.so /usr/local/lib/libswscale.so /usr/local/lib/libswresample.so -lpthread -lmov -lflv -lmk_api -lmpeg -lZLToolKit -ldl -lzltoolkit /usr/lib/aarch64-linux-gnu/libmysqlclient.so /usr/local/lib/libavcodec.so /usr/local/lib/libavformat.so /usr/local/lib/libavutil.so /usr/local/lib/libswscale.so /usr/local/lib/libswresample.so -lpthread /usr/lib/libopencv_videoio.so.4.1.1 /usr/lib/libopencv_imgcodecs.so.4.1.1 /usr/lib/libopencv_imgproc.so.4.1.1 /usr/lib/libopencv_flann.so.4.1.1 /usr/lib/libopencv_core.so.4.1.1 /usr/lib/libopencv_cudev.so.4.1.1 

+ 0 - 1
build/modules/CMakeFiles/modules.dir/progress.make

@@ -4,5 +4,4 @@ CMAKE_PROGRESS_3 = 5
 CMAKE_PROGRESS_4 = 6
 CMAKE_PROGRESS_5 = 7
 CMAKE_PROGRESS_6 = 8
-CMAKE_PROGRESS_7 = 9
 

BIN
build/modules/CMakeFiles/modules.dir/sqlHelper/src/sqlHelper.cpp.o


BIN
build/modules/CMakeFiles/modules.dir/userApp/src/user_app.cpp.o


+ 1 - 1
build/modules/CMakeFiles/progress.marks

@@ -1 +1 @@
-7
+6

+ 0 - 30
build/modules/Makefile

@@ -279,33 +279,6 @@ md5/src/md5.cpp.s:
 	cd /home/nvidia/work/VIA/build && $(MAKE) -f modules/CMakeFiles/modules.dir/build.make modules/CMakeFiles/modules.dir/md5/src/md5.cpp.s
 .PHONY : md5/src/md5.cpp.s
 
-sqlHelper/src/sqlHelper.o: sqlHelper/src/sqlHelper.cpp.o
-
-.PHONY : sqlHelper/src/sqlHelper.o
-
-# target to build an object file
-sqlHelper/src/sqlHelper.cpp.o:
-	cd /home/nvidia/work/VIA/build && $(MAKE) -f modules/CMakeFiles/modules.dir/build.make modules/CMakeFiles/modules.dir/sqlHelper/src/sqlHelper.cpp.o
-.PHONY : sqlHelper/src/sqlHelper.cpp.o
-
-sqlHelper/src/sqlHelper.i: sqlHelper/src/sqlHelper.cpp.i
-
-.PHONY : sqlHelper/src/sqlHelper.i
-
-# target to preprocess a source file
-sqlHelper/src/sqlHelper.cpp.i:
-	cd /home/nvidia/work/VIA/build && $(MAKE) -f modules/CMakeFiles/modules.dir/build.make modules/CMakeFiles/modules.dir/sqlHelper/src/sqlHelper.cpp.i
-.PHONY : sqlHelper/src/sqlHelper.cpp.i
-
-sqlHelper/src/sqlHelper.s: sqlHelper/src/sqlHelper.cpp.s
-
-.PHONY : sqlHelper/src/sqlHelper.s
-
-# target to generate assembly for a file
-sqlHelper/src/sqlHelper.cpp.s:
-	cd /home/nvidia/work/VIA/build && $(MAKE) -f modules/CMakeFiles/modules.dir/build.make modules/CMakeFiles/modules.dir/sqlHelper/src/sqlHelper.cpp.s
-.PHONY : sqlHelper/src/sqlHelper.cpp.s
-
 userApp/src/user_app.o: userApp/src/user_app.cpp.o
 
 .PHONY : userApp/src/user_app.o
@@ -358,9 +331,6 @@ help:
 	@echo "... md5/src/md5.o"
 	@echo "... md5/src/md5.i"
 	@echo "... md5/src/md5.s"
-	@echo "... sqlHelper/src/sqlHelper.o"
-	@echo "... sqlHelper/src/sqlHelper.i"
-	@echo "... sqlHelper/src/sqlHelper.s"
 	@echo "... userApp/src/user_app.o"
 	@echo "... userApp/src/user_app.i"
 	@echo "... userApp/src/user_app.s"

+ 0 - 4
build/modules/cmake_install.cmake

@@ -58,10 +58,6 @@ if("x${CMAKE_INSTALL_COMPONENT}x" STREQUAL "xUnspecifiedx" OR NOT CMAKE_INSTALL_
 endif()
 
 if("x${CMAKE_INSTALL_COMPONENT}x" STREQUAL "xUnspecifiedx" OR NOT CMAKE_INSTALL_COMPONENT)
-  file(INSTALL DESTINATION "${CMAKE_INSTALL_PREFIX}/include" TYPE DIRECTORY FILES "/home/nvidia/work/VIA/modules/sqlHelper/include/")
-endif()
-
-if("x${CMAKE_INSTALL_COMPONENT}x" STREQUAL "xUnspecifiedx" OR NOT CMAKE_INSTALL_COMPONENT)
   file(INSTALL DESTINATION "${CMAKE_INSTALL_PREFIX}/include" TYPE DIRECTORY FILES "/home/nvidia/work/VIA/modules/userApp/include/")
 endif()
 

BIN
lib/libmodules.so


+ 0 - 4
modules/CMakeLists.txt

@@ -23,10 +23,6 @@ if(build_md5)
   list(APPEND module_list md5)
   install(DIRECTORY md5/include/ DESTINATION include)
 endif()
-if(build_sqlHelper)
-  list(APPEND module_list sqlHelper)
-  install(DIRECTORY sqlHelper/include/ DESTINATION include)
-endif()
 if(build_userApp)
   list(APPEND module_list userApp)
   install(DIRECTORY userApp/include/ DESTINATION include)

+ 0 - 17
modules/sqlHelper/include/sqlHelper.h

@@ -1,17 +0,0 @@
-#pragma once
-
-#include <iostream>
-
-using namespace std;
-
-namespace VIA
-{
-    class SqlHelper
-    {
-    private:
-        
-    public:
-        SqlHelper();
-        ~SqlHelper();
-    };
-}

+ 0 - 13
modules/sqlHelper/src/sqlHelper.cpp

@@ -1,13 +0,0 @@
-#include "sqlHelper.h"
-
-namespace VIA
-{
-    SqlHelper::SqlHelper()
-    {
-
-    }
-    SqlHelper::~SqlHelper()
-    {
-
-    }
-} // namespace VIA

+ 8 - 9
modules/userApp/include/user_app.h

@@ -15,11 +15,12 @@
 #include "Util/SqlPool.h"
 #include "Network/TcpClient.h"
 #include "TCPClient.h"
-#include "inference.h"
 #include "inifile.h"
 
 #include <gst/gst.h>
 #include <vector>
+#include "inference.h"
+
 
 using namespace toolkit;
 using namespace mediakit;
@@ -34,8 +35,6 @@ namespace VIA
 {  
     class UserApp
     {
-    private:
-
     public:
         static std::shared_ptr<UserApp> CreateNew();
         UserApp();
@@ -59,18 +58,18 @@ namespace VIA
         std::string PIS_IdName;
 
         // Mysql
-        std::string MySql_ip;
-        int32_t MySql_port;
-        std::string MySql_User;
-        std::string MySql_Pwd;
+        std::string sql_ip;
+        int32_t sql_port;
+        std::string user;
+        std::string password;
+        std::string character;
 
         int device_id;
         std::string Log_src;
     private:
         // 负责链接Netty的Socker
         std::shared_ptr<TCPClient> m_tcpClient;
-        // 推理模块
-        
+
 
     };
 }

+ 29 - 25
modules/userApp/src/user_app.cpp

@@ -1,9 +1,8 @@
 #include "user_app.h"
 
 namespace VIA
-{
-    std::shared_ptr<Inference> m_Infer;
-
+{  
+    std::shared_ptr<Inference> m_Infer = NULL;
     std::shared_ptr<UserApp> UserApp::CreateNew(){
         return std::make_shared<UserApp>();
     }
@@ -40,37 +39,42 @@ namespace VIA
         this->PIS_port = m_ini.getIntValue("PIS", "PIS_port", ret);
         this->PIS_IdName = m_ini.getStringValue("PIS", "PIS_IdName", ret);
 
-        this->MySql_ip = m_ini.getStringValue("MySql", "MySql_ip", ret);
-        this->MySql_port = m_ini.getIntValue("MySql", "MySql_port", ret);
-        this->MySql_User = m_ini.getStringValue("MySql", "MySql_User", ret);
-        this->MySql_Pwd = m_ini.getStringValue("MySql", "MySql_Pwd", ret);
+        this->sql_ip = m_ini.getStringValue("MySql", "sql_ip", ret);
+        this->sql_port = m_ini.getIntValue("MySql", "sql_port", ret);
+        this->user = m_ini.getStringValue("MySql", "user", ret);
+        this->password = m_ini.getStringValue("MySql", "password", ret);
+        this->character = m_ini.getStringValue("MySql", "character", ret);
 
         this->device_id = m_ini.getIntValue("USER", "device_id", ret);
         this->Log_src = m_ini.getStringValue("Log", "Log_src", ret);
 
-        // 链接Mysql数据库
-        
-
-        // 获取车厢数据
-        
-
-        // 获取各个车厢的摄像头流
+        // 链接Mysql
+        #if defined(SUPPORT_DYNAMIC_TEMPLATE)
+            //初始化数据
+            SqlPool::Instance().Init(this->sql_ip,this->sql_port,"",this->user,this->password/*,character*/);
+        #else
+            //由于需要编译器对可变参数模板的支持,所以gcc5.0以下一般都不支持,否则编译报错
+            ErrorL << "your compiler does not support variable parameter templates!" << endl;
+            return -1;
+        #endif //defined(SUPPORT_DYNAMIC_TEMPLATE)
 
+        // 初始化数据库连接池
+        SqlPool::Instance().setSize(3 + thread::hardware_concurrency());
 
         // 链接Netty后端
         // m_tcpClient = TCPClient::Ptr();
         // m_tcpClient->startConnect(this->Netty_ip, this->Netty_port);
-        
+
         // 初始化Deepstream
-        m_Infer = Inference::CreateNew();
-        if(m_Infer == NULL){
-            ErrorL << "Inference module creation failed!";
-            return ERR;
-        }
-        if(m_Infer->Init() != OK){
-            ErrorL << "Inference module initialization failed";
-            return ERR;
-        }
+        // m_Infer = Inference::CreateNew();
+        // if(m_Infer == NULL){
+        //     ErrorL << "Inference module creation failed!";
+        //     return ERR;
+        // }
+        // if(m_Infer->Init() != OK){
+        //     ErrorL << "Inference module initialization failed";
+        //     return ERR;
+        // }
 
         InfoL << "System initialization is successful!";
         return OK;
@@ -89,7 +93,7 @@ namespace VIA
         ThreadPool pool(1,ThreadPool::PRIORITY_HIGHEST, false);
         // 挂起任务一
         pool.async([&](){
-            m_Infer->StartTask();
+            // m_Infer->StartTask();
         });
 
         // 启动任务

BIN
source/bin/main


BIN
source/bin/yolov5s.engine


+ 5 - 4
source/config/config.ini

@@ -9,10 +9,11 @@ PIS_port = 8090
 PIS_IdName = PIS
 
 [MySql]
-MySql_ip = 192.168.31.95
-MySql_port = 8091
-MySql_User = app
-MySql_Pwd = 123456
+sql_ip = 127.0.0.1
+sql_port = 3306
+user = root
+password = 123456
+character = utf8mb4
 
 [USER]
 device_id = 1

+ 1 - 1
source/src/main.cpp

@@ -7,7 +7,6 @@ using namespace std;
 using namespace VIA;
 
 
-
 int main(int argc, char *argv[])
 {
   //设置退出信号处理函数
@@ -35,3 +34,4 @@ int main(int argc, char *argv[])
   app->Destroy();
   return 0;
 }
+