@@ -243,18 +243,18 @@ static esp_err_t stream_handler(httpd_req_t *req) {
243243 } else {
244244 _timestamp.tv_sec = fb->timestamp .tv_sec ;
245245 _timestamp.tv_usec = fb->timestamp .tv_usec ;
246- if (fb->format != PIXFORMAT_JPEG) {
247- bool jpeg_converted = frame2jpg (fb, 80 , &_jpg_buf, &_jpg_buf_len);
248- esp_camera_fb_return (fb);
249- fb = NULL ;
250- if (!jpeg_converted) {
251- log_e (" JPEG compression failed" );
252- res = ESP_FAIL;
253- }
254- } else {
255- _jpg_buf_len = fb->len ;
256- _jpg_buf = fb->buf ;
246+ if (fb->format != PIXFORMAT_JPEG) {
247+ bool jpeg_converted = frame2jpg (fb, 80 , &_jpg_buf, &_jpg_buf_len);
248+ esp_camera_fb_return (fb);
249+ fb = NULL ;
250+ if (!jpeg_converted) {
251+ log_e (" JPEG compression failed" );
252+ res = ESP_FAIL;
257253 }
254+ } else {
255+ _jpg_buf_len = fb->len ;
256+ _jpg_buf = fb->buf ;
257+ }
258258 }
259259 if (res == ESP_OK) {
260260 res = httpd_resp_send_chunk (req, _STREAM_BOUNDARY, strlen (_STREAM_BOUNDARY));
@@ -286,9 +286,8 @@ static esp_err_t stream_handler(httpd_req_t *req) {
286286 uint32_t avg_frame_time = ra_filter_run (&ra_filter, frame_time);
287287#endif
288288 log_i (
289- " MJPG: %uB %ums (%.1ffps), AVG: %ums (%.1ffps)"
290- ,
291- (uint32_t )(_jpg_buf_len), (uint32_t )frame_time, 1000.0 / (uint32_t )frame_time, avg_frame_time, 1000.0 / avg_frame_time
289+ " MJPG: %uB %ums (%.1ffps), AVG: %ums (%.1ffps)" , (uint32_t )(_jpg_buf_len), (uint32_t )frame_time, 1000.0 / (uint32_t )frame_time, avg_frame_time,
290+ 1000.0 / avg_frame_time
292291 );
293292 }
294293
0 commit comments