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

Fixes

Browse Source
This commit is contained in:
Rene Zeldenthuis
2024-02-15 22:33:42 +01:00
parent f05932b896
commit 152c068f68
5 changed files with 27 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/micro-rtsp-server/include/micro_rtsp_server.h
View File

@@ -12,9 +12,12 @@
class micro_rtsp_server : WiFiServer
{
public:
micro_rtsp_server(const micro_rtsp_camera& source, unsigned frame_interval = 100, unsigned short port = 554);
micro_rtsp_server(const micro_rtsp_camera& source, unsigned frame_interval = 100);
~micro_rtsp_server();
void begin(unsigned short port = 554);
void end();
unsigned get_frame_interval() { return frame_interval_; }
unsigned set_frame_interval(unsigned value) { return frame_interval_ = value; }

5
lib/micro-rtsp-server/src/micro_rtsp_camera.cpp
View File

@@ -14,12 +14,13 @@ micro_rtsp_camera::~micro_rtsp_camera()
esp_err_t micro_rtsp_camera::initialize(camera_config_t *camera_config)
{
init_result = esp_camera_init(camera_config);
if (init_result == ESP_OK)
update_frame();
else
log_e("Camera initialization failed: 0x%x", init_result);
log_e("Camera initialization failed: 0x%02x", init_result);
return init_result;
}
esp_err_t micro_rtsp_camera::deinitialize()

16
lib/micro-rtsp-server/src/micro_rtsp_server.cpp
View File

@@ -3,15 +3,13 @@
#include <memory>
// Check client connections every 100 milliseconds
#define CHECK_CLIENT_INTERVAL 100
#define STREAM_NAME "mjpeg/1"
#define CHECK_CLIENT_INTERVAL 10
micro_rtsp_server::micro_rtsp_server(const micro_rtsp_camera &source, unsigned frame_interval /*= 100*/, unsigned short port /*= 554*/)
micro_rtsp_server::micro_rtsp_server(const micro_rtsp_camera &source, unsigned frame_interval /*= 100*/)
: source_(source)
{
log_i("starting RTSP server");
frame_interval_ = frame_interval;
begin(port);
}
micro_rtsp_server::~micro_rtsp_server()
@@ -19,6 +17,16 @@ micro_rtsp_server::~micro_rtsp_server()
end();
}
void micro_rtsp_server::begin(unsigned short port /*= 554*/)
{
WiFiServer::begin(port);
}
void micro_rtsp_server::end()
{
WiFiServer::end();
}
void micro_rtsp_server::loop()
{
auto now = millis();