administrator/frigate
1
0
Fork 0
mirror of https://github.com/blakeblackshear/frigate.git synced 2026-02-05 18:55:23 +03:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Improve layout with slightly larger than 16:9 cameras

Browse Source
This commit is contained in:
Nick Mowen 2023-06-15 10:07:34 -06:00
parent 741e3829b6
commit f908237385
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
frigate/output.py
View File

@ -370,10 +370,14 @@ class BirdsEyeFrameManager:
camera_aspect_x = camera_dims[0] / camera_gcd camera_aspect_x = camera_dims[0] / camera_gcd
camera_aspect_y = camera_dims[1] / 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 # account for slightly off 16:9 cameras
if round(camera_aspect_x / camera_aspect_y, 2) == 1.77:
camera_aspect_x = 16 camera_aspect_x = 16
camera_aspect_y = 9 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]: if camera_dims[1] > camera_dims[0]:
portrait = True portrait = True
@ -423,7 +427,7 @@ class BirdsEyeFrameManager:
return None return None
row_count = len(camera_layout) row_count = len(camera_layout)
row_height = int(canvas_height / row_count) row_height = int(canvas_height / coefficient)
final_camera_layout = [] final_camera_layout = []
starting_x = 0 starting_x = 0
@ -447,11 +451,18 @@ class BirdsEyeFrameManager:
scaled_height * camera_dims[0] / camera_dims[1] scaled_height * camera_dims[0] / camera_dims[1]
) )
if (
x + scaled_width > canvas_width
or y + scaled_height > canvas_height
):
return None
final_row.append((cameras[0], (x, y, scaled_width, scaled_height))) final_row.append((cameras[0], (x, y, scaled_width, scaled_height)))
x += scaled_width x += scaled_width
y += row_height y += row_height
final_camera_layout.append(final_row) final_camera_layout.append(final_row)
logger.error(f"Final layout {camera_layout} :: {final_camera_layout}")
return final_camera_layout return final_camera_layout
# determine how many cameras are tracking objects within the last 30 seconds # determine how many cameras are tracking objects within the last 30 seconds
@ -528,7 +539,7 @@ class BirdsEyeFrameManager:
) )
else: else:
# calculate optimal layout # calculate optimal layout
coefficient = 2.0 coefficient = 2
calculating = True calculating = True
# decrease scaling coefficient until height of all cameras can fit into the birdseye canvas # decrease scaling coefficient until height of all cameras can fit into the birdseye canvas
@ -543,6 +554,9 @@ class BirdsEyeFrameManager:
if coefficient < 10: if coefficient < 10:
coefficient += 1 coefficient += 1
continue continue
else:
logger.error(f"Error finding appropriate birdseye layout")
return
calculating = False calculating = False