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

Show sub label in debug view when available (#7567)

Browse Source 
* Show sub label in debug view if available

* Ensure sub label is printable to be used
This commit is contained in:
Nicolas Mowen 2023-09-01 06:03:47 -06:00 committed by GitHub
parent bbdf5e1bee
commit 45f7db5cf1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
frigate/object_processing.py
View File

@ -29,6 +29,7 @@ from frigate.util.image import (
calculate_region,
draw_box_with_label,
draw_timestamp,
is_label_printable,
)
logger = logging.getLogger(__name__)
@ -509,13 +510,21 @@ class CameraState:
# draw the bounding boxes on the frame
box = obj["box"]
text = (
obj["label"]
if (
not obj.get("sub_label")
or not is_label_printable(obj["sub_label"][0])
)
else obj["sub_label"][0]
)
draw_box_with_label(
frame_copy,
box[0],
box[1],
box[2],
box[3],
obj["label"],
text,
f"{obj['score']:.0%} {int(obj['area'])}",
thickness=thickness,
color=color,

6
frigate/util/image.py
View File

@ -4,6 +4,7 @@ import datetime
import logging
from abc import ABC, abstractmethod
from multiprocessing import shared_memory
from string import printable
from typing import AnyStr, Optional
import cv2
@ -154,6 +155,11 @@ def draw_box_with_label(
)
def is_label_printable(label) -> bool:
"""Check if label is printable."""
return not bool(set(label) - set(printable))
def calculate_region(frame_shape, xmin, ymin, xmax, ymax, model_size, multiplier=2):
# size is the longest edge and divisible by 4
size = int((max(xmax - xmin, ymax - ymin) * multiplier) // 4 * 4)