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

Allow 2 fps for previews where active fast objects are detected (#10025)

Browse Source 
* Allow 2 fps for previews where active fast objects are detected

* Cleanup
This commit is contained in:
Nicolas Mowen 2024-02-25 05:35:11 -07:00 committed by GitHub
parent c7e9fe7234
commit 7ccc7fb393
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 33 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
frigate/output/preview.py
View File

@ -20,21 +20,21 @@ from frigate.ffmpeg_presets import (
parse_preset_hardware_acceleration_encode, parse_preset_hardware_acceleration_encode,
) )
from frigate.models import Previews from frigate.models import Previews
from frigate.object_processing import TrackedObject
from frigate.util.image import copy_yuv_to_position, get_yuv_crop from frigate.util.image import copy_yuv_to_position, get_yuv_crop
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
FOLDER_PREVIEW_FRAMES = "preview_frames" FOLDER_PREVIEW_FRAMES = "preview_frames"
PREVIEW_OUTPUT_FPS = 1
PREVIEW_SEGMENT_DURATION = 3600 # one hour PREVIEW_SEGMENT_DURATION = 3600 # one hour
# important to have lower keyframe to maintain scrubbing performance # important to have lower keyframe to maintain scrubbing performance
PREVIEW_KEYFRAME_INTERVAL = 60 PREVIEW_KEYFRAME_INTERVAL = 60
PREVIEW_BIT_RATES = { PREVIEW_BIT_RATES = {
RecordQualityEnum.very_low: 4096, RecordQualityEnum.very_low: 5120,
RecordQualityEnum.low: 6144, RecordQualityEnum.low: 7168,
RecordQualityEnum.medium: 8192, RecordQualityEnum.medium: 9216,
RecordQualityEnum.high: 12288, RecordQualityEnum.high: 13312,
RecordQualityEnum.very_high: 16384, RecordQualityEnum.very_high: 17408,
} }
@ -69,7 +69,7 @@ class FFMpegConverter(threading.Thread):
self.ffmpeg_cmd = parse_preset_hardware_acceleration_encode( self.ffmpeg_cmd = parse_preset_hardware_acceleration_encode(
config.ffmpeg.hwaccel_args, config.ffmpeg.hwaccel_args,
input="-f concat -y -protocol_whitelist pipe,file -safe 0 -i /dev/stdin", input="-f concat -y -protocol_whitelist pipe,file -safe 0 -i /dev/stdin",
output=f"-g {PREVIEW_KEYFRAME_INTERVAL} -fpsmax {PREVIEW_OUTPUT_FPS} -bf 0 -b:v {PREVIEW_BIT_RATES[self.config.record.preview.quality]} {FPS_VFR_PARAM} -movflags +faststart -pix_fmt yuv420p {self.path}", output=f"-g {PREVIEW_KEYFRAME_INTERVAL} -fpsmax 2 -bf 0 -b:v {PREVIEW_BIT_RATES[self.config.record.preview.quality]} {FPS_VFR_PARAM} -movflags +faststart -pix_fmt yuv420p {self.path}",
type=EncodeTypeEnum.preview, type=EncodeTypeEnum.preview,
) )
@ -175,8 +175,19 @@ class PreviewRecorder:
frame_time: float, frame_time: float,
) -> bool: ) -> bool:
"""Decide if this frame should be added to PREVIEW.""" """Decide if this frame should be added to PREVIEW."""
preview_output_fps = (
2
if any(
o["label"] == "car"
for o in get_active_objects(
frame_time, self.config, current_tracked_objects
)
)
else 1
)
# limit output to 1 fps # limit output to 1 fps
if (frame_time - self.last_output_time) < 1 / PREVIEW_OUTPUT_FPS: if (frame_time - self.last_output_time) < 1 / preview_output_fps:
return False return False
# send frame if a non-stationary object is in a zone # send frame if a non-stationary object is in a zone
@ -264,3 +275,17 @@ class PreviewRecorder:
pass pass
self.requestor.stop() self.requestor.stop()
def get_active_objects(
frame_time: float, camera_config: CameraConfig, all_objects: list[TrackedObject]
) -> list[TrackedObject]:
"""get active objects for detection."""
return [
o
for o in all_objects
if o["motionless_count"] < camera_config.detect.stationary.threshold
and o["position_changes"] > 0
and o["frame_time"] == frame_time
and not o["false_positive"]
]