mirror of
https://github.com/blakeblackshear/frigate.git
synced 2026-05-09 15:05:26 +03:00
Compare commits
6 Commits
e8c034a6e5
...
d1b88b53d1
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d1b88b53d1 | ||
|
|
a182385618 | ||
|
|
088e1ad7ef | ||
|
|
011ad8eda7 | ||
|
|
b5a360be39 | ||
|
|
54a7c5015e |
@ -32,11 +32,14 @@ RUN echo /opt/rocm/lib|tee /opt/rocm-dist/etc/ld.so.conf.d/rocm.conf
|
|||||||
FROM deps AS deps-prelim
|
FROM deps AS deps-prelim
|
||||||
|
|
||||||
COPY docker/rocm/debian-backports.sources /etc/apt/sources.list.d/debian-backports.sources
|
COPY docker/rocm/debian-backports.sources /etc/apt/sources.list.d/debian-backports.sources
|
||||||
RUN apt-get update && \
|
# install_deps.sh upgraded libstdc++6 from trixie for Battlemage; the matching
|
||||||
|
# -dev package must also come from trixie or apt refuses to satisfy it.
|
||||||
|
RUN echo "deb http://deb.debian.org/debian trixie main" > /etc/apt/sources.list.d/trixie.list && \
|
||||||
|
apt-get update && \
|
||||||
apt-get install -y libnuma1 && \
|
apt-get install -y libnuma1 && \
|
||||||
apt-get install -qq -y -t bookworm-backports mesa-va-drivers mesa-vulkan-drivers && \
|
apt-get install -qq -y -t bookworm-backports mesa-va-drivers mesa-vulkan-drivers && \
|
||||||
# Install C++ standard library headers for HIPRTC kernel compilation fallback
|
apt-get install -qq -y -t trixie libstdc++-14-dev && \
|
||||||
apt-get install -qq -y libstdc++-12-dev && \
|
rm -f /etc/apt/sources.list.d/trixie.list && \
|
||||||
rm -rf /var/lib/apt/lists/*
|
rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
WORKDIR /opt/frigate
|
WORKDIR /opt/frigate
|
||||||
|
|||||||
@ -5,13 +5,15 @@ import logging
|
|||||||
import random
|
import random
|
||||||
import string
|
import string
|
||||||
import time
|
import time
|
||||||
|
import zipfile
|
||||||
|
from collections import deque
|
||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
from typing import List, Optional
|
from typing import Iterator, List, Optional
|
||||||
|
|
||||||
import psutil
|
import psutil
|
||||||
from fastapi import APIRouter, Depends, Query, Request
|
from fastapi import APIRouter, Depends, Query, Request
|
||||||
from fastapi.responses import JSONResponse
|
from fastapi.responses import JSONResponse, StreamingResponse
|
||||||
from pathvalidate import sanitize_filepath
|
from pathvalidate import sanitize_filename, sanitize_filepath
|
||||||
from peewee import DoesNotExist
|
from peewee import DoesNotExist
|
||||||
from playhouse.shortcuts import model_to_dict
|
from playhouse.shortcuts import model_to_dict
|
||||||
|
|
||||||
@ -361,6 +363,136 @@ def get_export_case(case_id: str):
|
|||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
_ZIP_STREAM_CHUNK_SIZE = 1024 * 1024 # 1 MiB
|
||||||
|
|
||||||
|
|
||||||
|
class _StreamingZipBuffer:
|
||||||
|
"""File-like sink for ZipFile that exposes written bytes via drain().
|
||||||
|
|
||||||
|
ZipFile writes synchronously into this buffer; the generator drains the
|
||||||
|
queue between writes so StreamingResponse can yield bytes without
|
||||||
|
materializing the whole archive in memory.
|
||||||
|
"""
|
||||||
|
|
||||||
|
def __init__(self) -> None:
|
||||||
|
self._queue: deque[bytes] = deque()
|
||||||
|
self._offset = 0
|
||||||
|
|
||||||
|
def write(self, data: bytes) -> int:
|
||||||
|
if data:
|
||||||
|
self._queue.append(bytes(data))
|
||||||
|
self._offset += len(data)
|
||||||
|
return len(data)
|
||||||
|
|
||||||
|
def tell(self) -> int:
|
||||||
|
return self._offset
|
||||||
|
|
||||||
|
def flush(self) -> None:
|
||||||
|
pass
|
||||||
|
|
||||||
|
def drain(self) -> Iterator[bytes]:
|
||||||
|
while self._queue:
|
||||||
|
yield self._queue.popleft()
|
||||||
|
|
||||||
|
|
||||||
|
def _unique_archive_name(export: Export, used: set[str]) -> str:
|
||||||
|
base = sanitize_filename(export.name) if export.name else None
|
||||||
|
if not base:
|
||||||
|
base = f"{export.camera}_{int(datetime.datetime.timestamp(export.date))}"
|
||||||
|
|
||||||
|
candidate = f"{base}.mp4"
|
||||||
|
counter = 1
|
||||||
|
while candidate in used:
|
||||||
|
candidate = f"{base}_{counter}.mp4"
|
||||||
|
counter += 1
|
||||||
|
|
||||||
|
used.add(candidate)
|
||||||
|
return candidate
|
||||||
|
|
||||||
|
|
||||||
|
def _stream_case_archive(exports: List[Export]) -> Iterator[bytes]:
|
||||||
|
"""Yield bytes of a zip archive built from the given exports' mp4 files."""
|
||||||
|
buffer = _StreamingZipBuffer()
|
||||||
|
used_names: set[str] = set()
|
||||||
|
|
||||||
|
# ZIP_STORED: mp4 is already compressed, recompressing wastes CPU for ~0% size win.
|
||||||
|
with zipfile.ZipFile(
|
||||||
|
buffer,
|
||||||
|
mode="w",
|
||||||
|
compression=zipfile.ZIP_STORED,
|
||||||
|
allowZip64=True,
|
||||||
|
) as archive:
|
||||||
|
for export in exports:
|
||||||
|
source = Path(export.video_path)
|
||||||
|
if not source.exists():
|
||||||
|
continue
|
||||||
|
|
||||||
|
arcname = _unique_archive_name(export, used_names)
|
||||||
|
|
||||||
|
with (
|
||||||
|
archive.open(arcname, mode="w", force_zip64=True) as entry,
|
||||||
|
source.open("rb") as src,
|
||||||
|
):
|
||||||
|
while True:
|
||||||
|
chunk = src.read(_ZIP_STREAM_CHUNK_SIZE)
|
||||||
|
if not chunk:
|
||||||
|
break
|
||||||
|
|
||||||
|
entry.write(chunk)
|
||||||
|
yield from buffer.drain()
|
||||||
|
|
||||||
|
yield from buffer.drain()
|
||||||
|
|
||||||
|
yield from buffer.drain()
|
||||||
|
|
||||||
|
|
||||||
|
@router.get(
|
||||||
|
"/cases/{case_id}/download",
|
||||||
|
dependencies=[Depends(allow_any_authenticated())],
|
||||||
|
summary="Download export case as zip",
|
||||||
|
description="Streams a zip archive containing every completed export's mp4 for the given case.",
|
||||||
|
)
|
||||||
|
def download_export_case(
|
||||||
|
case_id: str,
|
||||||
|
allowed_cameras: List[str] = Depends(get_allowed_cameras_for_filter),
|
||||||
|
):
|
||||||
|
try:
|
||||||
|
case = ExportCase.get(ExportCase.id == case_id)
|
||||||
|
except DoesNotExist:
|
||||||
|
return JSONResponse(
|
||||||
|
content={"success": False, "message": "Export case not found"},
|
||||||
|
status_code=404,
|
||||||
|
)
|
||||||
|
|
||||||
|
exports = list(
|
||||||
|
Export.select()
|
||||||
|
.where(
|
||||||
|
Export.export_case == case_id,
|
||||||
|
~Export.in_progress,
|
||||||
|
Export.camera << allowed_cameras,
|
||||||
|
)
|
||||||
|
.order_by(Export.date.asc())
|
||||||
|
)
|
||||||
|
|
||||||
|
if not exports:
|
||||||
|
return JSONResponse(
|
||||||
|
content={"success": False, "message": "No exports available to download."},
|
||||||
|
status_code=404,
|
||||||
|
)
|
||||||
|
|
||||||
|
archive_base = sanitize_filename(case.name) if case.name else ""
|
||||||
|
if not archive_base:
|
||||||
|
archive_base = case_id
|
||||||
|
|
||||||
|
return StreamingResponse(
|
||||||
|
_stream_case_archive(exports),
|
||||||
|
media_type="application/zip",
|
||||||
|
headers={
|
||||||
|
"Content-Disposition": f'attachment; filename="{archive_base}.zip"',
|
||||||
|
},
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
@router.patch(
|
@router.patch(
|
||||||
"/cases/{case_id}",
|
"/cases/{case_id}",
|
||||||
response_model=GenericResponse,
|
response_model=GenericResponse,
|
||||||
|
|||||||
@ -20,6 +20,7 @@ class CameraConfigUpdateEnum(str, Enum):
|
|||||||
ffmpeg = "ffmpeg"
|
ffmpeg = "ffmpeg"
|
||||||
live = "live"
|
live = "live"
|
||||||
motion = "motion" # includes motion and motion masks
|
motion = "motion" # includes motion and motion masks
|
||||||
|
mqtt = "mqtt"
|
||||||
notifications = "notifications"
|
notifications = "notifications"
|
||||||
objects = "objects"
|
objects = "objects"
|
||||||
object_genai = "object_genai"
|
object_genai = "object_genai"
|
||||||
@ -33,6 +34,7 @@ class CameraConfigUpdateEnum(str, Enum):
|
|||||||
lpr = "lpr"
|
lpr = "lpr"
|
||||||
snapshots = "snapshots"
|
snapshots = "snapshots"
|
||||||
timestamp_style = "timestamp_style"
|
timestamp_style = "timestamp_style"
|
||||||
|
ui = "ui"
|
||||||
zones = "zones"
|
zones = "zones"
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -27,7 +27,7 @@ class ReviewMetadata(BaseModel):
|
|||||||
)
|
)
|
||||||
title: str = Field(
|
title: str = Field(
|
||||||
max_length=80,
|
max_length=80,
|
||||||
description="A short title characterizing what took place and where, under 10 words.",
|
description="Under 10 words. Name the apparent purpose or outcome of the activity together with the location involved. Do not narrate or list the sequence of actions step by step.",
|
||||||
)
|
)
|
||||||
scene: str = Field(
|
scene: str = Field(
|
||||||
min_length=150,
|
min_length=150,
|
||||||
@ -36,7 +36,7 @@ class ReviewMetadata(BaseModel):
|
|||||||
)
|
)
|
||||||
shortSummary: str = Field(
|
shortSummary: str = Field(
|
||||||
min_length=70,
|
min_length=70,
|
||||||
max_length=100,
|
max_length=120,
|
||||||
description="A brief 2-sentence summary of the scene, suitable for notifications.",
|
description="A brief 2-sentence summary of the scene, suitable for notifications.",
|
||||||
)
|
)
|
||||||
confidence: float = Field(
|
confidence: float = Field(
|
||||||
|
|||||||
@ -517,10 +517,16 @@ class EmbeddingMaintainer(threading.Thread):
|
|||||||
try:
|
try:
|
||||||
event: Event = Event.get(Event.id == event_id)
|
event: Event = Event.get(Event.id == event_id)
|
||||||
except DoesNotExist:
|
except DoesNotExist:
|
||||||
|
for processor in self.post_processors:
|
||||||
|
if isinstance(processor, ObjectDescriptionProcessor):
|
||||||
|
processor.cleanup_event(event_id)
|
||||||
continue
|
continue
|
||||||
|
|
||||||
# Skip the event if not an object
|
# Skip the event if not an object
|
||||||
if event.data.get("type") != "object":
|
if event.data.get("type") != "object":
|
||||||
|
for processor in self.post_processors:
|
||||||
|
if isinstance(processor, ObjectDescriptionProcessor):
|
||||||
|
processor.cleanup_event(event_id)
|
||||||
continue
|
continue
|
||||||
|
|
||||||
# Extract valid thumbnail
|
# Extract valid thumbnail
|
||||||
|
|||||||
@ -205,6 +205,7 @@ class AudioEventMaintainer(threading.Thread):
|
|||||||
self.transcription_thread.start()
|
self.transcription_thread.start()
|
||||||
|
|
||||||
self.was_enabled = camera.enabled
|
self.was_enabled = camera.enabled
|
||||||
|
self.was_audio_enabled = camera.audio.enabled
|
||||||
|
|
||||||
def detect_audio(self, audio: np.ndarray) -> None:
|
def detect_audio(self, audio: np.ndarray) -> None:
|
||||||
if not self.camera_config.audio.enabled or self.stop_event.is_set():
|
if not self.camera_config.audio.enabled or self.stop_event.is_set():
|
||||||
@ -363,6 +364,17 @@ class AudioEventMaintainer(threading.Thread):
|
|||||||
time.sleep(0.1)
|
time.sleep(0.1)
|
||||||
continue
|
continue
|
||||||
|
|
||||||
|
audio_enabled = self.camera_config.audio.enabled
|
||||||
|
if audio_enabled != self.was_audio_enabled:
|
||||||
|
if not audio_enabled:
|
||||||
|
self.logger.debug(
|
||||||
|
f"Disabling audio detections for {self.camera_config.name}, ending events"
|
||||||
|
)
|
||||||
|
self.requestor.send_data(
|
||||||
|
EXPIRE_AUDIO_ACTIVITY, self.camera_config.name
|
||||||
|
)
|
||||||
|
self.was_audio_enabled = audio_enabled
|
||||||
|
|
||||||
self.read_audio()
|
self.read_audio()
|
||||||
|
|
||||||
if self.audio_listener:
|
if self.audio_listener:
|
||||||
|
|||||||
@ -201,9 +201,10 @@ Each line represents a detection state, not necessarily unique individuals. The
|
|||||||
except json.JSONDecodeError as je:
|
except json.JSONDecodeError as je:
|
||||||
logger.error("Failed to parse review description JSON: %s", je)
|
logger.error("Failed to parse review description JSON: %s", je)
|
||||||
return None
|
return None
|
||||||
# observations is required on the model; fill an empty default
|
# observations and confidence are required on the model; fill an empty default
|
||||||
# if the response omitted it so attribute access stays safe.
|
# if the response omitted it so attribute access stays safe.
|
||||||
raw.setdefault("observations", [])
|
raw.setdefault("observations", [])
|
||||||
|
raw.setdefault("confidence", 0.0)
|
||||||
metadata = ReviewMetadata.model_construct(**raw)
|
metadata = ReviewMetadata.model_construct(**raw)
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
logger.error(
|
logger.error(
|
||||||
|
|||||||
@ -594,112 +594,92 @@ class BirdsEyeFrameManager:
|
|||||||
) -> Optional[list[list[Any]]]:
|
) -> Optional[list[list[Any]]]:
|
||||||
"""Calculate the optimal layout for 2+ cameras."""
|
"""Calculate the optimal layout for 2+ cameras."""
|
||||||
|
|
||||||
def map_layout(
|
def find_available_x(
|
||||||
camera_layout: list[list[Any]], row_height: int
|
current_x: int,
|
||||||
) -> tuple[int, int, Optional[list[list[Any]]]]:
|
width: int,
|
||||||
"""Map the calculated layout."""
|
reserved_ranges: list[tuple[int, int]],
|
||||||
candidate_layout = []
|
max_width: int,
|
||||||
starting_x = 0
|
) -> Optional[int]:
|
||||||
x = 0
|
"""Find the first horizontal slot that does not collide with reservations."""
|
||||||
max_width = 0
|
x = current_x
|
||||||
y = 0
|
|
||||||
|
|
||||||
for row in camera_layout:
|
for reserved_start, reserved_end in sorted(reserved_ranges):
|
||||||
final_row = []
|
if x >= reserved_end:
|
||||||
max_width = max(max_width, x)
|
continue
|
||||||
x = starting_x
|
|
||||||
for cameras in row:
|
|
||||||
camera_dims = self.cameras[cameras[0]]["dimensions"].copy()
|
|
||||||
camera_aspect = cameras[1]
|
|
||||||
|
|
||||||
if camera_dims[1] > camera_dims[0]:
|
if x + width <= reserved_start:
|
||||||
scaled_height = int(row_height * 2)
|
return x
|
||||||
scaled_width = int(scaled_height * camera_aspect)
|
|
||||||
starting_x = scaled_width
|
|
||||||
else:
|
|
||||||
scaled_height = row_height
|
|
||||||
scaled_width = int(scaled_height * camera_aspect)
|
|
||||||
|
|
||||||
# layout is too large
|
x = max(x, reserved_end)
|
||||||
if (
|
|
||||||
x + scaled_width > self.canvas.width
|
|
||||||
or y + scaled_height > self.canvas.height
|
|
||||||
):
|
|
||||||
return x + scaled_width, y + scaled_height, None
|
|
||||||
|
|
||||||
final_row.append((cameras[0], (x, y, scaled_width, scaled_height)))
|
if x + width <= max_width:
|
||||||
x += scaled_width
|
return x
|
||||||
|
|
||||||
y += row_height
|
|
||||||
candidate_layout.append(final_row)
|
|
||||||
|
|
||||||
if max_width == 0:
|
|
||||||
max_width = x
|
|
||||||
|
|
||||||
return max_width, y, candidate_layout
|
|
||||||
|
|
||||||
canvas_aspect_x, canvas_aspect_y = self.canvas.get_aspect(coefficient)
|
|
||||||
camera_layout: list[list[Any]] = []
|
|
||||||
camera_layout.append([])
|
|
||||||
starting_x = 0
|
|
||||||
x = starting_x
|
|
||||||
y = 0
|
|
||||||
y_i = 0
|
|
||||||
max_y = 0
|
|
||||||
for camera in cameras_to_add:
|
|
||||||
camera_dims = self.cameras[camera]["dimensions"].copy()
|
|
||||||
camera_aspect_x, camera_aspect_y = self.canvas.get_camera_aspect(
|
|
||||||
camera, camera_dims[0], camera_dims[1]
|
|
||||||
)
|
|
||||||
|
|
||||||
if camera_dims[1] > camera_dims[0]:
|
|
||||||
portrait = True
|
|
||||||
else:
|
|
||||||
portrait = False
|
|
||||||
|
|
||||||
if (x + camera_aspect_x) <= canvas_aspect_x:
|
|
||||||
# insert if camera can fit on current row
|
|
||||||
camera_layout[y_i].append(
|
|
||||||
(
|
|
||||||
camera,
|
|
||||||
camera_aspect_x / camera_aspect_y,
|
|
||||||
)
|
|
||||||
)
|
|
||||||
|
|
||||||
if portrait:
|
|
||||||
starting_x = camera_aspect_x
|
|
||||||
else:
|
|
||||||
max_y = max(
|
|
||||||
max_y,
|
|
||||||
camera_aspect_y,
|
|
||||||
)
|
|
||||||
|
|
||||||
x += camera_aspect_x
|
|
||||||
else:
|
|
||||||
# move on to the next row and insert
|
|
||||||
y += max_y
|
|
||||||
y_i += 1
|
|
||||||
camera_layout.append([])
|
|
||||||
x = starting_x
|
|
||||||
|
|
||||||
if x + camera_aspect_x > canvas_aspect_x:
|
|
||||||
return None
|
|
||||||
|
|
||||||
camera_layout[y_i].append(
|
|
||||||
(
|
|
||||||
camera,
|
|
||||||
camera_aspect_x / camera_aspect_y,
|
|
||||||
)
|
|
||||||
)
|
|
||||||
x += camera_aspect_x
|
|
||||||
|
|
||||||
if y + max_y > canvas_aspect_y:
|
|
||||||
return None
|
return None
|
||||||
|
|
||||||
row_height = int(self.canvas.height / coefficient)
|
def map_layout(row_height: int) -> tuple[int, int, Optional[list[list[Any]]]]:
|
||||||
total_width, total_height, standard_candidate_layout = map_layout(
|
"""Lay out cameras row by row while reserving portrait spans for the next row."""
|
||||||
camera_layout, row_height
|
candidate_layout: list[list[Any]] = []
|
||||||
)
|
reserved_ranges: dict[int, list[tuple[int, int]]] = {}
|
||||||
|
current_row: list[Any] = []
|
||||||
|
row_index = 0
|
||||||
|
row_y = 0
|
||||||
|
row_x = 0
|
||||||
|
max_width = 0
|
||||||
|
max_height = 0
|
||||||
|
|
||||||
|
for camera in cameras_to_add:
|
||||||
|
camera_dims = self.cameras[camera]["dimensions"].copy()
|
||||||
|
camera_aspect_x, camera_aspect_y = self.canvas.get_camera_aspect(
|
||||||
|
camera, camera_dims[0], camera_dims[1]
|
||||||
|
)
|
||||||
|
portrait = camera_dims[1] > camera_dims[0]
|
||||||
|
scaled_height = row_height * 2 if portrait else row_height
|
||||||
|
scaled_width = int(scaled_height * (camera_aspect_x / camera_aspect_y))
|
||||||
|
|
||||||
|
while True:
|
||||||
|
x = find_available_x(
|
||||||
|
row_x,
|
||||||
|
scaled_width,
|
||||||
|
reserved_ranges.get(row_index, []),
|
||||||
|
self.canvas.width,
|
||||||
|
)
|
||||||
|
|
||||||
|
if x is not None and row_y + scaled_height <= self.canvas.height:
|
||||||
|
current_row.append(
|
||||||
|
(camera, (x, row_y, scaled_width, scaled_height))
|
||||||
|
)
|
||||||
|
row_x = x + scaled_width
|
||||||
|
max_width = max(max_width, row_x)
|
||||||
|
max_height = max(max_height, row_y + scaled_height)
|
||||||
|
|
||||||
|
if portrait:
|
||||||
|
reserved_ranges.setdefault(row_index + 1, []).append(
|
||||||
|
(x, row_x)
|
||||||
|
)
|
||||||
|
|
||||||
|
break
|
||||||
|
|
||||||
|
if current_row:
|
||||||
|
candidate_layout.append(current_row)
|
||||||
|
current_row = []
|
||||||
|
|
||||||
|
row_index += 1
|
||||||
|
row_y = row_index * row_height
|
||||||
|
row_x = 0
|
||||||
|
|
||||||
|
if row_y + scaled_height > self.canvas.height:
|
||||||
|
overflow_width = max(max_width, scaled_width)
|
||||||
|
overflow_height = row_y + scaled_height
|
||||||
|
return overflow_width, overflow_height, None
|
||||||
|
|
||||||
|
if current_row:
|
||||||
|
candidate_layout.append(current_row)
|
||||||
|
|
||||||
|
return max_width, max_height, candidate_layout
|
||||||
|
|
||||||
|
row_height = max(1, int(self.canvas.height / coefficient))
|
||||||
|
total_width, total_height, standard_candidate_layout = map_layout(row_height)
|
||||||
|
|
||||||
if not standard_candidate_layout:
|
if not standard_candidate_layout:
|
||||||
# if standard layout didn't work
|
# if standard layout didn't work
|
||||||
@ -708,9 +688,9 @@ class BirdsEyeFrameManager:
|
|||||||
total_width / self.canvas.width,
|
total_width / self.canvas.width,
|
||||||
total_height / self.canvas.height,
|
total_height / self.canvas.height,
|
||||||
)
|
)
|
||||||
row_height = int(row_height / scale_down_percent)
|
row_height = max(1, int(row_height / scale_down_percent))
|
||||||
total_width, total_height, standard_candidate_layout = map_layout(
|
total_width, total_height, standard_candidate_layout = map_layout(
|
||||||
camera_layout, row_height
|
row_height
|
||||||
)
|
)
|
||||||
|
|
||||||
if not standard_candidate_layout:
|
if not standard_candidate_layout:
|
||||||
@ -724,8 +704,8 @@ class BirdsEyeFrameManager:
|
|||||||
1 / (total_width / self.canvas.width),
|
1 / (total_width / self.canvas.width),
|
||||||
1 / (total_height / self.canvas.height),
|
1 / (total_height / self.canvas.height),
|
||||||
)
|
)
|
||||||
row_height = int(row_height * scale_up_percent)
|
row_height = max(1, int(row_height * scale_up_percent))
|
||||||
_, _, scaled_layout = map_layout(camera_layout, row_height)
|
_, _, scaled_layout = map_layout(row_height)
|
||||||
|
|
||||||
if scaled_layout:
|
if scaled_layout:
|
||||||
return scaled_layout
|
return scaled_layout
|
||||||
|
|||||||
@ -1,11 +1,64 @@
|
|||||||
"""Test camera user and password cleanup."""
|
"""Tests for Birdseye canvas sizing and layout behavior."""
|
||||||
|
|
||||||
import unittest
|
import unittest
|
||||||
|
from multiprocessing import Event
|
||||||
|
|
||||||
from frigate.output.birdseye import get_canvas_shape
|
from frigate.config import FrigateConfig
|
||||||
|
from frigate.output.birdseye import BirdsEyeFrameManager, get_canvas_shape
|
||||||
|
|
||||||
|
|
||||||
class TestBirdseye(unittest.TestCase):
|
class TestBirdseye(unittest.TestCase):
|
||||||
|
def _build_manager(
|
||||||
|
self, camera_dimensions: dict[str, tuple[int, int]]
|
||||||
|
) -> BirdsEyeFrameManager:
|
||||||
|
config = {
|
||||||
|
"mqtt": {"host": "mqtt"},
|
||||||
|
"birdseye": {"width": 1280, "height": 720},
|
||||||
|
"cameras": {},
|
||||||
|
}
|
||||||
|
|
||||||
|
for order, (camera, dimensions) in enumerate(
|
||||||
|
camera_dimensions.items(), start=1
|
||||||
|
):
|
||||||
|
config["cameras"][camera] = {
|
||||||
|
"ffmpeg": {
|
||||||
|
"inputs": [
|
||||||
|
{
|
||||||
|
"path": f"rtsp://10.0.0.1:554/{camera}",
|
||||||
|
"roles": ["detect"],
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"detect": {
|
||||||
|
"width": dimensions[0],
|
||||||
|
"height": dimensions[1],
|
||||||
|
"fps": 5,
|
||||||
|
},
|
||||||
|
"birdseye": {"order": order},
|
||||||
|
}
|
||||||
|
|
||||||
|
return BirdsEyeFrameManager(FrigateConfig(**config), Event())
|
||||||
|
|
||||||
|
def _assert_no_overlaps(
|
||||||
|
self, layout: list[list[tuple[str, tuple[int, int, int, int]]]]
|
||||||
|
):
|
||||||
|
rectangles = [position for row in layout for _, position in row]
|
||||||
|
|
||||||
|
for index, rect in enumerate(rectangles):
|
||||||
|
x1, y1, width1, height1 = rect
|
||||||
|
for other in rectangles[index + 1 :]:
|
||||||
|
x2, y2, width2, height2 = other
|
||||||
|
overlap = (
|
||||||
|
x1 < x2 + width2
|
||||||
|
and x2 < x1 + width1
|
||||||
|
and y1 < y2 + height2
|
||||||
|
and y2 < y1 + height1
|
||||||
|
)
|
||||||
|
self.assertFalse(
|
||||||
|
overlap,
|
||||||
|
msg=f"Overlapping rectangles found: {rect} and {other}",
|
||||||
|
)
|
||||||
|
|
||||||
def test_16x9(self):
|
def test_16x9(self):
|
||||||
"""Test 16x9 aspect ratio works as expected for birdseye."""
|
"""Test 16x9 aspect ratio works as expected for birdseye."""
|
||||||
width = 1280
|
width = 1280
|
||||||
@ -45,3 +98,104 @@ class TestBirdseye(unittest.TestCase):
|
|||||||
canvas_width, canvas_height = get_canvas_shape(width, height)
|
canvas_width, canvas_height = get_canvas_shape(width, height)
|
||||||
assert canvas_width == width # width will be the same
|
assert canvas_width == width # width will be the same
|
||||||
assert canvas_height != height
|
assert canvas_height != height
|
||||||
|
|
||||||
|
def test_portrait_camera_does_not_overlap_next_row(self):
|
||||||
|
"""Portrait cameras should reserve their real horizontal position on the next row."""
|
||||||
|
manager = self._build_manager(
|
||||||
|
{
|
||||||
|
"cam_a": (1280, 720),
|
||||||
|
"cam_p": (360, 640),
|
||||||
|
"cam_b": (1280, 720),
|
||||||
|
"cam_c": (640, 480),
|
||||||
|
}
|
||||||
|
)
|
||||||
|
|
||||||
|
layout = manager.calculate_layout(["cam_a", "cam_p", "cam_b", "cam_c"], 3)
|
||||||
|
|
||||||
|
self.assertIsNotNone(layout)
|
||||||
|
assert layout is not None
|
||||||
|
self._assert_no_overlaps(layout)
|
||||||
|
|
||||||
|
cam_c = [
|
||||||
|
position for row in layout for camera, position in row if camera == "cam_c"
|
||||||
|
][0]
|
||||||
|
self.assertEqual(cam_c[0], 0)
|
||||||
|
|
||||||
|
def test_portrait_reservation_only_applies_to_next_row(self):
|
||||||
|
"""Portrait reservations should not push later rows after the span ends."""
|
||||||
|
manager = self._build_manager(
|
||||||
|
{
|
||||||
|
"cam_a": (1280, 720),
|
||||||
|
"cam_p": (360, 640),
|
||||||
|
"cam_b": (1280, 720),
|
||||||
|
"cam_c": (1280, 720),
|
||||||
|
"cam_d": (1280, 720),
|
||||||
|
"cam_e": (1280, 720),
|
||||||
|
}
|
||||||
|
)
|
||||||
|
|
||||||
|
layout = manager.calculate_layout(
|
||||||
|
["cam_a", "cam_p", "cam_b", "cam_c", "cam_d", "cam_e"],
|
||||||
|
3,
|
||||||
|
)
|
||||||
|
|
||||||
|
self.assertIsNotNone(layout)
|
||||||
|
assert layout is not None
|
||||||
|
self._assert_no_overlaps(layout)
|
||||||
|
|
||||||
|
cam_e = [
|
||||||
|
position for row in layout for camera, position in row if camera == "cam_e"
|
||||||
|
][0]
|
||||||
|
self.assertEqual(cam_e[0], 0)
|
||||||
|
|
||||||
|
def test_multiple_portraits_reserve_distinct_ranges(self):
|
||||||
|
"""Multiple portrait cameras in one row should reserve separate spans below them."""
|
||||||
|
manager = self._build_manager(
|
||||||
|
{
|
||||||
|
"cam_a": (640, 480),
|
||||||
|
"cam_p1": (360, 640),
|
||||||
|
"cam_p2": (360, 640),
|
||||||
|
"cam_b": (640, 480),
|
||||||
|
"cam_c": (1280, 720),
|
||||||
|
"cam_d": (640, 480),
|
||||||
|
}
|
||||||
|
)
|
||||||
|
|
||||||
|
layout = manager.calculate_layout(
|
||||||
|
["cam_a", "cam_p1", "cam_p2", "cam_b", "cam_c", "cam_d"],
|
||||||
|
4,
|
||||||
|
)
|
||||||
|
|
||||||
|
self.assertIsNotNone(layout)
|
||||||
|
assert layout is not None
|
||||||
|
self._assert_no_overlaps(layout)
|
||||||
|
|
||||||
|
def test_two_landscapes_then_portrait_then_two_landscapes(self):
|
||||||
|
"""A portrait after two landscapes should reserve only its own tail span."""
|
||||||
|
manager = self._build_manager(
|
||||||
|
{
|
||||||
|
"cam_a": (1280, 720),
|
||||||
|
"cam_b": (1280, 720),
|
||||||
|
"cam_p": (360, 640),
|
||||||
|
"cam_c": (1280, 720),
|
||||||
|
"cam_d": (1280, 720),
|
||||||
|
}
|
||||||
|
)
|
||||||
|
|
||||||
|
layout = manager.calculate_layout(
|
||||||
|
["cam_a", "cam_b", "cam_p", "cam_c", "cam_d"],
|
||||||
|
3,
|
||||||
|
)
|
||||||
|
|
||||||
|
self.assertIsNotNone(layout)
|
||||||
|
assert layout is not None
|
||||||
|
self._assert_no_overlaps(layout)
|
||||||
|
|
||||||
|
cam_c = [
|
||||||
|
position for row in layout for camera, position in row if camera == "cam_c"
|
||||||
|
][0]
|
||||||
|
cam_d = [
|
||||||
|
position for row in layout for camera, position in row if camera == "cam_d"
|
||||||
|
][0]
|
||||||
|
self.assertEqual(cam_c[0], 0)
|
||||||
|
self.assertEqual(cam_d[0], cam_c[0] + cam_c[2])
|
||||||
|
|||||||
@ -317,16 +317,16 @@ class CameraWatchdog(threading.Thread):
|
|||||||
if camera != self.config.name:
|
if camera != self.config.name:
|
||||||
continue
|
continue
|
||||||
|
|
||||||
if topic.endswith(RecordingsDataTypeEnum.valid.value):
|
if topic.endswith(RecordingsDataTypeEnum.invalid.value):
|
||||||
self.logger.debug(
|
|
||||||
f"Latest valid recording segment time on {camera}: {segment_time}"
|
|
||||||
)
|
|
||||||
self.latest_valid_segment_time = segment_time
|
|
||||||
elif topic.endswith(RecordingsDataTypeEnum.invalid.value):
|
|
||||||
self.logger.warning(
|
self.logger.warning(
|
||||||
f"Invalid recording segment detected for {camera} at {segment_time}"
|
f"Invalid recording segment detected for {camera} at {segment_time}"
|
||||||
)
|
)
|
||||||
self.latest_invalid_segment_time = segment_time
|
self.latest_invalid_segment_time = segment_time
|
||||||
|
elif topic.endswith(RecordingsDataTypeEnum.valid.value):
|
||||||
|
self.logger.debug(
|
||||||
|
f"Latest valid recording segment time on {camera}: {segment_time}"
|
||||||
|
)
|
||||||
|
self.latest_valid_segment_time = segment_time
|
||||||
elif topic.endswith(RecordingsDataTypeEnum.latest.value):
|
elif topic.endswith(RecordingsDataTypeEnum.latest.value):
|
||||||
if segment_time is not None:
|
if segment_time is not None:
|
||||||
self.latest_cache_segment_time = segment_time
|
self.latest_cache_segment_time = segment_time
|
||||||
|
|||||||
@ -57,6 +57,7 @@ import { useTranslation } from "react-i18next";
|
|||||||
|
|
||||||
import { IoMdArrowRoundBack } from "react-icons/io";
|
import { IoMdArrowRoundBack } from "react-icons/io";
|
||||||
import {
|
import {
|
||||||
|
LuDownload,
|
||||||
LuFolderPlus,
|
LuFolderPlus,
|
||||||
LuFolderX,
|
LuFolderX,
|
||||||
LuPencil,
|
LuPencil,
|
||||||
@ -777,54 +778,76 @@ function Exports() {
|
|||||||
filters={["cameras"]}
|
filters={["cameras"]}
|
||||||
onUpdateFilter={setExportFilter}
|
onUpdateFilter={setExportFilter}
|
||||||
/>
|
/>
|
||||||
{isAdmin && (
|
<div className="flex items-center gap-1 md:gap-2">
|
||||||
<div className="flex items-center gap-1 md:gap-2">
|
{(exportsByCase[selectedCase.id]?.length ?? 0) > 0 && (
|
||||||
<Button
|
<Button
|
||||||
|
asChild
|
||||||
className="flex items-center gap-2 p-2"
|
className="flex items-center gap-2 p-2"
|
||||||
size="sm"
|
size="sm"
|
||||||
aria-label={t("toolbar.addExport")}
|
aria-label={t("button.download", { ns: "common" })}
|
||||||
onClick={() => setCaseForAddExport(selectedCase)}
|
|
||||||
>
|
>
|
||||||
<LuPlus className="text-secondary-foreground" />
|
<a
|
||||||
{!isMobile && (
|
download
|
||||||
<div className="text-primary">
|
href={`${baseUrl}api/cases/${selectedCase.id}/download`}
|
||||||
{t("toolbar.addExport")}
|
>
|
||||||
</div>
|
<LuDownload className="text-secondary-foreground" />
|
||||||
)}
|
{!isMobile && (
|
||||||
|
<div className="text-primary">
|
||||||
|
{t("button.download", { ns: "common" })}
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</a>
|
||||||
</Button>
|
</Button>
|
||||||
<Button
|
)}
|
||||||
className="flex items-center gap-2 p-2"
|
{isAdmin && (
|
||||||
size="sm"
|
<>
|
||||||
aria-label={t("toolbar.editCase")}
|
<Button
|
||||||
onClick={() =>
|
className="flex items-center gap-2 p-2"
|
||||||
setCaseDialog({
|
size="sm"
|
||||||
mode: "edit",
|
aria-label={t("toolbar.addExport")}
|
||||||
exportCase: selectedCase,
|
onClick={() => setCaseForAddExport(selectedCase)}
|
||||||
})
|
>
|
||||||
}
|
<LuPlus className="text-secondary-foreground" />
|
||||||
>
|
{!isMobile && (
|
||||||
<LuPencil className="text-secondary-foreground" />
|
<div className="text-primary">
|
||||||
{!isMobile && (
|
{t("toolbar.addExport")}
|
||||||
<div className="text-primary">
|
</div>
|
||||||
{t("toolbar.editCase")}
|
)}
|
||||||
</div>
|
</Button>
|
||||||
)}
|
<Button
|
||||||
</Button>
|
className="flex items-center gap-2 p-2"
|
||||||
<Button
|
size="sm"
|
||||||
className="flex items-center gap-2 p-2"
|
aria-label={t("toolbar.editCase")}
|
||||||
size="sm"
|
onClick={() =>
|
||||||
aria-label={t("toolbar.deleteCase")}
|
setCaseDialog({
|
||||||
onClick={() => setCaseToDelete(selectedCase)}
|
mode: "edit",
|
||||||
>
|
exportCase: selectedCase,
|
||||||
<LuTrash2 className="text-secondary-foreground" />
|
})
|
||||||
{!isMobile && (
|
}
|
||||||
<div className="text-primary">
|
>
|
||||||
{t("toolbar.deleteCase")}
|
<LuPencil className="text-secondary-foreground" />
|
||||||
</div>
|
{!isMobile && (
|
||||||
)}
|
<div className="text-primary">
|
||||||
</Button>
|
{t("toolbar.editCase")}
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
|
</Button>
|
||||||
|
<Button
|
||||||
|
className="flex items-center gap-2 p-2"
|
||||||
|
size="sm"
|
||||||
|
aria-label={t("toolbar.deleteCase")}
|
||||||
|
onClick={() => setCaseToDelete(selectedCase)}
|
||||||
|
>
|
||||||
|
<LuTrash2 className="text-secondary-foreground" />
|
||||||
|
{!isMobile && (
|
||||||
|
<div className="text-primary">
|
||||||
|
{t("toolbar.deleteCase")}
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</Button>
|
||||||
|
</>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
</>
|
</>
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user