diff --git a/src/ai_platform/MultiSourceProcess.cpp b/src/ai_platform/MultiSourceProcess.cpp index bc7c94c..b91b176 100755 --- a/src/ai_platform/MultiSourceProcess.cpp +++ b/src/ai_platform/MultiSourceProcess.cpp @@ -84,17 +84,17 @@ CMultiSourceProcess::~CMultiSourceProcess(){ } int CMultiSourceProcess::InitAlgorthim(tsl_aiplatform_param vptParam){ -// #ifdef USE_VILLAGE -// if (!CheckTime()) { //时间限制 -// std::cout << "sy_licence_check failed." << std::endl; -// return AUTHOR_ERROR; -// } -// #else -// if (!CheckLabel(vptParam.gpuid)) { //机器授权 -// std::cout << "sy_licence_check failed." << std::endl; -// return AUTHOR_ERROR; -// } -// #endif +#ifdef USE_VILLAGE + if (!CheckTime()) { //时间限制 + std::cout << "sy_licence_check failed." << std::endl; + return AUTHOR_ERROR; + } +#else + if (!CheckLabel(vptParam.gpuid)) { //机器授权 + std::cout << "sy_licence_check failed." << std::endl; + return AUTHOR_ERROR; + } +#endif set_default_logger(LogLevel(vptParam.log_level), "multi_source_process", vptParam.log_path, vptParam.log_mem, vptParam.log_mem); LOG_INFO("编译时间:{} {}", __DATE__, __TIME__); @@ -762,21 +762,21 @@ int CMultiSourceProcess::algorthim_process_thread(){ ACL_CALL(aclrtCreateContext(&ctx, m_devId), ACL_SUCCESS, 1); while (true){ -// #ifdef USE_VILLAGE -// if (!CheckTime()) { //时间限制 -// LOG_FATAL("authority failed!"); -// break; -// } -// #else -// if (check_label == -1) { //机器授权 -// LOG_FATAL("authority failed!"); -// break; -// } -// if (!UpdateLabel()) { -// LOG_FATAL("authority failed!"); -// break; -// } -// #endif +#ifdef USE_VILLAGE + if (!CheckTime()) { //时间限制 + LOG_FATAL("authority failed!"); + break; + } +#else + if (check_label == -1) { //机器授权 + LOG_FATAL("authority failed!"); + break; + } + if (!UpdateLabel()) { + LOG_FATAL("authority failed!"); + break; + } +#endif if(m_bfinish){ break; } @@ -2227,7 +2227,7 @@ bool CMultiSourceProcess::CheckTime() { nYear = info->tm_year + 1900; nMonth = info->tm_mon + 1; nDay = info->tm_mday; - if ((nYear == 2023 && nMonth <= 12) || (nYear == 2024 && nMonth <= 2)) + if ((nYear == 2023 && nMonth <= 12) || (nYear == 2024 && nMonth <= 12)) { return true; } diff --git a/src/demo/demo.cpp b/src/demo/demo.cpp index 481e446..dbde663 100755 --- a/src/demo/demo.cpp +++ b/src/demo/demo.cpp @@ -914,7 +914,7 @@ string createTask(void *handle, std::vector algor_vec, int gi, switch(gi){ case 0: - tparam.ipc_url = "rtsp://admin:ad123456@192.168.60.165:554/cam/realmonitor?channel=1&subtype=0"; + tparam.ipc_url = "rtsp://admin:admin@123456@192.168.60.176:554/cam/realmonitor?channel=1&subtype=0"; break; case 1: tparam.ipc_url = "rtsp://122.97.218.170:8604/openUrl/V5nXRHa?params=eyJwcm90b2NhbCI6InJ0c3AiLCJjbGllbnRUeXBlIjoib3Blbl9hcGkiLCJleHByaWVUaW1lIjotMSwicHJvdG9jb2wiOiJydHNwIiwiZXhwaXJlVGltZSI6MzAwLCJlbmFibGVNR0MiOnRydWUsImV4cGFuZCI6InN0YW5kYXJkPXJ0c3Amc3RyZWFtZm9ybT1ydHAiLCJhIjoiMTBjZjM4N2JjY2Y5NDg3YzhjNWYzNjE2M2ViMWUyNTJ8MXwwfDEiLCJ0IjoxfQ=="; @@ -1147,8 +1147,43 @@ void test_gpu(int gpuID){ // } - createTask(handle, algor_vec2, 8, false); - createTask(handle, algor_vec2, 27, false); + + char ch = 'a'; + while (ch != 'q') { + ch = getchar(); + switch (ch) + { + case 'a': + createTask(handle, algor_vec2, 4, false); + createTask(handle, algor_vec2, 5, false); + createTask(handle, algor_vec2, 6, false); + createTask(handle, algor_vec2, 7, false); + createTask(handle, algor_vec2, 8, false); + createTask(handle, algor_vec2, 9, false); + createTask(handle, algor_vec2, 10, false); + // createTask(handle, algor_vec2, 11, false); + // createTask(handle, algor_vec2, 12, false); + // createTask(handle, algor_vec2, 13, false); + // createTask(handle, algor_vec2, 14, false); + // createTask(handle, algor_vec2, 15, false); + // createTask(handle, algor_vec2, 16, false); + // createTask(handle, algor_vec2, 17, false); + // createTask(handle, algor_vec2, 18, false); + break; + case '0': + createTask(handle, algor_vec, 0, false); + break; + case '2': + createTask(handle, algor_vec, 2, false); + break; + case 'c': + close_all_task(handle); + break; + default: + break; + } + + } while (getchar() != 'q');