From c64a60d8734d8bb1979c473fa0292ce5db34ac40 Mon Sep 17 00:00:00 2001 From: 7FM <41307817+7FM@users.noreply.github.com> Date: Tue, 25 Feb 2020 17:03:47 +0100 Subject: [PATCH 1/2] Fix race condition --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 7b7bcaf..6864417 100644 --- a/README.md +++ b/README.md @@ -199,6 +199,7 @@ esp_err_t jpg_stream_httpd_handler(httpd_req_t *req){ if (!fb) { ESP_LOGE(TAG, "Camera capture failed"); res = ESP_FAIL; + break; } else { if(fb->format != PIXFORMAT_JPEG){ bool jpeg_converted = frame2jpg(fb, 80, &_jpg_buf, &_jpg_buf_len); From a82c8916a9a63772e87b1b267d423b38718ef580 Mon Sep 17 00:00:00 2001 From: 7FM <41307817+7FM@users.noreply.github.com> Date: Tue, 25 Feb 2020 19:03:01 +0100 Subject: [PATCH 2/2] remove redundant else block --- README.md | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 6864417..316775b 100644 --- a/README.md +++ b/README.md @@ -200,19 +200,19 @@ esp_err_t jpg_stream_httpd_handler(httpd_req_t *req){ ESP_LOGE(TAG, "Camera capture failed"); res = ESP_FAIL; break; - } else { - if(fb->format != PIXFORMAT_JPEG){ - bool jpeg_converted = frame2jpg(fb, 80, &_jpg_buf, &_jpg_buf_len); - if(!jpeg_converted){ - ESP_LOGE(TAG, "JPEG compression failed"); - esp_camera_fb_return(fb); - res = ESP_FAIL; - } - } else { - _jpg_buf_len = fb->len; - _jpg_buf = fb->buf; - } } + if(fb->format != PIXFORMAT_JPEG){ + bool jpeg_converted = frame2jpg(fb, 80, &_jpg_buf, &_jpg_buf_len); + if(!jpeg_converted){ + ESP_LOGE(TAG, "JPEG compression failed"); + esp_camera_fb_return(fb); + res = ESP_FAIL; + } + } else { + _jpg_buf_len = fb->len; + _jpg_buf = fb->buf; + } + if(res == ESP_OK){ res = httpd_resp_send_chunk(req, _STREAM_BOUNDARY, strlen(_STREAM_BOUNDARY)); }