switch to monotonic clock

Author: nschimme

src/IMPDeviceSource.cpp

@@ -1,6 +1,7 @@
 #include "IMPDeviceSource.hpp"
 #include <iostream>
 #include "GroupsockHelper.hh"
+#include "WorkerUtils.hpp"
 
 // explicit instantiation
 template class IMPDeviceSource<H264NALUnit, video_stream>;
@@ -75,10 +76,7 @@ void IMPDeviceSource<FrameType, Stream>::deliverFrame()
             fFrameSize = nal.data.size();
         }
 
-        /* timestamp fix, can be removed if solved
         fPresentationTime = nal.time;
-        */
-        gettimeofday(&fPresentationTime, NULL);
 
         memcpy(fTo, &nal.data[0], fFrameSize);
 

src/JPEGWorker.cpp

@@ -94,7 +94,7 @@ void JPEGWorker::run()
     unsigned long long ms{0};
 
     // Initialize timestamp for stats calculation (ensure it's set before first use)
-    gettimeofday(&global_jpeg[jpgChn]->stream->stats.ts, NULL);
+    WorkerUtils::getMonotonicTimeOfDay(&global_jpeg[jpgChn]->stream->stats.ts);
     global_jpeg[jpgChn]->stream->stats.ts.tv_sec -= 10;
 
     while (global_jpeg[jpgChn]->running)
@@ -197,14 +197,14 @@ void JPEGWorker::run()
                                                   &stream); // Release stream after saving
                     }
 
-                    ms = WorkerUtils::tDiffInMs(&global_jpeg[jpgChn]->stream->stats.ts);
+                    ms = WorkerUtils::getMonotonicTimeDiffInMs(&global_jpeg[jpgChn]->stream->stats.ts);
                     if (ms > 1000)
                     {
                         global_jpeg[jpgChn]->stream->stats.fps = fps;
                         global_jpeg[jpgChn]->stream->stats.bps = bps;
                         fps = 0;
                         bps = 0;
-                        gettimeofday(&global_jpeg[jpgChn]->stream->stats.ts, NULL);
+                        WorkerUtils::getMonotonicTimeOfDay(&global_jpeg[jpgChn]->stream->stats.ts);
 
                         LOG_DDEBUG("JPG " << jpgChn
                                           << " fps: " << global_jpeg[jpgChn]->stream->stats.fps

src/VideoWorker.cpp

@@ -54,12 +54,9 @@ void VideoWorker::run()
                     continue;
                 }
 
-                /* timestamp fix, can be removed if solved
-                int64_t nal_ts = stream.pack[stream.packCount - 1].timestamp;
-                struct timeval encoder_time;
-                encoder_time.tv_sec = nal_ts / 1000000;
-                encoder_time.tv_usec = nal_ts % 1000000;
-                */
+
+                struct timeval monotonic_time;
+                WorkerUtils::getMonotonicTimeOfDay(&monotonic_time);
 
                 for (uint32_t i = 0; i < stream.packCount; ++i)
                 {
@@ -76,12 +73,9 @@ void VideoWorker::run()
                         uint8_t *start = (uint8_t *) stream.pack[i].virAddr;
                         uint8_t *end = (uint8_t *) stream.pack[i].virAddr + stream.pack[i].length;
 #endif
-                        H264NALUnit nalu;
 
-                        /* timestamp fix, can be removed if solved
-                        nalu.imp_ts = stream.pack[i].timestamp;
-                        nalu.time = encoder_time;
-                        */
+                        H264NALUnit nalu;
+                        nalu.time = monotonic_time;
 
                         // We use start+4 because the encoder inserts 4-byte MPEG
                         //'startcodes' at the beginning of each NAL. Live555 complains
@@ -155,7 +149,7 @@ void VideoWorker::run()
 
                 IMP_Encoder_ReleaseStream(encChn, &stream);
 
-                ms = WorkerUtils::tDiffInMs(&global_video[encChn]->stream->stats.ts);
+                ms = WorkerUtils::getMonotonicTimeDiffInMs(&global_video[encChn]->stream->stats.ts);
                 if (ms > 1000)
                 {
                     /* currently we write into osd and stream stats,
@@ -168,7 +162,7 @@ void VideoWorker::run()
 
                     fps = 0;
                     bps = 0;
-                    gettimeofday(&global_video[encChn]->stream->stats.ts, NULL);
+                    WorkerUtils::getMonotonicTimeOfDay(&global_video[encChn]->stream->stats.ts);
                     global_video[encChn]->stream->osd.stats.ts = global_video[encChn]
                                                                      ->stream->stats.ts;
                     /*

src/WorkerUtils.cpp

@@ -1,20 +1,27 @@
 #include "WorkerUtils.hpp"
 
 #include <cstddef>
+#include <time.h>
 
 namespace WorkerUtils {
 
-unsigned long long tDiffInMs(struct timeval *startTime)
+void getMonotonicTimeOfDay(struct timeval *tv) {
+    struct timespec ts;
+    clock_gettime(CLOCK_MONOTONIC, &ts);
+    tv->tv_sec = ts.tv_sec;
+    tv->tv_usec = ts.tv_nsec / 1000;
+}
+
+
+unsigned long long getMonotonicTimeDiffInMs(struct timeval *startTime)
 {
     struct timeval currentTime;
-    gettimeofday(&currentTime, NULL);
-
-    long seconds = currentTime.tv_sec - startTime->tv_sec;
-    long microseconds = currentTime.tv_usec - startTime->tv_usec;
+    getMonotonicTimeOfDay(&currentTime);
 
-    unsigned long long milliseconds = (seconds * 1000) + (microseconds / 1000);
+    uint64_t start_us = (uint64_t)startTime->tv_sec * 1000000 + startTime->tv_usec;
+    uint64_t current_us = (uint64_t)currentTime.tv_sec * 1000000 + currentTime.tv_usec;
 
-    return milliseconds;
+    return (current_us - start_us) / 1000;
 }
 
 } // namespace WorkerUtils

src/WorkerUtils.hpp

@@ -12,9 +12,13 @@ struct StartHelper
     std::binary_semaphore has_started{0};
 };
 
+// WorkerUtils provides utility functions that are shared across different worker classes.
+// This includes time-related functions that use a monotonic clock to avoid issues
+// with system time changes (e.g., from NTP).
 namespace WorkerUtils {
 
-unsigned long long tDiffInMs(struct timeval *startTime);
+void getMonotonicTimeOfDay(struct timeval *tv);
+unsigned long long getMonotonicTimeDiffInMs(struct timeval *startTime);
 
 } // namespace WorkerUtils
 

src/globals.hpp

@@ -29,10 +29,7 @@ struct AudioFrame
 struct H264NALUnit
 {
 	std::vector<uint8_t> data;
-    /* timestamp fix, can be removed if solved
 	struct timeval time;
-	int64_t imp_ts;
-    */
 };
 
 struct BackchannelFrame