mirror of
https://github.com/blakeblackshear/frigate.git
synced 2024-11-21 19:07:46 +01:00
Bug fixes (#14092)
* Fix path of selected GPU * Fix selection bug * Simplify
This commit is contained in:
parent
15fa55c223
commit
3cff0df0ce
@ -32,7 +32,7 @@ class LibvaGpuSelector:
|
|||||||
devices = list(filter(lambda d: d.startswith("render"), os.listdir("/dev/dri")))
|
devices = list(filter(lambda d: d.startswith("render"), os.listdir("/dev/dri")))
|
||||||
|
|
||||||
if len(devices) < 2:
|
if len(devices) < 2:
|
||||||
self._selected_gpu = devices[0]
|
self._selected_gpu = f"/dev/dri/{devices[0]}"
|
||||||
return self._selected_gpu
|
return self._selected_gpu
|
||||||
|
|
||||||
for device in devices:
|
for device in devices:
|
||||||
|
@ -734,7 +734,7 @@ def process_frames(
|
|||||||
object_tracker.update_frame_times(frame_time)
|
object_tracker.update_frame_times(frame_time)
|
||||||
|
|
||||||
# group the attribute detections based on what label they apply to
|
# group the attribute detections based on what label they apply to
|
||||||
attribute_detections: dict[str, ObjectAttribute] = {}
|
attribute_detections: dict[str, list[ObjectAttribute]] = {}
|
||||||
for label, attribute_labels in model_config.attributes_map.items():
|
for label, attribute_labels in model_config.attributes_map.items():
|
||||||
attribute_detections[label] = [
|
attribute_detections[label] = [
|
||||||
ObjectAttribute(d)
|
ObjectAttribute(d)
|
||||||
@ -752,7 +752,9 @@ def process_frames(
|
|||||||
for attributes in attribute_detections.values():
|
for attributes in attribute_detections.values():
|
||||||
for attribute in attributes:
|
for attribute in attributes:
|
||||||
filtered_objects = filter(
|
filtered_objects = filter(
|
||||||
lambda o: o["label"] in attribute_detections.keys(), all_objects
|
lambda o: attribute.label
|
||||||
|
in model_config.attributes_map.get(o["label"], []),
|
||||||
|
all_objects,
|
||||||
)
|
)
|
||||||
selected_object_id = attribute.find_best_object(filtered_objects)
|
selected_object_id = attribute.find_best_object(filtered_objects)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user