QiaoJiaSystem/CMakeLists.txt
@@ -32,7 +32,7 @@ add_subdirectory(DataManagerServer) #add_subdirectory(EncodeServer) #add_subdirectory(VideoToImage) add_subdirectory(UnitTest) #add_subdirectory(UnitTest) add_subdirectory(VideoToImageMulth) #add_subdirectory(GB28181DecoderModel) #add_subdirectory(FaceSearchDbWithImg) QiaoJiaSystem/EncodeServer/CMakeLists.txt
File was deleted QiaoJiaSystem/EncodeServer/EncodeVideo.cpp
File was deleted QiaoJiaSystem/EncodeServer/EncodeVideo.h
File was deleted QiaoJiaSystem/EncodeServer/EncodeVideoManager.cpp
File was deleted QiaoJiaSystem/EncodeServer/EncodeVideoManager.h
File was deleted QiaoJiaSystem/EncodeServer/NewEncodeVideoManager.cpp
File was deleted QiaoJiaSystem/EncodeServer/NewEncodeVideoManager.h
File was deleted QiaoJiaSystem/EncodeServer/main.cpp
File was deleted QiaoJiaSystem/PerimeterAlarm/AppPaController.cpp
File was deleted QiaoJiaSystem/PerimeterAlarm/AppPaController.h
File was deleted QiaoJiaSystem/PerimeterAlarm/CMakeLists.txt
File was deleted QiaoJiaSystem/PerimeterAlarm/CMakeLists.txt.user
File was deleted QiaoJiaSystem/PerimeterAlarm/PaImageDrawElement.cpp
File was deleted QiaoJiaSystem/PerimeterAlarm/PaImageDrawElement.h
File was deleted QiaoJiaSystem/PerimeterAlarm/PaYoloRpcElement.cpp
File was deleted QiaoJiaSystem/PerimeterAlarm/PaYoloRpcElement.h
File was deleted QiaoJiaSystem/PerimeterAlarm/main.cpp
File was deleted QiaoJiaSystem/RecordVideo/CMakeLists.txt
File was deleted QiaoJiaSystem/RecordVideo/CommonFFmpegFunc.hpp
File was deleted QiaoJiaSystem/RecordVideo/ImageGrabberI.cpp
File was deleted QiaoJiaSystem/RecordVideo/ImageGrabberI.h
File was deleted QiaoJiaSystem/RecordVideo/LoopRecordVideoI.cpp
File was deleted QiaoJiaSystem/RecordVideo/LoopRecordVideoI.h
File was deleted QiaoJiaSystem/RecordVideo/LoopVideoRecorder.cpp
File was deleted QiaoJiaSystem/RecordVideo/LoopVideoRecorder.h
File was deleted QiaoJiaSystem/RecordVideo/RecordVideoI.cpp
File was deleted QiaoJiaSystem/RecordVideo/RecordVideoI.h
File was deleted QiaoJiaSystem/RecordVideo/VideoRecorder.cpp
File was deleted QiaoJiaSystem/RecordVideo/VideoRecorder.h
File was deleted QiaoJiaSystem/RecordVideo/VideoRecorderManager.cpp
File was deleted QiaoJiaSystem/RecordVideo/VideoRecorderManager.h
File was deleted QiaoJiaSystem/RecordVideo/config.cfg
File was deleted QiaoJiaSystem/RecordVideo/main.cpp
File was deleted QiaoJiaSystem/RecordVideo/rpc/RecordVideo.cpp
File was deleted QiaoJiaSystem/RecordVideo/rpc/RecordVideo.h
File was deleted QiaoJiaSystem/RecordVideo/rpc/RecordVideo.ice
File was deleted QiaoJiaSystem/RecordVideo/rpc/RecordVideo/__init__.py
File was deleted QiaoJiaSystem/RecordVideo/rpc/RecordVideo_ice.py
File was deleted QiaoJiaSystem/RecordVideo/rpc/test2.py
File was deleted QiaoJiaSystem/RecordVideo/rpc/testClient.py
File was deleted QiaoJiaSystem/StructureApp/AppPipeController.h
@@ -9,18 +9,19 @@ #include "FaceRpcElement.h" #include "FaceExtractElement.h" #include "YoloRpcElement.h" #include "RecordVideoElement.h" //#include "RecordVideoElement.h" #include <TriggerElement.h> #include <QtCore/QDateTime> #include "PerimeterElement.h" #include "JudgmentRetrogradeTool.h" #include "NewRecordVideoElement.h" //#include "NewRecordVideoElement.h" #include "PersonElement.h" #include "PerStaticElement.h" #include <jsoncpp/json/json.h> #include "DBStruct.h" #include "SaveVideoRpc.h" #include "VptRpcElement.h" #include "HiredisTool.h" class VideoCaptureElementNotDecoder : public ffmpeg::VideoCaptureElement { using ffmpeg::VideoCaptureElement::VideoCaptureElement; QiaoJiaSystem/StructureApp/CMakeLists.txt
@@ -9,11 +9,11 @@ SET(SOURCES # HiredisTool.cpp NewRecordVideoElement.cpp # NewRecordVideoElement.cpp JudgmentRetrogradeTool.cpp PerimeterElement.cpp NewEncodeVideoManager.cpp NewEncodeVideo.cpp # NewEncodeVideoManager.cpp # NewEncodeVideo.cpp HiredisTool.cpp PersonElement.cpp PerStaticElement.cpp @@ -24,14 +24,14 @@ FaceExtractElement.cpp YoloRpcElement.cpp ImageDrawElement.cpp RecordVideoElement.cpp # RecordVideoElement.cpp rpc/StructureApp.cpp AppPipeController.cpp ../YoloServer/rpc/YoloServer.cpp ../FaceDetectServer/rpc/FaceServer.cpp ../FaceSearchServer/rpc/FaceSearchServer.cpp ../RecordVideo/rpc/RecordVideo.cpp ../VideoToImage/rpc/RtspAnalysServer.cpp # ../RecordVideo/rpc/RecordVideo.cpp ../VideoToImageMulth/rpc/RtspAnalysServer.cpp ../RapidStructureApp/TriggerElement.cpp ../../../BasicPlatForm/basic/pipe_element/ffmpeg/FfmpegElement.cpp @@ -78,10 +78,10 @@ include_directories( ./rpc ../YoloServer/rpc ../RecordVideo/rpc # ../RecordVideo/rpc ../FaceDetectServer/rpc ../FaceSearchServer/rpc ../VideoToImage/rpc ../VideoToImageMulth/rpc ../RapidStructureApp/ ../../../BasicPlatForm QiaoJiaSystem/StructureApp/NewEncodeVideo.cpp
File was deleted QiaoJiaSystem/StructureApp/NewEncodeVideo.h
File was deleted QiaoJiaSystem/StructureApp/NewEncodeVideoManager.cpp
File was deleted QiaoJiaSystem/StructureApp/NewEncodeVideoManager.h
File was deleted QiaoJiaSystem/StructureApp/NewRecordVideoElement.cpp
File was deleted QiaoJiaSystem/StructureApp/NewRecordVideoElement.h
File was deleted QiaoJiaSystem/StructureApp/RecordVideoElement.cpp
File was deleted QiaoJiaSystem/StructureApp/RecordVideoElement.h
File was deleted QiaoJiaSystem/StructureApp/SaveVideoRpc.h
@@ -6,6 +6,6 @@ #define QIAOJIASYSTEM_SAVEVIDEORPC_H #include "../../../BasicPlatForm/basic/rpc/IceRpc.hpp" #include "../VideoToImage/rpc/RtspAnalysServer.h" #include "../VideoToImageMulth/rpc/RtspAnalysServer.h" using SaveVideoRpcClient_t = IceRpcClient<RtspAnalys::RtspAnalysServerPrx>; #endif //QIAOJIASYSTEM_SAVEVIDEORPC_H QiaoJiaSystem/UnitTest/BasicStruct_test.cpp
File was deleted QiaoJiaSystem/UnitTest/CMakeLists.txt
File was deleted QiaoJiaSystem/UnitTest/doctest/doctest.h
File was deleted QiaoJiaSystem/UnitTest/doctest/parts/doctest_fwd.h
File was deleted QiaoJiaSystem/UnitTest/doctest/parts/doctest_impl.h
File was deleted QiaoJiaSystem/UnitTest/doctest/parts/doctest_main.cpp
File was deleted QiaoJiaSystem/UnitTest/main.cpp
File was deleted QiaoJiaSystem/VideoAnalysFromHC/CMakeLists.txt
@@ -50,13 +50,13 @@ ../StructureApp/FaceRpcElement.cpp ../StructureApp/FaceExtractElement.cpp ../StructureApp/ImageDrawElement.cpp ../StructureApp/RecordVideoElement.cpp # ../StructureApp/RecordVideoElement.cpp ../StructureApp/JudgmentRetrogradeTool.cpp ../StructureApp/PerimeterElement.cpp ../StructureApp/NewRecordVideoElement.cpp ../StructureApp/NewEncodeVideoManager.cpp ../StructureApp/NewEncodeVideo.cpp # ../StructureApp/NewRecordVideoElement.cpp # ../StructureApp/NewEncodeVideoManager.cpp # ../StructureApp/NewEncodeVideo.cpp ../StructureApp/HiredisTool.cpp ../StructureApp/PersonElement.cpp ../StructureApp/PerStaticElement.cpp @@ -67,8 +67,8 @@ ../YoloServer/rpc/YoloServer.cpp ../FaceDetectServer/rpc/FaceServer.cpp ../FaceSearchServer/rpc/FaceSearchServer.cpp ../RecordVideo/rpc/RecordVideo.cpp ../VideoToImage/rpc/RtspAnalysServer.cpp # ../RecordVideo/rpc/RecordVideo.cpp ../VideoToImageMulth/rpc/RtspAnalysServer.cpp #通用模块 ../../../BasicPlatForm/basic/io/io.cpp @@ -185,12 +185,12 @@ ../VideoServer/QiaoJia/dispatchTool ../VptServer/rpc ../RecordVideo/rpc # ../RecordVideo/rpc ../StructureApp/rpc ../YoloServer/rpc ../FaceDetectServer/rpc ../FaceSearchServer/rpc ../VideoToImage/rpc ../VideoToImageMulth/rpc ../../../BasicPlatForm/ QiaoJiaSystem/VideoAnalysFromHC/main.cpp
@@ -9,7 +9,7 @@ #include "DBManageClass.h" #include "RtspAnalysElement.h" #include <basic/debug/Debug.h> #include "StructureApp/NewEncodeVideoManager.h" //#include "StructureApp/NewEncodeVideoManager.h" //#include "PerimeterAlarmManager.h" //#include "KeepRightManager.h" //"192.168.1.4", 8000, "admin", "basic123" QiaoJiaSystem/VideoToImage/CMakeLists.txt
File was deleted QiaoJiaSystem/VideoToImage/RtspAnalysManager.cpp
File was deleted QiaoJiaSystem/VideoToImage/RtspAnalysManager.h
File was deleted QiaoJiaSystem/VideoToImage/RtspCaptureElement.cpp
File was deleted QiaoJiaSystem/VideoToImage/RtspCaptureElement.h
File was deleted QiaoJiaSystem/VideoToImage/main.cpp
File was deleted QiaoJiaSystem/VideoToImage/rpc/RtspAnalysServer.cpp
File was deleted QiaoJiaSystem/VideoToImage/rpc/RtspAnalysServer.h
File was deleted QiaoJiaSystem/VideoToImage/rpc/RtspAnalysServer.ice
File was deleted QiaoJiaSystem/YoloServer/CMakeLists.txt
@@ -77,35 +77,35 @@ ${LIBS} ) add_executable(YoloDetectClientTest ../../../BasicPlatForm/basic/util/opencv/CvUtil.cpp ../../../BasicPlatForm/basic/util/opencv/CvUtil.h ../../../BasicPlatForm/basic/pipe/PipeConnector.cpp ../../../BasicPlatForm/basic/pipe/PipeConnector.h ../../../BasicPlatForm/basic/pipe/PipeController.cpp ../../../BasicPlatForm/basic/pipe/PipeController.h ../../../BasicPlatForm/basic/pipe/PipeElement.cpp ../../../BasicPlatForm/basic/pipe/PipeElement.h ../../../BasicPlatForm/basic/timer_counter/Clocktimer.h ../../../BasicPlatForm/basic/timer_counter/Clocktimer.cpp ../../../BasicPlatForm/basic/pipe_element/ImageFactoryElement.cpp ../../../BasicPlatForm/basic/pipe_element/ImageFactoryElement.h ../../../BasicPlatForm/basic/pipe_element/ImageShowElement.cpp ../../../BasicPlatForm/basic/pipe_element/ImageShowElement.h ../../../BasicPlatForm/basic/pipe_element/ffmpeg/VideoCaptureElement.cpp ../../../BasicPlatForm/basic/pipe_element/ffmpeg/VideoCaptureElement.h ../../../BasicPlatForm/basic/util/fastdfs/FastdfsClient.cpp ../../../BasicPlatForm/basic/pipe/TimerElement.cpp ../RapidStructureApp/TriggerElement.cpp ../../../BasicPlatForm/basic/db/Elasticsearch/EsDBTool.cpp ../../../BasicPlatForm/basic/util/curl/HttpRequestWithCrul.hpp rpc/YoloServer.cpp YoloDetectClientTest.cpp ./YoloRpcElement.cpp ./YoloRpcElement.h ImageDrawElement.cpp ) #add_executable(YoloDetectClientTest # ../../../BasicPlatForm/basic/util/opencv/CvUtil.cpp # ../../../BasicPlatForm/basic/util/opencv/CvUtil.h # ../../../BasicPlatForm/basic/pipe/PipeConnector.cpp # ../../../BasicPlatForm/basic/pipe/PipeConnector.h # ../../../BasicPlatForm/basic/pipe/PipeController.cpp # ../../../BasicPlatForm/basic/pipe/PipeController.h # ../../../BasicPlatForm/basic/pipe/PipeElement.cpp # ../../../BasicPlatForm/basic/pipe/PipeElement.h # ../../../BasicPlatForm/basic/timer_counter/Clocktimer.h # ../../../BasicPlatForm/basic/timer_counter/Clocktimer.cpp # # ../../../BasicPlatForm/basic/pipe_element/ImageFactoryElement.cpp # ../../../BasicPlatForm/basic/pipe_element/ImageFactoryElement.h # ../../../BasicPlatForm/basic/pipe_element/ImageShowElement.cpp # ../../../BasicPlatForm/basic/pipe_element/ImageShowElement.h # ../../../BasicPlatForm/basic/pipe_element/ffmpeg/VideoCaptureElement.cpp # ../../../BasicPlatForm/basic/pipe_element/ffmpeg/VideoCaptureElement.h # ../../../BasicPlatForm/basic/util/fastdfs/FastdfsClient.cpp # ../../../BasicPlatForm/basic/pipe/TimerElement.cpp ## ../StructureApp/TriggerElement.cpp # ../../../BasicPlatForm/basic/db/Elasticsearch/EsDBTool.cpp # ../../../BasicPlatForm/basic/util/curl/HttpRequestWithCrul.hpp # rpc/YoloServer.cpp # YoloDetectClientTest.cpp # ./YoloRpcElement.cpp # ./YoloRpcElement.h # ImageDrawElement.cpp # ) link_directories( @@ -138,16 +138,16 @@ #glog ../../../BasicPlatForm/libs/glog/include ) target_link_libraries(YoloDetectClientTest Ice Qt5Core avformat avcodec avutil avfilter swscale swresample opencv_world curl uuid jsoncpp fastcommon fdfsclient glog pthread ) #target_link_libraries(YoloDetectClientTest # Ice # Qt5Core # avformat avcodec avutil avfilter swscale swresample # opencv_world # curl # uuid # jsoncpp # fastcommon # fdfsclient # glog # pthread # )