Compare commits

..

No commits in common. "6e79ec1624afd20002ad11b800c12c0ab0443691" and "80a13e43e94cfed1152917b91eb3d41e75b2c770" have entirely different histories.

9 changed files with 13 additions and 58 deletions

View File

@ -152,7 +152,7 @@ go2rtc:
my_camera: rtsp://username:$%40foo%25@192.168.1.100
```
See [this comment](https://github.com/AlexxIT/go2rtc/issues/1217#issuecomment-2242296489) for more information.
See [this comment(https://github.com/AlexxIT/go2rtc/issues/1217#issuecomment-2242296489) for more information.
## Advanced Restream Configurations

View File

@ -175,7 +175,6 @@ class HailoAsyncInference:
return self.hef.get_input_vstream_infos()[0].shape
def run(self) -> None:
job = None
with self.infer_model.configure() as configured_infer_model:
while True:
batch_data = self.input_store.get()
@ -203,9 +202,7 @@ class HailoAsyncInference:
bindings_list=bindings_list,
),
)
if job is not None:
job.wait(100)
job.wait(100)
# ----------------- HailoDetector Class ----------------- #

View File

@ -28,12 +28,12 @@ class RequestStore:
def put(self, tensor_input: ndarray) -> int:
request_id = self.__get_request_id()
self.input_queue.put((request_id, tensor_input))
self.input_queue.get((request_id, tensor_input))
return request_id
def get(self) -> tuple[int, ndarray] | None:
try:
return self.input_queue.get()
return self.input_queue.get_nowait()
except Exception:
return None

View File

@ -24,7 +24,6 @@ from frigate.util.services import (
get_intel_gpu_stats,
get_jetson_stats,
get_nvidia_gpu_stats,
get_rockchip_gpu_stats,
get_rockchip_npu_stats,
is_vaapi_amd_driver,
)
@ -233,11 +232,6 @@ async def set_gpu_stats(
else:
stats["intel-vaapi"] = {"gpu": "", "mem": ""}
hwaccel_errors.append(args)
elif "preset-rk" in args:
rga_usage = get_rockchip_gpu_stats()
if rga_usage:
stats["rockchip"] = rga_usage
elif "v4l2m2m" in args or "rpi" in args:
# RPi v4l2m2m is currently not able to get usage stats
stats["rpi-v4l2m2m"] = {"gpu": "", "mem": ""}

View File

@ -382,29 +382,8 @@ def get_intel_gpu_stats(sriov: bool) -> dict[str, str]:
return results
def get_rockchip_gpu_stats() -> dict[str, str]:
"""Get GPU stats using rk."""
try:
with open("/sys/kernel/debug/rkrga/load", "r") as f:
content = f.read()
except FileNotFoundError:
return None
load_values = []
for line in content.splitlines():
match = re.search(r"load = (\d+)%", line)
if match:
load_values.append(int(match.group(1)))
if not load_values:
return None
average_load = f"{round(sum(load_values) / len(load_values), 2)}%"
return {"gpu": average_load, "mem": "-"}
def get_rockchip_npu_stats() -> dict[str, str]:
"""Get NPU stats using rk."""
"""Get stats using rk."""
try:
with open("/sys/kernel/debug/rknpu/load", "r") as f:
npu_output = f.read()

View File

@ -474,7 +474,7 @@
"deleteUser": {
"title": "Delete User",
"desc": "This action cannot be undone. This will permanently delete the user account and remove all associated data.",
"warn": "Are you sure you want to delete <strong>{{username}}</strong>?"
"warn": "Are you sure you want to delete"
},
"passwordSetting": {
"updatePassword": "Update Password for {{username}}",
@ -483,7 +483,7 @@
},
"changeRole": {
"title": "Change User Role",
"desc": "Update permissions for <strong>{{username}}</strong>",
"desc": "Update permissions for",
"roleInfo": {
"intro": "Select the appropriate role for this user:",
"admin": "Admin",

View File

@ -101,9 +101,6 @@ export default function Statusbar() {
case "intel-qsv":
gpuTitle = "Intel GPU";
break;
case "rockchip":
gpuTitle = "Rockchip GPU";
break;
default:
gpuTitle = name;
break;

View File

@ -1,4 +1,4 @@
import { Trans, useTranslation } from "react-i18next";
import { useTranslation } from "react-i18next";
import { Button } from "../ui/button";
import {
Dialog,
@ -35,14 +35,8 @@ export default function DeleteUserDialog({
<div className="my-4 rounded-md border border-destructive/20 bg-destructive/5 p-4 text-center text-sm">
<p className="font-medium text-destructive">
<Trans
i18nKey="users.dialog.deleteUser.warn"
ns="views/settings"
values={{ username }}
components={{
strong: <span className="font-medium" />,
}}
/>
{t("users.dialog.deleteUser.warn")}
<span className="font-medium"> {username}</span>?
</p>
</div>

View File

@ -1,4 +1,4 @@
import { Trans, useTranslation } from "react-i18next";
import { useTranslation } from "react-i18next";
import { Button } from "../ui/button";
import {
Dialog,
@ -46,14 +46,8 @@ export default function RoleChangeDialog({
{t("users.dialog.changeRole.title")}
</DialogTitle>
<DialogDescription>
<Trans
i18nKey="users.dialog.changeRole.desc"
ns="views/settings"
values={{ username }}
components={{
strong: <span className="font-medium" />,
}}
/>
{t("users.dialog.changeRole.desc")}
<span className="font-medium"> {username}</span>
</DialogDescription>
</DialogHeader>