mirror of
https://github.com/blakeblackshear/frigate.git
synced 2026-03-24 09:08:23 +03:00
Various Improvements (#22597)
Some checks are pending
CI / AMD64 Build (push) Waiting to run
CI / ARM Build (push) Waiting to run
CI / Jetson Jetpack 6 (push) Waiting to run
CI / AMD64 Extra Build (push) Blocked by required conditions
CI / ARM Extra Build (push) Blocked by required conditions
CI / Synaptics Build (push) Blocked by required conditions
CI / Assemble and push default build (push) Blocked by required conditions
Some checks are pending
CI / AMD64 Build (push) Waiting to run
CI / ARM Build (push) Waiting to run
CI / Jetson Jetpack 6 (push) Waiting to run
CI / AMD64 Extra Build (push) Blocked by required conditions
CI / ARM Extra Build (push) Blocked by required conditions
CI / Synaptics Build (push) Blocked by required conditions
CI / Assemble and push default build (push) Blocked by required conditions
* Filter out cmdline items that we are not interested in * Add endpoint for easily pulling review clip
This commit is contained in:
parent
a8b6ea5005
commit
573a5ede62
@ -1227,6 +1227,33 @@ async def event_clip(
|
|||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
@router.get(
|
||||||
|
"/review/{review_id}/clip.mp4",
|
||||||
|
)
|
||||||
|
async def review_clip(
|
||||||
|
request: Request,
|
||||||
|
review_id: str,
|
||||||
|
padding: int = Query(0, description="Padding to apply to clip."),
|
||||||
|
):
|
||||||
|
try:
|
||||||
|
review: ReviewSegment = ReviewSegment.get(ReviewSegment.id == review_id)
|
||||||
|
except DoesNotExist:
|
||||||
|
return JSONResponse(
|
||||||
|
content={"success": False, "message": "Review not found"}, status_code=404
|
||||||
|
)
|
||||||
|
|
||||||
|
await require_camera_access(review.camera, request=request)
|
||||||
|
|
||||||
|
end_ts = (
|
||||||
|
datetime.now().timestamp()
|
||||||
|
if review.end_time is None
|
||||||
|
else review.end_time + padding
|
||||||
|
)
|
||||||
|
return await recording_clip(
|
||||||
|
request, review.camera, review.start_time - padding, end_ts
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
@router.get(
|
@router.get(
|
||||||
"/events/{event_id}/preview.gif",
|
"/events/{event_id}/preview.gif",
|
||||||
)
|
)
|
||||||
|
|||||||
@ -117,12 +117,16 @@ def get_cpu_stats() -> dict[str, dict]:
|
|||||||
"mem": str(system_mem.percent),
|
"mem": str(system_mem.percent),
|
||||||
}
|
}
|
||||||
|
|
||||||
|
keywords = ["ffmpeg", "go2rtc", "frigate.", "python3"]
|
||||||
for process in psutil.process_iter(["pid", "name", "cpu_percent", "cmdline"]):
|
for process in psutil.process_iter(["pid", "name", "cpu_percent", "cmdline"]):
|
||||||
pid = str(process.info["pid"])
|
pid = str(process.info["pid"])
|
||||||
try:
|
try:
|
||||||
cpu_percent = process.info["cpu_percent"]
|
cpu_percent = process.info["cpu_percent"]
|
||||||
cmdline = " ".join(process.info["cmdline"]).rstrip()
|
cmdline = " ".join(process.info["cmdline"]).rstrip()
|
||||||
|
|
||||||
|
if not any(keyword in cmdline for keyword in keywords):
|
||||||
|
continue
|
||||||
|
|
||||||
with open(f"/proc/{pid}/stat", "r") as f:
|
with open(f"/proc/{pid}/stat", "r") as f:
|
||||||
stats = f.readline().split()
|
stats = f.readline().split()
|
||||||
utime = int(stats[13])
|
utime = int(stats[13])
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user