ryan/esp32cam-rtsp
1
0
Fork 0
forked from external-repos/esp32cam-rtsp
Code Pull Requests Activity

Merge pull request #46 from rzeldent/bugfix/camera_initialization

Browse Source 
Change moment of camera initialization
This commit is contained in:
rzeldent
2023-03-11 20:38:42 +01:00
committed by GitHub
parent d9cec86af6 a1c8bf18e8
commit 6a45d99871
1 changed files with 9 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/main.cpp
View File

@@ -300,18 +300,6 @@ void update_camera_settings()
void start_rtsp_server() void start_rtsp_server()
{ {
log_v("start_rtsp_server"); log_v("start_rtsp_server");
camera_init_result = initialize_camera();
if (camera_init_result != ESP_OK)
{
log_e("Failed to initialize camera: 0x%0x. Type: %s, frame size: %s, frame rate: %d ms, jpeg quality: %d", camera_init_result, param_board.value(), param_frame_size.value(), param_frame_duration.value(), param_jpg_quality.value());
return;
}
log_i("Camera initialized");
update_camera_settings();
log_i("Camera settings updated");
camera_server = std::unique_ptr<rtsp_server>(new rtsp_server(cam, param_frame_duration.value(), RTSP_PORT)); camera_server = std::unique_ptr<rtsp_server>(new rtsp_server(cam, param_frame_duration.value(), RTSP_PORT));
// Add service to mDNS - rtsp // Add service to mDNS - rtsp
MDNS.addService("rtsp", "tcp", 554); MDNS.addService("rtsp", "tcp", 554);
@@ -326,7 +314,8 @@ void on_connected()
analogWrite(LED_FLASH, param_led_intensity.value()); analogWrite(LED_FLASH, param_led_intensity.value());
// Start (OTA) Over The Air programming when connected // Start (OTA) Over The Air programming when connected
ArduinoOTA.begin(); ArduinoOTA.begin();
// Start the RTSP Server // Start the RTSP Server if initializef
if (camera_init_result == ESP_OK)
start_rtsp_server(); start_rtsp_server();
} }
@@ -400,6 +389,12 @@ void setup()
iotWebConf.setWifiConnectionCallback(on_connected); iotWebConf.setWifiConnectionCallback(on_connected);
iotWebConf.init(); iotWebConf.init();
camera_init_result = initialize_camera();
if (camera_init_result != ESP_OK)
log_e("Failed to initialize camera: 0x%0x. Type: %s, frame size: %s, frame rate: %d ms, jpeg quality: %d", camera_init_result, param_board.value(), param_frame_size.value(), param_frame_duration.value(), param_jpg_quality.value());
else
update_camera_settings();
// Set up required URL handlers on the web server // Set up required URL handlers on the web server
web_server.on("/", HTTP_GET, handle_root); web_server.on("/", HTTP_GET, handle_root);
web_server.on("/config", [] web_server.on("/config", []