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

Revert "Set default detect dimensions to 1280x720 and update DetectConfig to use the defaults"

Browse Source 
This reverts commit a1aed0414d.
This commit is contained in:
Sergey Krashevich 2023-06-15 04:08:16 +03:00
parent a1aed0414d
commit 838f246b06
No known key found for this signature in database
GPG Key ID: 625171324E7D3856
1 changed files with 4 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
frigate/config.py
View File

@ -44,7 +44,6 @@ FRIGATE_ENV_VARS = {k: v for k, v in os.environ.items() if k.startswith("FRIGATE
DEFAULT_TRACKED_OBJECTS = ["person"] DEFAULT_TRACKED_OBJECTS = ["person"]
DEFAULT_DETECTORS = {"cpu": {"type": "cpu"}} DEFAULT_DETECTORS = {"cpu": {"type": "cpu"}}
DEFAULT_DETECT_DIMENSIONS = {"width": 1280, "height": 720}
class FrigateBaseModel(BaseModel): class FrigateBaseModel(BaseModel):
@ -269,14 +268,8 @@ class StationaryConfig(FrigateBaseModel):
class DetectConfig(FrigateBaseModel): class DetectConfig(FrigateBaseModel):
autoconf: bool = Field(default=True, title="Auto detect height, width and fps.") autoconf: bool = Field(default=True, title="Auto detect height, width and fps.")
height: int = Field( height: int = Field(default=720, title="Height of the stream for the detect role.")
default=DEFAULT_DETECT_DIMENSIONS["height"], width: int = Field(default=1280, title="Width of the stream for the detect role.")
title="Height of the stream for the detect role.",
)
width: int = Field(
default=DEFAULT_DETECT_DIMENSIONS["width"],
title="Width of the stream for the detect role.",
)
fps: int = Field( fps: int = Field(
default=5, title="Number of frames per second to process through detection." default=5, title="Number of frames per second to process through detection."
) )
@ -679,20 +672,8 @@ class CameraConfig(FrigateBaseModel):
config["ffmpeg"]["inputs"][0]["roles"].append("rtmp") config["ffmpeg"]["inputs"][0]["roles"].append("rtmp")
for input in config["ffmpeg"]["inputs"]: for input in config["ffmpeg"]["inputs"]:
if ( if config["detect"].get("autoconf") and (
"detect" in config "detect" in input.get("roles", [])
and config["detect"].get("autoconf")
and ("detect" in input.get("roles", []))
and (
config["detect"].get("height") is None
or config["detect"].get("width") is None
or (
config["detect"].get("height")
== DEFAULT_DETECT_DIMENSIONS["height"]
and config["detect"].get("width")
== DEFAULT_DETECT_DIMENSIONS["width"]
)
)
): ):
try: try:
streamInfo = get_video_properties(input.get("path")) streamInfo = get_video_properties(input.get("path"))