diff --git a/build/decoder/Makefile b/build/decoder/Makefile index b1add86..eeadf2c 100644 --- a/build/decoder/Makefile +++ b/build/decoder/Makefile @@ -6,7 +6,7 @@ PROJECT_ROOT= /home/cmhu/vpt_ascend_arm DEPEND_DIR = $(PROJECT_ROOT)/bin SRC_ROOT = $(PROJECT_ROOT)/src -TARGET= $(PROJECT_ROOT)/bin/test_28181 +TARGET= $(PROJECT_ROOT)/bin/test_dec THIRDPARTY_ROOT = $(PROJECT_ROOT)/3rdparty SPDLOG_ROOT = $(THIRDPARTY_ROOT)/spdlog-1.9.2/release @@ -14,44 +14,25 @@ OPENCV_ROOT = $(THIRDPARTY_ROOT)/opencv_4_1 JSON_ROOT = $(THIRDPARTY_ROOT)/jsoncpp-1.9.5/release FFMPEG_ROOT = $(THIRDPARTY_ROOT)/ffmpeg-4.4.4/release -GB28181_SDK = /home/cmhu/vpt_ascend_arm/3rdparty/gb28181_3rd -JRTP_ROOT = $(GB28181_SDK)/jrtp_export -SIP_SDK = $(GB28181_SDK)/release +DEFS = -DENABLE_DVPP_INTERFACE -DEFS = -DENABLE_DVPP_INTERFACE -DUSE_DVPP - -include_dir=-I/usr/local/Ascend/ascend-toolkit/6.3.RC1/aarch64-linux/include \ +include_dir=-I/usr/local/Ascend/ascend-toolkit/latest/include \ -I $(SPDLOG_ROOT)/include \ -I $(SRC_ROOT)/common \ -I $(OPENCV_ROOT)/include \ -I $(JSON_ROOT)/include \ -I $(FFMPEG_ROOT)/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 \ -lib_dir=-L/usr/local/Ascend/ascend-toolkit/6.3.RC1/runtime/lib64 \ - -lib=-lacl_dvpp -lascendcl -LIBS= -L $(FFMPEG_ROOT)/lib -lavformat -lavcodec -lswscale -lavutil -lavfilter -lswresample -lavdevice \ - -L $(JRTP_ROOT)/jrtplib/lib -l:libjrtp.a \ - -L $(SIP_SDK)/lib -l:libeXosip2.a -l:libosipparser2.a -l:libosip2.a -lcares\ +LIBS= -L $(FFMPEG_ROOT)/lib -l:libavformat.a -l:libavcodec.a -l:libswscale.a -l:libavutil.a -l:libavfilter.a -l:libswresample.a -l:libavdevice.a -l:libx264.a\ + -L/usr/local/Ascend/ascend-toolkit/latest/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 +CXXFLAGS= -g -O0 -fPIC $(include_dir) $(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 SRCS:=$(wildcard $(SRC_ROOT)/decoder/interface/*.cpp) \ - $(wildcard $(SRC_ROOT)/decoder/dvpp/*.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/dvpp/*.cpp) \ $(wildcard $(SRC_ROOT)/decoder/*.cpp) \ OBJS = $(patsubst %.cpp, %.o, $(notdir $(SRCS))) @@ -65,24 +46,6 @@ $(TARGET):$(OBJS) %.o:$(SRC_ROOT)/decoder/dvpp/%.cpp $(XX) $(CXXFLAGS) -c $< -%.o:$(SRC_ROOT)/decoder/gb28181/%.cpp - $(XX) $(CXXFLAGS) -c $< - -%.o:$(SRC_ROOT)/decoder/gb28181/rtp/%.cpp - $(XX) $(CXXFLAGS) -c $< - -%.o:$(SRC_ROOT)/decoder/gb28181/sip/%.cpp - $(XX) $(CXXFLAGS) -c $< - -%.o:$(SRC_ROOT)/decoder/gb28181/sip/Message/%.cpp - $(XX) $(CXXFLAGS) -c $< - -%.o:$(SRC_ROOT)/decoder/gb28181/sip/tinyxml2/%.cpp - $(XX) $(CXXFLAGS) -c $< - -%.o:$(SRC_ROOT)/decoder/gb28181/sip/Utils/%.cpp - $(XX) $(CXXFLAGS) -c $< - %.o:$(SRC_ROOT)/decoder/interface/%.cpp $(XX) $(CXXFLAGS) -c $< diff --git a/build/decoder/Makefile.dvpp b/build/decoder/Makefile.28181 index 563ae93..b1add86 100644 --- a/build/decoder/Makefile.dvpp +++ b/build/decoder/Makefile.28181 @@ -6,7 +6,7 @@ PROJECT_ROOT= /home/cmhu/vpt_ascend_arm DEPEND_DIR = $(PROJECT_ROOT)/bin SRC_ROOT = $(PROJECT_ROOT)/src -TARGET= $(PROJECT_ROOT)/bin/test_dec +TARGET= $(PROJECT_ROOT)/bin/test_28181 THIRDPARTY_ROOT = $(PROJECT_ROOT)/3rdparty SPDLOG_ROOT = $(THIRDPARTY_ROOT)/spdlog-1.9.2/release @@ -14,7 +14,11 @@ OPENCV_ROOT = $(THIRDPARTY_ROOT)/opencv_4_1 JSON_ROOT = $(THIRDPARTY_ROOT)/jsoncpp-1.9.5/release FFMPEG_ROOT = $(THIRDPARTY_ROOT)/ffmpeg-4.4.4/release -DEFS = -DENABLE_DVPP_INTERFACE +GB28181_SDK = /home/cmhu/vpt_ascend_arm/3rdparty/gb28181_3rd +JRTP_ROOT = $(GB28181_SDK)/jrtp_export +SIP_SDK = $(GB28181_SDK)/release + +DEFS = -DENABLE_DVPP_INTERFACE -DUSE_DVPP include_dir=-I/usr/local/Ascend/ascend-toolkit/6.3.RC1/aarch64-linux/include \ -I $(SPDLOG_ROOT)/include \ @@ -22,24 +26,32 @@ include_dir=-I/usr/local/Ascend/ascend-toolkit/6.3.RC1/aarch64-linux/include \ -I $(OPENCV_ROOT)/include \ -I $(JSON_ROOT)/include \ -I $(FFMPEG_ROOT)/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 \ 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 -lregister -lge_common \ - -lplatform -lqos_manager +lib=-lacl_dvpp -lascendcl LIBS= -L $(FFMPEG_ROOT)/lib -lavformat -lavcodec -lswscale -lavutil -lavfilter -lswresample -lavdevice \ + -L $(JRTP_ROOT)/jrtplib/lib -l:libjrtp.a \ + -L $(SIP_SDK)/lib -l:libeXosip2.a -l:libosipparser2.a -l:libosip2.a -lcares\ 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 SRCS:=$(wildcard $(SRC_ROOT)/decoder/interface/*.cpp) \ - $(wildcard $(SRC_ROOT)/decoder/dvpp/*.cpp) \ + $(wildcard $(SRC_ROOT)/decoder/dvpp/*.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/*.cpp) \ OBJS = $(patsubst %.cpp, %.o, $(notdir $(SRCS))) @@ -53,6 +65,24 @@ $(TARGET):$(OBJS) %.o:$(SRC_ROOT)/decoder/dvpp/%.cpp $(XX) $(CXXFLAGS) -c $< +%.o:$(SRC_ROOT)/decoder/gb28181/%.cpp + $(XX) $(CXXFLAGS) -c $< + +%.o:$(SRC_ROOT)/decoder/gb28181/rtp/%.cpp + $(XX) $(CXXFLAGS) -c $< + +%.o:$(SRC_ROOT)/decoder/gb28181/sip/%.cpp + $(XX) $(CXXFLAGS) -c $< + +%.o:$(SRC_ROOT)/decoder/gb28181/sip/Message/%.cpp + $(XX) $(CXXFLAGS) -c $< + +%.o:$(SRC_ROOT)/decoder/gb28181/sip/tinyxml2/%.cpp + $(XX) $(CXXFLAGS) -c $< + +%.o:$(SRC_ROOT)/decoder/gb28181/sip/Utils/%.cpp + $(XX) $(CXXFLAGS) -c $< + %.o:$(SRC_ROOT)/decoder/interface/%.cpp $(XX) $(CXXFLAGS) -c $< diff --git a/build/demo/Makefile b/build/demo/Makefile index 9d2ccca..8f6f89c 100755 --- a/build/demo/Makefile +++ b/build/demo/Makefile @@ -17,7 +17,7 @@ RABBITMQ_CLIENT_ROOT = $(THIRDPARTY_ROOT)/rabbitmq-c-0.11.0/release DEFS = -DENABLE_DVPP_INTERFACE -include_dir=-I/usr/local/Ascend/ascend-toolkit/latest/aarch64-linux/include \ +include_dir=-I/usr/local/Ascend/ascend-toolkit/latest/include \ -I $(SPDLOG_ROOT)/include \ -I $(SRC_ROOT)/common \ -I $(OPENCV_ROOT)/include \ diff --git a/build/src/Makefile b/build/src/Makefile index b58a20b..2adf337 100755 --- a/build/src/Makefile +++ b/build/src/Makefile @@ -18,8 +18,7 @@ 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 \ -DEFS = -DENABLE_DVPP_INTERFACE -DWITH_FACE_DET_SS -DPOST_USE_RABBITMQ -# -DUSE_VILLAGE +DEFS = -DENABLE_DVPP_INTERFACE -DWITH_FACE_DET_SS -DPOST_USE_RABBITMQ -DUSE_VILLAGE # DEFS = -DENABLE_DVPP_INTERFACE -DUSE_VILLAGE include_dir=-I/usr/local/Ascend/ascend-toolkit/latest/include \ @@ -40,11 +39,12 @@ 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 -l:libjsoncpp.a \ - -L $(FFMPEG_ROOT)/lib -l:libavformat.a -l:libavcodec.a -l:libswscale.a -l:libavutil.a -l:libavfilter.a -l:libswresample.a -l:libavdevice.a -l:libx264.a\ -L $(RABBITMQ_CLIENT_ROOT)/lib/aarch64-linux-gnu -l:librabbitmq.a \ -L $(AUTHORITY_DIR)/lib -latlaslic \ -L/usr/local/Ascend/ascend-toolkit/latest/runtime/lib64 -lacl_dvpp -lascendcl \ -L $(BOOST_ROOT)/lib -lboost_system \ + -L $(FFMPEG_ROOT)/lib -l:libavformat.a -l:libavcodec.a -l:libswscale.a -l:libavutil.a -l:libavfilter.a -l:libswresample.a -l:libavdevice.a -l:libx264.a\ + # -L $(FFMPEG_ROOT)/lib -lavformat -lavcodec -lswscale -lavutil -lavfilter -lswresample -lavdevice -lx264\