Improve startup time for mpegts

Motion-Project · Oct 31, 2024 · 9bb83f4 · 9bb83f4
1 parent 3e995bc
commit 9bb83f4
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/src/webu_mpegts.cpp b/src/webu_mpegts.cpp
@@ -257,6 +257,11 @@ ssize_t cls_webu_mpegts::response(char *buf, size_t max)
     }
 
     if (stream_pos == 0) {
+        if ((webus->time_last.tv_sec - st_mono_time.tv_sec) < 2) {
+            webus->stream_fps = 30;
+        } else {
+            webus->set_fps();
+        }
         webus->delay();
         resetpos();
         if (getimg() < 0) {
@@ -297,9 +302,10 @@ int cls_webu_mpegts::open_mpegts()
     size_t          aviobuf_sz;
 
     opts = NULL;
-    webus->stream_fps = 10000;   /* For quick start up*/
+    webus->stream_fps = 30;
     aviobuf_sz = 4096;
     clock_gettime(CLOCK_REALTIME, &start_time);
+    clock_gettime(CLOCK_MONOTONIC, &st_mono_time);
 
     fmtctx = avformat_alloc_context();
     fmtctx->oformat = av_guess_format("mpegts", NULL, NULL);
@@ -392,8 +398,6 @@ int cls_webu_mpegts::open_mpegts()
 
     av_dict_free(&opts);
 
-    webus->set_fps();
-
     return 0;
 }
 

diff --git a/src/webu_mpegts.hpp b/src/webu_mpegts.hpp
@@ -38,6 +38,7 @@
             AVCodecContext  *ctx_codec;
             size_t          stream_pos;     /* Stream position of sent image */
             struct timespec start_time;     /* Start time of the stream*/
+            struct timespec st_mono_time;
 
             int pic_send(unsigned char *img);
             int pic_get();