From eb6d440eb86e5892a9fb1e37ab65b3a39878fbad Mon Sep 17 00:00:00 2001
From: Nick Mowen <nickmowen213@gmail.com>
Date: Tue, 4 Jul 2023 11:02:24 -0600
Subject: [PATCH] Isort

---
 frigate/output.py        | 32 +++++++++++---------------------
 frigate/util/builtin.py  |  3 +--
 frigate/util/image.py    |  1 -
 frigate/util/services.py |  1 -
 4 files changed, 12 insertions(+), 25 deletions(-)

diff --git a/frigate/output.py b/frigate/output.py
index befd30afa..e21632d7d 100644
--- a/frigate/output.py
+++ b/frigate/output.py
@@ -387,24 +387,6 @@ class BirdsEyeFrameManager:
     ) -> tuple[any]:
         """Calculate the optimal layout for 2+ cameras."""
 
-        def get_standard_aspect_ratio(camera_width, camera_height) -> tuple[int, int]:
-            """Ensure that only standard aspect ratios are used."""
-            known_aspects = [
-                (16, 9),
-                (9, 16),
-                (32, 9),
-                (12, 9),
-                (9, 12),
-            ]  # aspects are scaled to be same ratio
-            known_aspects_ratios = list(
-                map(lambda aspect: aspect[0] / aspect[1], known_aspects)
-            )
-            closest = min(
-                known_aspects_ratios,
-                key=lambda x: abs(x - (camera_width / camera_height)),
-            )
-            return known_aspects[known_aspects_ratios.index(closest)]
-
         def map_layout(row_height: int):
             """Map the calculated layout."""
             candidate_layout = []
@@ -462,9 +444,17 @@ class BirdsEyeFrameManager:
         for camera in cameras_to_add:
             camera_dims = self.cameras[camera]["dimensions"].copy()
             camera_gcd = math.gcd(camera_dims[0], camera_dims[1])
-            camera_aspect_x, camera_aspect_y = get_standard_aspect_ratio(
-                camera_dims[0] / camera_gcd, camera_dims[1] / camera_gcd
-            )
+            camera_aspect_x = camera_dims[0] / camera_gcd
+            camera_aspect_y = camera_dims[1] / camera_gcd
+
+            if round(camera_aspect_x / camera_aspect_y, 1) == 1.8:
+                # account for slightly off 16:9 cameras
+                camera_aspect_x = 16
+                camera_aspect_y = 9
+            elif round(camera_aspect_x / camera_aspect_y, 1) == 1.3:
+                # make 4:3 cameras the same relative size as 16:9
+                camera_aspect_x = 12
+                camera_aspect_y = 9
 
             if camera_dims[1] > camera_dims[0]:
                 portrait = True
diff --git a/frigate/util/builtin.py b/frigate/util/builtin.py
index 9c9d2a4fb..d6574aed0 100644
--- a/frigate/util/builtin.py
+++ b/frigate/util/builtin.py
@@ -3,7 +3,6 @@
 import copy
 import datetime
 import logging
-import pytz
 import re
 import shlex
 import urllib.parse
@@ -11,11 +10,11 @@ from collections import Counter
 from collections.abc import Mapping
 from typing import Any, Tuple
 
+import pytz
 import yaml
 
 from frigate.const import REGEX_HTTP_CAMERA_USER_PASS, REGEX_RTSP_CAMERA_USER_PASS
 
-
 logger = logging.getLogger(__name__)
 
 
diff --git a/frigate/util/image.py b/frigate/util/image.py
index f91f55888..4af94500d 100644
--- a/frigate/util/image.py
+++ b/frigate/util/image.py
@@ -9,7 +9,6 @@ from typing import AnyStr, Optional
 import cv2
 import numpy as np
 
-
 logger = logging.getLogger(__name__)
 
 
diff --git a/frigate/util/services.py b/frigate/util/services.py
index b782e4ff1..507ee76ea 100644
--- a/frigate/util/services.py
+++ b/frigate/util/services.py
@@ -15,7 +15,6 @@ import py3nvml.py3nvml as nvml
 
 from frigate.util.builtin import escape_special_characters
 
-
 logger = logging.getLogger(__name__)