diff --git a/src/Makefile b/src/Makefile index 7764b39..6bd85a9 100755 --- a/src/Makefile +++ b/src/Makefile @@ -1,7 +1,7 @@ XX = g++ -PROJECT_ROOT= /opt/cmhu/vpt_ascend_arm +PROJECT_ROOT= /data/shzhao/vpt_ascend DEPEND_DIR = $(PROJECT_ROOT)/bin SRC_ROOT = $(PROJECT_ROOT)/src diff --git a/src/demo/Makefile b/src/demo/Makefile index 3d88ac7..469e528 100755 --- a/src/demo/Makefile +++ b/src/demo/Makefile @@ -1,7 +1,7 @@ XX = g++ -PROJECT_ROOT= /opt/cmhu/vpt_ascend_arm +PROJECT_ROOT= /data/shzhao/vpt_ascend DEPEND_DIR = $(PROJECT_ROOT)/bin SRC_ROOT = $(PROJECT_ROOT)/src @@ -57,4 +57,4 @@ $(TARGET):$(OBJS) $(XX) $(CXXFLAGS) -c $< clean: - rm -f *.o $(TARGET) \ No newline at end of file + rm -f *.o $(TARGET) diff --git a/src/demo/demo.cpp b/src/demo/demo.cpp index bf1a6ce..194d59b 100755 --- a/src/demo/demo.cpp +++ b/src/demo/demo.cpp @@ -12,11 +12,11 @@ using namespace std; void init_mq_conn(void *handle) { for (auto key : {mq_type_t::ALARM_MQ, mq_type_t::GET_TASK_MQ, mq_type_t::HEART_BEAT_MQ, mq_type_t::SCREENSHORT_TASK_MQ, mq_type_t::TIMING_SCREENSHORT_TASK_MQ}) { rabbitmq_conn_params_t mq_conn_params; - mq_conn_params.port = 5673; + mq_conn_params.port = 5672; - strcpy(mq_conn_params.ip, "192.168.10.8"); - strcpy(mq_conn_params.uname, "guest"); - strcpy(mq_conn_params.passwd, "guest"); + strcpy(mq_conn_params.ip, "192.168.60.126"); + strcpy(mq_conn_params.uname, "admin"); + strcpy(mq_conn_params.passwd, "123456"); strcpy(mq_conn_params.vhost, "/"); strcpy(mq_conn_params.exchange, "topExchange"); strcpy(mq_conn_params.exchange_type, "topic"); @@ -658,10 +658,10 @@ string createTask(void *handle, std::vector algor_vec, int gi, tparam.ipc_url = "/opt/share/data/Street.uvf"; break; case 5: - tparam.ipc_url = "/opt/share/data/公安局老桥头_CVR15F89410_1465819864_1B.mp4"; + tparam.ipc_url = "/data/share/data/公安局老桥头_CVR15F89410_1465819864_1B.mp4"; break; case 6: - tparam.ipc_url = "/opt/share/data/不带头盔2.mp4"; + tparam.ipc_url = "/data/share/data/不带头盔2.mp4"; break; case 7: tparam.ipc_url = "/opt/share/data/caishenkezhan.mp4"; @@ -808,13 +808,13 @@ void test_gpu(int gpuID){ // createTask(handle, algor_vec, 20, false); // createTask(handle, algor_vec, 20, false); // createTask(handle, algor_vec, 20, false); - createTask(handle, algor_vec, 0); - createTask(handle, algor_vec, 1); - createTask(handle, algor_vec, 2); - createTask(handle, algor_vec, 3); + // createTask(handle, algor_vec, 0); + // createTask(handle, algor_vec, 1); + // createTask(handle, algor_vec, 2); + // createTask(handle, algor_vec, 3); // createTask(handle, algor_vec, 4); - // createTask(handle, algor_vec, 5); - // createTask(handle, algor_vec, 6); + createTask(handle, algor_vec2, 5); + createTask(handle, algor_vec2, 6); // createTask(handle, algor_vec, 7); // createTask(handle, algor_vec, 8); // createTask(handle, algor_vec, 9);