diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json new file mode 100644 index 0000000..a33b5b9 --- /dev/null +++ b/.vscode/c_cpp_properties.json @@ -0,0 +1,18 @@ +{ + "configurations": [ + { + "name": "linux-gcc-arm64", + "includePath": [ + "${workspaceFolder}/**" + ], + "compilerPath": "/usr/bin/gcc", + "cStandard": "${default}", + "cppStandard": "${default}", + "intelliSenseMode": "linux-gcc-arm64", + "compilerArgs": [ + "" + ] + } + ], + "version": 4 +} \ No newline at end of file diff --git a/.vscode/launch.json b/.vscode/launch.json index ebae047..2a6efea 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -76,24 +76,6 @@ "ignoreFailures": true } ] - },{ - "name": "gb28181", - "type": "cppdbg", - "request": "launch", - "program": "${workspaceFolder}/bin/test_sip", - "args": ["34020000001310000001"], - "stopAtEntry": false, - "cwd": "${workspaceFolder}/bin", - "environment": [], - "externalConsole": false, - "MIMode": "gdb", - "setupCommands": [ - { - "description": "Enable pretty-printing for gdb", - "text": "-enable-pretty-printing", - "ignoreFailures": true - } - ] } ] } \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json index fb36116..8cd21ac 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,69 +1,141 @@ { - "files.associations": { - "thread": "cpp", - "chrono": "cpp", - "array": "cpp", - "atomic": "cpp", - "bit": "cpp", - "*.tcc": "cpp", - "bitset": "cpp", - "cctype": "cpp", - "clocale": "cpp", - "cmath": "cpp", - "complex": "cpp", - "condition_variable": "cpp", - "cstdarg": "cpp", - "cstddef": "cpp", - "cstdint": "cpp", - "cstdio": "cpp", - "cstdlib": "cpp", - "cstring": "cpp", - "ctime": "cpp", - "cwchar": "cpp", - "cwctype": "cpp", - "deque": "cpp", - "list": "cpp", - "map": "cpp", - "set": "cpp", - "unordered_map": "cpp", - "vector": "cpp", - "exception": "cpp", - "algorithm": "cpp", - "functional": "cpp", - "iterator": "cpp", - "memory": "cpp", - "memory_resource": "cpp", - "numeric": "cpp", - "optional": "cpp", - "random": "cpp", - "ratio": "cpp", - "regex": "cpp", - "string": "cpp", - "string_view": "cpp", - "system_error": "cpp", - "tuple": "cpp", - "type_traits": "cpp", - "utility": "cpp", - "fstream": "cpp", - "future": "cpp", - "initializer_list": "cpp", - "iomanip": "cpp", - "iosfwd": "cpp", - "iostream": "cpp", - "istream": "cpp", - "limits": "cpp", - "mutex": "cpp", - "new": "cpp", - "ostream": "cpp", - "shared_mutex": "cpp", - "sstream": "cpp", - "stdexcept": "cpp", - "streambuf": "cpp", - "cfenv": "cpp", - "cinttypes": "cpp", - "typeinfo": "cpp", - "variant": "cpp", - "bsf_internal.h": "c", - "any": "cpp" - } + "files.associations": { + "thread": "cpp", + "chrono": "cpp", + "array": "cpp", + "atomic": "cpp", + "bit": "cpp", + "*.tcc": "cpp", + "bitset": "cpp", + "cctype": "cpp", + "clocale": "cpp", + "cmath": "cpp", + "complex": "cpp", + "condition_variable": "cpp", + "cstdarg": "cpp", + "cstddef": "cpp", + "cstdint": "cpp", + "cstdio": "cpp", + "cstdlib": "cpp", + "cstring": "cpp", + "ctime": "cpp", + "cwchar": "cpp", + "cwctype": "cpp", + "deque": "cpp", + "list": "cpp", + "map": "cpp", + "set": "cpp", + "unordered_map": "cpp", + "vector": "cpp", + "exception": "cpp", + "algorithm": "cpp", + "functional": "cpp", + "iterator": "cpp", + "memory": "cpp", + "memory_resource": "cpp", + "numeric": "cpp", + "optional": "cpp", + "random": "cpp", + "ratio": "cpp", + "regex": "cpp", + "string": "cpp", + "string_view": "cpp", + "system_error": "cpp", + "tuple": "cpp", + "type_traits": "cpp", + "utility": "cpp", + "fstream": "cpp", + "future": "cpp", + "initializer_list": "cpp", + "iomanip": "cpp", + "iosfwd": "cpp", + "iostream": "cpp", + "istream": "cpp", + "limits": "cpp", + "mutex": "cpp", + "new": "cpp", + "ostream": "cpp", + "shared_mutex": "cpp", + "sstream": "cpp", + "stdexcept": "cpp", + "streambuf": "cpp", + "cfenv": "cpp", + "cinttypes": "cpp", + "typeinfo": "cpp", + "variant": "cpp", + "bsf_internal.h": "c", + "any": "cpp", + "strstream": "cpp", + "codecvt": "cpp", + "unordered_set": "cpp", + "rope": "cpp", + "scoped_allocator": "cpp", + "typeindex": "cpp", + "*.cpp0": "c", + "*.ipp": "cpp", + "csetjmp": "cpp", + "csignal": "cpp", + "charconv": "cpp", + "forward_list": "cpp", + "source_location": "cpp", + "slist": "cpp", + "valarray": "cpp" + }, + "C_Cpp_Runner.cCompilerPath": "gcc", + "C_Cpp_Runner.cppCompilerPath": "g++", + "C_Cpp_Runner.debuggerPath": "gdb", + "C_Cpp_Runner.cStandard": "", + "C_Cpp_Runner.cppStandard": "", + "C_Cpp_Runner.msvcBatchPath": "", + "C_Cpp_Runner.useMsvc": false, + "C_Cpp_Runner.warnings": [ + "-Wall", + "-Wextra", + "-Wpedantic", + "-Wshadow", + "-Wformat=2", + "-Wcast-align", + "-Wconversion", + "-Wsign-conversion", + "-Wnull-dereference" + ], + "C_Cpp_Runner.msvcWarnings": [ + "/W4", + "/permissive-", + "/w14242", + "/w14287", + "/w14296", + "/w14311", + "/w14826", + "/w44062", + "/w44242", + "/w14905", + "/w14906", + "/w14263", + "/w44265", + "/w14928" + ], + "C_Cpp_Runner.enableWarnings": true, + "C_Cpp_Runner.warningsAsError": false, + "C_Cpp_Runner.compilerArgs": [], + "C_Cpp_Runner.linkerArgs": [], + "C_Cpp_Runner.includePaths": [], + "C_Cpp_Runner.includeSearch": [ + "*", + "**/*" + ], + "C_Cpp_Runner.excludeSearch": [ + "**/build", + "**/build/**", + "**/.*", + "**/.*/**", + "**/.vscode", + "**/.vscode/**" + ], + "C_Cpp_Runner.useAddressSanitizer": false, + "C_Cpp_Runner.useUndefinedSanitizer": false, + "C_Cpp_Runner.useLeakSanitizer": false, + "C_Cpp_Runner.showCompilationTime": false, + "C_Cpp_Runner.useLinkTimeOptimization": false, + "C_Cpp_Runner.msvcSecureNoWarnings": false } \ No newline at end of file diff --git a/build/demo/Makefile b/build/demo/Makefile index 75419d0..a8853c8 100755 --- a/build/demo/Makefile +++ b/build/demo/Makefile @@ -24,20 +24,13 @@ include_dir=-I/usr/local/Ascend/ascend-toolkit/6.3.RC1/aarch64-linux/include \ -I $(JSON_ROOT)/include \ -I $(FFMPEG_ROOT)/include \ -lib_dir=-L/usr/local/Ascend/ascend-toolkit/6.3.RC1/runtime/lib64 \ - -L/usr/local/Ascend/ascend-toolkit/latest/lib64 \ - -L/usr/local/Ascend/ascend-toolkit/latest/runtime/lib64 \ - -L/usr/local/Ascend/ascend-toolkit/latest/acllib/lib64 \ - -L/usr/local/Ascend/ascend-toolkit/6.3.RC1/runtime/lib64/stub \ - -lib=-lacl_dvpp -lascendcl -lacl_dvpp_mpi -lruntime -lascendalog -lc_sec -lmsprofiler -lgert -lmmpa -lascend_hal -lexe_graph -lge_executor -lgraph -lprofapi -lascend_protobuf -lerror_manager -lhybrid_executor -lregister -ldavinci_executor -lge_common -lge_common_base \ - -lplatform -lgraph_base -lqos_manager LIBS= -L $(DEPEND_DIR) -lvpt_det_vdec -lsycheck -lface_det_vdec -lhs_tri_process -lhs_truck_process -lhs_motor_process -lphone_motor_det -lhcp_vdec -lmotor_rainshed_vdec -ltraffic_light_vdec -lvehicle_pose_vdec -lroad_seg_vdec -lroad_3clsseg_vdec -latlaslic -lvpt_ascend\ -L $(OPENCV_ROOT)/lib -lopencv_world\ -L $(JSON_ROOT)/lib -ljsoncpp \ - -L $(FFMPEG_ROOT)/lib -lavformat -lavcodec -lswscale -lavutil -lavfilter -lswresample -lavdevice \ + -L $(FFMPEG_ROOT)/lib -lavformat -lavcodec -lswscale -lavutil -lavfilter -lswresample -lavdevice -lx264\ -L $(RABBITMQ_CLIENT_ROOT)/lib/aarch64-linux-gnu -lrabbitmq \ + -L/usr/local/Ascend/ascend-toolkit/6.3.RC1/runtime/lib64 -lacl_dvpp -lascendcl \ CXXFLAGS= -g -O0 -fPIC $(include_dir) $(lib_dir) $(lib) $(LIBS) $(DEFS) -lpthread -lrt -lz -fexceptions -std=c++11 -D_GLIBCXX_USE_CXX11_ABI=0 -fvisibility=hidden -Wall -Wno-deprecated -Wdeprecated-declarations -Wl,-Bsymbolic -ldl diff --git a/build/src/Makefile b/build/src/Makefile index 70e1080..8482adb 100755 --- a/build/src/Makefile +++ b/build/src/Makefile @@ -15,9 +15,10 @@ JSON_ROOT = $(THIRDPARTY_ROOT)/jsoncpp-1.9.5/release FFMPEG_ROOT = $(THIRDPARTY_ROOT)/ffmpeg-4.4.4/release RABBITMQ_CLIENT_ROOT = $(THIRDPARTY_ROOT)/rabbitmq-c-0.11.0/release AUTHORITY_DIR = $(THIRDPARTY_ROOT)/atlas_lic-aarch64-20220112/atlas_lic +BOOST_ROOT = $(THIRDPARTY_ROOT)/boost_1_81_0/release +WEBSOCKETPP_ROOT = $(THIRDPARTY_ROOT)/websocketpp-0.8.2/release/include \ JRTP_ROOT = $(THIRDPARTY_ROOT)/gb28181_3rd/jrtp_export -SIP_SDK = $(THIRDPARTY_ROOT)/gb28181_3rd/release DEFS = -DENABLE_DVPP_INTERFACE -DWITH_FACE_DET_SS -DPOST_USE_RABBITMQ -DUSE_VILLAGE # DEFS = -DENABLE_DVPP_INTERFACE -DUSE_VILLAGE @@ -31,22 +32,22 @@ include_dir=-I/usr/local/Ascend/ascend-toolkit/6.3.RC1/aarch64-linux/include \ -I $(RABBITMQ_CLIENT_ROOT)/include \ -I $(AUTHORITY_DIR)/include \ -I $(JRTP_ROOT)/jrtplib/include/jrtplib3 \ - -I $(SIP_SDK)/include \ -I $(SRC_ROOT)/decoder/gb28181/rtp \ - -I $(SRC_ROOT)/decoder/gb28181/sip \ -I $(SRC_ROOT)/decoder/gb28181 \ + -I $(WEBSOCKETPP_ROOT) \ + -I $(BOOST_ROOT)/include \ LIBS= -L $(SPDLOG_ROOT)/lib -l:libspdlog.a \ -L $(DEPEND_DIR) -lvpt_det_vdec -lsycheck -lface_det_vdec -lhs_tri_process -lhs_truck_process -lphone_motor_det -lhcp_vdec -lmotor_rainshed_vdec -ltraffic_light_vdec -lvehicle_pose_vdec -lroad_seg_vdec -lroad_3clsseg_vdec -lhs_motor_process\ -L $(OPENCV_ROOT)/lib -lopencv_world\ - -L $(JSON_ROOT)/lib -ljsoncpp \ + -L $(JSON_ROOT)/lib -l:libjsoncpp.a \ -L $(FFMPEG_ROOT)/lib -lavformat -lavcodec -lswscale -lavutil -lavfilter -lswresample -lavdevice -lx264\ - -L $(RABBITMQ_CLIENT_ROOT)/lib/aarch64-linux-gnu -lrabbitmq \ + -L $(RABBITMQ_CLIENT_ROOT)/lib/aarch64-linux-gnu -l:librabbitmq.a \ -L $(AUTHORITY_DIR)/lib -latlaslic \ -L $(JRTP_ROOT)/jrtplib/lib -l:libjrtp.a \ - -L $(SIP_SDK)/lib -l:libeXosip2.a -l:libosipparser2.a -l:libosip2.a -lcares\ -L/usr/local/Ascend/ascend-toolkit/6.3.RC1/runtime/lib64 -lacl_dvpp -lascendcl \ + -L $(BOOST_ROOT)/lib -lboost_system \ @@ -64,10 +65,9 @@ SRCS:=$(wildcard $(SRC_ROOT)/ai_platform/*.cpp) \ $(wildcard $(SRC_ROOT)/reprocessing_module/rbmq/*.cpp) \ $(wildcard $(SRC_ROOT)/decoder/gb28181/*.cpp) \ $(wildcard $(SRC_ROOT)/decoder/gb28181/rtp/*.cpp) \ - $(wildcard $(SRC_ROOT)/decoder/gb28181/sip/*.cpp) \ - $(wildcard $(SRC_ROOT)/decoder/gb28181/sip/Message/*.cpp) \ - $(wildcard $(SRC_ROOT)/decoder/gb28181/sip/tinyxml2/*.cpp) \ - $(wildcard $(SRC_ROOT)/decoder/gb28181/sip/Utils/*.cpp) \ + $(wildcard $(SRC_ROOT)/decoder/gb28181/Message/*.cpp) \ + $(wildcard $(SRC_ROOT)/decoder/gb28181/tinyxml2/*.cpp) \ + $(wildcard $(SRC_ROOT)/decoder/gb28181/websocket/*.cpp) \ OBJS = $(patsubst %.cpp, %.o, $(notdir $(SRCS))) @@ -107,16 +107,13 @@ $(TARGET):$(OBJS) %.o:$(SRC_ROOT)/decoder/gb28181/rtp/%.cpp $(XX) $(CXXFLAGS) -c $< -%.o:$(SRC_ROOT)/decoder/gb28181/sip/%.cpp +%.o:$(SRC_ROOT)/decoder/gb28181/websocket/%.cpp $(XX) $(CXXFLAGS) -c $< -%.o:$(SRC_ROOT)/decoder/gb28181/sip/Message/%.cpp +%.o:$(SRC_ROOT)/decoder/gb28181/Message/%.cpp $(XX) $(CXXFLAGS) -c $< -%.o:$(SRC_ROOT)/decoder/gb28181/sip/tinyxml2/%.cpp - $(XX) $(CXXFLAGS) -c $< - -%.o:$(SRC_ROOT)/decoder/gb28181/sip/Utils/%.cpp +%.o:$(SRC_ROOT)/decoder/gb28181/tinyxml2/%.cpp $(XX) $(CXXFLAGS) -c $< diff --git a/readme.md b/readme.md index fc2b010..7e74641 100755 --- a/readme.md +++ b/readme.md @@ -1,23 +1,5 @@ -人车物检测_x86_310p_v0.0.1.20230316_without_timelimit - -支持系统： - arm -文件清单： - vpt.h: 接口文件 - libvpt_det.so: 依赖库文件 - models/vpt0715_310p.om: 模型文件 - test/: 测试文件 - test.cpp: 调用示例 - 0_38863.jpg，datacasia_20160821_003198.jpg：测试数据 - list.txt: 测试图片列表 - Atlas人车物检测SDK说明_v0.0.0.pdf: SDK说明文档 - -更新内容: - -2023.03.16 编译ascend310p arm版本 - -注意事项说明: - - 当前版本跟踪前三帧无结果输出 - +# 注意 + 由于子库和opencv原因，三方库都要添加 _GLIBCXX_USE_CXX11_ABI=0 编译 ### ffmpeg编译 ~~~