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

Working in ideal conditions

Browse Source
This commit is contained in:
Nick Mowen 2023-06-07 09:25:55 -06:00
parent 9216a99b14
commit b3d4e9eeae
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
frigate/output.py
View File

@ -249,6 +249,8 @@ class BirdsEyeFrameManager:
return return
channel_dims = self.cameras[camera]["channel_dims"] channel_dims = self.cameras[camera]["channel_dims"]
logger.error(f"Copy to yuv {position}")
copy_yuv_to_position( copy_yuv_to_position(
self.frame, self.frame,
[position[1], position[0]], [position[1], position[0]],
@ -274,14 +276,13 @@ class BirdsEyeFrameManager:
camera_layout: list[list[any]] = [] camera_layout: list[list[any]] = []
camera_layout.append([]) camera_layout.append([])
x = 0 x = 0
x_i = 0
y = 0 y = 0
y_i = 0 y_i = 0
max_height = 0 max_height = 0
for camera in cameras_to_add: for camera in cameras_to_add:
detect_config = self.config.cameras[camera].detect detect_config = self.config.cameras[camera].detect
if self.config.cameras[camera].detect.width * coefficient <= canvas[0]: if (x + self.config.cameras[camera].detect.width * coefficient) <= canvas[0]:
# insert if camera can fit on current row # insert if camera can fit on current row
camera_layout[y_i].append( camera_layout[y_i].append(
( (
@ -297,7 +298,6 @@ class BirdsEyeFrameManager:
y_i += 1 y_i += 1
camera_layout.append([]) camera_layout.append([])
x = 0 x = 0
x_i = 0
camera_layout[y_i].append( camera_layout[y_i].append(
( (
camera, camera,
@ -390,8 +390,8 @@ class BirdsEyeFrameManager:
reverse=True, reverse=True,
) )
canvas_width = self.frame_shape[1] canvas_width = self.config.birdseye.width
canvas_height = self.frame_shape[0] canvas_height = self.config.birdseye.height
coefficient = 1 coefficient = 1
layout_candidate, total_height = calculate_layout( layout_candidate, total_height = calculate_layout(
@ -400,7 +400,7 @@ class BirdsEyeFrameManager:
if total_height > canvas_height: if total_height > canvas_height:
coefficient = canvas_height / total_height coefficient = canvas_height / total_height
layout_candidate = calculate_layout( layout_candidate, total_height = calculate_layout(
(canvas_width, canvas_height), active_cameras_to_add, coefficient (canvas_width, canvas_height), active_cameras_to_add, coefficient
) )
@ -408,6 +408,7 @@ class BirdsEyeFrameManager:
for row in self.camera_layout: for row in self.camera_layout:
for position in row: for position in row:
logger.error(f"Position is {position}")
self.copy_to_position( self.copy_to_position(
position[1], position[0], self.cameras[position[0]]["current_frame"] position[1], position[0], self.cameras[position[0]]["current_frame"]
) )