vcc_gnd
/
esp-who
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'improve/camera_web_server' into 'master' 

Face detection with LSSH

1. add lssh_detect_object() to example camera_web_serber.
2. add detector options (MTMN and LSSH) in Kconfig.projbuild.

See merge request face-recognition-framework/esp-who!54
pull/131/head
XiaochaoGONG 2019-11-01 21:56:50 +08:00
parent 1169211177 e1b44c0184
commit 51bf24326b
3 changed files with 435 additions and 242 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/esp-face

@ -1 +1 @@
Subproject commit ba76b6546f56933e571b98bc8431fb291db11668
Subproject commit eab655763e74f2ee3665eeb119ce7c426b48f5c2

14
examples/single_chip/camera_web_server/main/Kconfig.projbuild
View File

@ -248,9 +248,21 @@ config ESP_FACE_DETECT_ENABLED
help
Enables ESP-WHO Face Detection through the web interface.
choice ESP_FACE_DETECT_MODEL
bool "Detection Model"
depends on ESP_FACE_DETECT_ENABLED
default ESP_FACE_DETECT_MTMN
config ESP_FACE_DETECT_MTMN
bool "MTMN"
config ESP_FACE_DETECT_LSSH
bool "LSSH"
endchoice
config ESP_FACE_RECOGNITION_ENABLED
bool "ESP-WHO Face Recognition"
depends on ESP_FACE_DETECT_ENABLED
depends on ESP_FACE_DETECT_MTMN
default y
help
Enables ESP-WHO Face Recognition through the web interface.

451
examples/single_chip/camera_web_server/main/app_httpd.c
View File

@ -30,7 +30,15 @@ static const char* TAG = "camera_httpd";
#endif
#if CONFIG_ESP_FACE_DETECT_ENABLED
#if CONFIG_ESP_FACE_DETECT_MTMN
#include "fd_forward.h"
#endif
#if CONFIG_ESP_FACE_DETECT_LSSH
#include "lssh_forward.h"
#endif
#if CONFIG_ESP_FACE_RECOGNITION_ENABLED
#include "fr_forward.h"
@ -58,7 +66,8 @@ bool isStreaming = false;
#endif
#endif
typedef struct {
typedef struct
{
httpd_req_t *req;
size_t len;
} jpg_chunking_t;
@ -72,16 +81,27 @@ httpd_handle_t stream_httpd = NULL;
httpd_handle_t camera_httpd = NULL;
#if CONFIG_ESP_FACE_DETECT_ENABLED
static mtmn_config_t mtmn_config = {0};
static int8_t detection_enabled = 0;
#if CONFIG_ESP_FACE_DETECT_MTMN
static mtmn_config_t mtmn_config = {0};
#endif
#if CONFIG_ESP_FACE_DETECT_LSSH
static lssh_config_t lssh_config;
#endif
#if CONFIG_ESP_FACE_RECOGNITION_ENABLED
static int8_t recognition_enabled = 0;
static int8_t is_enrolling = 0;
static face_id_list id_list = {0};
#endif
#endif
typedef struct {
typedef struct
{
size_t size; //number of values used for filtering
size_t index; //current value index
size_t count; //value count
@ -91,11 +111,13 @@ typedef struct {
static ra_filter_t ra_filter;
static ra_filter_t * ra_filter_init(ra_filter_t * filter, size_t sample_size){
static ra_filter_t *ra_filter_init(ra_filter_t *filter, size_t sample_size)
{
memset(filter, 0, sizeof(ra_filter_t));
filter->values = (int *)malloc(sample_size * sizeof(int));
if(!filter->values){
if (!filter->values)
{
return NULL;
}
memset(filter->values, 0, sample_size * sizeof(int));
@ -104,8 +126,10 @@ static ra_filter_t * ra_filter_init(ra_filter_t * filter, size_t sample_size){
return filter;
}
static int ra_filter_run(ra_filter_t * filter, int value){
if(!filter->values){
static int ra_filter_run(ra_filter_t *filter, int value)
{
if (!filter->values)
{
return value;
}
filter->sum -= filter->values[filter->index];
@ -113,7 +137,8 @@ static int ra_filter_run(ra_filter_t * filter, int value){
filter->sum += filter->values[filter->index];
filter->index++;
filter->index = filter->index % filter->size;
if (filter->count < filter->size) {
if (filter->count < filter->size)
{
filter->count++;
}
return filter->sum / filter->count;
@ -121,7 +146,8 @@ static int ra_filter_run(ra_filter_t * filter, int value){
#if CONFIG_ESP_FACE_DETECT_ENABLED
#if CONFIG_ESP_FACE_RECOGNITION_ENABLED
static void rgb_print(dl_matrix3du_t *image_matrix, uint32_t color, const char * str){
static void rgb_print(dl_matrix3du_t *image_matrix, uint32_t color, const char *str)
{
fb_data_t fb;
fb.width = image_matrix->w;
fb.height = image_matrix->h;
@ -142,27 +168,34 @@ static int rgb_printf(dl_matrix3du_t *image_matrix, uint32_t color, const char *
va_copy(copy, arg);
len = vsnprintf(loc_buf, sizeof(loc_buf), format, arg);
va_end(copy);
if(len >= sizeof(loc_buf)){
if (len >= sizeof(loc_buf))
{
temp = (char *)malloc(len + 1);
if(temp == NULL) {
if (temp == NULL)
{
return 0;
}
}
vsnprintf(temp, len + 1, format, arg);
va_end(arg);
rgb_print(image_matrix, color, temp);
if(len > 64){
if (len > 64)
{
free(temp);
}
return len;
}
#endif
static void draw_face_boxes(dl_matrix3du_t *image_matrix, box_array_t *boxes, int face_id){
static void draw_face_boxes(dl_matrix3du_t *image_matrix, box_array_t *boxes, int face_id)
{
int x, y, w, h, i;
uint32_t color = FACE_COLOR_YELLOW;
if(face_id < 0){
if (face_id < 0)
{
color = FACE_COLOR_RED;
} else if(face_id > 0){
}
else if (face_id > 0)
{
color = FACE_COLOR_GREEN;
}
fb_data_t fb;
@ -171,7 +204,8 @@ static void draw_face_boxes(dl_matrix3du_t *image_matrix, box_array_t *boxes, in
fb.data = image_matrix->item;
fb.bytes_per_pixel = 3;
fb.format = FB_BGR888;
for (i = 0; i < boxes->len; i++){
for (i = 0; i < boxes->len; i++)
{
// rectangle box
x = (int)boxes->box[i].box_p[0];
y = (int)boxes->box[i].box_p[1];
@ -194,40 +228,53 @@ static void draw_face_boxes(dl_matrix3du_t *image_matrix, box_array_t *boxes, in
}
#if CONFIG_ESP_FACE_RECOGNITION_ENABLED
static int run_face_recognition(dl_matrix3du_t *image_matrix, box_array_t *net_boxes){
static int run_face_recognition(dl_matrix3du_t *image_matrix, box_array_t *net_boxes)
{
dl_matrix3du_t *aligned_face = NULL;
int matched_id = 0;
aligned_face = dl_matrix3du_alloc(1, FACE_WIDTH, FACE_HEIGHT, 3);
if(!aligned_face){
if (!aligned_face)
{
ESP_LOGE(TAG, "Could not allocate face recognition buffer");
return matched_id;
}
if (align_face(net_boxes, image_matrix, aligned_face) == ESP_OK){
if (is_enrolling == 1){
if (align_face(net_boxes, image_matrix, aligned_face) == ESP_OK)
{
if (is_enrolling == 1)
{
int8_t left_sample_face = enroll_face(&id_list, aligned_face);
if(left_sample_face == (ENROLL_CONFIRM_TIMES - 1)){
if (left_sample_face == (ENROLL_CONFIRM_TIMES - 1))
{
ESP_LOGD(TAG, "Enrolling Face ID: %d", id_list.tail);
}
ESP_LOGD(TAG, "Enrolling Face ID: %d sample %d", id_list.tail, ENROLL_CONFIRM_TIMES - left_sample_face);
rgb_printf(image_matrix, FACE_COLOR_CYAN, "ID[%u] Sample[%u]", id_list.tail, ENROLL_CONFIRM_TIMES - left_sample_face);
if (left_sample_face == 0){
if (left_sample_face == 0)
{
is_enrolling = 0;
ESP_LOGD(TAG, "Enrolled Face ID: %d", id_list.tail);
}
} else {
}
else
{
matched_id = recognize_face(&id_list, aligned_face);
if (matched_id >= 0) {
if (matched_id >= 0)
{
ESP_LOGW(TAG, "Match Face ID: %u", matched_id);
rgb_printf(image_matrix, FACE_COLOR_GREEN, "Hello Subject %u", matched_id);
} else {
}
else
{
ESP_LOGW(TAG, "No Match Found");
rgb_print(image_matrix, FACE_COLOR_RED, "Intruder Alert!");
matched_id = -1;
}
}
} else {
}
else
{
ESP_LOGW(TAG, "Face Not Aligned");
//rgb_print(image_matrix, FACE_COLOR_YELLOW, "Human Detected");
}
@ -239,9 +286,11 @@ static int run_face_recognition(dl_matrix3du_t *image_matrix, box_array_t *net_b
#endif
#ifdef CONFIG_LED_ILLUMINATOR_ENABLED
void enable_led(bool en) { // Turn LED On or Off
void enable_led(bool en)
{ // Turn LED On or Off
int duty = en ? led_duty : 0;
if (en && isStreaming && (led_duty > CONFIG_LED_MAX_INTENSITY)) {
if (en && isStreaming && (led_duty > CONFIG_LED_MAX_INTENSITY))
{
duty = CONFIG_LED_MAX_INTENSITY;
}
ledc_set_duty(CONFIG_LED_LEDC_SPEED_MODE, CONFIG_LED_LEDC_CHANNEL, duty);
@ -250,19 +299,23 @@ void enable_led(bool en) { // Turn LED On or Off
}
#endif
static size_t jpg_encode_stream(void * arg, size_t index, const void* data, size_t len){
static size_t jpg_encode_stream(void *arg, size_t index, const void *data, size_t len)
{
jpg_chunking_t *j = (jpg_chunking_t *)arg;
if(!index){
if (!index)
{
j->len = 0;
}
if(httpd_resp_send_chunk(j->req, (const char *)data, len) != ESP_OK){
if (httpd_resp_send_chunk(j->req, (const char *)data, len) != ESP_OK)
{
return 0;
}
j->len += len;
return len;
}
static esp_err_t capture_handler(httpd_req_t *req){
static esp_err_t capture_handler(httpd_req_t *req)
{
camera_fb_t *fb = NULL;
esp_err_t res = ESP_OK;
int64_t fr_start = esp_timer_get_time();
@ -276,7 +329,8 @@ static esp_err_t capture_handler(httpd_req_t *req){
fb = esp_camera_fb_get();
#endif
if (!fb) {
if (!fb)
{
ESP_LOGE(TAG, "Camera capture failed");
httpd_resp_send_500(req);
return ESP_FAIL;
@ -292,13 +346,17 @@ static esp_err_t capture_handler(httpd_req_t *req){
bool s;
bool detected = false;
int face_id = 0;
if(!detection_enabled || fb->width > 400){
if (!detection_enabled || fb->width > 400)
{
#endif
size_t fb_len = 0;
if(fb->format == PIXFORMAT_JPEG){
if (fb->format == PIXFORMAT_JPEG)
{
fb_len = fb->len;
res = httpd_resp_send(req, (const char *)fb->buf, fb->len);
} else {
}
else
{
jpg_chunking_t jchunk = {req, 0};
res = frame2jpg_cb(fb, 80, jpg_encode_stream, &jchunk) ? ESP_OK : ESP_FAIL;
httpd_resp_send_chunk(req, NULL, 0);
@ -312,7 +370,8 @@ static esp_err_t capture_handler(httpd_req_t *req){
}
dl_matrix3du_t *image_matrix = dl_matrix3du_alloc(1, fb->width, fb->height, 3);
if (!image_matrix) {
if (!image_matrix)
{
esp_camera_fb_return(fb);
ESP_LOGE(TAG, "dl_matrix3du_alloc failed");
httpd_resp_send_500(req);
@ -326,25 +385,35 @@ static esp_err_t capture_handler(httpd_req_t *req){
s = fmt2rgb888(fb->buf, fb->len, fb->format, out_buf);
esp_camera_fb_return(fb);
if(!s){
if (!s)
{
dl_matrix3du_free(image_matrix);
ESP_LOGE(TAG, "to rgb888 failed");
httpd_resp_send_500(req);
return ESP_FAIL;
}
#if CONFIG_ESP_FACE_DETECT_MTMN
box_array_t *net_boxes = face_detect(image_matrix, &mtmn_config);
#endif
if (net_boxes){
#if CONFIG_ESP_FACE_DETECT_LSSH
box_array_t *net_boxes = lssh_detect_object(image_matrix, lssh_config);
#endif
if (net_boxes)
{
detected = true;
#if CONFIG_ESP_FACE_RECOGNITION_ENABLED
if(recognition_enabled){
if (recognition_enabled)
{
face_id = run_face_recognition(image_matrix, net_boxes);
}
#endif
draw_face_boxes(image_matrix, net_boxes, face_id);
dl_lib_free(net_boxes->score);
dl_lib_free(net_boxes->box);
if (net_boxes->landmark != NULL)
dl_lib_free(net_boxes->landmark);
dl_lib_free(net_boxes);
}
@ -352,7 +421,8 @@ static esp_err_t capture_handler(httpd_req_t *req){
jpg_chunking_t jchunk = {req, 0};
s = fmt2jpg_cb(out_buf, out_len, out_width, out_height, PIXFORMAT_RGB888, 90, jpg_encode_stream, &jchunk);
dl_matrix3du_free(image_matrix);
if(!s){
if (!s)
{
ESP_LOGE(TAG, "JPEG compression failed");
return ESP_FAIL;
}
@ -363,7 +433,8 @@ static esp_err_t capture_handler(httpd_req_t *req){
#endif
}
static esp_err_t stream_handler(httpd_req_t *req){
static esp_err_t stream_handler(httpd_req_t *req)
{
camera_fb_t *fb = NULL;
esp_err_t res = ESP_OK;
size_t _jpg_buf_len = 0;
@ -381,12 +452,14 @@ static esp_err_t stream_handler(httpd_req_t *req){
#endif
static int64_t last_frame = 0;
if(!last_frame) {
if (!last_frame)
{
last_frame = esp_timer_get_time();
}
res = httpd_resp_set_type(req, _STREAM_CONTENT_TYPE);
if(res != ESP_OK){
if (res != ESP_OK)
{
return res;
}
@ -397,62 +470,92 @@ static esp_err_t stream_handler(httpd_req_t *req){
isStreaming = true;
#endif
while(true){
while (true)
{
#if CONFIG_ESP_FACE_DETECT_ENABLED
detected = false;
face_id = 0;
#endif
fb = esp_camera_fb_get();
if (!fb) {
if (!fb)
{
ESP_LOGE(TAG, "Camera capture failed");
res = ESP_FAIL;
} else {
}
else
{
#if CONFIG_ESP_FACE_DETECT_ENABLED
fr_start = esp_timer_get_time();
fr_ready = fr_start;
fr_face = fr_start;
fr_encode = fr_start;
fr_recognize = fr_start;
if(!detection_enabled || fb->width > 400){
if (!detection_enabled || fb->width > 400)
{
#endif
if(fb->format != PIXFORMAT_JPEG){
if (fb->format != PIXFORMAT_JPEG)
{
bool jpeg_converted = frame2jpg(fb, 80, &_jpg_buf, &_jpg_buf_len);
esp_camera_fb_return(fb);
fb = NULL;
if(!jpeg_converted){
if (!jpeg_converted)
{
ESP_LOGE(TAG, "JPEG compression failed");
res = ESP_FAIL;
}
} else {
}
else
{
_jpg_buf_len = fb->len;
_jpg_buf = fb->buf;
}
#if CONFIG_ESP_FACE_DETECT_ENABLED
} else {
}
else
{
image_matrix = dl_matrix3du_alloc(1, fb->width, fb->height, 3);
if (!image_matrix) {
if (!image_matrix)
{
ESP_LOGE(TAG, "dl_matrix3du_alloc failed");
res = ESP_FAIL;
} else {
if(!fmt2rgb888(fb->buf, fb->len, fb->format, image_matrix->item)){
}
else
{
if (!fmt2rgb888(fb->buf, fb->len, fb->format, image_matrix->item))
{
ESP_LOGE(TAG, "fmt2rgb888 failed");
res = ESP_FAIL;
} else {
}
else
{
#if CONFIG_ESP_FACE_DETECT_LSSH
lssh_update_image_shape(&lssh_config, image_matrix->h, image_matrix->w);
#endif
fr_ready = esp_timer_get_time();
box_array_t *net_boxes = NULL;
if(detection_enabled){
if (detection_enabled)
{
#if CONFIG_ESP_FACE_DETECT_MTMN
net_boxes = face_detect(image_matrix, &mtmn_config);
#endif
#if CONFIG_ESP_FACE_DETECT_LSSH
net_boxes = lssh_detect_object(image_matrix, lssh_config);
#endif
}
fr_face = esp_timer_get_time();
fr_recognize = fr_face;
if (net_boxes || fb->format != PIXFORMAT_JPEG){
if(net_boxes){
if (net_boxes || fb->format != PIXFORMAT_JPEG)
{
if (net_boxes)
{
detected = true;
#if CONFIG_ESP_FACE_RECOGNITION_ENABLED
if(recognition_enabled){
if (recognition_enabled)
{
face_id = run_face_recognition(image_matrix, net_boxes);
}
fr_recognize = esp_timer_get_time();
@ -460,15 +563,19 @@ static esp_err_t stream_handler(httpd_req_t *req){
draw_face_boxes(image_matrix, net_boxes, face_id);
dl_lib_free(net_boxes->score);
dl_lib_free(net_boxes->box);
if (net_boxes->landmark != NULL)
dl_lib_free(net_boxes->landmark);
dl_lib_free(net_boxes);
}
if(!fmt2jpg(image_matrix->item, fb->width*fb->height*3, fb->width, fb->height, PIXFORMAT_RGB888, 90, &_jpg_buf, &_jpg_buf_len)){
if (!fmt2jpg(image_matrix->item, fb->width * fb->height * 3, fb->width, fb->height, PIXFORMAT_RGB888, 90, &_jpg_buf, &_jpg_buf_len))
{
ESP_LOGE(TAG, "fmt2jpg failed");
}
esp_camera_fb_return(fb);
fb = NULL;
} else {
}
else
{
_jpg_buf = fb->buf;
_jpg_buf_len = fb->len;
}
@ -479,25 +586,32 @@ static esp_err_t stream_handler(httpd_req_t *req){
}
#endif
}
if(res == ESP_OK){
if (res == ESP_OK)
{
size_t hlen = snprintf((char *)part_buf, 64, _STREAM_PART, _jpg_buf_len);
res = httpd_resp_send_chunk(req, (const char *)part_buf, hlen);
}
if(res == ESP_OK){
if (res == ESP_OK)
{
res = httpd_resp_send_chunk(req, (const char *)_jpg_buf, _jpg_buf_len);
}
if(res == ESP_OK){
if (res == ESP_OK)
{
res = httpd_resp_send_chunk(req, _STREAM_BOUNDARY, strlen(_STREAM_BOUNDARY));
}
if(fb){
if (fb)
{
esp_camera_fb_return(fb);
fb = NULL;
_jpg_buf = NULL;
} else if(_jpg_buf){
}
else if (_jpg_buf)
{
free(_jpg_buf);
_jpg_buf = NULL;
}
if(res != ESP_OK){
if (res != ESP_OK)
{
break;
}
int64_t fr_end = esp_timer_get_time();
@ -518,17 +632,18 @@ static esp_err_t stream_handler(httpd_req_t *req){
#if CONFIG_ESP_FACE_DETECT_ENABLED
", %u+%u+%u+%u=%u %s%d"
#endif
,(uint32_t)(_jpg_buf_len),
,
(uint32_t)(_jpg_buf_len),
(uint32_t)frame_time, 1000.0 / (uint32_t)frame_time,
avg_frame_time, 1000.0 / avg_frame_time
#if CONFIG_ESP_FACE_DETECT_ENABLED
,(uint32_t)ready_time, (uint32_t)face_time, (uint32_t)recognize_time, (uint32_t)encode_time, (uint32_t)process_time,
,
(uint32_t)ready_time, (uint32_t)face_time, (uint32_t)recognize_time, (uint32_t)encode_time, (uint32_t)process_time,
(detected) ? "DETECTED " : "", face_id
#endif
);
}
#ifdef CONFIG_LED_ILLUMINATOR_ENABLED
isStreaming = false;
enable_led(false);
@ -538,34 +653,49 @@ static esp_err_t stream_handler(httpd_req_t *req){
return res;
}
static esp_err_t cmd_handler(httpd_req_t *req){
static esp_err_t cmd_handler(httpd_req_t *req)
{
char *buf;
size_t buf_len;
char variable[32] = {0,};
char value[32] = {0,};
char variable[32] = {
0,
};
char value[32] = {
0,
};
buf_len = httpd_req_get_url_query_len(req) + 1;
if (buf_len > 1) {
if (buf_len > 1)
{
buf = (char *)malloc(buf_len);
if(!buf){
if (!buf)
{
httpd_resp_send_500(req);
return ESP_FAIL;
}
if (httpd_req_get_url_query_str(req, buf, buf_len) == ESP_OK) {
if (httpd_req_get_url_query_str(req, buf, buf_len) == ESP_OK)
{
if (httpd_query_key_value(buf, "var", variable, sizeof(variable)) == ESP_OK &&
httpd_query_key_value(buf, "val", value, sizeof(value)) == ESP_OK) {
} else {
httpd_query_key_value(buf, "val", value, sizeof(value)) == ESP_OK)
{
}
else
{
free(buf);
httpd_resp_send_404(req);
return ESP_FAIL;
}
} else {
}
else
{
free(buf);
httpd_resp_send_404(req);
return ESP_FAIL;
}
free(buf);
} else {
}
else
{
httpd_resp_send_404(req);
return ESP_FAIL;
}
@ -575,60 +705,97 @@ static esp_err_t cmd_handler(httpd_req_t *req){
sensor_t *s = esp_camera_sensor_get();
int res = 0;
if(!strcmp(variable, "framesize")) {
if(s->pixformat == PIXFORMAT_JPEG) res = s->set_framesize(s, (framesize_t)val);
if (!strcmp(variable, "framesize"))
{
if (s->pixformat == PIXFORMAT_JPEG)
res = s->set_framesize(s, (framesize_t)val);
}
else if(!strcmp(variable, "quality")) res = s->set_quality(s, val);
else if(!strcmp(variable, "contrast")) res = s->set_contrast(s, val);
else if(!strcmp(variable, "brightness")) res = s->set_brightness(s, val);
else if(!strcmp(variable, "saturation")) res = s->set_saturation(s, val);
else if(!strcmp(variable, "gainceiling")) res = s->set_gainceiling(s, (gainceiling_t)val);
else if(!strcmp(variable, "colorbar")) res = s->set_colorbar(s, val);
else if(!strcmp(variable, "awb")) res = s->set_whitebal(s, val);
else if(!strcmp(variable, "agc")) res = s->set_gain_ctrl(s, val);
else if(!strcmp(variable, "aec")) res = s->set_exposure_ctrl(s, val);
else if(!strcmp(variable, "hmirror")) res = s->set_hmirror(s, val);
else if(!strcmp(variable, "vflip")) res = s->set_vflip(s, val);
else if(!strcmp(variable, "awb_gain")) res = s->set_awb_gain(s, val);
else if(!strcmp(variable, "agc_gain")) res = s->set_agc_gain(s, val);
else if(!strcmp(variable, "aec_value")) res = s->set_aec_value(s, val);
else if(!strcmp(variable, "aec2")) res = s->set_aec2(s, val);
else if(!strcmp(variable, "dcw")) res = s->set_dcw(s, val);
else if(!strcmp(variable, "bpc")) res = s->set_bpc(s, val);
else if(!strcmp(variable, "wpc")) res = s->set_wpc(s, val);
else if(!strcmp(variable, "raw_gma")) res = s->set_raw_gma(s, val);
else if(!strcmp(variable, "lenc")) res = s->set_lenc(s, val);
else if(!strcmp(variable, "special_effect")) res = s->set_special_effect(s, val);
else if(!strcmp(variable, "wb_mode")) res = s->set_wb_mode(s, val);
else if(!strcmp(variable, "ae_level")) res = s->set_ae_level(s, val);
else if (!strcmp(variable, "quality"))
res = s->set_quality(s, val);
else if (!strcmp(variable, "contrast"))
res = s->set_contrast(s, val);
else if (!strcmp(variable, "brightness"))
res = s->set_brightness(s, val);
else if (!strcmp(variable, "saturation"))
res = s->set_saturation(s, val);
else if (!strcmp(variable, "gainceiling"))
res = s->set_gainceiling(s, (gainceiling_t)val);
else if (!strcmp(variable, "colorbar"))
res = s->set_colorbar(s, val);
else if (!strcmp(variable, "awb"))
res = s->set_whitebal(s, val);
else if (!strcmp(variable, "agc"))
res = s->set_gain_ctrl(s, val);
else if (!strcmp(variable, "aec"))
res = s->set_exposure_ctrl(s, val);
else if (!strcmp(variable, "hmirror"))
res = s->set_hmirror(s, val);
else if (!strcmp(variable, "vflip"))
res = s->set_vflip(s, val);
else if (!strcmp(variable, "awb_gain"))
res = s->set_awb_gain(s, val);
else if (!strcmp(variable, "agc_gain"))
res = s->set_agc_gain(s, val);
else if (!strcmp(variable, "aec_value"))
res = s->set_aec_value(s, val);
else if (!strcmp(variable, "aec2"))
res = s->set_aec2(s, val);
else if (!strcmp(variable, "dcw"))
res = s->set_dcw(s, val);
else if (!strcmp(variable, "bpc"))
res = s->set_bpc(s, val);
else if (!strcmp(variable, "wpc"))
res = s->set_wpc(s, val);
else if (!strcmp(variable, "raw_gma"))
res = s->set_raw_gma(s, val);
else if (!strcmp(variable, "lenc"))
res = s->set_lenc(s, val);
else if (!strcmp(variable, "special_effect"))
res = s->set_special_effect(s, val);
else if (!strcmp(variable, "wb_mode"))
res = s->set_wb_mode(s, val);
else if (!strcmp(variable, "ae_level"))
res = s->set_ae_level(s, val);
#ifdef CONFIG_LED_ILLUMINATOR_ENABLED
else if(!strcmp(variable, "led_intensity")) { led_duty = val; if (isStreaming) enable_led(true); }
else if (!strcmp(variable, "led_intensity"))
{
led_duty = val;
if (isStreaming)
enable_led(true);
}
#endif
#if CONFIG_ESP_FACE_DETECT_ENABLED
else if(!strcmp(variable, "face_detect")) {
else if (!strcmp(variable, "face_detect"))
{
detection_enabled = val;
#if CONFIG_ESP_FACE_RECOGNITION_ENABLED
if(!detection_enabled) {
if (!detection_enabled)
{
recognition_enabled = 0;
}
#endif
}
#if CONFIG_ESP_FACE_RECOGNITION_ENABLED
else if(!strcmp(variable, "face_enroll")) is_enrolling = val;
else if(!strcmp(variable, "face_recognize")) {
else if (!strcmp(variable, "face_enroll"))
is_enrolling = val;
else if (!strcmp(variable, "face_recognize"))
{
recognition_enabled = val;
if(recognition_enabled){
if (recognition_enabled)
{
detection_enabled = val;
}
}
#endif
#endif
else {
else
{
res = -1;
}
if(res){
if (res)
{
return httpd_resp_send_500(req);
}
@ -636,7 +803,8 @@ static esp_err_t cmd_handler(httpd_req_t *req){
return httpd_resp_send(req, NULL, 0);
}
static esp_err_t status_handler(httpd_req_t *req){
static esp_err_t status_handler(httpd_req_t *req)
{
static char json_response[1024];
sensor_t *s = esp_camera_sensor_get();
@ -686,7 +854,8 @@ static esp_err_t status_handler(httpd_req_t *req){
return httpd_resp_send(req, json_response, strlen(json_response));
}
static esp_err_t index_handler(httpd_req_t *req){
static esp_err_t index_handler(httpd_req_t *req)
{
extern const unsigned char index_ov2640_html_gz_start[] asm("_binary_index_ov2640_html_gz_start");
extern const unsigned char index_ov2640_html_gz_end[] asm("_binary_index_ov2640_html_gz_end");
size_t index_ov2640_html_gz_len = index_ov2640_html_gz_end - index_ov2640_html_gz_start;
@ -695,63 +864,66 @@ static esp_err_t index_handler(httpd_req_t *req){
extern const unsigned char index_ov3660_html_gz_end[] asm("_binary_index_ov3660_html_gz_end");
size_t index_ov3660_html_gz_len = index_ov3660_html_gz_end - index_ov3660_html_gz_start;
httpd_resp_set_type(req, "text/html");
httpd_resp_set_hdr(req, "Content-Encoding", "gzip");
sensor_t *s = esp_camera_sensor_get();
if (s != NULL) {
if (s->id.PID == OV3660_PID) {
if (s != NULL)
{
if (s->id.PID == OV3660_PID)
{
return httpd_resp_send(req, (const char *)index_ov3660_html_gz_start, index_ov3660_html_gz_len);
} else {
}
else
{
return httpd_resp_send(req, (const char *)index_ov2640_html_gz_start, index_ov2640_html_gz_len);
}
} else {
}
else
{
ESP_LOGE(TAG, "Camera sensor not found");
return httpd_resp_send_500(req);
}
}
void app_httpd_main(){
void app_httpd_main()
{
httpd_config_t config = HTTPD_DEFAULT_CONFIG();
httpd_uri_t index_uri = {
.uri = "/",
.method = HTTP_GET,
.handler = index_handler,
.user_ctx = NULL
};
.user_ctx = NULL};
httpd_uri_t status_uri = {
.uri = "/status",
.method = HTTP_GET,
.handler = status_handler,
.user_ctx = NULL
};
.user_ctx = NULL};
httpd_uri_t cmd_uri = {
.uri = "/control",
.method = HTTP_GET,
.handler = cmd_handler,
.user_ctx = NULL
};
.user_ctx = NULL};
httpd_uri_t capture_uri = {
.uri = "/capture",
.method = HTTP_GET,
.handler = capture_handler,
.user_ctx = NULL
};
.user_ctx = NULL};
httpd_uri_t stream_uri = {
.uri = "/stream",
.method = HTTP_GET,
.handler = stream_handler,
.user_ctx = NULL
};
.user_ctx = NULL};
ra_filter_init(&ra_filter, 20);
#if CONFIG_ESP_FACE_DETECT_ENABLED
#if CONFIG_ESP_FACE_DETECT_MTMN
mtmn_config.type = FAST;
mtmn_config.min_face = 80;
mtmn_config.pyramid = 0.707;
@ -765,12 +937,20 @@ void app_httpd_main(){
mtmn_config.o_threshold.score = 0.7;
mtmn_config.o_threshold.nms = 0.7;
mtmn_config.o_threshold.candidate_number = 1;
#endif
#if CONFIG_ESP_FACE_DETECT_LSSH
lssh_config = lssh_initialize_config(80, 0.6, 0.3, 240, 320);
#endif
#if CONFIG_ESP_FACE_RECOGNITION_ENABLED
face_id_init(&id_list, FACE_ID_SAVE_NUMBER, ENROLL_CONFIRM_TIMES);
#endif
#endif
ESP_LOGI(TAG, "Starting web server on port: '%d'", config.server_port);
if (httpd_start(&camera_httpd, &config) == ESP_OK) {
if (httpd_start(&camera_httpd, &config) == ESP_OK)
{
httpd_register_uri_handler(camera_httpd, &index_uri);
httpd_register_uri_handler(camera_httpd, &cmd_uri);
httpd_register_uri_handler(camera_httpd, &status_uri);
@ -780,7 +960,8 @@ void app_httpd_main(){
config.server_port += 1;
config.ctrl_port += 1;
ESP_LOGI(TAG, "Starting stream server on port: '%d'", config.server_port);
if (httpd_start(&stream_httpd, &config) == ESP_OK) {
if (httpd_start(&stream_httpd, &config) == ESP_OK)
{
httpd_register_uri_handler(stream_httpd, &stream_uri);
}
}