Fix nan-robust stream FPS

Fix for Webcam stop working suddenly (Issue #6197)
ultralytics · Jan 5, 2022 · 25b0d13 · 25b0d13
1 parent b5b56a3
commit 25b0d13
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/utils/datasets.py b/utils/datasets.py
@@ -6,6 +6,7 @@
 import glob
 import hashlib
 import json
+import math
 import os
 import random
 import shutil
@@ -308,8 +309,9 @@ def __init__(self, sources='streams.txt', img_size=640, stride=32, auto=True):
             assert cap.isOpened(), f'{st}Failed to open {s}'
             w = int(cap.get(cv2.CAP_PROP_FRAME_WIDTH))
             h = int(cap.get(cv2.CAP_PROP_FRAME_HEIGHT))
-            self.fps[i] = max(cap.get(cv2.CAP_PROP_FPS) % 100, 0) or 30.0  # 30 FPS fallback
+            fps = cap.get(cv2.CAP_PROP_FPS)  # warning: may return 0 or nan
             self.frames[i] = max(int(cap.get(cv2.CAP_PROP_FRAME_COUNT)), 0) or float('inf')  # infinite stream fallback
+            self.fps[i] = max((fps if math.isfinite(fps) else 0) % 100, 0) or 30  # 30 FPS fallback
 
             _, self.imgs[i] = cap.read()  # guarantee first frame
             self.threads[i] = Thread(target=self.update, args=([i, cap, s]), daemon=True)