administrator/frigate
1
0
Fork 0
mirror of https://github.com/blakeblackshear/frigate.git synced 2026-02-19 01:17:06 +03:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

ensure points and distances are ordered clockwise

Browse Source
This commit is contained in:
Josh Hawkins 2024-12-22 16:06:59 -06:00
parent ff1193ecbf
commit 8d74e7b3ae
1 changed files with 33 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
frigate/util/velocity.py
View File

@ -3,6 +3,25 @@ import math
import numpy as np import numpy as np
def order_points_clockwise(points):
points = np.array(points)
centroid = np.mean(points, axis=0)
angles = np.arctan2(points[:, 1] - centroid[1], points[:, 0] - centroid[0])
# Sort points by angle
sorted_indices = np.argsort(angles)
sorted_points = points[sorted_indices]
# Find the top-left point (minimum sum of x and y coordinates)
top_left_idx = np.argmin(np.sum(sorted_points, axis=1))
# Rotate the points so that the top-left point is first
sorted_points = np.roll(sorted_points, -top_left_idx, axis=0)
return sorted_points.tolist()
def create_ground_plane(zone_points, distances): def create_ground_plane(zone_points, distances):
""" """
Create a ground plane that accounts for perspective distortion using real-world dimensions for each side of the zone. Create a ground plane that accounts for perspective distortion using real-world dimensions for each side of the zone.
@ -61,13 +80,25 @@ def calculate_real_world_speed(
directly from the zone string. directly from the zone string.
:param zone_contour: Array of absolute zone points :param zone_contour: Array of absolute zone points
:param distances: Comma separated distances of each side, ordered by A, B, C, D :param distances: List of distances of each side, ordered by A, B, C, D
:param velocity_pixels: List of tuples representing velocity in pixels/frame :param velocity_pixels: List of tuples representing velocity in pixels/frame
:param position: Current position of the object (x, y) in pixels :param position: Current position of the object (x, y) in pixels
:param camera_fps: Frames per second of the camera :param camera_fps: Frames per second of the camera
:return: speed and velocity angle direction :return: speed and velocity angle direction
""" """
ground_plane = create_ground_plane(zone_contour, distances) if not isinstance(zone_contour, np.ndarray):
zone_contour = np.array(zone_contour)
# Find the top-left point (minimum sum of x and y coordinates)
top_left_idx = np.argmin(np.sum(zone_contour, axis=1))
# Rotate the points so that the top-left point is first
ordered_zone_contour = np.roll(zone_contour, -top_left_idx, axis=0)
# Reorder distances to match the new order of zone_contour
ordered_distances = np.roll(distances, -top_left_idx)
ground_plane = create_ground_plane(ordered_zone_contour, ordered_distances)
if not isinstance(velocity_pixels, np.ndarray): if not isinstance(velocity_pixels, np.ndarray):
velocity_pixels = np.array(velocity_pixels) velocity_pixels = np.array(velocity_pixels)