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

Fix issues with different heights

Browse Source
This commit is contained in:
Nick Mowen 2023-06-07 09:53:44 -06:00
parent b3d4e9eeae
commit 1755fdc10e
1 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
frigate/output.py
View File

@ -7,6 +7,7 @@ import os
import queue import queue
import signal import signal
import subprocess as sp import subprocess as sp
import sys
import threading import threading
import traceback import traceback
from wsgiref.simple_server import make_server from wsgiref.simple_server import make_server
@ -287,25 +288,26 @@ class BirdsEyeFrameManager:
camera_layout[y_i].append( camera_layout[y_i].append(
( (
camera, camera,
(x, y, detect_config.width, detect_config.height), (x, y, int(detect_config.width * coefficient), int(detect_config.height * coefficient)),
) )
) )
x += detect_config.width x += int(detect_config.width * coefficient)
max_height = max(max_height, detect_config.height) max_height = max(max_height, int(detect_config.height * coefficient))
else: else:
# move on to the next row and insert # move on to the next row and insert
y = max_height y += max_height
y_i += 1 y_i += 1
camera_layout.append([]) camera_layout.append([])
x = 0 x = 0
camera_layout[y_i].append( camera_layout[y_i].append(
( (
camera, camera,
(x, y, detect_config.width, detect_config.height), (x, y, int(detect_config.width * coefficient), int(detect_config.height * coefficient)),
) )
) )
x += detect_config.width x += int(detect_config.width * coefficient)
logger.error(f"Calc total height {y + max_height}")
return (camera_layout, y + max_height) return (camera_layout, y + max_height)
# determine how many cameras are tracking objects within the last 30 seconds # determine how many cameras are tracking objects within the last 30 seconds
@ -385,30 +387,30 @@ class BirdsEyeFrameManager:
self.config.cameras[active_camera].birdseye.order, self.config.cameras[active_camera].birdseye.order,
active_camera, active_camera,
), ),
# we're popping out elements from the end, so this needs to be reverse
# as we want the last element to be the first
reverse=True,
) )
canvas_width = self.config.birdseye.width canvas_width = self.config.birdseye.width
canvas_height = self.config.birdseye.height canvas_height = self.config.birdseye.height
coefficient = 1 coefficient = 1.0
layout_candidate, total_height = calculate_layout( while True:
(canvas_width, canvas_height), active_cameras_to_add, coefficient
)
if total_height > canvas_height:
coefficient = canvas_height / total_height
layout_candidate, total_height = 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
) )
logger.error(f"With a coefficient of {coefficient} the total height is {total_height}")
if total_height <= canvas_height:
break
coefficient -= 0.1
self.camera_layout = layout_candidate self.camera_layout = layout_candidate
logger.error(f"The final layout is {self.camera_layout}")
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"]
) )