mirror of
https://github.com/blakeblackshear/frigate.git
synced 2026-05-05 13:07:44 +03:00
Cleanup existing naming
This commit is contained in:
parent
b14abffea3
commit
68eb0d1fb4
@ -146,8 +146,8 @@ class FaceRealTimeProcessor(RealTimeProcessorApi):
|
|||||||
return face
|
return face
|
||||||
|
|
||||||
def __update_metrics(self, duration: float) -> None:
|
def __update_metrics(self, duration: float) -> None:
|
||||||
self.metrics.face_rec_fps.value = (
|
self.metrics.face_rec_speed.value = (
|
||||||
self.metrics.face_rec_fps.value * 9 + duration
|
self.metrics.face_rec_speed.value * 9 + duration
|
||||||
) / 10
|
) / 10
|
||||||
|
|
||||||
def process_frame(self, obj_data: dict[str, any], frame: np.ndarray):
|
def process_frame(self, obj_data: dict[str, any], frame: np.ndarray):
|
||||||
|
|||||||
@ -6,18 +6,18 @@ from multiprocessing.sharedctypes import Synchronized
|
|||||||
|
|
||||||
|
|
||||||
class DataProcessorMetrics:
|
class DataProcessorMetrics:
|
||||||
image_embeddings_fps: Synchronized
|
image_embeddings_speed: Synchronized
|
||||||
text_embeddings_sps: Synchronized
|
text_embeddings_speed: Synchronized
|
||||||
face_rec_fps: Synchronized
|
face_rec_speed: Synchronized
|
||||||
alpr_pps: Synchronized
|
alpr_speed: Synchronized
|
||||||
yolov9_lpr_fps: Synchronized
|
yolov9_lpr_speed: Synchronized
|
||||||
|
|
||||||
def __init__(self):
|
def __init__(self):
|
||||||
self.image_embeddings_fps = mp.Value("d", 0.01)
|
self.image_embeddings_speed = mp.Value("d", 0.01)
|
||||||
self.text_embeddings_sps = mp.Value("d", 0.01)
|
self.text_embeddings_speed = mp.Value("d", 0.01)
|
||||||
self.face_rec_fps = mp.Value("d", 0.01)
|
self.face_rec_speed = mp.Value("d", 0.01)
|
||||||
self.alpr_pps = mp.Value("d", 0.01)
|
self.alpr_speed = mp.Value("d", 0.01)
|
||||||
self.yolov9_lpr_fps = mp.Value("d", 0.01)
|
self.yolov9_lpr_speed = mp.Value("d", 0.01)
|
||||||
|
|
||||||
|
|
||||||
class DataProcessorModelRunner:
|
class DataProcessorModelRunner:
|
||||||
|
|||||||
@ -175,8 +175,8 @@ class Embeddings:
|
|||||||
)
|
)
|
||||||
|
|
||||||
duration = datetime.datetime.now().timestamp() - start
|
duration = datetime.datetime.now().timestamp() - start
|
||||||
self.metrics.image_embeddings_fps.value = (
|
self.metrics.image_embeddings_speed.value = (
|
||||||
self.metrics.image_embeddings_fps.value * 9 + duration
|
self.metrics.image_embeddings_speed.value * 9 + duration
|
||||||
) / 10
|
) / 10
|
||||||
|
|
||||||
return embedding
|
return embedding
|
||||||
@ -209,8 +209,8 @@ class Embeddings:
|
|||||||
)
|
)
|
||||||
|
|
||||||
duration = datetime.datetime.now().timestamp() - start
|
duration = datetime.datetime.now().timestamp() - start
|
||||||
self.metrics.text_embeddings_sps.value = (
|
self.metrics.text_embeddings_speed.value = (
|
||||||
self.metrics.text_embeddings_sps.value * 9 + (duration / len(ids))
|
self.metrics.text_embeddings_speed.value * 9 + (duration / len(ids))
|
||||||
) / 10
|
) / 10
|
||||||
|
|
||||||
return embeddings
|
return embeddings
|
||||||
@ -231,8 +231,8 @@ class Embeddings:
|
|||||||
)
|
)
|
||||||
|
|
||||||
duration = datetime.datetime.now().timestamp() - start
|
duration = datetime.datetime.now().timestamp() - start
|
||||||
self.metrics.text_embeddings_sps.value = (
|
self.metrics.text_embeddings_speed.value = (
|
||||||
self.metrics.text_embeddings_sps.value * 9 + duration
|
self.metrics.text_embeddings_speed.value * 9 + duration
|
||||||
) / 10
|
) / 10
|
||||||
|
|
||||||
return embedding
|
return embedding
|
||||||
@ -264,8 +264,8 @@ class Embeddings:
|
|||||||
)
|
)
|
||||||
|
|
||||||
duration = datetime.datetime.now().timestamp() - start
|
duration = datetime.datetime.now().timestamp() - start
|
||||||
self.metrics.text_embeddings_sps.value = (
|
self.metrics.text_embeddings_speed.value = (
|
||||||
self.metrics.text_embeddings_sps.value * 9 + (duration / len(ids))
|
self.metrics.text_embeddings_speed.value * 9 + (duration / len(ids))
|
||||||
) / 10
|
) / 10
|
||||||
|
|
||||||
return embeddings
|
return embeddings
|
||||||
|
|||||||
@ -293,27 +293,30 @@ def stats_snapshot(
|
|||||||
stats["embeddings"].update(
|
stats["embeddings"].update(
|
||||||
{
|
{
|
||||||
"image_embedding_speed": round(
|
"image_embedding_speed": round(
|
||||||
embeddings_metrics.image_embeddings_fps.value * 1000, 2
|
embeddings_metrics.image_embeddings_speed.value * 1000, 2
|
||||||
),
|
),
|
||||||
"text_embedding_speed": round(
|
"text_embedding_speed": round(
|
||||||
embeddings_metrics.text_embeddings_sps.value * 1000, 2
|
embeddings_metrics.text_embeddings_speed.value * 1000, 2
|
||||||
),
|
),
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
|
||||||
if config.face_recognition.enabled:
|
if config.face_recognition.enabled:
|
||||||
stats["embeddings"]["face_recognition_speed"] = round(
|
stats["embeddings"]["face_recognition_speed"] = round(
|
||||||
embeddings_metrics.face_rec_fps.value * 1000, 2
|
embeddings_metrics.face_rec_speed.value * 1000, 2
|
||||||
|
)
|
||||||
|
stats["embeddings"]["face_recognition_rps"] = round(
|
||||||
|
embeddings_metrics.face_rec_rps, 2
|
||||||
)
|
)
|
||||||
|
|
||||||
if config.lpr.enabled:
|
if config.lpr.enabled:
|
||||||
stats["embeddings"]["plate_recognition_speed"] = round(
|
stats["embeddings"]["plate_recognition_speed"] = round(
|
||||||
embeddings_metrics.alpr_pps.value * 1000, 2
|
embeddings_metrics.alpr_speed.value * 1000, 2
|
||||||
)
|
)
|
||||||
|
|
||||||
if "license_plate" not in config.objects.all_objects:
|
if "license_plate" not in config.objects.all_objects:
|
||||||
stats["embeddings"]["yolov9_plate_detection_speed"] = round(
|
stats["embeddings"]["yolov9_plate_detection_speed"] = round(
|
||||||
embeddings_metrics.yolov9_lpr_fps.value * 1000, 2
|
embeddings_metrics.yolov9_lpr_speed.value * 1000, 2
|
||||||
)
|
)
|
||||||
|
|
||||||
get_processing_stats(config, stats, hwaccel_errors)
|
get_processing_stats(config, stats, hwaccel_errors)
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user