administrator/frigate
1
0
Fork 0
mirror of https://github.com/blakeblackshear/frigate.git synced 2026-01-27 22:48:29 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Move object area outside of conditional to work with all object types

Browse Source
This commit is contained in:
Kyle Niewiada 2019-07-03 07:07:17 -04:00
parent 9de0f12710
commit 5f1634b998
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
frigate/video.py
View File

@ -234,12 +234,10 @@ class Camera:
return return
for obj in objects: for obj in objects:
# Store object area to use in bounding box labels
obj['area'] = (obj['xmax']-obj['xmin'])*(obj['ymax']-obj['ymin'])
if obj['name'] == 'person': if obj['name'] == 'person':
person_area = (obj['xmax']-obj['xmin'])*(obj['ymax']-obj['ymin'])
# Store person_area to use in the label later
obj['area'] = person_area
# find the matching region # find the matching region
region = None region = None
for r in self.regions: for r in self.regions:
@ -254,7 +252,7 @@ class Camera:
# if the min person area is larger than the # if the min person area is larger than the
# detected person, don't add it to detected objects # detected person, don't add it to detected objects
if region and region['min_person_area'] > person_area: if region and region['min_person_area'] > obj['area']:
continue continue
# compute the coordinates of the person and make sure # compute the coordinates of the person and make sure
@ -283,9 +281,7 @@ class Camera:
# draw the bounding boxes on the screen # draw the bounding boxes on the screen
for obj in detected_objects: for obj in detected_objects:
# since debug mode can show all kinds of objects, we need to calculate the area outside of `add_objects` label = "{}: {}% {}".format(obj['name'],int(obj['score']*100),int(obj['area']))
area = (obj['xmax']-obj['xmin'])*(obj['ymax']-obj['ymin'])
label = "{}: {}% {}".format(obj['name'],int(obj['score']*100),int(area))
draw_box_with_label(frame, obj['xmin'], obj['ymin'], obj['xmax'], obj['ymax'], label) draw_box_with_label(frame, obj['xmin'], obj['ymin'], obj['xmax'], obj['ymax'], label)
for region in self.regions: for region in self.regions: