Mirrors/blakeblackshear.frigate
1
0
Fork 0
mirror of https://github.com/blakeblackshear/frigate.git synced 2024-11-21 19:07:46 +01:00
Code Issues Projects Releases Wiki Activity

use values from config

Browse Source
This commit is contained in:
Blake Blackshear 2021-06-11 07:50:09 -05:00
parent d1a5e2e8e0
commit 94c21a6363
1 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
frigate/output.py
View File

@ -19,6 +19,7 @@ from ws4py.server.wsgirefserver import (
from ws4py.server.wsgiutils import WebSocketWSGIApplication from ws4py.server.wsgiutils import WebSocketWSGIApplication
from ws4py.websocket import WebSocket from ws4py.websocket import WebSocket
from frigate.config import FrigateConfig
from frigate.util import SharedMemoryFrameManager, get_yuv_crop, copy_yuv_to_position from frigate.util import SharedMemoryFrameManager, get_yuv_crop, copy_yuv_to_position
@ -73,9 +74,11 @@ class BroadcastThread(threading.Thread):
class BirdsEyeFrameManager: class BirdsEyeFrameManager:
def __init__(self, config, frame_manager: SharedMemoryFrameManager, width, height): def __init__(self, config, frame_manager: SharedMemoryFrameManager):
self.config = config self.config = config
self.frame_manager = frame_manager self.frame_manager = frame_manager
width = config.birdseye.width
height = config.birdseye.height
self.frame_shape = (height, width) self.frame_shape = (height, width)
self.yuv_shape = (height * 3 // 2, width) self.yuv_shape = (height * 3 // 2, width)
self.frame = np.ndarray(self.yuv_shape, dtype=np.uint8) self.frame = np.ndarray(self.yuv_shape, dtype=np.uint8)
@ -134,6 +137,7 @@ class BirdsEyeFrameManager:
def update_frame(self): def update_frame(self):
# determine how many cameras are tracking objects within the last 30 seconds # determine how many cameras are tracking objects within the last 30 seconds
now = datetime.datetime.now().timestamp() now = datetime.datetime.now().timestamp()
# TODO: this needs to be based on the "mode" from the config
active_cameras = set( active_cameras = set(
[ [
cam cam
@ -251,7 +255,7 @@ class BirdsEyeFrameManager:
return self.update_frame() return self.update_frame()
def output_frames(config, video_output_queue): def output_frames(config: FrigateConfig, video_output_queue):
threading.current_thread().name = f"output" threading.current_thread().name = f"output"
setproctitle(f"frigate.output") setproctitle(f"frigate.output")
@ -289,7 +293,14 @@ def output_frames(config, video_output_queue):
camera, converters[camera], websocket_server camera, converters[camera], websocket_server
) )
converters["birdseye"] = FFMpegConverter(1280, 720, 1280, 720, 8) if config.birdseye.enabled:
converters["birdseye"] = FFMpegConverter(
config.birdseye.width,
config.birdseye.height,
config.birdseye.width,
config.birdseye.height,
config.birdseye.quality,
)
broadcasters["birdseye"] = BroadcastThread( broadcasters["birdseye"] = BroadcastThread(
"birdseye", converters["birdseye"], websocket_server "birdseye", converters["birdseye"], websocket_server
) )
@ -299,7 +310,7 @@ def output_frames(config, video_output_queue):
for t in broadcasters.values(): for t in broadcasters.values():
t.start() t.start()
birdseye_manager = BirdsEyeFrameManager(config, frame_manager, 1280, 720) birdseye_manager = BirdsEyeFrameManager(config, frame_manager)
while not stop_event.is_set(): while not stop_event.is_set():
try: try:
@ -325,7 +336,7 @@ def output_frames(config, video_output_queue):
converters[camera].write(frame.tobytes()) converters[camera].write(frame.tobytes())
# update birdseye if websockets are connected # update birdseye if websockets are connected
if any( if config.birdseye.enabled and any(
ws.environ["PATH_INFO"].endswith("birdseye") ws.environ["PATH_INFO"].endswith("birdseye")
for ws in websocket_server.manager for ws in websocket_server.manager
): ):