add stream counter

Author: daschr

app_httpd.cpp

@@ -51,7 +51,6 @@ extern int streamPort;
 extern char httpURL[];
 extern char streamURL[];
 extern char default_index[];
-extern int8_t streamCount;
 extern unsigned long streamsServed;
 extern unsigned long imagesServed;
 extern int myRotation;
@@ -85,9 +84,6 @@ static const char* _STREAM_PART = "Content-Type: image/jpeg\r\nContent-Length: %
 httpd_handle_t stream_httpd = NULL;
 httpd_handle_t camera_httpd = NULL;
 
-// Flag that can be set to kill all active streams
-bool streamKill;
-
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -152,7 +148,7 @@ void serialDump() {
     int McuTc = (temprature_sens_read() - 32) / 1.8; // celsius
     int McuTf = temprature_sens_read(); // fahrenheit
     Serial.printf("System up: %" PRId64 ":%02i:%02i:%02i (d:h:m:s)\r\n", upDays, upHours, upMin, upSec);
-    Serial.printf("Active streams: %i, Previous streams: %lu, Images captured: %lu\r\n", streamCount, streamsServed, imagesServed);
+    Serial.printf("Active streams: %lu, Previous streams: %lu, Images captured: %lu\r\n", cam_streamer_get_num_clients(cam_streamer), streamsServed, imagesServed);
     Serial.printf("CPU Freq: %i MHz, Xclk Freq: %i MHz\r\n", ESP.getCpuFreqMHz(), xclk);
     Serial.printf("MCU temperature : %i C, %i F  (approximate)\r\n", McuTc, McuTf);
     Serial.printf("Heap: %i, free: %i, min free: %i, max block: %i\r\n", ESP.getHeapSize(), ESP.getFreeHeap(), ESP.getMinFreeHeap(), ESP.getMaxAllocHeap());
@@ -232,7 +228,10 @@ static esp_err_t stream_handler(httpd_req_t *req){
 		printf("[stream_handler] could not get socket fd!\n");
 		return ESP_FAIL;
 	}
-	cam_streamer_enqueue_client(cam_streamer, fd);
+	
+	if(cam_streamer_enqueue_client(cam_streamer, fd))
+			++streamsServed;
+
 	return ESP_OK;
 }
 
@@ -307,7 +306,7 @@ static esp_err_t cmd_handler(httpd_req_t *req){
     else if(!strcmp(variable, "autolamp") && (lampVal != -1)) {
         autoLamp = val;
         if (autoLamp) {
-           if (streamCount > 0) setLamp(lampVal);
+           if (cam_streamer_get_num_clients(cam_streamer) > 0) setLamp(lampVal);
            else setLamp(0);
         } else {
             setLamp(lampVal);
@@ -316,7 +315,7 @@ static esp_err_t cmd_handler(httpd_req_t *req){
     else if(!strcmp(variable, "lamp") && (lampVal != -1)) {
         lampVal = constrain(val,0,100);
         if (autoLamp) {
-           if (streamCount > 0) setLamp(lampVal);
+           if (cam_streamer_get_num_clients(cam_streamer) > 0) setLamp(lampVal);
            else setLamp(0);
         } else {
             setLamp(lampVal);
@@ -513,7 +512,7 @@ static esp_err_t dump_handler(httpd_req_t *req){
     int McuTf = temprature_sens_read(); // fahrenheit
 
     d+= sprintf(d,"Up: %" PRId64 ":%02i:%02i:%02i (d:h:m:s)<br>\n", upDays, upHours, upMin, upSec);
-    d+= sprintf(d,"Active streams: %i, Previous streams: %lu, Images captured: %lu<br>\n", streamCount, streamsServed, imagesServed);
+    d+= sprintf(d,"Active streams: %i, Previous streams: %lu, Images captured: %lu<br>\n", cam_streamer_get_num_clients(cam_streamer), streamsServed, imagesServed);
     d+= sprintf(d,"CPU Freq: %i MHz, Xclk Freq: %i MHz<br>\n", ESP.getCpuFreqMHz(), xclk);
     d+= sprintf(d,"<span title=\"NOTE: Internal temperature sensor readings can be innacurate on the ESP32-c1 chipset, and may vary significantly between devices!\">");
     d+= sprintf(d,"MCU temperature : %i &deg;C, %i &deg;F</span>\n<br>", McuTc, McuTf);
@@ -550,7 +549,7 @@ static esp_err_t dump_handler(httpd_req_t *req){
 static esp_err_t stop_handler(httpd_req_t *req){
     flashLED(75);
     Serial.println("\r\nStream stop requested via Web");
-    streamKill = true;
+    cam_streamer_dequeue_all_clients(cam_streamer);
     httpd_resp_set_hdr(req, "Access-Control-Allow-Origin", "*");
     return httpd_resp_send(req, NULL, 0);
 }
@@ -794,7 +793,10 @@ void startCameraServer(int hPort, int sPort){
             httpd_register_uri_handler(stream_httpd, &info_uri);
             httpd_register_uri_handler(stream_httpd, &streamviewer_uri);
         	cam_streamer=(cam_streamer_t *) malloc(sizeof(cam_streamer_t));
-			cam_streamer_init(cam_streamer, stream_httpd, 3);
+#ifndef CAM_STREAMER_DESIRED_FPS
+#define CAM_STREAMER_DESIRED_FPS 2
+#endif
+			cam_streamer_init(cam_streamer, stream_httpd, CAM_STREAMER_DESIRED_FPS);
 			cam_streamer_start(cam_streamer);
 		}
         httpd_register_uri_handler(stream_httpd, &favicon_16x16_uri);

cam_streamer.c

@@ -78,10 +78,17 @@ static void cam_streamer_update_frame(cam_streamer_t *s) {
 #endif
 }
 
+static void cam_streamer_decrement_num_clients(cam_streamer_t *s) {
+    size_t num_clients=s->num_clients;
+    while(num_clients>0 && !__atomic_compare_exchange_n(&s->num_clients, &num_clients, num_clients-1, 0, __ATOMIC_RELAXED, __ATOMIC_RELAXED));
+#ifdef DEBUG_DEFAULT_ON
+    printf("[cam_streamer] num_clients decremented\n");
+#endif
+}
+
 void cam_streamer_task(void *p) {
     cam_streamer_t *s=(cam_streamer_t *) p;
 
-    uint8_t res;
     uint64_t last_time=0, current_time;
     int fd;
     unsigned int n_entries;
@@ -108,21 +115,26 @@ void cam_streamer_task(void *p) {
             printf("[cam_streamer] dequeued fd %d\n", fd);
             printf("[cam_streamer] sending part: \"%.*s\"\n", (int) s->part_len, s->part_buf);
 #endif
-            if((res=is_send_error(httpd_socket_send(s->server, fd, s->part_buf, s->part_len, 0))))
+
+            if(is_send_error(httpd_socket_send(s->server, fd, s->part_buf, s->part_len, 0))) {
+                cam_streamer_decrement_num_clients(s);
                 continue;
+            }
 
-            if((res|=is_send_error(httpd_socket_send(s->server, fd, s->buf->buf, s->buf->len, 0))))
+            if(is_send_error(httpd_socket_send(s->server, fd, s->buf->buf, s->buf->len, 0))) {
+                cam_streamer_decrement_num_clients(s);
                 continue;
+            }
 
-            if((res|=is_send_error(httpd_socket_send(s->server, fd, _STREAM_BOUNDARY, strlen(_STREAM_BOUNDARY), 0))))
+            if(is_send_error(httpd_socket_send(s->server, fd, _STREAM_BOUNDARY, strlen(_STREAM_BOUNDARY), 0))) {
+                cam_streamer_decrement_num_clients(s);
                 continue;
+            }
 
-            if(!res) {
+            xQueueSend(s->clients, (void *) &fd, 10/portTICK_PERIOD_MS);
 #ifdef DEBUG_DEFAULT_ON
-                printf("[cam_streamer] fd %d requeued\n", fd);
+            printf("[cam_streamer] fd %d requeued\n", fd);
 #endif
-                xQueueSend(s->clients, (void *) &fd, 10/portTICK_PERIOD_MS);
-            }
         }
     }
 }
@@ -140,6 +152,15 @@ void cam_streamer_stop(cam_streamer_t *s) {
     vTaskDelete(s->task);
 }
 
+size_t cam_streamer_get_num_clients(cam_streamer_t *s) {
+    return s->num_clients;
+}
+
+void cam_streamer_dequeue_all_clients(cam_streamer_t *s) {
+    xQueueReset(s->clients);
+    __atomic_exchange_n(&s->num_clients, 0, __ATOMIC_RELAXED);
+}
+
 bool cam_streamer_enqueue_client(cam_streamer_t *s, int fd) {
 #ifdef DEBUG_DEFAULT_ON
     printf("sending stream headers:\n%s\nLength: %d\n", _STREAM_HEADERS, strlen(_STREAM_HEADERS));
@@ -170,6 +191,7 @@ bool cam_streamer_enqueue_client(cam_streamer_t *s, int fd) {
 #ifdef DEBUG_DEFAULT_ON
         printf("[cam_streamer] socket %d enqueued\n", fd);
 #endif
+        __atomic_fetch_add(&s->num_clients, 1, __ATOMIC_RELAXED);
         vTaskResume(s->task);
     }
 

cam_streamer.h

@@ -13,21 +13,24 @@
 
 #define CAM_STREAMER_MAX_CLIENTS 10
 typedef struct {
-		QueueHandle_t clients;
-        TaskHandle_t task;
-		uint64_t last_updated;
-		int64_t frame_delay;
-		uint8_t buf_lock;
-		camera_fb_t *buf;
-		char part_buf[64];
-		size_t part_len;
-		httpd_handle_t server;
+    QueueHandle_t clients;
+    TaskHandle_t task;
+    uint64_t last_updated;
+    int64_t frame_delay;
+    uint8_t buf_lock;
+    camera_fb_t *buf;
+    char part_buf[64];
+    size_t part_len;
+    httpd_handle_t server;
+    size_t num_clients;
 } cam_streamer_t;
 
 void cam_streamer_init(cam_streamer_t *s, httpd_handle_t server, uint16_t fps);
 void cam_streamer_task(void *p);
 void cam_streamer_start(cam_streamer_t *s);
 void cam_streamer_stop(cam_streamer_t *s);
 bool cam_streamer_enqueue_client(cam_streamer_t *s, int fd);
+size_t cam_streamer_get_num_clients(cam_streamer_t *s);
+void cam_streamer_dequeue_all_clients(cam_streamer_t *s);
 
 #endif

esp32-cam-webserver.ino

@@ -136,7 +136,6 @@ char httpURL[64] = {"Undefined"};
 char streamURL[64] = {"Undefined"};
 
 // Counters for info screens and debug
-int8_t streamCount = 0;          // Number of currently active streams
 unsigned long streamsServed = 0; // Total completed streams
 unsigned long imagesServed = 0;  // Total image requests