Mirror/esp32-cam-webserver
1
0
Fork 0
mirror of https://github.com/easytarget/esp32-cam-webserver.git synced 2024-02-16 18:18:24 +08:00
Code Issues Projects Releases Wiki Activity

Stream view fix, Status dump (#63)

Browse Source 
* Better treatment of rotated stream in stream viewer,
still not perfect but ok for now.
* Info Page: fix #56
This commit is contained in:
Owen Carter
2020-10-03 19:49:08 +02:00
committed by GitHub
parent 93db6cb5e6
commit adfa3ca8d3
8 changed files with 171 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

119
app_httpd.cpp
View File

@ -16,6 +16,7 @@
#include "esp_camera.h" #include "esp_camera.h"
#include "img_converters.h" #include "img_converters.h"
#include "Arduino.h" #include "Arduino.h"
#include <WiFi.h>
#include "index_ov2640.h" #include "index_ov2640.h"
#include "index_ov3660.h" #include "index_ov3660.h"
@ -31,14 +32,22 @@ extern void flashLED(int flashtime);
extern void setLamp(int newVal); extern void setLamp(int newVal);
// External variables declared in main .ino // External variables declared in main .ino
extern char myName[]; // Camera Name extern char myName[];
extern char myVer[]; // Firmware Build Info extern char myVer[];
extern int myRotation; // Rotation extern int myRotation;
extern int lampVal; // The current Lamp value extern int lampVal;
extern char streamURL[]; // Stream URL extern char streamURL[];
extern int8_t detection_enabled; // Face detection enable extern int8_t detection_enabled;
extern int8_t recognition_enabled; // Face recognition enable extern int8_t recognition_enabled;
extern bool filesystem; // Save/restore features enabled extern bool filesystem;
extern int httpPort;
extern int streamPort;
extern IPAddress ip;
extern IPAddress net;
extern IPAddress gw;
extern int sketchSize;
extern int sketchSpace;
extern String sketchMD5;
#include "fb_gfx.h" #include "fb_gfx.h"
#include "fd_forward.h" #include "fd_forward.h"
@ -659,7 +668,6 @@ static esp_err_t info_handler(httpd_req_t *req){
char * p = json_response; char * p = json_response;
*p++ = '{'; *p++ = '{';
p+=sprintf(p, "\"cam_name\":\"%s\",", myName); p+=sprintf(p, "\"cam_name\":\"%s\",", myName);
p+=sprintf(p, "\"code_ver\":\"%s\",", myVer);
p+=sprintf(p, "\"rotate\":\"%d\",", myRotation); p+=sprintf(p, "\"rotate\":\"%d\",", myRotation);
p+=sprintf(p, "\"stream_url\":\"%s\"", streamURL); p+=sprintf(p, "\"stream_url\":\"%s\"", streamURL);
*p++ = '}'; *p++ = '}';
@ -687,19 +695,81 @@ static esp_err_t favicon_ico_handler(httpd_req_t *req){
return httpd_resp_send(req, (const char *)favicon_ico, favicon_ico_len); return httpd_resp_send(req, (const char *)favicon_ico, favicon_ico_len);
} }
// DEBUG static esp_err_t dump_handler(httpd_req_t *req){
extern void dumpPrefs(fs::FS &fs);
static esp_err_t dump_prefs_handler(httpd_req_t *req){
flashLED(75); flashLED(75);
Serial.println("\nDump Requested");
Serial.print("Preferences file: ");
dumpPrefs(SPIFFS); dumpPrefs(SPIFFS);
Serial.printf("mtmn_config size: %u :: ra_filter size: %u :: id_list %u\n", sizeof(mtmn_config), sizeof(ra_filter), sizeof(id_list)); static char dumpOut[1200] = "n";
httpd_resp_set_type(req, "text/css"); char * d = dumpOut;
// Header
d+= sprintf(d,"<html><head><meta charset=\"utf-8\">\n");
d+= sprintf(d,"<meta name=\"viewport\" content=\"width=device-width,initial-scale=1\">\n");
d+= sprintf(d,"<title>%s - Status</title>\n", myName);
d+= sprintf(d,"<link rel=\"icon\" type=\"image/png\" sizes=\"32x32\" href=\"/favicon-32x32.png\">\n");
d+= sprintf(d,"<link rel=\"icon\" type=\"image/png\" sizes=\"16x16\" href=\"/favicon-16x16.png\">\n");
d+= sprintf(d,"<link rel=\"stylesheet\" type=\"text/css\" href=\"/style.css\">\n");
d+= sprintf(d,"</head>\n<body>\n");
d+= sprintf(d,"<h1>ESP32 Cam Webserver</h1>\n");
// Module
d+= sprintf(d,"Name: %s<br>\n", myName);
Serial.printf("Name: %s\n", myName);
d+= sprintf(d,"Firmware: %s<br>\n", myVer);
Serial.printf("Firmware: %s\n", myVer);
float sketchPct = 100 * sketchSize / sketchSpace;
d+= sprintf(d,"Sketch Size: %i (total: %i, %.1f%% used)<br>\n", sketchSize, sketchSpace, sketchPct);
Serial.printf("Sketch Size: %i (total: %i, %.1f%% used)\n", sketchSize, sketchSpace, sketchPct);
d+= sprintf(d,"MD5: %s<br>\n", sketchMD5.c_str());
Serial.printf("MD5: %s\n", sketchMD5.c_str());
d+= sprintf(d,"ESP sdk: %s<br>\n", ESP.getSdkVersion());
Serial.printf("ESP sdk: %s\n", ESP.getSdkVersion());
// Network
d+= sprintf(d,"<h2>WiFi</h2>\n");
String ssidName = WiFi.SSID();
d+= sprintf(d,"SSID: %s<br>\n", ssidName.c_str());
Serial.printf("Ssid: %s\n", ssidName.c_str());
d+= sprintf(d,"Rssi: %i<br>\n", WiFi.RSSI());
Serial.printf("Rssi: %i\n", WiFi.RSSI());
d+= sprintf(d,"Http port: %i, Stream port: %i<br>\n", httpPort, streamPort);
Serial.printf("Http port: %i, Stream port: %i\n", httpPort, streamPort);
d+= sprintf(d,"IP address: %d.%d.%d.%d<br>\n", ip[0], ip[1], ip[2], ip[3]);
Serial.printf("IP address: %d.%d.%d.%d\n", ip[0], ip[1], ip[2], ip[3]);
d+= sprintf(d,"Netmask: %d.%d.%d.%d<br>\n", net[0], net[1], net[2], net[3]);
Serial.printf("Netmask: %d.%d.%d.%d\n", net[0], net[1], net[2], net[3]);
d+= sprintf(d,"Gateway: %d.%d.%d.%d<br>\n", gw[0], gw[1], gw[2], gw[3]);
Serial.printf("Gateway: %d.%d.%d.%d\n", gw[0], gw[1], gw[2], gw[3]);
// System
d+= sprintf(d,"<h2>System</h2>\n");
int64_t sec = esp_timer_get_time() / 1000000;
int64_t upDays = int64_t(floor(sec/86400));
int upHours = int64_t(floor(sec/3600)) % 24;
int upMin = int64_t(floor(sec/60)) % 60;
int upSec = sec % 60;
d+= sprintf(d,"Up: %" PRId64 ":%02i:%02i:%02i (d:h:m:s)<br>\n", upDays, upHours, upMin, upSec);
Serial.printf("Up: %" PRId64 ":%02i:%02i:%02i (d:h:m:s)\n", upDays, upHours, upMin, upSec);
d+= sprintf(d,"Freq: %i MHz<br>\n", ESP.getCpuFreqMHz());
Serial.printf("Freq: %i MHz\n", ESP.getCpuFreqMHz());
d+= sprintf(d,"Heap: %i, free: %i, min free: %i, max block: %i<br>\n", ESP.getHeapSize(), ESP.getFreeHeap(), ESP.getMinFreeHeap(), ESP.getMaxAllocHeap());
Serial.printf("Heap: %i, free: %i, min free: %i, max block: %i\n", ESP.getHeapSize(), ESP.getFreeHeap(), ESP.getMinFreeHeap(), ESP.getMaxAllocHeap());
d+= sprintf(d,"Psram: %i, free: %i, min free: %i, max block: %i<br>\n", ESP.getPsramSize(), ESP.getFreePsram(), ESP.getMinFreePsram(), ESP.getMaxAllocPsram());
Serial.printf("Psram: %i, free: %i, min free: %i, max block: %i\n", ESP.getPsramSize(), ESP.getFreePsram(), ESP.getMinFreePsram(), ESP.getMaxAllocPsram());
if (filesystem) {
d+= sprintf(d,"Spiffs: %i, used: %i<br>\n", SPIFFS.totalBytes(), SPIFFS.usedBytes());
Serial.printf("Spiffs: %i, used: %i\n", SPIFFS.totalBytes(), SPIFFS.usedBytes());
}
// Following is debug while implementing FaceDB dump
// d+= sprintf(d,"mtmn_config size: %u<br>ra_filter size: %u<br>id_list %u<br>\n", sizeof(mtmn_config), sizeof(ra_filter), sizeof(id_list));
// Serial.printf("mtmn_config size: %u<br>ra_filter size: %u<br>id_list %u\n", sizeof(mtmn_config), sizeof(ra_filter), sizeof(id_list));
// Footer
d+= sprintf(d,"<br><div class=\"input-group\">\n");
d+= sprintf(d,"<button title=\"Refresh this page\" onclick=\"location.replace(document.URL)\">Refresh</button>\n");
d+= sprintf(d,"<button title=\"Close this page\" onclick=\"javascript:window.close()\">Close</button>\n");
d+= sprintf(d,"</div>\n</body>\n</html>\n");
*d++ = 0;
httpd_resp_set_type(req, "text/html");
httpd_resp_set_hdr(req, "Content-Encoding", "identity"); httpd_resp_set_hdr(req, "Content-Encoding", "identity");
char resp[] = "DEBUG: Preferences file Dumped to serial"; return httpd_resp_send(req, dumpOut, strlen(dumpOut));
return httpd_resp_send(req, resp, strlen(resp));
} }
// /DEBUG
static esp_err_t style_handler(httpd_req_t *req){ static esp_err_t style_handler(httpd_req_t *req){
httpd_resp_set_type(req, "text/css"); httpd_resp_set_type(req, "text/css");
@ -737,7 +807,7 @@ static esp_err_t index_handler(httpd_req_t *req){
void startCameraServer(int hPort, int sPort){ void startCameraServer(int hPort, int sPort){
httpd_config_t config = HTTPD_DEFAULT_CONFIG(); httpd_config_t config = HTTPD_DEFAULT_CONFIG();
config.max_uri_handlers = 10; // we use more than the default 8 (on port 80) config.max_uri_handlers = 12; // we use more than the default 8 (on port 80)
httpd_uri_t index_uri = { httpd_uri_t index_uri = {
.uri = "/", .uri = "/",
@ -794,10 +864,10 @@ void startCameraServer(int hPort, int sPort){
.user_ctx = NULL .user_ctx = NULL
}; };
// DEBUG // DEBUG
httpd_uri_t dump_prefs_uri = { httpd_uri_t dump_uri = {
.uri = "/dump", .uri = "/dump",
.method = HTTP_GET, .method = HTTP_GET,
.handler = dump_prefs_handler, .handler = dump_handler,
.user_ctx = NULL .user_ctx = NULL
}; };
// DEBUG // DEBUG
@ -835,11 +905,12 @@ void startCameraServer(int hPort, int sPort){
mtmn_config.o_threshold.nms = 0.7; mtmn_config.o_threshold.nms = 0.7;
mtmn_config.o_threshold.candidate_number = 1; mtmn_config.o_threshold.candidate_number = 1;
face_id_init(&id_list, FACE_ID_SAVE_NUMBER, ENROLL_CONFIRM_TIMES); face_id_init(&id_list, FACE_ID_SAVE_NUMBER, ENROLL_CONFIRM_TIMES);
config.server_port = hPort; config.server_port = hPort;
config.ctrl_port = hPort; config.ctrl_port = hPort;
Serial.printf("Starting web server on port: '%d'\n", config.server_port); Serial.printf("Starting web server on port: '%d'\n", config.server_port);
if (httpd_start(&camera_httpd, &config) == ESP_OK) { if (httpd_start(&camera_httpd, &config) == ESP_OK) {
// Note; config.max_uri_handlers (above) must be >= the number of handlers
httpd_register_uri_handler(camera_httpd, &index_uri); httpd_register_uri_handler(camera_httpd, &index_uri);
httpd_register_uri_handler(camera_httpd, &cmd_uri); httpd_register_uri_handler(camera_httpd, &cmd_uri);
httpd_register_uri_handler(camera_httpd, &status_uri); httpd_register_uri_handler(camera_httpd, &status_uri);
@ -849,7 +920,7 @@ void startCameraServer(int hPort, int sPort){
httpd_register_uri_handler(camera_httpd, &favicon_16x16_uri); httpd_register_uri_handler(camera_httpd, &favicon_16x16_uri);
httpd_register_uri_handler(camera_httpd, &favicon_32x32_uri); httpd_register_uri_handler(camera_httpd, &favicon_32x32_uri);
httpd_register_uri_handler(camera_httpd, &favicon_ico_uri); httpd_register_uri_handler(camera_httpd, &favicon_ico_uri);
httpd_register_uri_handler(camera_httpd, &dump_prefs_uri); // DEBUG httpd_register_uri_handler(camera_httpd, &dump_uri);
} }
@ -864,6 +935,4 @@ void startCameraServer(int hPort, int sPort){
httpd_register_uri_handler(stream_httpd, &favicon_32x32_uri); httpd_register_uri_handler(stream_httpd, &favicon_32x32_uri);
httpd_register_uri_handler(stream_httpd, &favicon_ico_uri); httpd_register_uri_handler(stream_httpd, &favicon_ico_uri);
} }
Serial.printf("mtmn_config size: %u :: ra_filter size: %u :: id_list %u\n", sizeof(mtmn_config), sizeof(ra_filter), sizeof(id_list));
} }

4
css.h
View File

@ -51,13 +51,9 @@ section.main {
figure { figure {
padding: 0px; padding: 0px;
margin: 0; margin: 0;
-webkit-margin-before: 0;
margin-block-start: 0; margin-block-start: 0;
-webkit-margin-after: 0;
margin-block-end: 0; margin-block-end: 0;
-webkit-margin-start: 0;
margin-inline-start: 0; margin-inline-start: 0;
-webkit-margin-end: 0;
margin-inline-end: 0 margin-inline-end: 0
} }

42
esp32-cam-webserver.ino
View File

@ -4,24 +4,23 @@
/* This sketch is a extension/expansion/reork of the 'official' ESP32 Camera example /* This sketch is a extension/expansion/reork of the 'official' ESP32 Camera example
* sketch from Expressif: * sketch from Expressif:
* https://github.com/espressif/arduino-esp32/tree/master/libraries/ESP32/examples/Camera/CameraWebServer * https://github.com/espressif/arduino-esp32/tree/master/libraries/ESP32/examples/Camera/CameraWebServer
* *
* It is modified to allow control of Illumination LED Lamps's (present on some modules), * It is modified to allow control of Illumination LED Lamps's (present on some modules),
* greater feedback via a status LED, and the HTML contents are present in plain text * greater feedback via a status LED, and the HTML contents are present in plain text
* for easy modification. * for easy modification.
* *
* A camera name can now be configured, and wifi details can be stored in an optional * A camera name can now be configured, and wifi details can be stored in an optional
* header file to allow easier updated of the repo. * header file to allow easier updated of the repo.
* *
* The web UI has had minor changes to add the lamp control when present, I have made the * The web UI has had changes to add the lamp control, rotation, a standalone viewer,
* 'Start Stream' controls more accessible, and add feedback of the camera name/firmware. * more feeedback, new controls and other tweaks and changes,
*
* note: Make sure that you have either selected ESP32 AI Thinker, * note: Make sure that you have either selected ESP32 AI Thinker,
* or another board which has PSRAM enabled to use high resolution camera modes * or another board which has PSRAM enabled to use high resolution camera modes
*/ */
/* /*
* FOR NETWORK AND HARDWARE SETTINGS COPY OR RENAME 'myconfig.sample.h' to 'myconfig.h' AND EDIT THAT. * FOR NETWORK AND HARDWARE SETTINGS COPY OR RENAME 'myconfig.sample.h' TO 'myconfig.h' AND EDIT THAT.
* *
* By default this sketch will assume an AI-THINKER ESP-CAM and create * By default this sketch will assume an AI-THINKER ESP-CAM and create
* an accesspoint called "ESP32-CAM-CONNECT" (password: "InsecurePassword") * an accesspoint called "ESP32-CAM-CONNECT" (password: "InsecurePassword")
@ -51,6 +50,16 @@
// used for non-volatile camera settings and face DB store // used for non-volatile camera settings and face DB store
#include "storage.h" #include "storage.h"
// Sketch Info
int sketchSize;
int sketchSpace;
String sketchMD5;
// IP address, netmask and gateway
IPAddress ip;
IPAddress net;
IPAddress gw;
// Declare external function from app_httpd.cpp // Declare external function from app_httpd.cpp
extern void startCameraServer(int hPort, int sPort); extern void startCameraServer(int hPort, int sPort);
@ -102,7 +111,7 @@ int myRotation = CAM_ROTATION;
#endif #endif
#else #else
int lampVal = -1; // no lamp pin assigned int lampVal = -1; // no lamp pin assigned
#endif #endif
int lampChannel = 7; // a free PWM channel (some channels used by camera) int lampChannel = 7; // a free PWM channel (some channels used by camera)
const int pwmfreq = 50000; // 50K pwm frequency const int pwmfreq = 50000; // 50K pwm frequency
@ -213,7 +222,7 @@ void WifiSetup(){
delay(WIFI_WATCHDOG / 10); delay(WIFI_WATCHDOG / 10);
Serial.print('.'); Serial.print('.');
} }
// If we have connected, show details // If we have connected, show details
if (WiFi.status() == WL_CONNECTED) { if (WiFi.status() == WL_CONNECTED) {
Serial.println(" Succeeded"); Serial.println(" Succeeded");
@ -392,25 +401,30 @@ void setup() {
startCameraServer(httpPort, streamPort); startCameraServer(httpPort, streamPort);
// find our IP address // find our IP address
IPAddress ip;
char httpURL[64] = {"Unknown"}; char httpURL[64] = {"Unknown"};
#if defined(WIFI_AP_ENABLE) #if defined(WIFI_AP_ENABLE)
ip = WiFi.softAPIP(); ip = WiFi.softAPIP();
#else #else
ip = WiFi.localIP(); ip = WiFi.localIP();
#endif #endif
net = WiFi.subnetMask();
gw = WiFi.gatewayIP();
// Construct the App URL // Construct the App URL
if (httpPort != 80) { if (httpPort != 80) {
sprintf(httpURL, "http://%d.%d.%d.%d:%d/", ip[0], ip[1], ip[2], ip[3], httpPort); sprintf(httpURL, "http://%d.%d.%d.%d:%d/", ip[0], ip[1], ip[2], ip[3], httpPort);
} else { } else {
sprintf(httpURL, "http://%d.%d.%d.%d/", ip[0], ip[1], ip[2], ip[3]); sprintf(httpURL, "http://%d.%d.%d.%d/", ip[0], ip[1], ip[2], ip[3]);
} }
Serial.printf("\nCamera Ready!\nUse '%s' to connect\n", httpURL);
// Construct the Stream URL // Construct the Stream URL
sprintf(streamURL, "http://%d.%d.%d.%d:%d/", ip[0], ip[1], ip[2], ip[3], streamPort); sprintf(streamURL, "http://%d.%d.%d.%d:%d/", ip[0], ip[1], ip[2], ip[3], streamPort);
// Inform the user Serial.printf("Stream viewer available at '%s/view'\n", streamURL);
Serial.printf("\nCamera Ready!\nUse '%s' to connect\n", httpURL);
Serial.printf("Raw stream URL is '%s'\n", streamURL); Serial.printf("Raw stream URL is '%s'\n", streamURL);
Serial.printf("Stream viewer available at '%sview'\n", streamURL);
// Used when dumpung status; slow functions, so do them here
sketchSize = ESP.getSketchSize();
sketchSpace = ESP.getFreeSketchSpace();
sketchMD5 = ESP.getSketchMD5();
} }
void loop() { void loop() {

34
index_ov2640.h
View File

@ -19,26 +19,6 @@ const uint8_t index_ov2640_html[] = R"=====(
flex-wrap: nowrap; flex-wrap: nowrap;
align-items: stretch align-items: stretch
} }
figure img {
display: block;
max-width: 100%;
width: auto;
height: auto
}
figure {
padding: 0 0 0 0px;
margin: 0;
-webkit-margin-before: 0;
margin-block-start: 0;
-webkit-margin-after: 0;
margin-block-end: 0;
-webkit-margin-start: 0;
margin-inline-start: 0;
-webkit-margin-end: 0;
margin-inline-end: 0
}
} }
</style> </style>
</head> </head>
@ -274,7 +254,8 @@ const uint8_t index_ov2640_html[] = R"=====(
<button id="clear_prefs" title="Erase saved Preferences on camera module">Erase</button> <button id="clear_prefs" title="Erase saved Preferences on camera module">Erase</button>
</div> </div>
<div class="input-group" id="cam_name-group"> <div class="input-group" id="cam_name-group">
<label for="cam_name">Name:</label> <label for="cam_name">
<a href="/dump" title="System Info" target="_blank">Name</a></label>
<div id="cam_name" class="default-action"></div> <div id="cam_name" class="default-action"></div>
</div> </div>
<div class="input-group" id="code_ver-group"> <div class="input-group" id="code_ver-group">
@ -303,6 +284,7 @@ const uint8_t index_ov2640_html[] = R"=====(
document.addEventListener('DOMContentLoaded', function (event) { document.addEventListener('DOMContentLoaded', function (event) {
var baseHost = document.location.origin; var baseHost = document.location.origin;
var streamURL = 'Undefined'; var streamURL = 'Undefined';
var viewerURL = 'Undefined';
const settings = document.getElementById('sidebar') const settings = document.getElementById('sidebar')
const waitSettings = document.getElementById('wait-settings') const waitSettings = document.getElementById('wait-settings')
@ -391,14 +373,16 @@ const uint8_t index_ov2640_html[] = R"=====(
rotate.value = value; rotate.value = value;
applyRotation(); applyRotation();
} else if(el.id === "stream_url"){ } else if(el.id === "stream_url"){
streamURL = value;
viewerURL = value + 'view';
stream_url.innerHTML = value; stream_url.innerHTML = value;
stream_link.setAttribute("title", "Open stream viewer ( " + value + "view )"); stream_link.setAttribute("title", "Open stream viewer (" + viewerURL + ")");
stream_link.style.textDecoration = "underline"; stream_link.style.textDecoration = "underline";
stream_link.style.cursor = "pointer"; stream_link.style.cursor = "pointer";
streamURL = value;
streamButton.setAttribute("title", `You can also browse to '${streamURL}' for a raw stream`); streamButton.setAttribute("title", `You can also browse to '${streamURL}' for a raw stream`);
show(streamGroup) show(streamGroup)
console.log('Stream URL set to:' + value); console.log('Stream URL set to: ' + streamURL);
console.log('Stream Viewer URL set to: ' + viewerURL);
} }
} }
} }
@ -495,7 +479,7 @@ const uint8_t index_ov2640_html[] = R"=====(
streamLink.onclick = () => { streamLink.onclick = () => {
stopStream(); stopStream();
window.open(streamURL + "view", "_blank"); window.open(viewerURL, "_blank");
} }
stillButton.onclick = () => { stillButton.onclick = () => {

31
index_ov3660.h
View File

@ -19,26 +19,6 @@ const uint8_t index_ov3660_html[] = R"=====(
flex-wrap: nowrap; flex-wrap: nowrap;
align-items: stretch align-items: stretch
} }
figure img {
display: block;
max-width: 100%;
width: auto;
height: auto
}
figure {
padding: 0 0 0 0px;
margin: 0;
-webkit-margin-before: 0;
margin-block-start: 0;
-webkit-margin-after: 0;
margin-block-end: 0;
-webkit-margin-start: 0;
margin-inline-start: 0;
-webkit-margin-end: 0;
margin-inline-end: 0
}
} }
</style> </style>
</head> </head>
@ -316,6 +296,7 @@ const uint8_t index_ov3660_html[] = R"=====(
document.addEventListener('DOMContentLoaded', function (event) { document.addEventListener('DOMContentLoaded', function (event) {
var baseHost = document.location.origin; var baseHost = document.location.origin;
var streamURL = 'Undefined'; var streamURL = 'Undefined';
var viewerURL = 'Undefined';
const settings = document.getElementById('sidebar') const settings = document.getElementById('sidebar')
const waitSettings = document.getElementById('wait-settings') const waitSettings = document.getElementById('wait-settings')
@ -402,14 +383,16 @@ const uint8_t index_ov3660_html[] = R"=====(
rotate.value = value; rotate.value = value;
applyRotation(); applyRotation();
} else if(el.id === "stream_url"){ } else if(el.id === "stream_url"){
streamURL = value;
viewerURL = value + 'view';
stream_url.innerHTML = value; stream_url.innerHTML = value;
stream_link.setAttribute("title", "Open stream viewer ( " + value + "view )"); stream_link.setAttribute("title", "Open stream viewer (" + viewerURL + ")");
stream_link.style.textDecoration = "underline"; stream_link.style.textDecoration = "underline";
stream_link.style.cursor = "pointer"; stream_link.style.cursor = "pointer";
streamURL = value;
streamButton.setAttribute("title", `You can also browse to '${streamURL}' for a raw stream`); streamButton.setAttribute("title", `You can also browse to '${streamURL}' for a raw stream`);
show(streamGroup) show(streamGroup)
console.log('Stream URL set to:' + value); console.log('Stream URL set to: ' + streamURL);
console.log('Stream Viewer URL set to: ' + viewerURL);
} }
} }
} }
@ -506,7 +489,7 @@ const uint8_t index_ov3660_html[] = R"=====(
streamLink.onclick = () => { streamLink.onclick = () => {
stopStream(); stopStream();
window.open(streamURL + "view", "_blank"); window.open(viewerURL, "_blank");
} }
stillButton.onclick = () => { stillButton.onclick = () => {

2
storage.cpp
View File

@ -44,7 +44,6 @@ void listDir(fs::FS &fs, const char * dirname, uint8_t levels){
} }
} }
// DEBUG
void dumpPrefs(fs::FS &fs){ void dumpPrefs(fs::FS &fs){
if (fs.exists(PREFERENCES_FILE)) { if (fs.exists(PREFERENCES_FILE)) {
// Dump contents for debug // Dump contents for debug
@ -56,7 +55,6 @@ void dumpPrefs(fs::FS &fs){
Serial.printf("%s not found, nothing to dump.\n", PREFERENCES_FILE); Serial.printf("%s not found, nothing to dump.\n", PREFERENCES_FILE);
} }
} }
// /DEBUG
void loadPrefs(fs::FS &fs){ void loadPrefs(fs::FS &fs){
if (fs.exists(PREFERENCES_FILE)) { if (fs.exists(PREFERENCES_FILE)) {

1
storage.h
View File

@ -6,6 +6,7 @@
#define PREFERENCES_FILE "/esp32cam-preferences.json" #define PREFERENCES_FILE "/esp32cam-preferences.json"
#define FACE_DB_FILE "/esp32cam-facedb" #define FACE_DB_FILE "/esp32cam-facedb"
extern void dumpPrefs(fs::FS &fs);
extern void loadPrefs(fs::FS &fs); extern void loadPrefs(fs::FS &fs);
extern void removePrefs(fs::FS &fs); extern void removePrefs(fs::FS &fs);
extern void savePrefs(fs::FS &fs); extern void savePrefs(fs::FS &fs);

92
viewers.h
View File

@ -302,33 +302,18 @@ size_t miniviewer_html_len = sizeof(miniviewer_html);
color: #EFEFEF; color: #EFEFEF;
font-size: 16px; font-size: 16px;
margin: 0px; margin: 0px;
overflow:hidden;
} }
figure { img {
padding: 0px;
margin: 0px;
-webkit-margin-before: 0;
margin-block-start: 0;
-webkit-margin-after: 0;
margin-block-end: 0;
-webkit-margin-start: 0;
margin-inline-start: 0;
-webkit-margin-end: 0;
margin-inline-end: 0
}
figure img {
object-fit: contain; object-fit: contain;
display: block; display: block;
margin: 0px;
padding: 0px;
width: 100vw; width: 100vw;
height: 100vh; height: 100vh;
} }
.image-container {
position: relative;
transform-origin: top left
}
.loader { .loader {
border: 0.5em solid #f3f3f3; border: 0.5em solid #f3f3f3;
border-top: 0.5em solid #000000; border-top: 0.5em solid #000000;
@ -353,34 +338,25 @@ size_t miniviewer_html_len = sizeof(miniviewer_html);
<body> <body>
<section class="main"> <section class="main">
<div id="logo"> <div id="wait-settings" style="float:left;" class="loader" title="Waiting for stream settings to load"></div>
<div id="wait-settings" style="float:left;" class="loader" title="Waiting for stream settings to load"></div> <div style="display: none;">
</div> <!-- Hide the next entries, they are present in the body so that we
<div> can pass settings to/from them for use in the scripting -->
<div style="display: none;"> <div id="rotate" class="action-setting hidden">0</div>
<!-- Hide the next entries, they are present in the body so that we <div id="cam_name" class="action-setting hidden"></div>
can pass settings to/from them for use in the scripting --> <div id="stream_url" class="action-setting hidden"></div>
<div id="rotate" class="action-setting hidden"></div>
<div id="cam_name" class="action-setting hidden"></div>
<div id="code_ver" class="action-setting hidden"></div>
<div id="stream_url" class="action-setting hidden"></div>
</div>
<figure>
<div id="stream-container" class="image-container" style="display: none;">
<img id="stream" src="">
</div>
</figure>
</div> </div>
<img id="stream" src="">
</section> </section>
</body> </body>
<script> <script>
document.addEventListener('DOMContentLoaded', function (event) { document.addEventListener('DOMContentLoaded', function (event) {
var baseHost = document.location.origin; var baseHost = document.location.origin;
var streamURL = 'Undefined';
const rotate = document.getElementById('rotate') const rotate = document.getElementById('rotate')
const view = document.getElementById('stream') const stream = document.getElementById('stream')
const viewContainer = document.getElementById('stream-container')
const spinner = document.getElementById('wait-settings') const spinner = document.getElementById('wait-settings')
const updateValue = (el, value, updateRemote) => { const updateValue = (el, value, updateRemote) => {
@ -400,13 +376,11 @@ size_t miniviewer_html_len = sizeof(miniviewer_html);
} else if(!updateRemote){ } else if(!updateRemote){
if(el.id === "cam_name"){ if(el.id === "cam_name"){
window.document.title = value; window.document.title = value;
viewContainer.setAttribute("title", value + "\n(doubleclick for fullscreen)"); stream.setAttribute("title", value + "\n(doubleclick for fullscreen)");
console.log('Name set to: ' + value); console.log('Name set to: ' + value);
} else if(el.id === "code_ver"){
console.log('Firmware Build: ' + value);
} else if(el.id === "rotate"){ } else if(el.id === "rotate"){
rotate.value = value; rotate.value = value;
applyRotation(); console.log('Rotate recieved: ' + rotate.value);
} else if(el.id === "stream_url"){ } else if(el.id === "stream_url"){
streamURL = value; streamURL = value;
console.log('Stream URL set to:' + value); console.log('Stream URL set to:' + value);
@ -426,38 +400,36 @@ size_t miniviewer_html_len = sizeof(miniviewer_html);
updateValue(el, state[el.id], false) updateValue(el, state[el.id], false)
}) })
spinner.style.display = `none`; spinner.style.display = `none`;
applyRotation();
startStream(); startStream();
}) })
const startStream = () => { const startStream = () => {
view.src = streamURL; stream.src = streamURL;
view.scrollIntoView(false); stream.style.display = `block`;
viewContainer.style.display = `block`;
} }
const applyRotation = () => { const applyRotation = () => {
rot = rotate.value; rot = rotate.value;
if (rot == -90) { if (rot == -90) {
viewContainer.style.transform = `rotate(-90deg) translate(-100%)`; stream.style.transform = `rotate(-90deg)`;
} else if (rot == 90) { } else if (rot == 90) {
viewContainer.style.transform = `rotate(90deg) translate(0, -100%)`; stream.style.transform = `rotate(90deg)`;
} else {
viewContainer.style.transform = `rotate(0deg)`;
} }
console.log('Rotation ' + rot + ' applied'); console.log('Rotation ' + rot + ' applied');
}
view.ondblclick = () => { stream.ondblclick = () => {
if (view.requestFullscreen) { if (stream.requestFullscreen) {
view.requestFullscreen(); stream.requestFullscreen();
} else if (view.mozRequestFullScreen) { /* Firefox */ } else if (stream.mozRequestFullScreen) { /* Firefox */
view.mozRequestFullScreen(); stream.mozRequestFullScreen();
} else if (view.webkitRequestFullscreen) { /* Chrome, Safari and Opera */ } else if (stream.webkitRequestFullscreen) { /* Chrome, Safari and Opera */
view.webkitRequestFullscreen(); stream.webkitRequestFullscreen();
} else if (view.msRequestFullscreen) { /* IE/Edge */ } else if (stream.msRequestFullscreen) { /* IE/Edge */
view.msRequestFullscreen(); stream.msRequestFullscreen();
} }
} }
}
}) })
</script> </script>
</html> </html>