Add person model into RTMPOSE
This commit is contained in:
@@ -300,6 +300,10 @@ namespace ANSCENTER {
|
||||
|
||||
bool ANSONNXRTMPOSE::Destroy() {
|
||||
try {
|
||||
if (m_personDetector) {
|
||||
m_personDetector->Destroy();
|
||||
m_personDetector.reset();
|
||||
}
|
||||
m_ortEngine.reset();
|
||||
ANS_DBG("ANSONNXRTMPOSE", "Destroy: engine released");
|
||||
return true;
|
||||
@@ -317,6 +321,11 @@ namespace ANSCENTER {
|
||||
// ANSONNXYOLO::OptimizeModel which is also a no-op beyond folder
|
||||
// resolution.
|
||||
optimizedModelFolder = _modelFolder;
|
||||
|
||||
// Also bring up the bundled person-detector if present so its ORT
|
||||
// session is constructed (and any cached engine is materialized)
|
||||
// alongside the pose model. Mirrors the TRT counterpart's behavior.
|
||||
(void)TryLoadPersonDetector(_modelFolder);
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -457,6 +466,10 @@ namespace ANSCENTER {
|
||||
WarmUpEngine();
|
||||
}
|
||||
|
||||
// Top-down pipeline: try to load the bundled person detector.
|
||||
// Falls back gracefully (whole-image pose) when the files are missing.
|
||||
(void)TryLoadPersonDetector(_modelFolder);
|
||||
|
||||
_modelLoadValid = true;
|
||||
_isInitialized = true;
|
||||
return true;
|
||||
@@ -510,6 +523,9 @@ namespace ANSCENTER {
|
||||
_modelConfig.numKPS = m_ortEngine->numKeypoints();
|
||||
WarmUpEngine();
|
||||
}
|
||||
|
||||
(void)TryLoadPersonDetector(_modelFolder);
|
||||
|
||||
_modelLoadValid = true;
|
||||
_isInitialized = true;
|
||||
return true;
|
||||
@@ -577,6 +593,9 @@ namespace ANSCENTER {
|
||||
_modelConfig.numKPS = m_ortEngine->numKeypoints();
|
||||
WarmUpEngine();
|
||||
}
|
||||
|
||||
(void)TryLoadPersonDetector(_modelFolder);
|
||||
|
||||
_modelLoadValid = true;
|
||||
_isInitialized = true;
|
||||
return true;
|
||||
@@ -623,21 +642,32 @@ namespace ANSCENTER {
|
||||
}
|
||||
|
||||
// ------------------------------------------------------------------
|
||||
// DetectObjects — top-down: with no external bbox, treat the whole
|
||||
// input image as the person crop and run RTMPose. Higher-level
|
||||
// orchestration that already has per-person bboxes should call
|
||||
// ANSODBase::RunInference(input, vector<Rect>, cam) — that overload
|
||||
// crops each bbox and routes back here per crop.
|
||||
// DetectObjects — two pipelines:
|
||||
//
|
||||
// (a) Top-down (preferred) — m_personDetector loaded from the
|
||||
// bundled person.onnx + person.names. Detect people first,
|
||||
// then run RTMPose ONCE per person bbox. This is what RTMPose
|
||||
// is designed for; works on multi-person scenes with small /
|
||||
// distant subjects.
|
||||
//
|
||||
// (b) Standalone fallback — no detector files in the model folder.
|
||||
// Treat the whole image as a single person crop. Only sensible
|
||||
// for inputs that are already a person (selfies, single-subject
|
||||
// fitness clips, unit-test crops). Higher-level callers can
|
||||
// also use ANSODBase::RunInference(input, vector<Rect>, cam)
|
||||
// which crops each bbox and routes back here per crop.
|
||||
// ------------------------------------------------------------------
|
||||
std::vector<Object> ANSONNXRTMPOSE::DetectObjects(const cv::Mat& inputImage,
|
||||
const std::string& camera_id)
|
||||
{
|
||||
try {
|
||||
// Snapshot engine handle under brief lock; dereference outside
|
||||
// (mirrors ANSONNXYOLO::DetectObjects so concurrent inference
|
||||
// threads don't serialise on _mutex for the full ORT Run()).
|
||||
// Snapshot engine handle + detector under brief lock; dereference
|
||||
// outside (mirrors ANSONNXYOLO::DetectObjects so concurrent
|
||||
// inference threads don't serialise on _mutex for the full
|
||||
// ORT Run() chain).
|
||||
std::shared_ptr<ONNXRtmPose> engine;
|
||||
std::string firstClass;
|
||||
ANSONNXYOLO* personDetector = nullptr; // raw view; lifetime owned by m_personDetector
|
||||
std::string firstClass;
|
||||
{
|
||||
auto lk = TryLockWithTimeout("ANSONNXRTMPOSE::DetectObjects");
|
||||
if (!lk.owns_lock()) return {};
|
||||
@@ -646,10 +676,39 @@ namespace ANSCENTER {
|
||||
"ORT engine is null", __FILE__, __LINE__);
|
||||
return {};
|
||||
}
|
||||
engine = m_ortEngine; // ref-count++
|
||||
engine = m_ortEngine; // ref-count++
|
||||
personDetector = m_personDetector.get();
|
||||
if (!_classes.empty()) firstClass = _classes.front();
|
||||
}
|
||||
|
||||
// --- Top-down path ---
|
||||
if (personDetector) {
|
||||
std::vector<Object> persons = personDetector->RunInference(inputImage, camera_id);
|
||||
if (persons.empty()) {
|
||||
ANS_DBG("ANSONNXRTMPOSE", "DetectObjects: detector found 0 persons cam='%s'",
|
||||
camera_id.c_str());
|
||||
return {};
|
||||
}
|
||||
|
||||
std::vector<Object> out;
|
||||
out.reserve(persons.size());
|
||||
for (const auto& person : persons) {
|
||||
if (person.box.width <= 0 || person.box.height <= 0) continue;
|
||||
Object pose = engine->estimate(inputImage, person.box);
|
||||
if (pose.kps.empty()) continue;
|
||||
pose.cameraId = camera_id;
|
||||
pose.trackId = person.trackId;
|
||||
pose.confidence = person.confidence;
|
||||
pose.className = !person.className.empty() ? person.className
|
||||
: (firstClass.empty() ? std::string("person") : firstClass);
|
||||
out.push_back(std::move(pose));
|
||||
}
|
||||
ANS_DBG("ANSONNXRTMPOSE", "DetectObjects: %zu persons -> %zu poses cam='%s'",
|
||||
persons.size(), out.size(), camera_id.c_str());
|
||||
return out;
|
||||
}
|
||||
|
||||
// --- Standalone fallback path ---
|
||||
const cv::Rect wholeImage(0, 0, inputImage.cols, inputImage.rows);
|
||||
Object obj = engine->estimate(inputImage, wholeImage);
|
||||
if (obj.kps.empty()) return {};
|
||||
@@ -659,7 +718,7 @@ namespace ANSCENTER {
|
||||
|
||||
std::vector<Object> out;
|
||||
out.push_back(std::move(obj));
|
||||
ANS_DBG("ANSONNXRTMPOSE", "DetectObjects: kps=%d cam='%s'",
|
||||
ANS_DBG("ANSONNXRTMPOSE", "DetectObjects (standalone): kps=%d cam='%s'",
|
||||
engine->numKeypoints(), camera_id.c_str());
|
||||
return out;
|
||||
}
|
||||
@@ -670,4 +729,78 @@ namespace ANSCENTER {
|
||||
}
|
||||
}
|
||||
|
||||
// ====================================================================
|
||||
// TryLoadPersonDetector
|
||||
//
|
||||
// Look for person.onnx + person.names alongside the pose model. If
|
||||
// both exist, instantiate an ANSONNXYOLO front-end and load it via
|
||||
// LoadModelFromFolder (which creates the ORT session). On success
|
||||
// m_personDetector is non-null and DetectObjects switches to the
|
||||
// proper top-down pipeline.
|
||||
//
|
||||
// Missing files are NOT an error — the wrapper is designed to work
|
||||
// standalone for single-person test inputs. We log a debug line so
|
||||
// it's clear which path is active and return false.
|
||||
// ====================================================================
|
||||
bool ANSONNXRTMPOSE::TryLoadPersonDetector(const std::string& modelFolder) {
|
||||
const std::string personOnnx = CreateFilePath(modelFolder, "person.onnx");
|
||||
const std::string personNames = CreateFilePath(modelFolder, "person.names");
|
||||
if (!FileExist(personOnnx) || !FileExist(personNames)) {
|
||||
ANS_DBG("ANSONNXRTMPOSE",
|
||||
"TryLoadPersonDetector: person.onnx/person.names not in '%s' "
|
||||
"-- standalone mode (whole-image pose)", modelFolder.c_str());
|
||||
return false;
|
||||
}
|
||||
if (m_personDetector) {
|
||||
ANS_DBG("ANSONNXRTMPOSE", "TryLoadPersonDetector: already loaded, skipping");
|
||||
return true;
|
||||
}
|
||||
|
||||
try {
|
||||
auto detector = std::make_unique<ANSONNXYOLO>();
|
||||
detector->SetLoadEngineOnCreation(this->_loadEngineOnCreation);
|
||||
|
||||
ModelConfig personCfg{};
|
||||
personCfg.detectionType = DetectionType::DETECTION;
|
||||
personCfg.modelType = ModelType::ONNXYOLO;
|
||||
personCfg.precisionType = PrecisionType::FP32;
|
||||
personCfg.inpHeight = 640;
|
||||
personCfg.inpWidth = 640;
|
||||
personCfg.detectionScoreThreshold = 0.5f;
|
||||
personCfg.modelConfThreshold = 0.5f;
|
||||
personCfg.modelMNSThreshold = 0.45f;
|
||||
personCfg.numKPS = 0;
|
||||
personCfg.gpuOptBatchSize = 1;
|
||||
personCfg.gpuMaxBatchSize = 1;
|
||||
|
||||
std::string personLabelMap;
|
||||
const bool ok = detector->LoadModelFromFolder(
|
||||
/*licenseKey*/ _licenseKey,
|
||||
personCfg,
|
||||
/*modelName*/ "person",
|
||||
/*className*/ "person.names",
|
||||
/*modelFolder*/ modelFolder,
|
||||
personLabelMap);
|
||||
if (!ok) {
|
||||
_logger.LogWarn("ANSONNXRTMPOSE::TryLoadPersonDetector",
|
||||
"Person detector LoadModelFromFolder FAILED -- falling back to whole-image pose",
|
||||
__FILE__, __LINE__);
|
||||
ANS_DBG("ANSONNXRTMPOSE", "TryLoadPersonDetector: detector load FAILED");
|
||||
return false;
|
||||
}
|
||||
|
||||
m_personDetector = std::move(detector);
|
||||
ANS_DBG("ANSONNXRTMPOSE",
|
||||
"TryLoadPersonDetector: detector loaded OK from '%s' (labels='%s')",
|
||||
modelFolder.c_str(), personLabelMap.c_str());
|
||||
return true;
|
||||
}
|
||||
catch (const std::exception& e) {
|
||||
_logger.LogWarn("ANSONNXRTMPOSE::TryLoadPersonDetector", e.what(), __FILE__, __LINE__);
|
||||
ANS_DBG("ANSONNXRTMPOSE", "TryLoadPersonDetector: EXCEPTION '%s'", e.what());
|
||||
m_personDetector.reset();
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
} // namespace ANSCENTER
|
||||
|
||||
Reference in New Issue
Block a user