Commit 97743cecc433d3389e315a6dd2eb2fa791d17211
1 parent
e9f933b5
恢复授权代码
Showing
2 changed files
with
15 additions
and
17 deletions
vehicle_structure_platform.git0708-3080-trt-face/src/VPT/MutliSourceVideoProcess.cpp
| @@ -16,7 +16,7 @@ | @@ -16,7 +16,7 @@ | ||
| 16 | #include "CropImg.h" | 16 | #include "CropImg.h" |
| 17 | 17 | ||
| 18 | 18 | ||
| 19 | -// #define AUTHORIZATION | 19 | +#define AUTHORIZATION |
| 20 | //#define DQ_AUTHORIZATION | 20 | //#define DQ_AUTHORIZATION |
| 21 | 21 | ||
| 22 | 22 | ||
| @@ -133,8 +133,8 @@ int CMutliSourceVideoProcess::InitAlgorthim(mvpt_param vptParam, VIDEO_OBJECT_IN | @@ -133,8 +133,8 @@ int CMutliSourceVideoProcess::InitAlgorthim(mvpt_param vptParam, VIDEO_OBJECT_IN | ||
| 133 | if (SUCCESS == ret) | 133 | if (SUCCESS == ret) |
| 134 | #endif | 134 | #endif |
| 135 | #else | 135 | #else |
| 136 | - // ret = license_check(vptParam.auth_license, productSN);// sy_time_check(2022, 2); | ||
| 137 | - ret = strcmp(AUTH_LICENSE, vptParam.auth_license); | 136 | + ret = license_check(vptParam.auth_license, productSN);// sy_time_check(2022, 2); |
| 137 | + // ret = strcmp(AUTH_LICENSE, vptParam.auth_license); | ||
| 138 | if (ret == SUCCESS) | 138 | if (ret == SUCCESS) |
| 139 | #endif | 139 | #endif |
| 140 | { | 140 | { |
vehicle_structure_platform.git0708-3080-trt-face/src/VPT/MutliSourceVideoProcess.h
| @@ -131,19 +131,7 @@ public: | @@ -131,19 +131,7 @@ public: | ||
| 131 | 131 | ||
| 132 | void algorthim_process(); | 132 | void algorthim_process(); |
| 133 | 133 | ||
| 134 | -private: | ||
| 135 | - std::thread ProcessThread; | ||
| 136 | - std::mutex _tx_add_task; | ||
| 137 | - | ||
| 138 | - deque<Operator> TaskOperatorQ; | ||
| 139 | - int capacity; | ||
| 140 | - | ||
| 141 | - double gpu_total_memory; | ||
| 142 | - std::thread thrd; | ||
| 143 | - void* authority_handle; | ||
| 144 | - | ||
| 145 | -public: /*��������Ӧ����public�� �������̺߳����л��õ����µ����� ÿ����дһ��get����̫������*/ | ||
| 146 | - void * VPT_Handle; | 134 | +public: |
| 147 | int section_batch_size; | 135 | int section_batch_size; |
| 148 | int licence_status; | 136 | int licence_status; |
| 149 | int thrd_status; | 137 | int thrd_status; |
| @@ -175,11 +163,21 @@ public: /*��������Ӧ����public�� ������ï | @@ -175,11 +163,21 @@ public: /*��������Ӧ����public�� ������ï | ||
| 175 | sy_command m_face_det_config; //�Ƿ���������� | 163 | sy_command m_face_det_config; //�Ƿ���������� |
| 176 | snapshot_helper m_snaphot_helper; | 164 | snapshot_helper m_snaphot_helper; |
| 177 | 165 | ||
| 178 | -private: | ||
| 179 | bool m_bExit{false}; | 166 | bool m_bExit{false}; |
| 167 | + | ||
| 168 | +private: | ||
| 180 | bool m_bProcessExit{false}; | 169 | bool m_bProcessExit{false}; |
| 181 | 170 | ||
| 182 | VPTProcess m_vptProcess; | 171 | VPTProcess m_vptProcess; |
| 172 | + | ||
| 173 | + std::thread ProcessThread; | ||
| 174 | + std::mutex _tx_add_task; | ||
| 175 | + | ||
| 176 | + deque<Operator> TaskOperatorQ; | ||
| 177 | + int capacity; | ||
| 178 | + | ||
| 179 | + double gpu_total_memory; | ||
| 180 | + std::thread thrd; | ||
| 183 | }; | 181 | }; |
| 184 | 182 | ||
| 185 | #endif | 183 | #endif |