administrator/frigate
1
0
Fork 0
mirror of https://github.com/blakeblackshear/frigate.git synced 2026-02-05 10:45:21 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

simplify object consolidation

Browse Source
This commit is contained in:
Blake Blackshear 2023-06-10 14:24:09 -05:00
parent c061ff14ee
commit 4e93e8c427
1 changed files with 28 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
frigate/video.py
View File

@ -4,7 +4,6 @@ import math
import multiprocessing as mp
import os
import queue
import random
import signal
import subprocess as sp
import threading
@ -29,7 +28,6 @@ from frigate.util import (
SharedMemoryFrameManager,
area,
calculate_region,
clipped,
intersection,
intersection_over_union,
listen,
@ -825,13 +823,8 @@ def process_frames(
)
#########
# merge objects, check for clipped objects and look again up to 4 times
# merge objects
#########
refining = len(regions) > 0
refine_count = 0
while refining and refine_count < 4:
refining = False
# group by name
detected_object_groups = defaultdict(lambda: [])
for detection in detections:
@ -854,46 +847,15 @@ def process_frames(
confidences = [o[1] for o in group]
idxs = cv2.dnn.NMSBoxes(boxes, confidences, 0.5, 0.4)
# add objects
for index in idxs:
index = index if isinstance(index, np.int32) else index[0]
obj = group[index]
if clipped(obj, frame_shape):
box = obj[2]
# calculate a new region that will hopefully get the entire object
region = calculate_region(
frame_shape,
box[0],
box[1],
box[2],
box[3],
region_min_size,
)
regions.append(region)
selected_objects.extend(
detect(
detect_config,
object_detector,
frame,
model_config,
region,
objects_to_track,
object_filters,
)
)
refining = True
else:
selected_objects.append(obj)
# set the detections list to only include top, complete objects
# and new detections
# set the detections list to only include top objects
detections = selected_objects
if refining:
refine_count += 1
## drop detections that overlap too much
consolidated_detections = []