Merge branch 'update/esp-face' into 'master'

update/esp-face esp32-camera

See merge request face-recognition-framework/esp-who!56
pull/131/head
XiaochaoGONG 2019-11-27 19:38:40 +08:00
commit 6d3c69ed31
3 changed files with 5 additions and 4 deletions

@ -1 +1 @@
Subproject commit ae3ba5a2538fafa00dcb0d3f6a0ba0367e5bebab
Subproject commit 6a8b537b35d166637b3ea10790ccd89a007a2bb0

@ -1 +1 @@
Subproject commit 3f7b5ed16fc71a766e97d5a6806aa7217d969eab
Subproject commit 1b8fdfe335b3c8c8b9e091e3615b0aee16946ef0

View File

@ -90,6 +90,7 @@ static mtmn_config_t mtmn_config = {0};
#if CONFIG_ESP_FACE_DETECT_LSSH
static lssh_config_t lssh_config;
static int min_face=80;
#endif
#if CONFIG_ESP_FACE_RECOGNITION_ENABLED
@ -532,7 +533,7 @@ static esp_err_t stream_handler(httpd_req_t *req)
else
{
#if CONFIG_ESP_FACE_DETECT_LSSH
lssh_update_image_shape(&lssh_config, image_matrix->h, image_matrix->w);
// lssh_update_config(&lssh_config, min_face, image_matrix->h, image_matrix->w);
#endif
fr_ready = esp_timer_get_time();
box_array_t *net_boxes = NULL;
@ -940,7 +941,7 @@ void app_httpd_main()
#endif
#if CONFIG_ESP_FACE_DETECT_LSSH
lssh_config = lssh_initialize_config(80, 0.6, 0.3, 240, 320);
lssh_config = lssh_get_config(min_face, 0.7, 0.3, 240, 320);
#endif
#if CONFIG_ESP_FACE_RECOGNITION_ENABLED