Merge pull request #120 from abergmann/ffmpeg_streaming_issue

me-no-dev · web-flow · commit 193b090df99d · 2020-02-14T11:06:09.000+02:00
Move _STREAM_BOUNDARY before _STREAM_PART
diff --git a/README.md b/README.md
@@ -212,6 +212,9 @@ esp_err_t jpg_stream_httpd_handler(httpd_req_t *req){
                 _jpg_buf = fb->buf;
             }
         }
+        if(res == ESP_OK){
+            res = httpd_resp_send_chunk(req, _STREAM_BOUNDARY, strlen(_STREAM_BOUNDARY));
+        }
         if(res == ESP_OK){
             size_t hlen = snprintf((char *)part_buf, 64, _STREAM_PART, _jpg_buf_len);
 
@@ -220,9 +223,6 @@ esp_err_t jpg_stream_httpd_handler(httpd_req_t *req){
         if(res == ESP_OK){
             res = httpd_resp_send_chunk(req, (const char *)_jpg_buf, _jpg_buf_len);
         }
-        if(res == ESP_OK){
-            res = httpd_resp_send_chunk(req, _STREAM_BOUNDARY, strlen(_STREAM_BOUNDARY));
-        }
         if(fb->format != PIXFORMAT_JPEG){
             free(_jpg_buf);
         }

Original file line number	Diff line number	Diff line change
`@@ -212,6 +212,9 @@ esp_err_t jpg_stream_httpd_handler(httpd_req_t *req){`
`212`	`212`	`_jpg_buf = fb->buf;`
`213`	`213`	`}`
`214`	`214`	`}`
	`215`	`+ if(res == ESP_OK){`
	`216`	`+ res = httpd_resp_send_chunk(req, _STREAM_BOUNDARY, strlen(_STREAM_BOUNDARY));`
	`217`	`+ }`
`215`	`218`	`if(res == ESP_OK){`
`216`	`219`	`size_t hlen = snprintf((char *)part_buf, 64, _STREAM_PART, _jpg_buf_len);`
`217`	`220`
`@@ -220,9 +223,6 @@ esp_err_t jpg_stream_httpd_handler(httpd_req_t *req){`
`220`	`223`	`if(res == ESP_OK){`
`221`	`224`	`res = httpd_resp_send_chunk(req, (const char *)_jpg_buf, _jpg_buf_len);`
`222`	`225`	`}`
`223`		`- if(res == ESP_OK){`
`224`		`- res = httpd_resp_send_chunk(req, _STREAM_BOUNDARY, strlen(_STREAM_BOUNDARY));`
`225`		`- }`
`226`	`226`	`if(fb->format != PIXFORMAT_JPEG){`
`227`	`227`	`free(_jpg_buf);`
`228`	`228`	`}`