Hu Chunming / vpt_ascend_arm

Commit 7d83f99ec593e141124f9c452102bbe6a3c4aace

Authored by Hu Chunming
1 parent c20924e8

打开权限时间

Inline Side-by-side
Showing 2 changed files with 65 additions and 30 deletions
src/ai_platform/MultiSourceProcess.cpp
  View file @7d83f99
@@ -84,17 +84,17 @@ CMultiSourceProcess::~CMultiSourceProcess(){ @@ -84,17 +84,17 @@ CMultiSourceProcess::~CMultiSourceProcess(){
84 } 84 }
85 85
86 int CMultiSourceProcess::InitAlgorthim(tsl_aiplatform_param vptParam){ 86 int CMultiSourceProcess::InitAlgorthim(tsl_aiplatform_param vptParam){
87 -// #ifdef USE_VILLAGE  
88 -// if (!CheckTime()) { //时间限制  
89 -// std::cout << "sy_licence_check failed." << std::endl;  
90 -// return AUTHOR_ERROR;  
91 -// }  
92 -// #else  
93 -// if (!CheckLabel(vptParam.gpuid)) { //机器授权  
94 -// std::cout << "sy_licence_check failed." << std::endl;  
95 -// return AUTHOR_ERROR;  
96 -// }  
97 -// #endif 87 +#ifdef USE_VILLAGE
  88 + if (!CheckTime()) { //时间限制
  89 + std::cout << "sy_licence_check failed." << std::endl;
  90 + return AUTHOR_ERROR;
  91 + }
  92 +#else
  93 + if (!CheckLabel(vptParam.gpuid)) { //机器授权
  94 + std::cout << "sy_licence_check failed." << std::endl;
  95 + return AUTHOR_ERROR;
  96 + }
  97 +#endif
98 set_default_logger(LogLevel(vptParam.log_level), "multi_source_process", vptParam.log_path, vptParam.log_mem, vptParam.log_mem); 98 set_default_logger(LogLevel(vptParam.log_level), "multi_source_process", vptParam.log_path, vptParam.log_mem, vptParam.log_mem);
99 LOG_INFO("编译时间：{} {}", __DATE__, __TIME__); 99 LOG_INFO("编译时间：{} {}", __DATE__, __TIME__);
100 100
@@ -762,21 +762,21 @@ int CMultiSourceProcess::algorthim_process_thread(){ @@ -762,21 +762,21 @@ int CMultiSourceProcess::algorthim_process_thread(){
762 ACL_CALL(aclrtCreateContext(&ctx, m_devId), ACL_SUCCESS, 1); 762 ACL_CALL(aclrtCreateContext(&ctx, m_devId), ACL_SUCCESS, 1);
763 763
764 while (true){ 764 while (true){
765 -// #ifdef USE_VILLAGE  
766 -// if (!CheckTime()) { //时间限制  
767 -// LOG_FATAL("authority failed!");  
768 -// break;  
769 -// }  
770 -// #else  
771 -// if (check_label == -1) { //机器授权  
772 -// LOG_FATAL("authority failed!");  
773 -// break;  
774 -// }  
775 -// if (!UpdateLabel()) {  
776 -// LOG_FATAL("authority failed!");  
777 -// break;  
778 -// }  
779 -// #endif 765 +#ifdef USE_VILLAGE
  766 + if (!CheckTime()) { //时间限制
  767 + LOG_FATAL("authority failed!");
  768 + break;
  769 + }
  770 +#else
  771 + if (check_label == -1) { //机器授权
  772 + LOG_FATAL("authority failed!");
  773 + break;
  774 + }
  775 + if (!UpdateLabel()) {
  776 + LOG_FATAL("authority failed!");
  777 + break;
  778 + }
  779 +#endif
780 if(m_bfinish){ 780 if(m_bfinish){
781 break; 781 break;
782 } 782 }
@@ -2227,7 +2227,7 @@ bool CMultiSourceProcess::CheckTime() { @@ -2227,7 +2227,7 @@ bool CMultiSourceProcess::CheckTime() {
2227 nYear = info->tm_year + 1900; 2227 nYear = info->tm_year + 1900;
2228 nMonth = info->tm_mon + 1; 2228 nMonth = info->tm_mon + 1;
2229 nDay = info->tm_mday; 2229 nDay = info->tm_mday;
2230 - if ((nYear == 2023 && nMonth <= 12) || (nYear == 2024 && nMonth <= 2)) 2230 + if ((nYear == 2023 && nMonth <= 12) || (nYear == 2024 && nMonth <= 12))
2231 { 2231 {
2232 return true; 2232 return true;
2233 } 2233 }
src/demo/demo.cpp
  View file @7d83f99
@@ -914,7 +914,7 @@ string createTask(void *handle, std::vector&lt;algorithm_type_t&gt; algor_vec, int gi, @@ -914,7 +914,7 @@ string createTask(void *handle, std::vector&lt;algorithm_type_t&gt; algor_vec, int gi,
914 914
915 switch(gi){ 915 switch(gi){
916 case 0: 916 case 0:
917 - tparam.ipc_url = "rtsp://admin:ad123456@192.168.60.165:554/cam/realmonitor?channel=1&subtype=0"; 917 + tparam.ipc_url = "rtsp://admin:admin@123456@192.168.60.176:554/cam/realmonitor?channel=1&subtype=0";
918 break; 918 break;
919 case 1: 919 case 1:
920 tparam.ipc_url = "rtsp://122.97.218.170:8604/openUrl/V5nXRHa?params=eyJwcm90b2NhbCI6InJ0c3AiLCJjbGllbnRUeXBlIjoib3Blbl9hcGkiLCJleHByaWVUaW1lIjotMSwicHJvdG9jb2wiOiJydHNwIiwiZXhwaXJlVGltZSI6MzAwLCJlbmFibGVNR0MiOnRydWUsImV4cGFuZCI6InN0YW5kYXJkPXJ0c3Amc3RyZWFtZm9ybT1ydHAiLCJhIjoiMTBjZjM4N2JjY2Y5NDg3YzhjNWYzNjE2M2ViMWUyNTJ8MXwwfDEiLCJ0IjoxfQ=="; 920 tparam.ipc_url = "rtsp://122.97.218.170:8604/openUrl/V5nXRHa?params=eyJwcm90b2NhbCI6InJ0c3AiLCJjbGllbnRUeXBlIjoib3Blbl9hcGkiLCJleHByaWVUaW1lIjotMSwicHJvdG9jb2wiOiJydHNwIiwiZXhwaXJlVGltZSI6MzAwLCJlbmFibGVNR0MiOnRydWUsImV4cGFuZCI6InN0YW5kYXJkPXJ0c3Amc3RyZWFtZm9ybT1ydHAiLCJhIjoiMTBjZjM4N2JjY2Y5NDg3YzhjNWYzNjE2M2ViMWUyNTJ8MXwwfDEiLCJ0IjoxfQ==";
@@ -1147,8 +1147,43 @@ void test_gpu(int gpuID){ @@ -1147,8 +1147,43 @@ void test_gpu(int gpuID){
1147 1147
1148 // } 1148 // }
1149 1149
1150 - createTask(handle, algor_vec2, 8, false);  
1151 - createTask(handle, algor_vec2, 27, false); 1150 +
  1151 + char ch = 'a';
  1152 + while (ch != 'q') {
  1153 + ch = getchar();
  1154 + switch (ch)
  1155 + {
  1156 + case 'a':
  1157 + createTask(handle, algor_vec2, 4, false);
  1158 + createTask(handle, algor_vec2, 5, false);
  1159 + createTask(handle, algor_vec2, 6, false);
  1160 + createTask(handle, algor_vec2, 7, false);
  1161 + createTask(handle, algor_vec2, 8, false);
  1162 + createTask(handle, algor_vec2, 9, false);
  1163 + createTask(handle, algor_vec2, 10, false);
  1164 + // createTask(handle, algor_vec2, 11, false);
  1165 + // createTask(handle, algor_vec2, 12, false);
  1166 + // createTask(handle, algor_vec2, 13, false);
  1167 + // createTask(handle, algor_vec2, 14, false);
  1168 + // createTask(handle, algor_vec2, 15, false);
  1169 + // createTask(handle, algor_vec2, 16, false);
  1170 + // createTask(handle, algor_vec2, 17, false);
  1171 + // createTask(handle, algor_vec2, 18, false);
  1172 + break;
  1173 + case '0':
  1174 + createTask(handle, algor_vec, 0, false);
  1175 + break;
  1176 + case '2':
  1177 + createTask(handle, algor_vec, 2, false);
  1178 + break;
  1179 + case 'c':
  1180 + close_all_task(handle);
  1181 + break;
  1182 + default:
  1183 + break;
  1184 + }
  1185 +
  1186 + }
1152 1187
1153 while (getchar() != 'q'); 1188 while (getchar() != 'q');
1154 1189