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

Actually use the calculated aspect ratio when building the layout

Browse Source
This commit is contained in:
Nick Mowen 2023-07-03 21:42:36 -06:00
parent 08c6feaed1
commit 805247fdb3
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
frigate/output.py
View File

@ -415,18 +415,15 @@ class BirdsEyeFrameManager:
x = starting_x x = starting_x
for cameras in row: for cameras in row:
camera_dims = self.cameras[cameras[0]]["dimensions"].copy() camera_dims = self.cameras[cameras[0]]["dimensions"].copy()
camera_aspect = cameras[1]
if camera_dims[1] > camera_dims[0]: if camera_dims[1] > camera_dims[0]:
scaled_height = int(row_height * 2) scaled_height = int(row_height * 2)
scaled_width = int( scaled_width = int(scaled_height * camera_aspect)
scaled_height * camera_dims[0] / camera_dims[1]
)
starting_x = scaled_width starting_x = scaled_width
else: else:
scaled_height = row_height scaled_height = row_height
scaled_width = int( scaled_width = int(scaled_height * camera_aspect)
scaled_height * camera_dims[0] / camera_dims[1]
)
# layout is too large # layout is too large
if ( if (
@ -472,10 +469,7 @@ class BirdsEyeFrameManager:
camera_layout[y_i].append( camera_layout[y_i].append(
( (
camera, camera,
( camera_aspect_x / camera_aspect_y,
camera_aspect_x,
camera_aspect_y,
),
) )
) )
@ -501,7 +495,7 @@ class BirdsEyeFrameManager:
camera_layout[y_i].append( camera_layout[y_i].append(
( (
camera, camera,
(camera_aspect_x, camera_aspect_y), camera_aspect_x / camera_aspect_y,
) )
) )
x += camera_aspect_x x += camera_aspect_x