A bunch of changes...

[python_utils.git] / camera_utils.py

diff --git a/camera_utils.py b/camera_utils.py
index e85bd6e4dbbedc060aad4944d16519b91bd1c746..acf760d55ca8b61d69871260ac55e18844f46acb 100644 (file)
--- a/camera_utils.py
+++ b/camera_utils.py
@@ -12,6 +12,7 @@ import numpy as np
 import requests
 
 import decorator_utils
+import exceptions
 
 logger = logging.getLogger(__name__)
 
@@ -23,28 +24,35 @@ class RawJpgHsv(NamedTuple):
     hsv: Optional[np.ndarray]
 
 
-class BlueIrisImageMetadata(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 analyze_blue_iris_image(hsv: np.ndarray) -> BlueIrisImageMetadata:
+def sanity_check_image(hsv: np.ndarray) -> SanityCheckImageMetadata:
     """See if a Blue Iris image is bad and infrared."""
+    def is_near(a, b) -> bool:
+        return abs(a - b) < 3
+
     rows, cols, _ = hsv.shape
     num_pixels = rows * cols
+    weird_orange_count = 0
     hs_zero_count = 0
-    gray_count = 0
     for r in range(rows):
         for c in range(cols):
             pixel = hsv[(r, c)]
-            if pixel[0] == 0 and pixel[1] == 0:
+            if (
+                    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)):
                 hs_zero_count += 1
-            if abs(pixel[2] - 64) <= 10:
-                gray_count += 1
-    logger.debug(f"gray#={gray_count}, hs0#={hs_zero_count}")
-    return BlueIrisImageMetadata(
-        gray_count > (num_pixels * 0.33), hs_zero_count > (num_pixels * 0.75)
+    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)
     )
 
 
@@ -55,15 +63,19 @@ def fetch_camera_image_from_video_server(
     """Fetch the raw webcam image from the video server."""
     camera_name = camera_name.replace(".house", "")
     camera_name = camera_name.replace(".cabin", "")
-    url = f"http://10.0.0.56:81/image/{camera_name}?w={width}&q={quality}"
+    url = f"http://10.0.0.226:8080/Umtxxf1uKMBniFblqeQ9KRbb6DDzN4/jpeg/GKlT2FfiSQ/{camera_name}/s.jpg"
     try:
         response = requests.get(url, stream=False, timeout=10.0)
         if response.ok:
             raw = response.content
+            logger.debug(f'Read {len(response.content)} byte image from HTTP server')
             tmp = np.frombuffer(raw, dtype="uint8")
+            logger.debug(f'Translated raw content into {tmp.shape} {type(tmp)} with element type {type(tmp[0])}.')
             jpg = cv2.imdecode(tmp, cv2.IMREAD_COLOR)
+            logger.debug(f'Decoded into {jpg.shape} jpeg {type(jpg)} with element type {type(jpg[0][0])}')
             hsv = cv2.cvtColor(jpg, cv2.COLOR_BGR2HSV)
-            (is_bad_image, _) = analyze_blue_iris_image(hsv)
+            logger.debug(f'Converted JPG into HSV {hsv.shape} HSV {type(hsv)} with element type {type(hsv[0][0])}')
+            (_, is_bad_image) = sanity_check_image(hsv)
             if not is_bad_image:
                 logger.debug(f"Got a good image from {url}")
                 return raw
@@ -156,5 +168,5 @@ def fetch_camera_image(
 ) -> RawJpgHsv:
     try:
         return _fetch_camera_image(camera_name, width=width, quality=quality)
-    except decorator_utils.TimeoutError:
+    except exceptions.TimeoutError:
         return RawJpgHsv(None, None, None)