ANSFR: support ANS_FaceRecognizer v1.4 models (AdaFace + ONNX attributes)
- Recognizer: adafacerecognizer.onnx (AdaFace, new default) with automatic fallback to ansfacerecognizer.onnx (ArcFace) for pre-v1.4 zips. AdaFace consumes BGR: new AdaFace handler in ONNXEngine skips the BGR2RGB swap, and the TensorRT paths gate their cvtColor on m_swapRB. - New C API: SetANSRFRecognizerModel (0=AdaFace, 1=ArcFace), GetANSRFRecognizerModel, GetANSRFModelInfo. A live switch reloads the recognizer and regenerates all stored embeddings from the enrolled face crops; the generating model is persisted in a new SETTINGS table (EMBEDDING_MODEL) so upgrading an ArcFace database to the AdaFace default migrates automatically on LoadEngine. - Attributes: prefer agegender.onnx (ViT: gender_logits [male,female] + age_pred in years; also handles the single-tensor research export) and emotionsrecognition.onnx (YOLOv11-cls, classes from .names) behind new IAgeGenderEstimator/IEmotionsClassifier interfaces, falling back to the legacy OpenVINO IRs. EP follows hardware: NVIDIA uses TensorRT EP with disk-cached engines, AMD DirectML, Intel OpenVINO. - Emotion JSON mapping: handle the new Fear class and the never-matched surprise label (both map to Attentive). - ANSFR-UnitTest: TestModelSwitchV14 covers default model selection, ONNX attribute backends, enrollment, and adaface<->arcface switching. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
@@ -654,10 +654,14 @@ namespace ANSCENTER {
|
||||
adjustedEmotionName = "Attentive";
|
||||
else if (emotionName == "Surprised" || emotionName == "surprised")
|
||||
adjustedEmotionName = "Attentive";
|
||||
else if (emotionName == "Surprise" || emotionName == "surprise")
|
||||
adjustedEmotionName = "Attentive";
|
||||
else if (emotionName == "Disgusted" || emotionName == "disgusted")
|
||||
adjustedEmotionName = "Attentive";
|
||||
else if (emotionName == "Fearful" || emotionName == "fearful")
|
||||
adjustedEmotionName = "Attentive";
|
||||
else if (emotionName == "Fear" || emotionName == "fear")
|
||||
adjustedEmotionName = "Attentive";
|
||||
else if (emotionName == "Anger" || emotionName == "anger")
|
||||
adjustedEmotionName = "Attentive";
|
||||
else
|
||||
|
||||
Reference in New Issue
Block a user