compile without face detection for space saving
This commit is contained in:
Matthias Cramer
parent
b549c5bba9
commit
e015f130cd
109
app_httpd.cpp
109
app_httpd.cpp
|
|
@ -12,6 +12,9 @@
|
|||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
// #define FACE_DETECTION_COMPILE
|
||||
|
||||
|
||||
#include <esp_http_server.h>
|
||||
#include <esp_timer.h>
|
||||
#include <esp_camera.h>
|
||||
|
|
@ -61,21 +64,25 @@ extern int sketchSize;
|
|||
extern int sketchSpace;
|
||||
extern String sketchMD5;
|
||||
|
||||
#include "fb_gfx.h"
|
||||
#include "fd_forward.h"
|
||||
#include "fr_forward.h"
|
||||
#if defined(FACE_DETECTION_COMPILE)
|
||||
#include "fb_gfx.h"
|
||||
#include "fd_forward.h"
|
||||
#include "fr_forward.h"
|
||||
#endif
|
||||
|
||||
#define ENROLL_CONFIRM_TIMES 5
|
||||
#define FACE_ID_SAVE_NUMBER 7
|
||||
#if defined(FACE_DETECTION_COMPILE)
|
||||
#define ENROLL_CONFIRM_TIMES 5
|
||||
#define FACE_ID_SAVE_NUMBER 7
|
||||
|
||||
#define FACE_COLOR_WHITE 0x00FFFFFF
|
||||
#define FACE_COLOR_BLACK 0x00000000
|
||||
#define FACE_COLOR_RED 0x000000FF
|
||||
#define FACE_COLOR_GREEN 0x0000FF00
|
||||
#define FACE_COLOR_BLUE 0x00FF0000
|
||||
#define FACE_COLOR_YELLOW (FACE_COLOR_RED | FACE_COLOR_GREEN)
|
||||
#define FACE_COLOR_CYAN (FACE_COLOR_BLUE | FACE_COLOR_GREEN)
|
||||
#define FACE_COLOR_PURPLE (FACE_COLOR_BLUE | FACE_COLOR_RED)
|
||||
#define FACE_COLOR_WHITE 0x00FFFFFF
|
||||
#define FACE_COLOR_BLACK 0x00000000
|
||||
#define FACE_COLOR_RED 0x000000FF
|
||||
#define FACE_COLOR_GREEN 0x0000FF00
|
||||
#define FACE_COLOR_BLUE 0x00FF0000
|
||||
#define FACE_COLOR_YELLOW (FACE_COLOR_RED | FACE_COLOR_GREEN)
|
||||
#define FACE_COLOR_CYAN (FACE_COLOR_BLUE | FACE_COLOR_GREEN)
|
||||
#define FACE_COLOR_PURPLE (FACE_COLOR_BLUE | FACE_COLOR_RED)
|
||||
#endif
|
||||
|
||||
typedef struct {
|
||||
size_t size; //number of values used for filtering
|
||||
|
|
@ -99,12 +106,13 @@ static ra_filter_t ra_filter;
|
|||
httpd_handle_t stream_httpd = NULL;
|
||||
httpd_handle_t camera_httpd = NULL;
|
||||
|
||||
static mtmn_config_t mtmn_config = {0};
|
||||
static int8_t is_enrolling = 0;
|
||||
static face_id_list id_list = {0};
|
||||
int id_list_alloc = 0;
|
||||
#if defined(FACE_DETECTION_COMPILE)
|
||||
static mtmn_config_t mtmn_config = {0};
|
||||
static int8_t is_enrolling = 0;
|
||||
static face_id_list id_list = {0};
|
||||
int id_list_alloc = 0;
|
||||
|
||||
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));
|
||||
|
|
@ -115,9 +123,9 @@ static ra_filter_t * ra_filter_init(ra_filter_t * filter, size_t sample_size){
|
|||
|
||||
filter->size = sample_size;
|
||||
return filter;
|
||||
}
|
||||
}
|
||||
|
||||
static int ra_filter_run(ra_filter_t * filter, int value) {
|
||||
static int ra_filter_run(ra_filter_t * filter, int value) {
|
||||
if(!filter->values){
|
||||
return value;
|
||||
}
|
||||
|
|
@ -130,9 +138,9 @@ static int ra_filter_run(ra_filter_t * filter, int value) {
|
|||
filter->count++;
|
||||
}
|
||||
return filter->sum / filter->count;
|
||||
}
|
||||
}
|
||||
|
||||
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;
|
||||
|
|
@ -140,9 +148,9 @@ static void rgb_print(dl_matrix3du_t *image_matrix, uint32_t color, const char *
|
|||
fb.bytes_per_pixel = 3;
|
||||
fb.format = FB_BGR888;
|
||||
fb_gfx_print(&fb, (fb.width - (strlen(str) * 14)) / 2, 10, color, str);
|
||||
}
|
||||
}
|
||||
|
||||
static int rgb_printf(dl_matrix3du_t *image_matrix, uint32_t color, const char *format, ...){
|
||||
static int rgb_printf(dl_matrix3du_t *image_matrix, uint32_t color, const char *format, ...){
|
||||
char loc_buf[64];
|
||||
char * temp = loc_buf;
|
||||
int len;
|
||||
|
|
@ -165,9 +173,11 @@ static int rgb_printf(dl_matrix3du_t *image_matrix, uint32_t color, const char *
|
|||
free(temp);
|
||||
}
|
||||
return len;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
static void draw_face_boxes(dl_matrix3du_t *image_matrix, box_array_t *boxes, int face_id){
|
||||
#if defined(FACE_DETECTION_COMPILE)
|
||||
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){
|
||||
|
|
@ -201,9 +211,11 @@ static void draw_face_boxes(dl_matrix3du_t *image_matrix, box_array_t *boxes, in
|
|||
}
|
||||
#endif
|
||||
}
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
static int run_face_recognition(dl_matrix3du_t *image_matrix, box_array_t *net_boxes){
|
||||
#if defined(FACE_DETECTION_COMPILE)
|
||||
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;
|
||||
|
||||
|
|
@ -244,7 +256,8 @@ static int run_face_recognition(dl_matrix3du_t *image_matrix, box_array_t *net_b
|
|||
|
||||
dl_matrix3du_free(aligned_face);
|
||||
return matched_id;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
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;
|
||||
|
|
@ -305,6 +318,7 @@ static esp_err_t capture_handler(httpd_req_t *req){
|
|||
return res;
|
||||
}
|
||||
|
||||
#if defined(FACE_DETECTION_COMPILE)
|
||||
dl_matrix3du_t *image_matrix = dl_matrix3du_alloc(1, fb->width, fb->height, 3);
|
||||
if (!image_matrix) {
|
||||
esp_camera_fb_return(fb);
|
||||
|
|
@ -313,8 +327,11 @@ static esp_err_t capture_handler(httpd_req_t *req){
|
|||
if (autoLamp && (lampVal != -1)) setLamp(0);
|
||||
return ESP_FAIL;
|
||||
}
|
||||
#endif
|
||||
|
||||
#if defined(FACE_DETECTION_COMPILE)
|
||||
out_buf = image_matrix->item;
|
||||
#endif
|
||||
out_len = fb->width * fb->height * 3;
|
||||
out_width = fb->width;
|
||||
out_height = fb->height;
|
||||
|
|
@ -322,13 +339,16 @@ 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 defined(FACE_DETECTION_COMPILE)
|
||||
dl_matrix3du_free(image_matrix);
|
||||
#endif
|
||||
Serial.println("to rgb888 failed");
|
||||
httpd_resp_send_500(req);
|
||||
if (autoLamp && (lampVal != -1)) setLamp(0);
|
||||
return ESP_FAIL;
|
||||
}
|
||||
|
||||
#if defined(FACE_DETECTION_COMPILE)
|
||||
box_array_t *net_boxes = face_detect(image_matrix, &mtmn_config);
|
||||
|
||||
if (net_boxes){
|
||||
|
|
@ -342,10 +362,13 @@ static esp_err_t capture_handler(httpd_req_t *req){
|
|||
free(net_boxes->landmark);
|
||||
free(net_boxes);
|
||||
}
|
||||
#endif
|
||||
|
||||
jpg_chunking_t jchunk = {req, 0};
|
||||
s = fmt2jpg_cb(out_buf, out_len, out_width, out_height, PIXFORMAT_RGB888, 90, jpg_encode_stream, &jchunk);
|
||||
#if defined(FACE_DETECTION_COMPILE)
|
||||
dl_matrix3du_free(image_matrix);
|
||||
#endif
|
||||
if(!s){
|
||||
Serial.println("JPEG compression failed");
|
||||
if (autoLamp && (lampVal != -1)) setLamp(0);
|
||||
|
|
@ -366,6 +389,8 @@ static esp_err_t stream_handler(httpd_req_t *req){
|
|||
size_t _jpg_buf_len = 0;
|
||||
uint8_t * _jpg_buf = NULL;
|
||||
char * part_buf[64];
|
||||
|
||||
#if defined(FACE_DETECTION_COMPILE)
|
||||
dl_matrix3du_t *image_matrix = NULL;
|
||||
int face_id = 0;
|
||||
bool detected = false;
|
||||
|
|
@ -374,6 +399,7 @@ static esp_err_t stream_handler(httpd_req_t *req){
|
|||
int64_t fr_recognize = 0;
|
||||
int64_t fr_encode = 0;
|
||||
int64_t fr_ready = 0;
|
||||
#endif
|
||||
|
||||
Serial.println("Stream requested");
|
||||
if (autoLamp && (lampVal != -1)) setLamp(lampVal);
|
||||
|
|
@ -396,18 +422,22 @@ static esp_err_t stream_handler(httpd_req_t *req){
|
|||
httpd_resp_set_hdr(req, "Access-Control-Allow-Origin", "*");
|
||||
|
||||
while(true){
|
||||
#if defined(FACE_DETECTION_COMPILE)
|
||||
detected = false;
|
||||
face_id = 0;
|
||||
#endif
|
||||
fb = esp_camera_fb_get();
|
||||
if (!fb) {
|
||||
Serial.println("Camera capture failed");
|
||||
res = ESP_FAIL;
|
||||
} else {
|
||||
#if defined(FACE_DETECTION_COMPILE)
|
||||
fr_start = esp_timer_get_time();
|
||||
fr_ready = fr_start;
|
||||
fr_face = fr_start;
|
||||
fr_encode = fr_start;
|
||||
fr_recognize = fr_start;
|
||||
#endif
|
||||
if(!detection_enabled || fb->width > 400){
|
||||
if(fb->format != PIXFORMAT_JPEG){
|
||||
bool jpeg_converted = frame2jpg(fb, 80, &_jpg_buf, &_jpg_buf_len);
|
||||
|
|
@ -422,7 +452,7 @@ static esp_err_t stream_handler(httpd_req_t *req){
|
|||
_jpg_buf = fb->buf;
|
||||
}
|
||||
} else {
|
||||
|
||||
#if defined(FACE_DETECTION_COMPILE)
|
||||
image_matrix = dl_matrix3du_alloc(1, fb->width, fb->height, 3);
|
||||
|
||||
if (!image_matrix) {
|
||||
|
|
@ -467,6 +497,7 @@ static esp_err_t stream_handler(httpd_req_t *req){
|
|||
}
|
||||
dl_matrix3du_free(image_matrix);
|
||||
}
|
||||
#endif
|
||||
}
|
||||
}
|
||||
if(res == ESP_OK){
|
||||
|
|
@ -492,12 +523,14 @@ static esp_err_t stream_handler(httpd_req_t *req){
|
|||
}
|
||||
|
||||
int64_t fr_end = esp_timer_get_time();
|
||||
#if defined(FACE_DETECTION_COMPILE)
|
||||
int64_t ready_time = (fr_ready - fr_start)/1000;
|
||||
int64_t face_time = (fr_face - fr_ready)/1000;
|
||||
int64_t recognize_time = (fr_recognize - fr_face)/1000;
|
||||
int64_t encode_time = (fr_encode - fr_recognize)/1000;
|
||||
int64_t process_time = (fr_encode - fr_start)/1000;
|
||||
int64_t frame_time = fr_end - last_frame;
|
||||
|
||||
last_frame = fr_end;
|
||||
frame_time /= 1000;
|
||||
uint32_t avg_frame_time = ra_filter_run(&ra_filter, frame_time);
|
||||
|
|
@ -510,6 +543,7 @@ static esp_err_t stream_handler(httpd_req_t *req){
|
|||
(detected)?"DETECTED ":"", face_id
|
||||
);
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
if (autoLamp && (lampVal != -1)) setLamp(0);
|
||||
|
|
@ -582,6 +616,7 @@ static esp_err_t cmd_handler(httpd_req_t *req){
|
|||
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, "rotate")) myRotation = val;
|
||||
#if defined(FACE_DETECTION_COMPILE)
|
||||
else if(!strcmp(variable, "face_detect")) {
|
||||
detection_enabled = val;
|
||||
if(!detection_enabled) {
|
||||
|
|
@ -595,6 +630,7 @@ static esp_err_t cmd_handler(httpd_req_t *req){
|
|||
detection_enabled = val;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
else if(!strcmp(variable, "autolamp") && (lampVal != -1)) {
|
||||
autoLamp = val;
|
||||
if (autoLamp) {
|
||||
|
|
@ -613,12 +649,14 @@ static esp_err_t cmd_handler(httpd_req_t *req){
|
|||
setLamp(lampVal);
|
||||
}
|
||||
}
|
||||
#if defined(FACE_DETECTION_COMPILE)
|
||||
else if(!strcmp(variable, "save_face")) {
|
||||
if (filesystem) saveFaceDB(SPIFFS);
|
||||
}
|
||||
else if(!strcmp(variable, "clear_face")) {
|
||||
if (filesystem) removeFaceDB(SPIFFS);
|
||||
}
|
||||
#endif
|
||||
else if(!strcmp(variable, "save_prefs")) {
|
||||
if (filesystem) savePrefs(SPIFFS);
|
||||
}
|
||||
|
|
@ -681,9 +719,11 @@ static esp_err_t status_handler(httpd_req_t *req){
|
|||
p+=sprintf(p, "\"hmirror\":%u,", s->status.hmirror);
|
||||
p+=sprintf(p, "\"dcw\":%u,", s->status.dcw);
|
||||
p+=sprintf(p, "\"colorbar\":%u,", s->status.colorbar);
|
||||
#if defined(FACE_DETECTION_COMPILE)
|
||||
p+=sprintf(p, "\"face_detect\":%u,", detection_enabled);
|
||||
p+=sprintf(p, "\"face_enroll\":%u,", is_enrolling);
|
||||
p+=sprintf(p, "\"face_recognize\":%u,", recognition_enabled);
|
||||
#endif
|
||||
p+=sprintf(p, "\"cam_name\":\"%s\",", myName);
|
||||
p+=sprintf(p, "\"code_ver\":\"%s\",", myVer);
|
||||
p+=sprintf(p, "\"rotate\":\"%d\",", myRotation);
|
||||
|
|
@ -825,8 +865,10 @@ static esp_err_t dump_handler(httpd_req_t *req){
|
|||
d+= sprintf(d,"Spiffs: %i, used: %i<br>\n", SPIFFS.totalBytes(), SPIFFS.usedBytes());
|
||||
Serial.printf("Spiffs: %i, used: %i\n", SPIFFS.totalBytes(), SPIFFS.usedBytes());
|
||||
}
|
||||
#if defined(FACE_DETECTION_COMPILE)
|
||||
d+= sprintf(d,"Enrolled faces: %i (max %i)<br>\n", id_list.count, id_list.size);
|
||||
Serial.printf("Enrolled faces: %i (max %i)\n", id_list.count, id_list.size);
|
||||
#endif
|
||||
|
||||
// Footer
|
||||
d+= sprintf(d,"<br><div class=\"input-group\">\n");
|
||||
|
|
@ -1040,9 +1082,12 @@ void startCameraServer(int hPort, int sPort){
|
|||
};
|
||||
|
||||
// Filter list; used during face detection
|
||||
#if defined(FACE_DETECTION_COMPILE)
|
||||
ra_filter_init(&ra_filter, 20);
|
||||
#endif
|
||||
|
||||
// Mtmn config values (face detection and recognition parameters)
|
||||
#if defined(FACE_DETECTION_COMPILE)
|
||||
mtmn_config.type = FAST;
|
||||
mtmn_config.min_face = 80;
|
||||
mtmn_config.pyramid = 0.707;
|
||||
|
|
@ -1056,9 +1101,11 @@ void startCameraServer(int hPort, int sPort){
|
|||
mtmn_config.o_threshold.score = 0.7;
|
||||
mtmn_config.o_threshold.nms = 0.7;
|
||||
mtmn_config.o_threshold.candidate_number = 1;
|
||||
|
||||
#endif
|
||||
// Face ID list (settings + pointer to the data allocation)
|
||||
#if defined(FACE_DETECTION_COMPILE)
|
||||
face_id_init(&id_list, FACE_ID_SAVE_NUMBER, ENROLL_CONFIRM_TIMES);
|
||||
#endif
|
||||
// The size of the allocated data block; calculated in dl_lib_calloc()
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -5,6 +5,8 @@
|
|||
#include <DNSServer.h>
|
||||
#include "src/parsebytes.h"
|
||||
|
||||
// #define FACE_DETECTION_COMPILE
|
||||
|
||||
|
||||
/* This sketch is a extension/expansion/reork of the 'official' ESP32 Camera example
|
||||
* sketch from Expressif:
|
||||
|
|
@ -160,13 +162,18 @@ const int pwmMax = pow(2,pwmresolution)-1;
|
|||
bool filesystem = true;
|
||||
#endif
|
||||
|
||||
#if defined(FACE_DETECTION)
|
||||
#if defined(FACE_DETECTION_COMPILE)
|
||||
#if defined(FACE_DETECTION)
|
||||
int8_t detection_enabled = 1;
|
||||
#if defined(FACE_RECOGNITION)
|
||||
int8_t recognition_enabled = 1;
|
||||
#else
|
||||
int8_t recognition_enabled = 0;
|
||||
#endif
|
||||
#else
|
||||
int8_t detection_enabled = 0;
|
||||
int8_t recognition_enabled = 0;
|
||||
#endif
|
||||
#else
|
||||
int8_t detection_enabled = 0;
|
||||
int8_t recognition_enabled = 0;
|
||||
|
|
@ -550,7 +557,9 @@ void setup() {
|
|||
if (filesystem) {
|
||||
filesystemStart();
|
||||
loadPrefs(SPIFFS);
|
||||
#if defined(FACE_DETECTION_COMPILE)
|
||||
loadFaceDB(SPIFFS);
|
||||
#endif
|
||||
} else {
|
||||
Serial.println("No Internal Filesystem, cannot save preferences or face DB");
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue