Merge pull request #15 from tobybreckon/fps-display

update patent status
tobybreckon · Sep 22, 2023 · 0a3e863 · 0a3e863
2 parents c5287de + c0711ee
commit 0a3e863
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -122,9 +122,9 @@ If you are making use of this work in any way please reference the following art
 }
 ```
 
-For non-commercial use (i.e. academic, non-for-profit and research) the (very permissive) terms of the MIT free software [LICENSE](LICENSE) must be adhered to.
+Free for commercial use and non-commercial use (i.e. academic, non-for-profit and research) under the (very permissive) terms of the MIT free software [LICENSE](LICENSE) that must be adhered to.
 
-For commercial use, the Division of Gaussians (DIVoG / DoG) saliency detection algorithm is patented (WIPO reference: [WO2013034878A3](https://patents.google.com/patent/WO2013034878A3/)) and available for licensing via [Cranfield University](https://www.cranfield.ac.uk/).
+The Division of Gaussians (DIVoG / DoG) saliency detection algorithm was filed as a patent (WIPO reference: [WO2013034878A2](https://patents.google.com/patent/WO2013034878A2/) by [Cranfield University](https://www.cranfield.ac.uk/), 2013/14) but this patent application has now lasped.
 
 ### Acknowledgements:
 

diff --git a/camera_stream.py b/camera_stream.py
@@ -129,6 +129,7 @@ def __init__(self, src=None, backend=None,
         # set the initial timestamps to zero
         self.timestamp = 0
         self.timestamp_last_read = 0
+        self.use_timestamps = False
 
         # set internal framecounters to -1
         self.framecounter = -1
@@ -141,18 +142,24 @@ def __init__(self, src=None, backend=None,
         # set some sensible backends for real-time video capture from
         # directly connected hardware on a per-OS basis,
         # that can we overidden via the open() method
+        # + remember timestamps only seem to work on linux
         if sys.platform.startswith('linux'):        # all Linux
             self.backend_default = cv2.CAP_V4L
+            self.use_timestamps = True
         elif sys.platform.startswith('win'):        # MS Windows
             self.backend_default = cv2.CAP_DSHOW
+            self.use_timestamps = False
         elif sys.platform.startswith('darwin'):     # macOS
             self.backend_default = cv2.CAP_AVFOUNDATION
+            self.use_timestamps = False
         else:
             self.backend_default = cv2.CAP_ANY      # auto-detect via OpenCV
 
         # if a source was specified at init, proceed to open device
         if not (src is None):
             self.open(src, backend)
+            if not (backend == cv2.CAP_V4L):
+                self.use_timestamps = False
 
     def open(self, src=0, backend=None):
 
@@ -212,7 +219,8 @@ def update(self):
             if not (self.suspend):
                 self.camera.grab()
                 latest_timestamp = self.camera.get(cv2.CAP_PROP_POS_MSEC)
-                if (latest_timestamp > self.timestamp):
+                if ((latest_timestamp > self.timestamp)
+                        or (self.use_timestamps is False)):
                     (self.grabbed, self.frame) = self.camera.retrieve()
                     self.framecounter += 1
                     logging.info("GRAB - frame %d @ time %f",