处理合并冲突

Zhao Shuaihua
2 parents b309bd27 1b57a1c5
Showing 108 changed files with 104 additions and 26 deletions
.vscode/launch.json
3rdparty/spdlog-1.9.2/release/include/spdlog/async.h
3rdparty/spdlog-1.9.2/release/include/spdlog/async_logger-inl.h
3rdparty/spdlog-1.9.2/release/include/spdlog/async_logger.h
3rdparty/spdlog-1.9.2/release/include/spdlog/cfg/argv.h
3rdparty/spdlog-1.9.2/release/include/spdlog/cfg/env.h
3rdparty/spdlog-1.9.2/release/include/spdlog/cfg/helpers-inl.h
3rdparty/spdlog-1.9.2/release/include/spdlog/cfg/helpers.h
3rdparty/spdlog-1.9.2/release/include/spdlog/common-inl.h
3rdparty/spdlog-1.9.2/release/include/spdlog/common.h
3rdparty/spdlog-1.9.2/release/include/spdlog/details/backtracer-inl.h
3rdparty/spdlog-1.9.2/release/include/spdlog/details/backtracer.h
3rdparty/spdlog-1.9.2/release/include/spdlog/details/circular_q.h
3rdparty/spdlog-1.9.2/release/include/spdlog/details/console_globals.h
3rdparty/spdlog-1.9.2/release/include/spdlog/details/file_helper-inl.h
3rdparty/spdlog-1.9.2/release/include/spdlog/details/file_helper.h
3rdparty/spdlog-1.9.2/release/include/spdlog/details/fmt_helper.h
3rdparty/spdlog-1.9.2/release/include/spdlog/details/log_msg-inl.h
3rdparty/spdlog-1.9.2/release/include/spdlog/details/log_msg.h
3rdparty/spdlog-1.9.2/release/include/spdlog/details/log_msg_buffer-inl.h
@@ -23,10 +23,10 @@
             }
             ]
         },{
-            "name": "test",
+            "name": "test_face",
             "type": "cppdbg",
             "request": "launch",
-            "program": "${workspaceFolder}/bin/test",
+            "program": "${workspaceFolder}/bin/test_face",
             "args": ["/opt/cmhu/data/Street.uvf","0", "0", "0"],
             "stopAtEntry": false,
             "cwd": "${workspaceFolder}/bin",
-prefix=/opt/cmhu/vpt_ascend/3rdparty/spdlog-1.9.2/release
+prefix=/opt/cmhu/vpt_ascend_arm/3rdparty/spdlog-1.9.2/release
 exec_prefix=${prefix}
 includedir=${prefix}/include
 libdir=${exec_prefix}/lib
 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
@@ -241,7 +241,6 @@ int CMultiSourceProcess::InitAlgorthim(tsl_aiplatform_param vptParam){
     }
     , this);
  
-
   m_timing_snapshot_thread = new std::thread(
         [](void* arg)
         {
@@ -1853,4 +1852,4 @@ bool CMultiSourceProcess::CheckTime() {
     {
         return false;
     }
-}
 \ No newline at end of file
+}
@@ -91,4 +91,4 @@ $(TARGET):$(OBJS)
 	$(XX) $(CXXFLAGS) -c $<
  
 clean:
-	rm -f *.o $(TARGET)
 \ No newline at end of file
+	rm -f *.o $(TARGET)
 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
@@ -15,7 +15,7 @@ JSON_ROOT = $(THIRDPARTY_ROOT)/jsoncpp-1.9.5/release
 FFMPEG_ROOT = $(THIRDPARTY_ROOT)/ffmpeg-4.4.4/release
 RABBITMQ_CLIENT_ROOT = $(THIRDPARTY_ROOT)/rabbitmq-c-0.11.0/release
  
-DEFS = -DENABLE_DVPP_INTERFACE -DPOST_USE_RABBITMQ
+DEFS = -DENABLE_DVPP_INTERFACE -DPOST_USE_RABBITMQ -DUSE_VILLAGE
  
 include_dir=-I/usr/local/Ascend/ascend-toolkit/6.3.RC1/aarch64-linux/include \
 			-I $(SPDLOG_ROOT)/include \
@@ -635,7 +635,9 @@ static long long get_cur_time(){
     return tpMicro.time_since_epoch().count();
 }
  
-string createTask(void *handle, std::vector<algorithm_type_t> algor_vec, int gi){
+static int nTaskId = 0;
+
+string createTask(void *handle, std::vector<algorithm_type_t> algor_vec, int gi, bool bFlag = true){
   task_param tparam;
  
   switch(gi){
@@ -643,17 +645,18 @@ string createTask(void *handle, std::vector&lt;algorithm_type_t&gt; algor_vec, int gi)
       tparam.ipc_url = "rtsp://admin:ad123456@192.168.60.165:554/cam/realmonitor?channel=1&subtype=0";
       break;
     case 1:
-      tparam.ipc_url = "/opt/share/data/bayue.mp4";
+      tparam.ipc_url = "rtsp://122.97.218.170:8604/openUrl/V5nXRHa?params=eyJwcm90b2NhbCI6InJ0c3AiLCJjbGllbnRUeXBlIjoib3Blbl9hcGkiLCJleHByaWVUaW1lIjotMSwicHJvdG9jb2wiOiJydHNwIiwiZXhwaXJlVGltZSI6MzAwLCJlbmFibGVNR0MiOnRydWUsImV4cGFuZCI6InN0YW5kYXJkPXJ0c3Amc3RyZWFtZm9ybT1ydHAiLCJhIjoiMTBjZjM4N2JjY2Y5NDg3YzhjNWYzNjE2M2ViMWUyNTJ8MXwwfDEiLCJ0IjoxfQ==";
       break;
     case 2:
-      tparam.ipc_url = "/opt/share/data/Street.uvf";
+      tparam.ipc_url = "rtsp://admin:ad123456@192.168.10.166:554/cam/realmonitor?channel=1&subtype=0";
       break;
     case 3:
       tparam.ipc_url = "rtsp://122.97.218.170:8604/openUrl/LBBYTra?params=eyJwcm90b2NhbCI6InJ0c3AiLCJjbGllbnRUeXBlIjoib3Blbl9hcGkiLCJleHByaWVUaW1lIjotMSwicHJvdG9jb2wiOiJydHNwIiwiZXhwaXJlVGltZSI6MzAwLCJlbmFibGVNR0MiOnRydWUsImV4cGFuZCI6InN0YW5kYXJkPXJ0c3Amc3RyZWFtZm9ybT1ydHAiLCJhIjoiOTgzYjRjMmUxMThlNGU1OTlkYThmMTI3NTkyMGViODV8MXwwfDEiLCJ0IjoxfQ==";
       // tparam.ipc_url = "rtsp://122.97.218.170:8604/openUrl/V5nXRHa?params=eyJwcm90b2NhbCI6InJ0c3AiLCJjbGllbnRUeXBlIjoib3Blbl9hcGkiLCJleHByaWVUaW1lIjotMSwicHJvdG9jb2wiOiJydHNwIiwiZXhwaXJlVGltZSI6MzAwLCJlbmFibGVNR0MiOnRydWUsImV4cGFuZCI6InN0YW5kYXJkPXJ0c3Amc3RyZWFtZm9ybT1ydHAiLCJhIjoiMTBjZjM4N2JjY2Y5NDg3YzhjNWYzNjE2M2ViMWUyNTJ8MXwwfDEiLCJ0IjoxfQ==";
+      //tparam.ipc_url = "/opt/share/data/bayue.mp4";
       break;
     case 4:
-      tparam.ipc_url = "rtsp://admin:ad123456@192.168.60.165:554/cam/realmonitor?channel=1&subtype=0";
+      tparam.ipc_url = "/opt/share/data/Street.uvf";
       break;
     case 5:
       tparam.ipc_url = "/opt/share/data/公安局老桥头_CVR15F89410_1465819864_1B.mp4";
@@ -661,6 +664,46 @@ string createTask(void *handle, std::vector&lt;algorithm_type_t&gt; algor_vec, int gi)
     case 6:
       tparam.ipc_url = "/opt/share/data/不带头盔2.mp4";
       break;
+    case 7:
+      tparam.ipc_url = "/opt/share/data/caishenkezhan.mp4";
+      break;
+    case 8:
+      tparam.ipc_url = "/opt/share/data/1-00000001d9.mp4";
+      break;
+    case 9:
+      tparam.ipc_url = "/opt/share/data/1-00000002d55_h265.mp4";
+      break;
+    case 10:
+      tparam.ipc_url = "/opt/share/data/1-00000002d55.mp4";
+      break;
+    case 11:
+      tparam.ipc_url = "/opt/share/data/1.mp4";
+      break;
+    case 12:
+      tparam.ipc_url = "/opt/share/data/20041609451310232511_20211128090026~1.mp4";
+      break;
+    case 13:
+      tparam.ipc_url = "/opt/share/data/720.avi";
+      break;
+    case 14:
+      tparam.ipc_url = "/opt/share/data/callphone.mp4";
+      break;
+    case 15:
+      tparam.ipc_url = "/opt/share/data/crk2.mp4";
+      break;
+    case 16:
+      tparam.ipc_url = "/opt/share/data/crk3.mp4";
+      break;
+    case 17:
+      tparam.ipc_url = "/opt/share/data/diedao.mp4";
+      break;
+    case 18:
+      tparam.ipc_url = "rtsp://122.97.218.170:8604/openUrl/LBBYTra?params=eyJwcm90b2NhbCI6InJ0c3AiLCJjbGllbnRUeXBlIjoib3Blbl9hcGkiLCJleHByaWVUaW1lIjotMSwicHJvdG9jb2wiOiJydHNwIiwiZXhwaXJlVGltZSI6MzAwLCJlbmFibGVNR0MiOnRydWUsImV4cGFuZCI6InN0YW5kYXJkPXJ0c3Amc3RyZWFtZm9ybT1ydHAiLCJhIjoiOTgzYjRjMmUxMThlNGU1OTlkYThmMTI3NTkyMGViODV8MXwwfDEiLCJ0IjoxfQ==";
+      break;
+    case 19:
+      // 公安内网
+      tparam.ipc_url = "http://192.168.51.200:8554/320202202308231001001002";
+      break;
     default:
       tparam.ipc_url = "/opt/share/data/Street.uvf";
       break;
@@ -669,9 +712,15 @@ string createTask(void *handle, std::vector&lt;algorithm_type_t&gt; algor_vec, int gi)
   tparam.algor_counts = algor_vec.size();
   tparam.dec_type = 2;
  
-  std::string task_id_str = "test_task_id_" + std::to_string(gi);
+  if (bFlag){
+    nTaskId = gi;
+  }
+
+  std::string task_id_str = "test_task_id_" + std::to_string(nTaskId);
   tparam.task_id = task_id_str.c_str();
  
+  nTaskId++;
+
   tparam.algor_config_params = new algor_config_param[tparam.algor_counts];
  
   for (size_t idx = 0; idx < algor_vec.size(); ++idx)
@@ -732,24 +781,54 @@ void test_gpu(int gpuID){
 #endif // #ifdef POST_USE_RABBITMQ
  
     std::vector<algorithm_type_t> algor_vec = {algorithm_type_t::FACE_SNAPSHOT, algorithm_type_t::HUMAN_SNAPSHOT,algorithm_type_t::ROAD_WORK_DET, algorithm_type_t::PEDESTRIAN_RETROGRADE, algorithm_type_t::VEHICLE_RETROGRADE,
-                                            algorithm_type_t::PEDESTRIAN_TRESPASS, algorithm_type_t::VEHICLE_TRESPASS, algorithm_type_t::VEHICLE_SNAPSHOT, algorithm_type_t::NONMOTOR_VEHICLE_SNAPSHOT, algorithm_type_t::VIDEO_TIMING_SNAPSHOT, algorithm_type_t::VIDEO_SNAPSHOT};
+                                            algorithm_type_t::PEDESTRIAN_TRESPASS, algorithm_type_t::VEHICLE_TRESPASS, algorithm_type_t::VEHICLE_SNAPSHOT, algorithm_type_t::NONMOTOR_VEHICLE_SNAPSHOT, algorithm_type_t::VIDEO_TIMING_SNAPSHOT
+                                            , algorithm_type_t::VIDEO_SNAPSHOT, algorithm_type_t::NONMOTOR_VEHICLE_NOHELMET, algorithm_type_t::NONMOTOR_VEHICLE_OVERMAN, algorithm_type_t::TRICYCLE_MANNED, algorithm_type_t::TRUCK_MANNED};
  
  
     std::vector<algorithm_type_t> algor_vec2 = {algorithm_type_t::NONMOTOR_VEHICLE_NOHELMET, algorithm_type_t::NONMOTOR_VEHICLE_OVERMAN, algorithm_type_t::TRICYCLE_MANNED, algorithm_type_t::TRUCK_MANNED};
+    // std::vector<algorithm_type_t> algor_vec2 = {algorithm_type_t::TRICYCLE_MANNED, algorithm_type_t::TRUCK_MANNED};
     std::vector<algorithm_type_t> algor_vec3 = {algorithm_type_t::FACE_SNAPSHOT};
  
+/*
   int repeat_num = 1000;
   while(repeat_num--)  {
     printf("============================:%d\n",repeat_num);
     string task_id = createTask(handle, algor_vec, 3 + gpuID * 10);  
     string task_id1 = createTask(handle, algor_vec2, 5);  
     string task_id2 = createTask(handle, algor_vec2, 6);   
+*/
+    
+    // string task_id = createTask(handle, algor_vec, 3 + gpuID * 10);  
+    // string task_id1 = createTask(handle, algor_vec2, 5);  
+    createTask(handle, algor_vec, 18, false); 
+    createTask(handle, algor_vec, 18, false); 
+    createTask(handle, algor_vec, 18, false); 
+    createTask(handle, algor_vec, 18, false); 
+    createTask(handle, algor_vec, 18, false); 
+    // createTask(handle, algor_vec, 3);  
+    // createTask(handle, algor_vec, 4);  
+    // createTask(handle, algor_vec, 5);  
+    // createTask(handle, algor_vec, 6);  
+    // createTask(handle, algor_vec, 7);  
+    // createTask(handle, algor_vec, 8);  
+    // createTask(handle, algor_vec, 9);  
+    // createTask(handle, algor_vec, 10);  
+    // createTask(handle, algor_vec, 11);  
+    // createTask(handle, algor_vec, 12);
+    // createTask(handle, algor_vec, 13);
+    // createTask(handle, algor_vec, 14);
+    // createTask(handle, algor_vec, 15);
+    // createTask(handle, algor_vec, 16);
+    // createTask(handle, algor_vec, 17);
+    // createTask(handle, algor_vec, 18);
+    // createTask(handle, algor_vec, 19);
+/*
  
     // test_snapshot(handle);
     sleep(60); //60s
     finish_task(handle, (char*)task_id2.data(), 0);
     finish_task(handle, (char*)task_id1.data(), 0);
-  }
+  }*/
     while (getchar() != 'q');
  
     // finish_task(handle, (char*)task_id.data(), 0);
@@ -762,16 +841,16 @@ void test_gpu(int gpuID){
 int main(int argc, char *argv[]) {
     printf("new test\n");
  
-    if (argc < 4) {
-    fprintf(stderr, "./xxx 0 2 10 1 ## [start_ai_id, end_ai_id) repeat_num gpu_id\n");
-    return -1;
-    }
+    // if (argc < 4) {
+    //   fprintf(stderr, "./xxx 0 2 10 1 ## [start_ai_id, end_ai_id) repeat_num gpu_id\n");
+    //   return -1;
+    // }
  
-    //! load params.
-    int start_id = atoi(argv[1]);
-    int end_id = atoi(argv[2]);
-    int repeat_num = atoi(argv[3]);
-    int gpuID = atoi(argv[4]);
+    // //! load params.
+    // int start_id = atoi(argv[1]);
+    // int end_id = atoi(argv[2]);
+    // int repeat_num = atoi(argv[3]);
+    // int gpuID = atoi(argv[4]);
  
     test_gpu(0);
     // test_gpu(1);
@@ -783,4 +862,4 @@ int main(int argc, char *argv[]) {
     printf("Done.\n"); 
  
     return 0;
-}
 \ No newline at end of file
+}