From 9d717b371c69a93da3fb0c0c9b34eb86f19c9761 Mon Sep 17 00:00:00 2001
From: Nicolas Mowen <nickmowen213@gmail.com>
Date: Mon, 30 Oct 2023 18:24:42 -0600
Subject: [PATCH] Improve logic of birdseye (#8375)

* Improve logic of birdseye

* Formatting
---
 frigate/output.py | 24 +++++++++++++++++++-----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/frigate/output.py b/frigate/output.py
index b485f864c..8842d1610 100644
--- a/frigate/output.py
+++ b/frigate/output.py
@@ -463,7 +463,7 @@ class BirdsEyeFrameManager:
     def calculate_layout(self, cameras_to_add: list[str], coefficient) -> tuple[any]:
         """Calculate the optimal layout for 2+ cameras."""
 
-        def map_layout(row_height: int):
+        def map_layout(camera_layout: list[list[any]], row_height: int):
             """Map the calculated layout."""
             candidate_layout = []
             starting_x = 0
@@ -492,7 +492,7 @@ class BirdsEyeFrameManager:
                         x + scaled_width > self.canvas.width
                         or y + scaled_height > self.canvas.height
                     ):
-                        return 0, 0, None
+                        return x + scaled_width, y + scaled_height, None
 
                     final_row.append((cameras[0], (x, y, scaled_width, scaled_height)))
                     x += scaled_width
@@ -564,10 +564,24 @@ class BirdsEyeFrameManager:
             return None
 
         row_height = int(self.canvas.height / coefficient)
-        total_width, total_height, standard_candidate_layout = map_layout(row_height)
+        total_width, total_height, standard_candidate_layout = map_layout(
+            camera_layout, row_height
+        )
 
         if not standard_candidate_layout:
-            return None
+            # if standard layout didn't work
+            # try reducing row_height by the % overflow
+            scale_down_percent = max(
+                total_width / self.canvas.width,
+                total_height / self.canvas.height,
+            )
+            row_height = int(row_height / scale_down_percent)
+            total_width, total_height, standard_candidate_layout = map_layout(
+                camera_layout, row_height
+            )
+
+            if not standard_candidate_layout:
+                return None
 
         # layout can't be optimized more
         if total_width / self.canvas.width >= 0.99:
@@ -578,7 +592,7 @@ class BirdsEyeFrameManager:
             1 / (total_height / self.canvas.height),
         )
         row_height = int(row_height * scale_up_percent)
-        _, _, scaled_layout = map_layout(row_height)
+        _, _, scaled_layout = map_layout(camera_layout, row_height)
 
         if scaled_layout:
             return scaled_layout