From 97743cecc433d3389e315a6dd2eb2fa791d17211 Mon Sep 17 00:00:00 2001 From: cmhu <2657262686@qq.com> Date: Tue, 7 Nov 2023 16:55:25 +0800 Subject: [PATCH] 恢复授权代码 --- vehicle_structure_platform.git0708-3080-trt-face/src/VPT/MutliSourceVideoProcess.cpp | 6 +++--- vehicle_structure_platform.git0708-3080-trt-face/src/VPT/MutliSourceVideoProcess.h | 26 ++++++++++++-------------- 2 files changed, 15 insertions(+), 17 deletions(-) diff --git a/vehicle_structure_platform.git0708-3080-trt-face/src/VPT/MutliSourceVideoProcess.cpp b/vehicle_structure_platform.git0708-3080-trt-face/src/VPT/MutliSourceVideoProcess.cpp index d11c2dd..4ffc82d 100644 --- a/vehicle_structure_platform.git0708-3080-trt-face/src/VPT/MutliSourceVideoProcess.cpp +++ b/vehicle_structure_platform.git0708-3080-trt-face/src/VPT/MutliSourceVideoProcess.cpp @@ -16,7 +16,7 @@ #include "CropImg.h" -// #define AUTHORIZATION +#define AUTHORIZATION //#define DQ_AUTHORIZATION @@ -133,8 +133,8 @@ int CMutliSourceVideoProcess::InitAlgorthim(mvpt_param vptParam, VIDEO_OBJECT_IN if (SUCCESS == ret) #endif #else - // ret = license_check(vptParam.auth_license, productSN);// sy_time_check(2022, 2); - ret = strcmp(AUTH_LICENSE, vptParam.auth_license); + ret = license_check(vptParam.auth_license, productSN);// sy_time_check(2022, 2); + // ret = strcmp(AUTH_LICENSE, vptParam.auth_license); if (ret == SUCCESS) #endif { diff --git a/vehicle_structure_platform.git0708-3080-trt-face/src/VPT/MutliSourceVideoProcess.h b/vehicle_structure_platform.git0708-3080-trt-face/src/VPT/MutliSourceVideoProcess.h index cc27dcc..72d2d40 100644 --- a/vehicle_structure_platform.git0708-3080-trt-face/src/VPT/MutliSourceVideoProcess.h +++ b/vehicle_structure_platform.git0708-3080-trt-face/src/VPT/MutliSourceVideoProcess.h @@ -131,19 +131,7 @@ public: void algorthim_process(); -private: - std::thread ProcessThread; - std::mutex _tx_add_task; - - deque TaskOperatorQ; - int capacity; - - double gpu_total_memory; - std::thread thrd; - void* authority_handle; - -public: /*��������Ӧ����public�� �������̺߳����л��õ����µ����� ÿ����дһ��get����̫������*/ - void * VPT_Handle; +public: int section_batch_size; int licence_status; int thrd_status; @@ -175,11 +163,21 @@ public: /*��������Ӧ����public�� ������ sy_command m_face_det_config; //�Ƿ���������� snapshot_helper m_snaphot_helper; -private: bool m_bExit{false}; + +private: bool m_bProcessExit{false}; VPTProcess m_vptProcess; + + std::thread ProcessThread; + std::mutex _tx_add_task; + + deque TaskOperatorQ; + int capacity; + + double gpu_total_memory; + std::thread thrd; }; #endif -- libgit2 0.21.4