diff --git a/build/decoder/Makefile b/build/decoder/Makefile index 7b62361..b1add86 100644 --- a/build/decoder/Makefile +++ b/build/decoder/Makefile @@ -33,13 +33,8 @@ include_dir=-I/usr/local/Ascend/ascend-toolkit/6.3.RC1/aarch64-linux/include \ -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 \ diff --git a/build/src/Makefile b/build/src/Makefile index 5dbe538..ef37b5a 100755 --- a/build/src/Makefile +++ b/build/src/Makefile @@ -16,6 +16,9 @@ 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 +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 @@ -27,15 +30,15 @@ include_dir=-I/usr/local/Ascend/ascend-toolkit/6.3.RC1/aarch64-linux/include \ -I $(FFMPEG_ROOT)/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 \ 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 +lib=-lacl_dvpp -lascendcl 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\ @@ -44,6 +47,11 @@ LIBS= -L $(SPDLOG_ROOT)/lib -l:libspdlog.a \ -L $(FFMPEG_ROOT)/lib -lavformat -lavcodec -lswscale -lavutil -lavfilter -lswresample -lavdevice \ -L $(RABBITMQ_CLIENT_ROOT)/lib/aarch64-linux-gnu -lrabbitmq \ -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 \ + + 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 @@ -57,6 +65,12 @@ SRCS:=$(wildcard $(SRC_ROOT)/ai_platform/*.cpp) \ $(wildcard $(SRC_ROOT)/util/*.cpp) \ $(wildcard $(SRC_ROOT)/reprocessing_module/*.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) \ OBJS = $(patsubst %.cpp, %.o, $(notdir $(SRCS))) @@ -90,6 +104,27 @@ $(TARGET):$(OBJS) %.o:$(SRC_ROOT)/reprocessing_module/rbmq/%.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 $< + + + + clean: rm -f *.o $(TARGET) diff --git a/src/decoder/test_28181.cpp b/src/decoder/test_28181.cpp index 4f37e8d..f275d52 100644 --- a/src/decoder/test_28181.cpp +++ b/src/decoder/test_28181.cpp @@ -142,7 +142,7 @@ int main(){ printf("start... \n"); - ServerInfo info( + ServerInfo info( "SY_Sip_Server", "12345678", "192.168.60.179",