Mirror
/
esp32-cam-webserver
mirror of https://github.com/easytarget/esp32-cam-webserver.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Remove framebuffer-jpeg conversion, not needed without FaceDetection

This commit is contained in:
Owen 2021-09-03 15:17:04 +02:00
parent b6f79e8120
commit b1cb4a0432
1 changed files with 4 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
app_httpd.cpp
View File

@ -159,18 +159,6 @@ void serialDump() {
return; return;
} }
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){
j->len = 0;
}
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; camera_fb_t * fb = NULL;
esp_err_t res = ESP_OK; esp_err_t res = ESP_OK;
@ -198,10 +186,8 @@ static esp_err_t capture_handler(httpd_req_t *req){
fb_len = fb->len; fb_len = fb->len;
res = httpd_resp_send(req, (const char *)fb->buf, fb->len); res = httpd_resp_send(req, (const char *)fb->buf, fb->len);
} else { } else {
jpg_chunking_t jchunk = {req, 0}; res = ESP_FAIL;
res = frame2jpg_cb(fb, 80, jpg_encode_stream, &jchunk)?ESP_OK:ESP_FAIL; Serial.println("Capture Error: Non-JPEG image returned by camera module");
httpd_resp_send_chunk(req, NULL, 0);
fb_len = jchunk.len;
} }
esp_camera_fb_return(fb); esp_camera_fb_return(fb);
int64_t fr_end = esp_timer_get_time(); int64_t fr_end = esp_timer_get_time();
@ -249,13 +235,8 @@ static esp_err_t stream_handler(httpd_req_t *req){
res = ESP_FAIL; res = ESP_FAIL;
} else { } else {
if(fb->format != PIXFORMAT_JPEG){ if(fb->format != PIXFORMAT_JPEG){
bool jpeg_converted = frame2jpg(fb, 80, &_jpg_buf, &_jpg_buf_len); Serial.println("STREAM: Non-JPEG frame returned by camera module");
esp_camera_fb_return(fb); res = ESP_FAIL;
fb = NULL;
if(!jpeg_converted){
Serial.println("STREAM: JPEG compression failed");
res = ESP_FAIL;
}
} else { } else {
_jpg_buf_len = fb->len; _jpg_buf_len = fb->len;
_jpg_buf = fb->buf; _jpg_buf = fb->buf;