X-Git-Url: https://wannabe.guru.org/gitweb/?a=blobdiff_plain;f=camera_utils.py;h=9e7efd6dfccbd7df2d1eb8bd13eb8075a6bfe4f1;hb=31c81f6539969a5eba864d3305f9fb7bf716a367;hp=66ef6ac8e4d77f76f1775569f808f1ab57839176;hpb=52290f9c9e0eeaba3d5a067043f5ba98c9b386e5;p=python_utils.git

diff --git a/camera_utils.py b/camera_utils.py
index 66ef6ac..9e7efd6 100644
--- a/camera_utils.py
+++ b/camera_utils.py
@@ -5,8 +5,8 @@
 import logging
 import platform
 import subprocess
-from typing import NamedTuple, Optional
 import warnings
+from typing import NamedTuple, Optional
 
 import cv2  # type: ignore
 import numpy as np
@@ -20,6 +20,7 @@ logger = logging.getLogger(__name__)
 
 class RawJpgHsv(NamedTuple):
     """Raw image bytes, the jpeg image and the HSV (hue saturation value) image."""
+
     raw: Optional[bytes]
     jpg: Optional[np.ndarray]
     hsv: Optional[np.ndarray]
@@ -27,12 +28,14 @@ class RawJpgHsv(NamedTuple):
 
 class SanityCheckImageMetadata(NamedTuple):
     """Is a Blue Iris image bad (big grey borders around it) or infrared?"""
+
     is_bad_image: bool
     is_infrared_image: bool
 
 
 def sanity_check_image(hsv: np.ndarray) -> SanityCheckImageMetadata:
     """See if a Blue Iris or Shinobi image is bad and infrared."""
+
     def is_near(a, b) -> bool:
         return abs(a - b) < 3
 
@@ -44,16 +47,17 @@ def sanity_check_image(hsv: np.ndarray) -> SanityCheckImageMetadata:
         for c in range(cols):
             pixel = hsv[(r, c)]
             if (
-                    is_near(pixel[0], 16) and
-                    is_near(pixel[1], 117) and
-                    is_near(pixel[2], 196)
+                is_near(pixel[0], 16)
+                and is_near(pixel[1], 117)
+                and is_near(pixel[2], 196)
             ):
                 weird_orange_count += 1
-            elif (is_near(pixel[0], 0) and is_near(pixel[1], 0)):
+            elif is_near(pixel[0], 0) and is_near(pixel[1], 0):
                 hs_zero_count += 1
     logger.debug(f"hszero#={hs_zero_count}, weird_orange={weird_orange_count}")
     return SanityCheckImageMetadata(
-        hs_zero_count > (num_pixels * 0.75), weird_orange_count > (num_pixels * 0.75)
+        hs_zero_count > (num_pixels * 0.75),
+        weird_orange_count > (num_pixels * 0.75),
     )
 
 
@@ -150,7 +154,7 @@ def fetch_camera_image_from_rtsp_stream(
             return out
     except Exception as e:
         logger.exception(e)
-    msg = "Failed to retrieve image via RTSP {stream}, returning None."
+    msg = f"Failed to retrieve image via RTSP {stream}, returning None."
     logger.warning(msg)
     warnings.warn(msg, stacklevel=2)
     return None
@@ -160,17 +164,13 @@ def fetch_camera_image_from_rtsp_stream(
 def _fetch_camera_image(
     camera_name: str, *, width: int = 256, quality: int = 70
 ) -> RawJpgHsv:
-    """Fetch a webcam image given the camera name.
-
-    """
+    """Fetch a webcam image given the camera name."""
     logger.debug("Trying to fetch camera image from video server")
     raw = fetch_camera_image_from_video_server(
         camera_name, width=width, quality=quality
     )
     if raw is None:
-        logger.debug(
-            "Reading from video server failed; trying direct RTSP stream"
-        )
+        logger.debug("Reading from video server failed; trying direct RTSP stream")
         raw = fetch_camera_image_from_rtsp_stream(camera_name, width=width)
     if raw is not None and len(raw) > 0:
         tmp = np.frombuffer(raw, dtype="uint8")
@@ -199,4 +199,5 @@ def fetch_camera_image(
 
 if __name__ == '__main__':
     import doctest
+
     doctest.testmod()