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

Formatting

Browse Source
This commit is contained in:
Nick Mowen 2023-07-03 20:06:17 -06:00
parent a1e3dda3ee
commit 08c6feaed1
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
frigate/output.py
View File

@ -385,9 +385,20 @@ class BirdsEyeFrameManager:
def get_standard_aspect_ratio(camera_width, camera_height) -> tuple[int, int]: def get_standard_aspect_ratio(camera_width, camera_height) -> tuple[int, int]:
"""Ensure that only standard aspect ratios are used.""" """Ensure that only standard aspect ratios are used."""
known_aspects = [(16, 9), (9, 16), (32, 9), (12, 9), (9, 12)] # aspects are scaled to have common relative size known_aspects = [
known_aspects_ratios = list(map(lambda aspect: aspect[0] / aspect[1], known_aspects)) (16, 9),
closest = min(known_aspects_ratios, key=lambda x:abs(x-(camera_width / camera_height))) (9, 16),
(32, 9),
(12, 9),
(9, 12),
] # aspects are scaled to have common relative size
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)] return known_aspects[known_aspects_ratios.index(closest)]
def map_layout(row_height: int): def map_layout(row_height: int):
@ -447,7 +458,9 @@ class BirdsEyeFrameManager:
for camera in cameras_to_add: for camera in cameras_to_add:
camera_dims = self.cameras[camera]["dimensions"].copy() camera_dims = self.cameras[camera]["dimensions"].copy()
camera_gcd = math.gcd(camera_dims[0], camera_dims[1]) 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_aspect_y = get_standard_aspect_ratio(
camera_dims[0] / camera_gcd, camera_dims[1] / camera_gcd
)
if camera_dims[1] > camera_dims[0]: if camera_dims[1] > camera_dims[0]:
portrait = True portrait = True