asyncweb: enforce MjpegConfig.frameTimeout

Author: yoursunny

src/esp32cam/asyncweb.cpp

@@ -118,7 +118,7 @@ StillResponse::_fillBuffer(uint8_t* buf, size_t buflen) {
 }
 
 MjpegResponse::MjpegResponse(const MjpegConfig& cfg)
-  : m_task(4)
+  : m_task(2)
   , m_ctrl(cfg) {
   MJPEG_LOG("created");
   if (!m_task) {
@@ -147,6 +147,7 @@ MjpegResponse::_fillBuffer(uint8_t* buf, size_t buflen) {
       if (auto frame = m_task.retrieve(); frame) {
         m_ctrl.notifyReturn(std::move(frame));
       }
+      m_sendSince = millis();
       m_sendNext = SIPartHeader;
       m_sendRemain = 0;
 
@@ -160,6 +161,9 @@ MjpegResponse::_fillBuffer(uint8_t* buf, size_t buflen) {
       if (len == 0 && m_sendNext == SINone) {
         m_ctrl.notifySent(true);
       } else {
+        if (static_cast<int>(millis() - m_sendSince) > m_ctrl.cfg.frameTimeout) {
+          m_ctrl.notifySent(false);
+        }
         return len;
       }
 
@@ -190,11 +194,13 @@ MjpegResponse::sendPart(uint8_t* buf, size_t buflen) {
         m_sendRemain = m_hdr.size;
         m_sendNext = SIFrame;
         break;
-      case SIFrame:
-        m_sendBuf = m_ctrl.getFrame()->data();
-        m_sendRemain = m_ctrl.getFrame()->size();
+      case SIFrame: {
+        Frame* frame = m_ctrl.getFrame();
+        m_sendBuf = frame->data();
+        m_sendRemain = frame->size();
         m_sendNext = SIPartTrailer;
         break;
+      }
       case SIPartTrailer:
         m_hdr.preparePartTrailer();
         m_sendBuf = reinterpret_cast<const uint8_t*>(m_hdr.buf);

src/esp32cam/asyncweb.hpp

@@ -113,6 +113,7 @@ class MjpegResponse : public AsyncAbstractResponse {
   const uint8_t* m_sendBuf = nullptr;
   size_t m_sendRemain = 0;
   unsigned long m_createTime = millis();
+  unsigned long m_sendSince = 0;
 };
 
 /** @brief Handle HTTP request for MJPEG stream. */

src/esp32cam/mjpeg.cpp

@@ -7,7 +7,7 @@ namespace esp32cam {
 namespace detail {
 
 MjpegController::MjpegController(MjpegConfig cfg)
-  : m_cfg(cfg)
+  : cfg(cfg)
   , m_nextCaptureTime(millis()) {}
 
 int
@@ -25,7 +25,7 @@ MjpegController::decideAction() {
 void
 MjpegController::notifyCapture() {
   m_nextAction = RETURN;
-  m_nextCaptureTime = millis() + static_cast<unsigned long>(m_cfg.minInterval);
+  m_nextCaptureTime = millis() + static_cast<unsigned long>(cfg.minInterval);
   MC_LOG("notifyCapture next=%lu", m_nextCaptureTime);
 }
 
@@ -51,7 +51,7 @@ MjpegController::notifySent(bool ok) {
     return;
   }
   m_frame.reset();
-  m_nextAction = m_cfg.maxFrames < 0 || m_count < m_cfg.maxFrames ? CAPTURE : STOP;
+  m_nextAction = cfg.maxFrames < 0 || m_count < cfg.maxFrames ? CAPTURE : STOP;
 }
 
 void

src/esp32cam/mjpeg.hpp

@@ -7,12 +7,21 @@
 
 namespace esp32cam {
 
+/** MJPEG stream options. */
 struct MjpegConfig {
-  /** @brief minimum interval between frame captures. */
+  /**
+   * @brief Minimum interval between frame captures in millis.
+   */
   int minInterval = 0;
-  /** @brief maximum number of frames before disconnecting. */
+
+  /**
+   * @brief Maximum number of frames before disconnecting.
+   *
+   * Negative value means unlimited.
+   */
   int maxFrames = -1;
-  /** @brief time limit of writing one frame in millis. */
+
+  /** @brief Time limit of writing one frame in millis. */
   int frameTimeout = 10000;
 };
 
@@ -23,23 +32,11 @@ class MjpegController {
 public:
   explicit MjpegController(MjpegConfig cfg);
 
-  /** @brief Retrieve config object. */
-  const MjpegConfig& getConfig() const {
-    return m_cfg;
-  }
-
   /** @brief Retrieve number of sent frames. */
   int countSentFrames() const {
     return m_count;
   }
 
-  enum {
-    CAPTURE = -1,
-    RETURN = -2,
-    SEND = -3,
-    STOP = -4,
-  };
-
   /**
    * @brief Decide what to do now.
    * @retval CAPTURE capture a frame.
@@ -72,6 +69,9 @@ class MjpegController {
    * @brief Notify that a frame is sent to the client.
    * @param ok whether sent successfully.
    * @post getFrame()==nullptr
+   *
+   * The caller is expected to enforce @c MjpegConfig::frameTimeout and call
+   * `notifySent(false)` in case of send timeout.
    */
   void notifySent(bool ok);
 
@@ -82,8 +82,17 @@ class MjpegController {
    */
   void notifyFail();
 
+public:
+  enum Action {
+    CAPTURE = -1,
+    RETURN = -2,
+    SEND = -3,
+    STOP = -4,
+  };
+
+  const MjpegConfig cfg;
+
 private:
-  MjpegConfig m_cfg;
   std::unique_ptr<Frame> m_frame;
   unsigned long m_nextCaptureTime;
   int m_nextAction = CAPTURE;
@@ -105,7 +114,7 @@ class MjpegHeader {
 
 public:
   size_t size = 0;
-  char buf[160];
+  char buf[120];
 };
 
 } // namespace detail