ANSCENTER/ANSCORE
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove locks

Browse Source
This commit is contained in:
Tuan Nghia Nguyen
2026-04-24 17:10:29 +10:00
parent 7a11c9617b
commit 3a527d2dad
51 changed files with 38 additions and 1251 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
modules/ANSODEngine/ANSMotionDetector.cpp
View File

@@ -108,7 +108,6 @@ namespace ANSCENTER {
}
}
void ANSMOTIONDETECTOR::setMinObjectArea(const std::string& camera_id, double area)
{
std::lock_guard<std::recursive_mutex> lock(cameras_mutex);
@@ -183,7 +182,6 @@ namespace ANSCENTER {
return 0.0;
}
bool ANSMOTIONDETECTOR::isMovementDetected(const std::string& camera_id) const
{
std::lock_guard<std::recursive_mutex> lock(cameras_mutex);
@@ -303,7 +301,6 @@ namespace ANSCENTER {
return std::vector<std::vector<cv::Point>>();
}
ANSMOTIONDETECTOR::CameraStats ANSMOTIONDETECTOR::getStats(const std::string& camera_id) const
{
std::lock_guard<std::recursive_mutex> lock(cameras_mutex);
@@ -557,7 +554,6 @@ namespace ANSCENTER {
camera.psnr_threshold = base_threshold * camera.sensitivity_multiplier;
}
std::cout << "Base threshold: " << base_threshold
<< ", Sensitivity: " << camera.sensitivity_multiplier
<< ", Final threshold: " << camera.psnr_threshold << std::endl;
@@ -920,7 +916,6 @@ namespace ANSCENTER {
return MovementDetect(camera_id, camera.next_frame_index, next_image);
}
//std::vector<Object> ANSMOTIONDETECTOR::MovementDetect(const std::string& camera_id, const size_t frame_index, const cv::Mat& image)
//{
// std::lock_guard<std::recursive_mutex> lock(cameras_mutex);
@@ -1336,7 +1331,6 @@ namespace ANSCENTER {
// return outputObjects;
// }
// // Store original dimensions for scaling back
// const int original_width = image.cols;
// const int original_height = image.rows;
@@ -1953,15 +1947,6 @@ namespace ANSCENTER {
bool result = ANSODBase::Initialize(licenseKey, modelConfig, modelZipFilePath, modelZipPassword, labelMap);
if (!result) return false;
// Serialize derived init against concurrent extract re-entries on the
// same folder. See ModelFolderLockGuard in ANSEngineCommon.h.
ModelFolderLockGuard _flg(_modelFolder, "ANSMOTIONDETECTOR::Initialize");
if (!_flg.acquired()) {
this->_logger.LogError("ANSMOTIONDETECTOR::Initialize",
"Timed out waiting for model-folder lock: " + _modelFolder,
__FILE__, __LINE__);
return false;
}
_isInitialized = true;
//_modelConfig.detectionScoreThreshold = 0.5;
labelMap = "Movement";
@@ -1977,15 +1962,6 @@ namespace ANSCENTER {
bool ANSMOTIONDETECTOR::LoadModelFromFolder(std::string licenseKey, ModelConfig modelConfig, std::string modelName, std::string className, const std::string& modelFolder, std::string& labelMap) {
bool result = ANSODBase::LoadModelFromFolder(licenseKey, modelConfig, modelName, className, modelFolder, labelMap);
if (!result) return false;
// Serialize derived init against concurrent extract re-entries on the
// same folder. See ModelFolderLockGuard in ANSEngineCommon.h.
ModelFolderLockGuard _flg(_modelFolder, "ANSMOTIONDETECTOR::LoadModel");
if (!_flg.acquired()) {
this->_logger.LogError("ANSMOTIONDETECTOR::LoadModel",
"Timed out waiting for model-folder lock: " + _modelFolder,
__FILE__, __LINE__);
return false;
}
_isInitialized = true;
labelMap = "Movement";
return true;