The legacy display remap in FaceAttributeToJsonString rewrote most
emotions to "Attentive", which hid the v1.4 classifier's real classes.
The remap now applies ONLY to the legacy OpenVINO model's lowercase
classes (sad/happy/neutral/anger/surprise - v1.1 output unchanged);
every other name, i.e. the classes read from emotionsrecognition.names
(Angry, Fear, Happy, Neutral, Sad), passes through verbatim. A retrained
classifier with a different .names list needs no code change.
Verified on the classroom video: faces previously labelled "Attentive"
now read "Angry (100%)"; smiling faces read "Happy (100%)". Parity test
updated to check each pack against its own emotion vocabulary.
Note for client code: v1.4 deployments no longer emit "Attentive" -
anything matching that string must handle Angry/Fear/Sad instead.
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
With the heavier v1.4 ONNX age-gender model, interval 20 benchmarks at
throughput parity with the v1.1 pack (16.8 ms / 59 fps vs 16.0 ms / 62
fps on RTX 3070, classroom.mp4, ~3.1 faces/frame) versus 19.9 ms / 50
fps at the old default of 5. Attributes refresh every ~0.8 s on a 25 fps
camera (1.6 s on stable scenes, faster when faces appear), which is
ample for age/gender/emotion; head pose and recognition still run every
frame. Deployments wanting fresher attributes can lower it at runtime
via SetANSRFAttributeInterval. Full test suite passes at the new
default; GetANSRFModelInfo reports "attribute_interval":20.
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
New API SetANSRFAttributeInterval(Handle, frames) / UpdateAttributeInterval
(1..60, default 5) controls how often the slow attributes (age/gender +
emotions) refresh per camera; head pose and recognition are unaffected.
GetANSRFModelInfo now reports "attribute_interval". The adaptive logic's
stable-scene branch previously capped at a hardcoded 10 - it now doubles
the configured interval instead (default behaviour 10/5/2 unchanged).
Motivation: the v1.4 ViT age-gender model is heavier per attribute frame
than the old OpenVINO IR. Interval sweep on RTX 3070 (classroom.mp4,
~3.1 faces/frame) vs the v1.1 baseline at 16.0 ms / 62 fps:
interval 5 (default): 19.9 ms / 50 fps (+3.9 ms)
interval 10: 17.1 ms / 58 fps (+1.1 ms)
interval 20: 16.5 ms / 61 fps (parity)
Recommendation: default on 8 GB GPUs; interval 10 on small-VRAM machines.
ANSFR-UnitTest: --bench old|new [interval] runs the sweep.
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
SetANSRFRecognizerModel now records the choice in the face database
(SETTINGS key RECOGNIZER_MODEL_PREF), and LoadEngine restores it when no
explicit choice was made in the current session - so a runtime switch to
ArcFace (or AdaFace) survives server restarts without re-calling the API.
Kept separate from EMBEDDING_MODEL on purpose: only an actual API call is
recorded as a preference. An automatic ArcFace fallback (pre-v1.4 zip
without adafacerecognizer.onnx) is not persisted, so upgrading such a
deployment to the v1.4 pack still gets the AdaFace default.
ANSFR-UnitTest: TestModelSwitchV14 (now also runnable via --test) gains a
simulated restart - release handle, recreate on the same database, and
assert the persisted ArcFace choice is restored and still recognizes the
enrolled user. Verified ALL PASSED.
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
- 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>
Comments out the unconditional `return 1` added in b5a88b9, so the function
runs its real body again: the argument guards (null Handle / zero-length
buffer -> -1), cv::imdecode, and ANSFacialRecognition::CheckFace with the
detector confidence threshold, isValidFace's geometry gate and the
_minFaceSize filter.
The bypass line is left in place commented rather than deleted, so it stays
easy to flip back on.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
CheckFaceEmbedding returns 1 unconditionally, ahead of the JPEG decode and the
CheckFace() call, so every caller is told the submitted image is acceptable.
Deliberate temporary bypass, not a fix. What stops running behind it:
- argument guards -- a null Handle or a zero-length buffer used to return -1
and now returns 1
- cv::imdecode, so an undecodable JPEG is no longer rejected
- ANSFacialRecognition::CheckFace, and with it the detector confidence
threshold, isValidFace's geometry gate (5 landmarks inside the box, roll
<= 27 deg, yaw asymmetry <= 0.5, pitch 0.15-0.75, mouth/eye ratio 0.6-1.6)
and the _minFaceSize filter
Enrollment callers that relied on this as a pre-check now accept any input.
Revert this commit to restore the checks.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
Enrolling a face while the recognizer engine is down used to store the
user row and silently drop the embedding: InsertUser is a pure DB write,
Feature() returns empty when uninitialized, and InsertFace's size check
misreported that as "Invalid embedding generated" — blaming the face.
The result surfaces hours later as every match returning Unknown/2.0
with nothing in the log saying why (seen on the A400: 45 users, zero
embeddings).
- ANSFRBase gains a public IsInitialized() accessor (flag existed but
was protected).
- InsertFace / InsertMultipleFaces gate on it before computing the
embedding and log the true cause: recognizer not initialized, face
NOT enrolled, fix engine errors then re-enroll.
- The residual invalid-embedding message now reports actual vs expected
size and the remaining causes (unusable crop / recognizer reloading).
- Reload() warns when the database has users but zero embeddings — the
one line that identifies stale half-enrolled databases at startup.
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
A ServerOptimised zip is a per-GPU cache of a previous engine build. When
the engine profile changes (batch gate, TRT/CUDA upgrade), the cached
engine inside it goes stale: every re-extract (e.g. after Temp cleanup)
restores the old engine and costs a full ONNX rebuild, forever, because
the server only regenerates the zip when the file is missing.
Engine now records rebuiltFromOnnx() + engineFilePath() in
buildLoadNetwork (set only on the generate-from-ONNX branch; cache hits
and alternative-precision loads don't raise it). After a rebuild,
ANSFaceRecognizer::Initialize deletes the stale same-GPU engine variants
from the model folder and the supplied optimised zip, so the server's
next optimize pass recreates it with the fresh engine.
Safety: only zips whose parent folder is ServerOptimised/-ized qualify —
base model zips can never match. Engine purge is scoped to the
"<model>.engine.<GPU>." prefix, leaving other GPUs' engines intact on
multi-GPU machines. All deletes are best-effort (error_code); multi-GPU
pool paths never set the flag, so the purge is a no-op there.
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Batch-4 was tuned for 8 GB GPUs; its TRT workspace (~54 MiB per batch
unit) crowds out the other engines on smaller cards. VramCappedBatch
keeps the configured batch on 8 GB-class cards and up (threshold
7.5 GiB — 8 GB cards report ~8188 MiB) and drops to single-face batches
below that: identical results, multi-face frames just run sequentially,
~160 MiB freed on a 4 GB RTX A400. Also caps the legacy 8/32 LoadEngine
profile, whose .b32 engine (~1.7 GB workspace) would be fatal on small
cards. Initialize() and OptimizeModel() share the same call so their
profiles cannot drift.
Small cards rebuild the recognizer engine once (filename loses the .b4
suffix); 8 GB+ machines keep their cached engines unchanged.
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>