diff --git a/src/Makefile b/src/Makefile index 4cfa157..07444cf 100755 --- a/src/Makefile +++ b/src/Makefile @@ -1,7 +1,7 @@ XX = g++ -PROJECT_ROOT= /opt/shzhao/vpt_ascend +PROJECT_ROOT= /opt/cmhu/vpt_ascend_arm DEPEND_DIR = $(PROJECT_ROOT)/bin SRC_ROOT = $(PROJECT_ROOT)/src diff --git a/src/ai_platform/MultiSourceProcess.cpp b/src/ai_platform/MultiSourceProcess.cpp index 6bc85be..15b664e 100755 --- a/src/ai_platform/MultiSourceProcess.cpp +++ b/src/ai_platform/MultiSourceProcess.cpp @@ -365,16 +365,14 @@ bool CMultiSourceProcess::AddTask(task_param _cur_task_param){ dec->setSnapTimeInterval(frame_stride * 1000); } } - } - - // 测试代码 - // auto task_other_params = m_task_param_manager->get_task_other_params(); - - // const algor_basic_config_param_t *cur_param = - // ((algor_init_config_param_t *)(task_other_params[task_id][algorithm_type_t::FACE_SNAPSHOT]))->basic_param; - - // LOG_INFO("face_snapshot, result_folder: {} result_folder_little: {}", cur_param->result_folder, cur_param->result_folder_little); + // 测试代码 + // auto algor_face = algor_map->find(algorithm_type_t::FACE_SNAPSHOT); + // if(algor_face != algor_map->end()){ + // const algor_basic_config_param_t *cur_param = ((algor_init_config_param_t *)(algor_face->second))->basic_param; + // LOG_INFO("face_snapshot, result_folder: {} result_folder_little: {}", cur_param->result_folder, cur_param->result_folder_little); + // } + } LOG_INFO("started task {} successed!", config.name); @@ -492,11 +490,9 @@ int CMultiSourceProcess::snapshot_task(std::string& uri_or_name, const std::stri delete devMem; devMem = nullptr; - LOG_INFO("snap successed!"); return SUCCESS; } - LOG_ERROR("failed! \n"); return FAILED; } @@ -532,7 +528,7 @@ int CMultiSourceProcess::SnapShot(task_param _cur_task_param) { #endif LOG_INFO("SnapShot task: {} success", task_id); } else { - LOG_INFO("SnapShot task: {} failed !", task_id); + LOG_ERROR("SnapShot task: {} failed !", task_id); } return bSnapShot; @@ -1672,7 +1668,7 @@ void CMultiSourceProcess::face_locus_finished(const OBJ_KEY obj_key) { #ifdef POST_USE_RABBITMQ json_str = helpers::gen_json::gen_face_detection_json( obj_key.video_id, obj_key.obj_id, fpath_snapShotLittle, fpath_src, - obj_value.position, obj_value.confidence, obj_value.landmark_point, 25); + obj_value.position, obj_value.confidence, obj_value.landmark_point, 25); #endif ImgSaveInfo roi_save_info; @@ -1711,4 +1707,4 @@ int CMultiSourceProcess::recode_thread() { } LOG_INFO("recode_thread end."); -} \ No newline at end of file +} diff --git a/src/demo/Makefile b/src/demo/Makefile index 6bd1c9d..0b4f2f9 100755 --- a/src/demo/Makefile +++ b/src/demo/Makefile @@ -1,7 +1,7 @@ XX = g++ -PROJECT_ROOT= /opt/shzhao/vpt_ascend +PROJECT_ROOT= /opt/cmhu/vpt_ascend_arm DEPEND_DIR = $(PROJECT_ROOT)/bin SRC_ROOT = $(PROJECT_ROOT)/src diff --git a/src/reprocessing_module/save_snapshot_reprocessing.cpp b/src/reprocessing_module/save_snapshot_reprocessing.cpp index e4b69e3..8320145 100755 --- a/src/reprocessing_module/save_snapshot_reprocessing.cpp +++ b/src/reprocessing_module/save_snapshot_reprocessing.cpp @@ -103,7 +103,7 @@ void save_snapshot_reprocessing::save_img_process() { if (callback_ != nullptr && cur_image.json_str.length() > 0) { // LOG_INFO("mq publish process begin"); callback_(cur_image.json_str.c_str()); - // LOG_INFO("mq publish process end: {} ", cur_image.json_str); + LOG_INFO("mq publish process end: {} ", cur_image.json_str); } #endif