Darkages/SpotMicroESP32-Leika
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

🪄 Formats CameraService

Browse Source
This commit is contained in:
Rune Harlyk
2024-07-09 20:03:28 +02:00
committed by Rune Harlyk
parent 74c2285800
commit bbc7498653
3 changed files with 43 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
esp32/lib/ESP32-sveltekit/CameraService.cpp
+15 -24
View File
@@ -1,10 +1,8 @@
#include <CameraService.h> #include <CameraService.h>
static const char *_STREAM_CONTENT_TYPE = static const char *_STREAM_CONTENT_TYPE = "multipart/x-mixed-replace;boundary=" PART_BOUNDARY;
"multipart/x-mixed-replace;boundary=" PART_BOUNDARY;
static const char *_STREAM_BOUNDARY = "\r\n--" PART_BOUNDARY "\r\n"; static const char *_STREAM_BOUNDARY = "\r\n--" PART_BOUNDARY "\r\n";
static const char *_STREAM_PART = static const char *_STREAM_PART = "Content-Type: image/jpeg\r\nContent-Length: %u\r\n\r\n";
"Content-Type: image/jpeg\r\nContent-Length: %u\r\n\r\n";
SemaphoreHandle_t cameraMutex = xSemaphoreCreateMutex(); SemaphoreHandle_t cameraMutex = xSemaphoreCreateMutex();
@@ -27,23 +25,15 @@ sensor_t *safe_sensor_get() {
void safe_sensor_return() { xSemaphoreGive(cameraMutex); } void safe_sensor_return() { xSemaphoreGive(cameraMutex); }
CameraService::CameraService(PsychicHttpServer *server, CameraService::CameraService(PsychicHttpServer *server, TaskManager *taskManager, SecurityManager *securityManager)
TaskManager *taskManager, : _server(server), _taskManager(taskManager), _securityManager(securityManager) {}
SecurityManager *securityManager)
: _server(server),
_taskManager(taskManager),
_securityManager(securityManager) {}
void CameraService::begin() { void CameraService::begin() {
InitializeCamera(); InitializeCamera();
_server->on( _server->on(STILL_SERVICE_PATH, HTTP_GET,
STILL_SERVICE_PATH, HTTP_GET, _securityManager->wrapRequest(std::bind(&CameraService::cameraStill, this, std::placeholders::_1),
_securityManager->wrapRequest(
std::bind(&CameraService::cameraStill, this, std::placeholders::_1),
AuthenticationPredicates::IS_AUTHENTICATED)); AuthenticationPredicates::IS_AUTHENTICATED));
_server->on(STREAM_SERVICE_PATH, HTTP_GET, _server->on(STREAM_SERVICE_PATH, HTTP_GET,
_securityManager->wrapRequest( _securityManager->wrapRequest(std::bind(&CameraService::cameraStream, this, std::placeholders::_1),
std::bind(&CameraService::cameraStream, this,
std::placeholders::_1),
AuthenticationPredicates::IS_AUTHENTICATED)); AuthenticationPredicates::IS_AUTHENTICATED));
ESP_LOGV("CameraService", "Registered GET endpoint: %s", STILL_SERVICE_PATH); ESP_LOGV("CameraService", "Registered GET endpoint: %s", STILL_SERVICE_PATH);
@@ -89,8 +79,10 @@ esp_err_t CameraService::InitializeCamera() {
log_i("Initializing camera"); log_i("Initializing camera");
esp_err_t err = esp_camera_init(&camera_config); esp_err_t err = esp_camera_init(&camera_config);
if (err == ESP_OK) ESP_LOGI("CameraService", "Camera probe successful"); if (err == ESP_OK)
else ESP_LOGE("CameraService", "Camera probe failed with error 0x%x", err); ESP_LOGI("CameraService", "Camera probe successful");
else
ESP_LOGE("CameraService", "Camera probe failed with error 0x%x", err);
return err; return err;
} }
@@ -102,8 +94,7 @@ esp_err_t CameraService::cameraStill(PsychicRequest *request) {
request->reply(500, "text/plain", "Camera capture failed"); request->reply(500, "text/plain", "Camera capture failed");
return ESP_FAIL; return ESP_FAIL;
} }
PsychicStreamResponse response = PsychicStreamResponse response = PsychicStreamResponse(request, "image/jpeg", "capture.jpg");
PsychicStreamResponse(request, "image/jpeg", "capture.jpg");
response.beginSend(); response.beginSend();
response.write(fb->buf, fb->len); response.write(fb->buf, fb->len);
esp_camera_fb_return(fb); esp_camera_fb_return(fb);
@@ -113,7 +104,7 @@ esp_err_t CameraService::cameraStill(PsychicRequest *request) {
void streamTask(void *pv) { void streamTask(void *pv) {
esp_err_t res = ESP_OK; esp_err_t res = ESP_OK;
PsychicRequest *request = static_cast<PsychicRequest*>(pv); PsychicRequest *request = static_cast<PsychicRequest *>(pv);
httpd_req_t *copy = nullptr; httpd_req_t *copy = nullptr;
res = httpd_req_async_handler_begin(request->request(), &copy); res = httpd_req_async_handler_begin(request->request(), &copy);
@@ -140,8 +131,8 @@ void streamTask(void *pv) {
ESP_LOGE("Stream", "Camera capture failed"); ESP_LOGE("Stream", "Camera capture failed");
break; break;
} }
if(fb->format != PIXFORMAT_JPEG){ if (fb->format != PIXFORMAT_JPEG) {
if(!frame2jpg(fb, 80, &buf, &buf_len)) break; if (!frame2jpg(fb, 80, &buf, &buf_len)) break;
} else { } else {
buf_len = fb->len; buf_len = fb->len;
buf = fb->buf; buf = fb->buf;
esp32/lib/ESP32-sveltekit/CameraService.h
+3 -4
View File
@@ -11,7 +11,7 @@
#include <Features.h> #include <Features.h>
#if FT_ENABLED(FT_CAMERA) #if FT_ENABLED(FT_CAMERA)
#include <CameraPins.h> #include <CameraPins.h>
#endif #endif
#define STREAM_SERVICE_PATH "/api/camera/stream" #define STREAM_SERVICE_PATH "/api/camera/stream"
@@ -20,11 +20,10 @@
#define PART_BOUNDARY "frame" #define PART_BOUNDARY "frame"
camera_fb_t *safe_camera_fb_get(); camera_fb_t *safe_camera_fb_get();
sensor_t* safe_sensor_get(); sensor_t *safe_sensor_get();
void safe_sensor_return(); void safe_sensor_return();
class CameraService class CameraService {
{
public: public:
CameraService(PsychicHttpServer *server, TaskManager *taskManager, SecurityManager *securityManager); CameraService(PsychicHttpServer *server, TaskManager *taskManager, SecurityManager *securityManager);
esp32/lib/ESP32-sveltekit/CameraSettingsService.h
+7 -13
View File
@@ -81,8 +81,7 @@ class CameraSettings {
root["colorbar"] = settings.colorbar; root["colorbar"] = settings.colorbar;
} }
static StateUpdateResult update(JsonObject &root, static StateUpdateResult update(JsonObject &root, CameraSettings &settings) {
CameraSettings &settings) {
settings.pixformat = root["pixformat"]; settings.pixformat = root["pixformat"];
settings.framesize = root["framesize"]; settings.framesize = root["framesize"];
settings.brightness = root["brightness"]; settings.brightness = root["brightness"];
@@ -120,19 +119,14 @@ class CameraSettings {
class CameraSettingsService : public StatefulService<CameraSettings> { class CameraSettingsService : public StatefulService<CameraSettings> {
public: public:
CameraSettingsService(PsychicHttpServer *server, FS *fs, CameraSettingsService(PsychicHttpServer *server, FS *fs, SecurityManager *securityManager, EventSocket *socket)
SecurityManager *securityManager, EventSocket *socket)
: _server(server), : _server(server),
_securityManager(securityManager), _securityManager(securityManager),
_httpEndpoint(CameraSettings::read, CameraSettings::update, this, _httpEndpoint(CameraSettings::read, CameraSettings::update, this, server, CAMERA_SETTINGS_PATH,
server, CAMERA_SETTINGS_PATH, securityManager, securityManager, AuthenticationPredicates::IS_ADMIN),
AuthenticationPredicates::IS_ADMIN), _eventEndpoint(CameraSettings::read, CameraSettings::update, this, socket, EVENT_CAMERA_SETTINGS),
_eventEndpoint(CameraSettings::read, CameraSettings::update, this, _fsPersistence(CameraSettings::read, CameraSettings::update, this, fs, CAMERA_SETTINGS_FILE) {
socket, EVENT_CAMERA_SETTINGS), addUpdateHandler([&](const String &originId) { updateCamera(); }, false);
_fsPersistence(CameraSettings::read, CameraSettings::update, this, fs,
CAMERA_SETTINGS_FILE) {
addUpdateHandler([&](const String &originId) { updateCamera(); },
false);
} }
void begin() { void begin() {