mirror of
https://github.com/blakeblackshear/frigate.git
synced 2026-02-02 17:25:22 +03:00
Formatting
This commit is contained in:
parent
3a493bb65f
commit
7b039886d6
@ -13,9 +13,9 @@ services:
|
|||||||
build:
|
build:
|
||||||
context: .
|
context: .
|
||||||
dockerfile: docker/Dockerfile.dev
|
dockerfile: docker/Dockerfile.dev
|
||||||
devices:
|
#devices:
|
||||||
- /dev/bus/usb:/dev/bus/usb
|
# - /dev/bus/usb:/dev/bus/usb
|
||||||
- /dev/dri:/dev/dri # for intel hwaccel, needs to be updated for your hardware
|
# - /dev/dri:/dev/dri # for intel hwaccel, needs to be updated for your hardware
|
||||||
volumes:
|
volumes:
|
||||||
- /etc/localtime:/etc/localtime:ro
|
- /etc/localtime:/etc/localtime:ro
|
||||||
- .:/lab/frigate:cached
|
- .:/lab/frigate:cached
|
||||||
|
|||||||
@ -103,8 +103,15 @@ class FrigateApp:
|
|||||||
"frame_queue": mp.Queue(maxsize=2),
|
"frame_queue": mp.Queue(maxsize=2),
|
||||||
"capture_process": None,
|
"capture_process": None,
|
||||||
"process": None,
|
"process": None,
|
||||||
"birdseye_enabled": mp.Value("i", self.config.cameras[camera_name].birdseye.enabled),
|
"birdseye_enabled": mp.Value(
|
||||||
"birdseye_mode": mp.Value("i", int_from_birdseye_mode(self.config.cameras[camera_name].birdseye.mode)),
|
"i", self.config.cameras[camera_name].birdseye.enabled
|
||||||
|
),
|
||||||
|
"birdseye_mode": mp.Value(
|
||||||
|
"i",
|
||||||
|
int_from_birdseye_mode(
|
||||||
|
self.config.cameras[camera_name].birdseye.mode
|
||||||
|
),
|
||||||
|
),
|
||||||
}
|
}
|
||||||
|
|
||||||
def set_log_levels(self) -> None:
|
def set_log_levels(self) -> None:
|
||||||
|
|||||||
@ -217,19 +217,46 @@ def create_mqtt_client(config: FrigateConfig, camera_metrics):
|
|||||||
birdseye_settings = config.cameras[camera_name].birdseye
|
birdseye_settings = config.cameras[camera_name].birdseye
|
||||||
|
|
||||||
if payload == BirdseyeModeEnum.continuous:
|
if payload == BirdseyeModeEnum.continuous:
|
||||||
if birdseye_mode_from_int(camera_metrics[camera_name]["birdseye_mode"].value) != BirdseyeModeEnum.continuous:
|
if (
|
||||||
logger.info(f"Setting birdseye mode for {camera_name} to {payload} via mqtt")
|
birdseye_mode_from_int(
|
||||||
camera_metrics[camera_name]["birdseye_mode"].value = int_from_birdseye_mode(BirdseyeModeEnum.continuous)
|
camera_metrics[camera_name]["birdseye_mode"].value
|
||||||
|
)
|
||||||
|
!= BirdseyeModeEnum.continuous
|
||||||
|
):
|
||||||
|
logger.info(
|
||||||
|
f"Setting birdseye mode for {camera_name} to {payload} via mqtt"
|
||||||
|
)
|
||||||
|
camera_metrics[camera_name][
|
||||||
|
"birdseye_mode"
|
||||||
|
].value = int_from_birdseye_mode(BirdseyeModeEnum.continuous)
|
||||||
birdseye_settings.mode = BirdseyeModeEnum.continuous
|
birdseye_settings.mode = BirdseyeModeEnum.continuous
|
||||||
elif payload == BirdseyeModeEnum.motion:
|
elif payload == BirdseyeModeEnum.motion:
|
||||||
if birdseye_mode_from_int(camera_metrics[camera_name]["birdseye_mode"].value) != BirdseyeModeEnum.motion:
|
if (
|
||||||
logger.info(f"Setting birdseye mode for {camera_name} to {payload} via mqtt")
|
birdseye_mode_from_int(
|
||||||
camera_metrics[camera_name]["birdseye_mode"].value = int_from_birdseye_mode(BirdseyeModeEnum.motion)
|
camera_metrics[camera_name]["birdseye_mode"].value
|
||||||
|
)
|
||||||
|
!= BirdseyeModeEnum.motion
|
||||||
|
):
|
||||||
|
logger.info(
|
||||||
|
f"Setting birdseye mode for {camera_name} to {payload} via mqtt"
|
||||||
|
)
|
||||||
|
camera_metrics[camera_name][
|
||||||
|
"birdseye_mode"
|
||||||
|
].value = int_from_birdseye_mode(BirdseyeModeEnum.motion)
|
||||||
birdseye_settings.mode = BirdseyeModeEnum.motion
|
birdseye_settings.mode = BirdseyeModeEnum.motion
|
||||||
elif payload == BirdseyeModeEnum.objects:
|
elif payload == BirdseyeModeEnum.objects:
|
||||||
if birdseye_mode_from_int(camera_metrics[camera_name]["birdseye_mode"].value) != BirdseyeModeEnum.objects:
|
if (
|
||||||
logger.info(f"Setting birdseye mode for {camera_name} to {payload} via mqtt")
|
birdseye_mode_from_int(
|
||||||
camera_metrics[camera_name]["birdseye_mode"].value = int_from_birdseye_mode(BirdseyeModeEnum.objects)
|
camera_metrics[camera_name]["birdseye_mode"].value
|
||||||
|
)
|
||||||
|
!= BirdseyeModeEnum.objects
|
||||||
|
):
|
||||||
|
logger.info(
|
||||||
|
f"Setting birdseye mode for {camera_name} to {payload} via mqtt"
|
||||||
|
)
|
||||||
|
camera_metrics[camera_name][
|
||||||
|
"birdseye_mode"
|
||||||
|
].value = int_from_birdseye_mode(BirdseyeModeEnum.objects)
|
||||||
birdseye_settings.mode = BirdseyeModeEnum.objects
|
birdseye_settings.mode = BirdseyeModeEnum.objects
|
||||||
else:
|
else:
|
||||||
logger.warning(f"Received unsupported value at {message.topic}: {payload}")
|
logger.warning(f"Received unsupported value at {message.topic}: {payload}")
|
||||||
|
|||||||
@ -325,7 +325,9 @@ class BirdsEyeFrameManager:
|
|||||||
|
|
||||||
# update the last active frame for the camera
|
# update the last active frame for the camera
|
||||||
self.cameras[camera]["current_frame"] = frame_time
|
self.cameras[camera]["current_frame"] = frame_time
|
||||||
if self.camera_active(camera_info["birdseye_mode"].value, object_count, motion_count):
|
if self.camera_active(
|
||||||
|
camera_info["birdseye_mode"].value, object_count, motion_count
|
||||||
|
):
|
||||||
self.cameras[camera]["last_active_frame"] = frame_time
|
self.cameras[camera]["last_active_frame"] = frame_time
|
||||||
|
|
||||||
now = datetime.datetime.now().timestamp()
|
now = datetime.datetime.now().timestamp()
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user