BUg corrected return enroll ID

cnadler86 · cnadler86 · commit bf057bcf2681 · 2025-04-14T20:22:17.000+02:00
diff --git a/examples/CameraSettings.py b/examples/CameraSettings.py
@@ -79,13 +79,16 @@ async def handle_client(reader, writer):
             if BB is not None:
                 for box in BB:
                     color = LookupTable(box['score']*100, BoxSettings['color'])
-                    bounding_boxes.append(
-                        { "x1":box['box'][0],
-                          "y1":box['box'][1],
-                          "x2":box['box'][2],
-                          "y2":box['box'][3],
-                          "label":f"Score: {box['score']*100:.2f}%",
-                          "color":color})
+                    Dict = {"x1":box['box'][0],
+                            "y1":box['box'][1],
+                            "x2":box['box'][2],
+                            "y2":box['box'][3],
+                            "label":f"Score: {box['score']*100:.0f}%",
+                            "color":color}
+                    if Model.__class__.__name__ == "FaceRecognizer":
+                        if box['person'] is not None:   
+                            Dict['label'] = f"{box['person']['name']} ({box['person']['similarity']*100:.0f}%), Score: {box['score']*100:.0f}%"
+                    bounding_boxes.append(Dict)
             response = 'HTTP/1.1 200 OK\r\nContent-Type: application/json\r\n\r\n' + json.dumps(bounding_boxes)
             writer.write(response.encode())
             await writer.drain()
diff --git a/src/lib/dl_recognition_define.hpp b/src/lib/dl_recognition_define.hpp
@@ -1,2 +1,47 @@
 #pragma once
-#include "dl_recognition_types.hpp"
+#include <cstdint>
+#include <cstring>
+
+namespace mp_esp_dl {
+namespace recognition {
+
+#define MAX_NAME_LENGTH 32
+
+struct database_meta {
+    uint16_t num_feats_total;
+    uint16_t num_feats_valid;
+    uint16_t feat_len;
+};
+
+struct database_feat {
+    uint16_t id;
+    float *feat;
+    char name[MAX_NAME_LENGTH];
+
+    database_feat() : id(0), feat(nullptr) {
+        name[0] = '\0';
+    }
+    
+    database_feat(uint16_t _id, float *_feat, const char *_name = "") : id(_id), feat(_feat) {
+        strncpy(name, _name, MAX_NAME_LENGTH - 1);
+        name[MAX_NAME_LENGTH - 1] = '\0';
+    }
+};
+
+struct result_t {
+    uint16_t id;
+    float similarity;
+    char name[MAX_NAME_LENGTH];
+
+    result_t() : id(0), similarity(0.0f) {
+        name[0] = '\0';
+    }
+    
+    result_t(uint16_t _id, float _sim, const char *_name = "") : id(_id), similarity(_sim) {
+        strncpy(name, _name, MAX_NAME_LENGTH - 1);
+        name[MAX_NAME_LENGTH - 1] = '\0';
+    }
+};
+
+} // namespace recognition
+} // namespace mp_esp_dl
diff --git a/src/lib/dl_recognition_types.hpp b/src/lib/dl_recognition_types.hpp
@@ -1,47 +0,0 @@
-#pragma once
-#include <cstdint>
-#include <cstring>
-
-namespace mp_esp_dl {
-namespace recognition {
-
-#define MAX_NAME_LENGTH 32
-
-struct database_meta {
-    uint16_t num_feats_total;
-    uint16_t num_feats_valid;
-    uint16_t feat_len;
-};
-
-struct database_feat {
-    uint16_t id;
-    float *feat;
-    char name[MAX_NAME_LENGTH];
-
-    database_feat() : id(0), feat(nullptr) {
-        name[0] = '\0';
-    }
-    
-    database_feat(uint16_t _id, float *_feat, const char *_name = "") : id(_id), feat(_feat) {
-        strncpy(name, _name, MAX_NAME_LENGTH - 1);
-        name[MAX_NAME_LENGTH - 1] = '\0';
-    }
-};
-
-struct result_t {
-    uint16_t id;
-    float similarity;
-    char name[MAX_NAME_LENGTH];
-
-    result_t() : id(0), similarity(0.0f) {
-        name[0] = '\0';
-    }
-    
-    result_t(uint16_t _id, float _sim, const char *_name = "") : id(_id), similarity(_sim) {
-        strncpy(name, _name, MAX_NAME_LENGTH - 1);
-        name[MAX_NAME_LENGTH - 1] = '\0';
-    }
-};
-
-} // namespace recognition
-} // namespace mp_esp_dl
diff --git a/src/lib/mp_esp_dl_human_face_recognition.cpp b/src/lib/mp_esp_dl_human_face_recognition.cpp
@@ -84,14 +84,14 @@ std::vector<mp_esp_dl::recognition::result_t> HumanFaceRecognizer::recognize(con
     }
 }
 
-esp_err_t HumanFaceRecognizer::enroll(const dl::image::img_t &img, std::list<dl::detect::result_t> &detect_res, const char *name)
+esp_err_t HumanFaceRecognizer::enroll(const dl::image::img_t &img, std::list<dl::detect::result_t> &detect_res, const char *name, uint16_t *new_id)
 {
     if (detect_res.empty()) {
         ESP_LOGW("HumanFaceRecognizer", "Failed to enroll. No face detected.");
         return ESP_FAIL;
     } else if (detect_res.size() == 1) {
         auto feat = m_feat_extract->run(img, detect_res.back().keypoint);
-        return enroll_feat(feat, name);
+        return enroll_feat(feat, name, new_id);
     } else {
         auto max_detect_res =
             std::max_element(detect_res.begin(),
@@ -100,6 +100,6 @@ esp_err_t HumanFaceRecognizer::enroll(const dl::image::img_t &img, std::list<dl:
                                  return a.box_area() > b.box_area();
                              });
         auto feat = m_feat_extract->run(img, max_detect_res->keypoint);
-        return enroll_feat(feat, name);
+        return enroll_feat(feat, name, new_id);
     }
 }
diff --git a/src/lib/mp_esp_dl_human_face_recognition.hpp b/src/lib/mp_esp_dl_human_face_recognition.hpp
@@ -44,5 +44,5 @@ class HumanFaceRecognizer : public mp_esp_dl::recognition::DataBase {
 
     std::vector<mp_esp_dl::recognition::result_t> recognize(const dl::image::img_t &img,
                                                      std::list<dl::detect::result_t> &detect_res);
-    esp_err_t enroll(const dl::image::img_t &img, std::list<dl::detect::result_t> &detect_res, const char *name = "");
+    esp_err_t enroll(const dl::image::img_t &img, std::list<dl::detect::result_t> &detect_res, const char *name, uint16_t *new_id);
 };
diff --git a/src/lib/mp_esp_dl_recognition_database.cpp b/src/lib/mp_esp_dl_recognition_database.cpp
@@ -144,7 +144,8 @@ esp_err_t DataBase::load_database_from_storage(int feat_len)
     return ESP_OK;
 }
 
-esp_err_t DataBase::enroll_feat(dl::TensorBase *feat, const char *name, uint16_t *out_id) {
+esp_err_t DataBase::enroll_feat(dl::TensorBase *feat, const char *name, uint16_t *new_id)
+{
     ESP_LOGI(TAG, "Enrolling feature.");
     if (feat->dtype != dl::DATA_TYPE_FLOAT) {
         ESP_LOGE(TAG, "Only support float feature.");
@@ -159,9 +160,11 @@ esp_err_t DataBase::enroll_feat(dl::TensorBase *feat, const char *name, uint16_t
     float *feat_copy = (float *)heap_caps_malloc(m_meta.feat_len * sizeof(float), MALLOC_CAP_SPIRAM);
     memcpy(feat_copy, feat->data, feat->get_bytes());
 
+    // Neue ID generieren
+    uint16_t id = m_meta.num_feats_total + 1;
+
     // Füge das Feature zur internen Liste hinzu
-    uint16_t new_id = m_meta.num_feats_total + 1;
-    m_feats.emplace_back(new_id, feat_copy, name);
+    m_feats.emplace_back(id, feat_copy, name);
     m_meta.num_feats_total++;
     m_meta.num_feats_valid++;
 
@@ -188,7 +191,7 @@ esp_err_t DataBase::enroll_feat(dl::TensorBase *feat, const char *name, uint16_t
     }
 
     // Schreibe die Feature-ID in die Datei
-    size = mp_write(f, &new_id, sizeof(uint16_t));
+    size = mp_write(f, &m_feats.back().id, sizeof(uint16_t));
     if (size != sizeof(uint16_t)) {
         ESP_LOGE(TAG, "Failed to write feature id.");
         mp_close(f);
@@ -211,14 +214,11 @@ esp_err_t DataBase::enroll_feat(dl::TensorBase *feat, const char *name, uint16_t
         return ESP_FAIL;
     }
 
-    // Schließe die Datei
     mp_close(f);
-
-    // Setze die neue ID zurück
-    if (out_id) {
-        *out_id = new_id;
-    }
-
+    
+    // Setze die neue ID
+    *new_id = id;
+    
     return ESP_OK;
 }
 
diff --git a/src/lib/mp_esp_dl_recognition_database.hpp b/src/lib/mp_esp_dl_recognition_database.hpp
@@ -4,7 +4,7 @@
 #include "freertos/queue.h"
 #include "freertos/event_groups.h"
 #include "freertos/idf_additions.h"
-#include "dl_recognition_types.hpp"
+#include "dl_recognition_define.hpp"
 #include "dl_tensor_base.hpp"
 #include "esp_check.h"
 #include "esp_system.h"
@@ -26,7 +26,7 @@ class DataBase {
     DataBase(const char *db_path, int feat_len);
     virtual ~DataBase();
     esp_err_t clear_all_feats();
-    esp_err_t enroll_feat(dl::TensorBase *feat, const char *name = "", uint16_t *out_id = nullptr);
+    esp_err_t enroll_feat(dl::TensorBase *feat, const char *name, uint16_t *new_id);
     esp_err_t delete_feat(uint16_t id);
     esp_err_t delete_last_feat();
     std::vector<result_t> query_feat(dl::TensorBase *feat, float thr, int top_k);

Original file line number	Diff line number	Diff line change
`@@ -84,14 +84,14 @@ std::vector<mp_esp_dl::recognition::result_t> HumanFaceRecognizer::recognize(con`
`84`	`84`	`}`
`85`	`85`	`}`
`86`	`86`
`87`		`-esp_err_t HumanFaceRecognizer::enroll(const dl::image::img_t &img, std::list<dl::detect::result_t> &detect_res, const char *name)`
	`87`	`+esp_err_t HumanFaceRecognizer::enroll(const dl::image::img_t &img, std::list<dl::detect::result_t> &detect_res, const char name, uint16_t new_id)`
`88`	`88`	`{`
`89`	`89`	`if (detect_res.empty()) {`
`90`	`90`	`ESP_LOGW("HumanFaceRecognizer", "Failed to enroll. No face detected.");`
`91`	`91`	`return ESP_FAIL;`
`92`	`92`	`} else if (detect_res.size() == 1) {`
`93`	`93`	`auto feat = m_feat_extract->run(img, detect_res.back().keypoint);`
`94`		`- return enroll_feat(feat, name);`
	`94`	`+ return enroll_feat(feat, name, new_id);`
`95`	`95`	`} else {`
`96`	`96`	`auto max_detect_res =`
`97`	`97`	`std::max_element(detect_res.begin(),`
`@@ -100,6 +100,6 @@ esp_err_t HumanFaceRecognizer::enroll(const dl::image::img_t &img, std::list<dl:`
`100`	`100`	`return a.box_area() > b.box_area();`
`101`	`101`	`});`
`102`	`102`	`auto feat = m_feat_extract->run(img, max_detect_res->keypoint);`
`103`		`- return enroll_feat(feat, name);`
	`103`	`+ return enroll_feat(feat, name, new_id);`
`104`	`104`	`}`
`105`	`105`	`}`