Update IDF to ebdcbe8c6 (#2539)

- ESP-Face to 2937054
- ESP32-Camera to 113629b

tools/sdk/include/esp-face/fr_flash.h

@@ -24,6 +24,9 @@ extern "C"
     int8_t enroll_face_id_to_flash(face_id_list *l,
             dl_matrix3du_t *aligned_face);
 
+    int8_t enroll_face_id_to_flash_with_name(face_id_name_list *l,
+            dl_matrix3du_t *aligned_face,
+            char *name);
     /**
      * @brief Read the enrolled face IDs from the flash.
      * 
@@ -32,6 +35,8 @@ extern "C"
      */
     int8_t read_face_id_from_flash(face_id_list *l);
 
+    int8_t read_face_id_from_flash_with_name(face_id_name_list *l);
+
     /**
      * @brief Delete the enrolled face IDs in the flash.
      * 
@@ -39,6 +44,8 @@ extern "C"
      * @return int8_t               The number of IDs remaining in flash
      */
     int8_t delete_face_id_in_flash(face_id_list *l);
+	int8_t delete_face_id_in_flash_with_name(face_id_name_list *l, char *name);
+    void delete_face_all_in_flash_with_name(face_id_name_list *l);
 
 #if __cplusplus
 }

tools/sdk/include/esp-face/fr_forward.h

@@ -25,12 +25,25 @@ extern "C"
 #define NOSE_EYE_RATIO_THRES_MIN 0.49f
 #define NOSE_EYE_RATIO_THRES_MAX 2.04f
 
-#define FLASH_INFO_FLAG 12138
-#define FLASH_PARTITION_NAME "fr"
-
 /**
  * @brief      HTTP Client events data
  */
+#define ENROLL_NAME_LEN 16
+    typedef struct tag_face_id_node
+    {
+        struct tag_face_id_node *next;
+        char id_name[ENROLL_NAME_LEN];
+        dl_matrix3d_t *id_vec;
+    } face_id_node;
+
+    typedef struct
+    {
+        face_id_node *head;               /*!< head pointer of the id list */
+        face_id_node *tail;               /*!< tail pointer of the id list */
+        uint8_t count;              /*!< number of enrolled ids */
+        uint8_t confirm_times;      /*!< images needed for one enrolling */
+    } face_id_name_list;
+	
     typedef struct
     {
         uint8_t head;               /*!< head index of the id list */
@@ -51,6 +64,7 @@ extern "C"
      * @return dl_matrix3du_t*          Size: 1xFACE_WIDTHxFACE_HEIGHTx3
      */
     void face_id_init(face_id_list *l, uint8_t size, uint8_t confirm_times);
+    void face_id_name_init(face_id_name_list *l, uint8_t size, uint8_t confirm_times);
 
     /**
      * @brief Alloc memory for aligned face.
@@ -90,7 +104,9 @@ extern "C"
      */
     int8_t recognize_face(face_id_list *l,
                             dl_matrix3du_t *algined_face);
-
+							
+    face_id_node *recognize_face_with_name(face_id_name_list *l,
+                            dl_matrix3du_t *algined_face);
     /**
      * @brief Produce face id according to the input aligned face, and save it to dest_id.
      * 
@@ -103,6 +119,10 @@ extern "C"
      */
     int8_t enroll_face(face_id_list *l, 
                     dl_matrix3du_t *aligned_face);
+					
+    int8_t enroll_face_with_name(face_id_name_list *l, 
+                    dl_matrix3du_t *aligned_face,
+                    char *name);
 
     /**
      * @brief Alloc memory for aligned face.
@@ -111,6 +131,8 @@ extern "C"
      * @return uint8_t              left count
      */
     uint8_t delete_face(face_id_list *l);
+	int8_t delete_face_with_name(face_id_name_list *l, char *name);
+    void delete_face_all_with_name(face_id_name_list *l);
 #if __cplusplus
 }
 #endif

tools/sdk/include/esp-face/image_util.h

@@ -41,6 +41,10 @@ extern "C"
 #define RGB565_MASK_GREEN 0x07E0
 #define RGB565_MASK_BLUE 0x001F
 
+    typedef enum
+    {
+        BINARY,
+    } en_threshold_mode;
     typedef struct
     {
         fptp_t landmark_p[10];
@@ -233,7 +237,7 @@ extern "C"
      * @param ratio 
      * @param center 
      */
-    void image_cropper(dl_matrix3du_t *corp_image, dl_matrix3du_t *src_image, float rotate_angle, float ratio, float *center);
+    void image_cropper(uint8_t *corp_image, uint8_t *src_image, int dst_w, int dst_h, int dst_c, int src_w, int src_h, float rotate_angle, float ratio, float *center);
 
     /**
      * @brief 
@@ -270,6 +274,9 @@ extern "C"
      * @param width 
      */
     void draw_rectangle_rgb888(uint8_t *buf, box_array_t *boxes, int width);
+    void image_abs_diff(uint8_t *dst, uint8_t *src1, uint8_t *src2, int count);
+    void image_threshold(uint8_t *dst, uint8_t *src, int threshold, int value, int count, en_threshold_mode mode);
+    void image_erode(uint8_t *dst, uint8_t *src, int src_w, int src_h, int src_c);
 #ifdef __cplusplus
 }
 #endif