c_detectMarkers and makeVideo: further deal with broken frames. Of co…

…urse these can't be processed, so need to either skip (c_detectMarkers), or replace with a black frame (makeVideo). Also aligned frame counting between these two files, and moved where we print what frame we're on so all that handling is in just one place.

src/glassesValidator/process/c_detectMarkers.py

@@ -95,10 +95,16 @@ def do_the_work(working_dir, config_dir, gui, show_rejected_markers):
         # process frame-by-frame
         ret, frame = cap.read()
         frame_idx += 1
+
         # check if we're done. Can't trust ret==False to indicate we're at end of video, as it may also return false for some frames when video has errors in the middle that we can just read past
         if (not ret and (frame_idx==0 or frame_idx/nframes>.99)) or (hasAnalyzeFrames and frame_idx > analyzeFrames[-1]):
             # done
             break
+        if frame_idx%100==0:
+            print('  frame {}'.format(frame_idx))
+        if not ret or frame is None:
+            # we don't have a valid frame, continue to next
+            continue
 
         if show_visualization:
             keys = gui.get_key_presses()
@@ -192,9 +198,6 @@ def do_the_work(working_dir, config_dir, gui, show_rejected_markers):
                 stopAllProcessing = True
                 break
 
-        if frame_idx%100==0:
-            print('  frame {}'.format(frame_idx))
-
     csv_file.close()
     cap.release()
     if show_visualization:

src/glassesValidator/utils/makeVideo.py

@@ -113,17 +113,24 @@ def do_the_work(working_dir, config_dir, gui, main_win_id, show_rejected_markers
     if analyzeFrames is None:
         analyzeFrames = []
 
-    frame_idx = 0
+    frame_idx = -1
     armLength = poster.markerSize/2 # arms of axis are half a marker long
     subPixelFac = 8   # for sub-pixel positioning
     stopAllProcessing = False
     hasRequestedFocus = not isMacOS # False only if on Mac OS, else True since its a no-op
     while True:
         # process frame-by-frame
         ret, frame = vidIn.read()
+        frame_idx += 1
+
         # check if we're done. Can't trust ret==False to indicate we're at end of video, as it may also return false for some frames when video has errors in the middle that we can just read past
         if not ret and (frame_idx==0 or frame_idx/nframes>.99):
             break
+        if not show_visualization and frame_idx%100==0:
+            print('  frame {}'.format(frame_idx))
+        if not ret or frame is None:
+            # we don't have a valid frame, use a fully black frame
+            frame = np.zeros((int(height),int(width),3), np.uint8)   # black image
         refImg = poster.getImgCopy()
 
         # detect markers, undistort
@@ -233,10 +240,6 @@ def do_the_work(working_dir, config_dir, gui, main_win_id, show_rejected_markers
             if closed:
                 stopAllProcessing = True
                 break
-        elif (frame_idx+1)%100==0:
-            print('  frame {}'.format(frame_idx+1))
-
-        frame_idx += 1
 
     vidIn.release()
     vidOutScene.close()