Address #5 by adding debug options via shift menu

Author: glenne

native/recorder/src/FrameProcessor.cpp

@@ -37,9 +37,9 @@ FrameProcessor::FrameProcessor(const std::string directory,
                                const std::string prefix,
                                std::shared_ptr<VideoRecorder> videoRecorder,
                                int durationSecs, FRectangle cropArea,
-                               Guide guide)
+                               Guide guide, bool addTimeOverlay)
     : directory(directory), prefix(prefix), cropArea(cropArea),
-      pxCropArea(Rectangle(0, 0, 0, 0)), guide(guide),
+      pxCropArea(Rectangle(0, 0, 0, 0)), guide(guide), addTimeOverlay(addTimeOverlay),
       videoRecorder(videoRecorder), durationSecs(durationSecs), running(true),
       processThread(&FrameProcessor::processFrames, this)
 {
@@ -293,7 +293,10 @@ void FrameProcessor::processFrames()
       }
 
       encodeTimestamp(cropped->data, cropped->stride, video_frame->timestamp);
-      // overlayTime(cropped->data, cropped->stride, video_frame->timestamp);
+      if (addTimeOverlay)
+      {
+        overlayTime(cropped->data, cropped->stride, video_frame->timestamp);
+      }
 
       auto err = videoRecorder->writeVideoFrame(cropped);
       if (!err.empty())

native/recorder/src/FrameProcessor.hpp

@@ -64,7 +64,7 @@ class FrameProcessor
    */
   FrameProcessor(const std::string directory, const std::string prefix,
                  std::shared_ptr<VideoRecorder> videoRecorder, int durationSecs,
-                 FRectangle cropArea, Guide guide);
+                 FRectangle cropArea, Guide guide, bool addTimeOverlay);
 
   void addFrame(FramePtr frame);
 
@@ -102,6 +102,8 @@ class FrameProcessor
   FRectangle cropArea;
   Rectangle pxCropArea;
   Guide guide;
+  bool addTimeOverlay;
+
   std::shared_ptr<VideoRecorder> videoRecorder;
   uint64_t durationSecs;
   uint64_t nextStartTime = 0;

native/recorder/src/NdiReader.cpp

@@ -250,21 +250,27 @@ class NdiReader : public VideoReader
 
           auto msPerFrame =
               1000 * video_frame.frame_rate_D / video_frame.frame_rate_N;
+
+          if (frameCount < (2000 / msPerFrame))
+          {
+            // Ignore the first two seconds as there are often missing or badly timestamped frames
+            break;
+          }
           if (deltaMs == 0 || (lastTS != 0 && deltaMs >= 2 * msPerFrame))
           {
             std::stringstream timestring;
             timestring << std::put_time(local_time, "%H:%M:%S") << "." << std::setw(3)
                        << std::setfill('0') << milli % 1000;
 
             // For diagnostic purposes
-            std::cerr << "Gap=" << deltaMs << "ms, msPerFrame=" << msPerFrame << " at " << timestring.str() << std::endl;
+            std::stringstream message;
+            message << "Gap=" << deltaMs << "ms (" << std::max(0.0, std::round(deltaMs / msPerFrame - 1)) << "frames missing) prior to " << timestring.str();
+            std::cerr << message.str() << std::endl;
 
-            if (lastTS != 0 && deltaMs >= 100)
+            if ((lastTS != 0 && deltaMs >= 110) || reportAllGaps)
             {
-              // Only designate an error if past the 2s frame mark as startup often misses some
-              std::stringstream ss;
-              ss << (frameCount > (2000 / msPerFrame) ? "Error: " : "") << "Gap of " << deltaMs << "ms at " << timestring.str();
-              SystemEventQueue::push("NDI", ss.str());
+              const auto errmsg = std::string("Error: ") + message.str();
+              SystemEventQueue::push("NDI", errmsg);
             }
           }
 

native/recorder/src/RecorderAPI.cpp

@@ -191,6 +191,16 @@ nativeVideoRecorder(const Napi::CallbackInfo &info)
           return ret;
         }
       }
+      bool reportAllGaps = false;
+      if (props.Has("reportAllGaps"))
+      {
+        reportAllGaps = props.Get("reportAllGaps").As<Napi::Boolean>();
+      }
+      bool addTimeOverlay = false;
+      if (props.Has("addTimeOverlay"))
+      {
+        addTimeOverlay = props.Get("addTimeOverlay").As<Napi::Boolean>();
+      }
       auto folder = props.Get("recordingFolder").As<Napi::String>().Utf8Value();
       auto prefix = props.Get("recordingPrefix").As<Napi::String>().Utf8Value();
       auto networkCamera =
@@ -215,7 +225,7 @@ nativeVideoRecorder(const Napi::CallbackInfo &info)
       guide.pt2 = guideObj.Get("pt2").As<Napi::Number>().FloatValue();
 
       auto result = recorder->start(networkCamera, "ffmpeg", folder, prefix,
-                                    interval, cropRect, guide);
+                                    interval, cropRect, guide, reportAllGaps, addTimeOverlay);
       if (!result.empty())
       {
         std::cerr << "Error: " << result << std::endl;
@@ -331,7 +341,7 @@ nativeVideoRecorder(const Napi::CallbackInfo &info)
       ret.Set("width", Napi::Number::New(env, uyvy422Frame->xres));
       ret.Set("height", Napi::Number::New(env, uyvy422Frame->yres));
       ret.Set("totalBytes", Napi::Number::New(env, totalBytes));
-      ret.Set("tsMilli", Napi::Number::New(env, uyvy422Frame->timestamp/10000));
+      ret.Set("tsMilli", Napi::Number::New(env, uyvy422Frame->timestamp / 10000));
       return ret;
     }
     else if (op == "send-visca-cmd")

native/recorder/src/VideoController.hpp

@@ -104,7 +104,8 @@ class VideoController
                     const std::string dir, const std::string prefix,
                     const int interval,
                     const FrameProcessor::FRectangle cropArea,
-                    const FrameProcessor::Guide guide)
+                    const FrameProcessor::Guide guide,
+                    const bool reportAllGaps, const bool addTimeOverlay)
   {
     std::lock_guard<std::recursive_mutex> lock(controlMutex);
     this->srcName = srcName;
@@ -157,8 +158,9 @@ class VideoController
     }
 
     frameProcessor = std::shared_ptr<FrameProcessor>(new FrameProcessor(
-        dir, prefix, videoRecorder, interval, cropArea, guide));
+        dir, prefix, videoRecorder, interval, cropArea, guide, addTimeOverlay));
 
+    videoReader->setProperties(reportAllGaps);
     retval = videoReader->start(srcName, [this](FramePtr frame)
                                 { this->frameProcessor->addFrame(frame); });
     if (!retval.empty())

native/recorder/src/VideoReader.hpp

@@ -7,6 +7,9 @@
 
 class VideoReader
 {
+protected:
+  bool reportAllGaps = false;
+
 public:
   using AddFrameFunction = std::function<void(FramePtr)>;
   typedef struct CameraInfo
@@ -21,6 +24,10 @@ class VideoReader
   virtual std::string start(const std::string srcName,
                             AddFrameFunction addFrameFunction) = 0;
   virtual std::string stop() = 0;
+  virtual void setProperties(bool reportAllGaps)
+  {
+    this->reportAllGaps = reportAllGaps;
+  }
   virtual std::vector<CameraInfo> getCameraList()
   {
     return std::vector<CameraInfo>();

native/recorder/src/VideoUtils.cpp

@@ -1,6 +1,7 @@
 #include <algorithm>
 #include <chrono>
 #include <iostream>
+#include <vector>
 #include <stdint.h>
 #include "VideoUtils.hpp"
 
@@ -220,7 +221,7 @@ void overlayTime(uint8_t *ptr, int stride, uint64_t ts100ns, const std::tm *loca
   int local_minutes = local_time->tm_min;
   int local_secs = local_time->tm_sec;
 
-  Point point = Point(stride / 8, 40);
+  Point point = Point(40, 40); // Point(stride / 8, 40);
 
   overlayDigits(screen, stride, point, local_hours, 2);
   setDigitPixels(screen, 10, point, stride, timeColor, black);