mjpeg: boundary correction

refs #67

Author: yoursunny

src/esp32cam/asyncweb.cpp

@@ -151,7 +151,7 @@ MjpegResponse::_fillBuffer(uint8_t* buf, size_t buflen) {
         m_ctrl.notifyReturn(std::move(frame));
       }
       m_sendSince = millis();
-      m_sendNext = SIPartHeader;
+      m_sendNext = SIBoundary;
       m_sendRemain = 0;
 
       if (m_ctrl.decideAction() != Ctrl::SEND) {
@@ -191,8 +191,8 @@ size_t
 MjpegResponse::sendPart(uint8_t* buf, size_t buflen) {
   if (m_sendRemain == 0) {
     switch (m_sendNext) {
-      case SIPartHeader:
-        m_hdr.preparePartHeader(m_ctrl.getFrame()->size());
+      case SIBoundary:
+        m_hdr.prepareBoundary(m_ctrl.getFrame()->size());
         m_sendBuf = reinterpret_cast<const uint8_t*>(m_hdr.buf);
         m_sendRemain = m_hdr.size;
         m_sendNext = SIFrame;
@@ -201,15 +201,9 @@ MjpegResponse::sendPart(uint8_t* buf, size_t buflen) {
         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);
-        m_sendRemain = m_hdr.size;
         m_sendNext = SINone;
         break;
+      }
       case SINone:
         return 0;
     }

src/esp32cam/asyncweb.hpp

@@ -112,9 +112,8 @@ class MjpegResponse : public AsyncAbstractResponse {
 
   enum SendItem {
     SINone,
-    SIPartHeader,
+    SIBoundary,
     SIFrame,
-    SIPartTrailer,
   };
   SendItem m_sendNext = SINone;
   const uint8_t* m_sendBuf = nullptr;

src/esp32cam/camera.cpp

@@ -83,14 +83,15 @@ CameraClass::streamMjpeg(Client& client, const MjpegConfig& cfg) {
         break;
       }
       case Ctrl::SEND: {
-        hdr.preparePartHeader(ctrl.getFrame()->size());
+        hdr.prepareBoundary(ctrl.getFrame()->size());
         hdr.writeTo(client);
         ctrl.notifySent(ctrl.getFrame()->writeTo(client, cfg.frameTimeout));
-        hdr.preparePartTrailer();
         hdr.writeTo(client);
         break;
       }
       case Ctrl::STOP: {
+        hdr.prepareTrailer();
+        hdr.writeTo(client);
         client.stop();
         return ctrl.countSentFrames();
       }

src/esp32cam/mjpeg.cpp

@@ -77,16 +77,17 @@ MjpegHeader::prepareResponseContentType() {
 }
 
 void
-MjpegHeader::preparePartHeader(size_t contentLength) {
+MjpegHeader::prepareBoundary(size_t contentLength) {
   size = snprintf(buf, sizeof(buf),
+                  "\r\n--" BOUNDARY "\r\n"
                   "Content-Type: image/jpeg\r\n"
                   "Content-Length: %zu\r\n"
                   "\r\n",
                   contentLength);
 }
 
 void
-MjpegHeader::preparePartTrailer() {
+MjpegHeader::prepareTrailer() {
   size = snprintf(buf, sizeof(buf), "\r\n--" BOUNDARY "\r\n");
 }
 

src/esp32cam/mjpeg.hpp

@@ -108,9 +108,9 @@ class MjpegHeader {
 
   void prepareResponseContentType();
 
-  void preparePartHeader(size_t contentLength);
+  void prepareBoundary(size_t contentLength);
 
-  void preparePartTrailer();
+  void prepareTrailer();
 
   size_t writeTo(Print& os);