external-repos/esp32cam-rtsp
1
0
Fork 1
mirror of https://github.com/rzeldent/esp32cam-rtsp.git synced 2025-11-15 12:38:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #28 from rzeldent/bugfix/snapshot_update

Browse Source 
Bugfix/snapshot update
This commit is contained in:
rzeldent
2022-11-07 17:54:55 +01:00
committed by GitHub
parent 9d8479ab31 370f3c805c
commit 94a010e99b
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/main.cpp
View File

@@ -149,19 +149,23 @@ void handle_snapshot()
return; return;
} }
if (cam.getfb() == nullptr) // Remove old images stored in the framebuffer
auto frame_buffers = atoi(frame_buffers_val);
while (frame_buffers--)
cam.run();
auto fb_len = cam.getSize();
auto fb = (const char*)cam.getfb();
if (fb == nullptr)
{ {
web_server.send(404, "text/plain", "Unable to obtain frame buffer from the camera"); web_server.send(404, "text/plain", "Unable to obtain frame buffer from the camera");
return; return;
} }
auto fb_len = cam.getSize();
auto fb = (const char *)memcpy(new uint8_t[fb_len], cam.getfb(), fb_len);
web_server.sendHeader("Cache-Control", "no-cache, no-store, must-revalidate"); web_server.sendHeader("Cache-Control", "no-cache, no-store, must-revalidate");
web_server.setContentLength(fb_len); web_server.setContentLength(fb_len);
web_server.send(200, "image/jpeg", ""); web_server.send(200, "image/jpeg", "");
web_server.sendContent(fb, fb_len); web_server.sendContent(fb, fb_len);
delete[] fb;
} }
void handle_flash() void handle_flash()
@@ -188,7 +192,6 @@ void on_config_saved()
log_v("on_config_saved"); log_v("on_config_saved");
// Set flash led intensity // Set flash led intensity
analogWrite(LED_FLASH, atoi(flash_led_intensity_val)); analogWrite(LED_FLASH, atoi(flash_led_intensity_val));
config_changed = true; config_changed = true;
} }
@@ -219,7 +222,7 @@ void start_rtsp_server()
camera_init_result = initialize_camera(); camera_init_result = initialize_camera();
if (camera_init_result != ESP_OK) if (camera_init_result != ESP_OK)
{ {
log_e("Failed to initialize camera: 0x%0xd. Type: %s, frame size: %s, frame buffers: %s, frame rate: %s ms, jpeg quality: %s", camera_init_result, camera_config_val, frame_size_val, frame_buffers_val, frame_duration_val, jpeg_quality_val); log_e("Failed to initialize camera: 0x%0x. Type: %s, frame size: %s, frame buffers: %s, frame rate: %s ms, jpeg quality: %s", camera_init_result, camera_config_val, frame_size_val, frame_buffers_val, frame_duration_val, jpeg_quality_val);
return; return;
} }