github/DeepFaceLive
1
0
Fork 0
mirror of https://github.com/iperov/DeepFaceLive synced 2025-07-12 16:13:52 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

FaceDetector: added new sort methods, added more explained help for this setting.

Browse source
This commit is contained in:
iperov 2021-11-18 21:41:01 +04:00
parent 053d099ecf
commit 77dd13bfcb
3 changed files with 75 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

18
apps/DeepFaceLive/backend/FaceDetector.py
View file

@ -24,8 +24,14 @@ DetectorTypeNames = ['CenterFace', 'S3FD', 'YoloV5']
class FaceSortBy(IntEnum):
LARGEST = 0
DIST_FROM_CENTER = 1
LEFT_RIGHT = 2
RIGHT_LEFT = 3
TOP_BOTTOM = 4
BOTTOM_TOP = 5
FaceSortByNames = ['@FaceDetector.largest', '@FaceDetector.dist_from_center']
FaceSortByNames = ['@FaceDetector.LARGEST', '@FaceDetector.DIST_FROM_CENTER',
'@FaceDetector.LEFT_RIGHT', '@FaceDetector.RIGHT_LEFT',
'@FaceDetector.TOP_BOTTOM', '@FaceDetector.BOTTOM_TOP' ]
class FaceDetector(BackendHost):
def __init__(self, weak_heap : BackendWeakHeap,
@ -234,7 +240,15 @@ class FaceDetectorWorker(BackendWorker):
if detector_state.sort_by == FaceSortBy.LARGEST:
rects = FRect.sort_by_area_size(rects)
elif detector_state.sort_by == FaceSortBy.DIST_FROM_CENTER:
rects = FRect.sort_by_dist_from_center(rects)
rects = FRect.sort_by_dist_from_2D_point(rects, 0.5, 0.5)
elif detector_state.sort_by == FaceSortBy.LEFT_RIGHT:
rects = FRect.sort_by_dist_from_horizontal_point(rects, 0)
elif detector_state.sort_by == FaceSortBy.RIGHT_LEFT:
rects = FRect.sort_by_dist_from_horizontal_point(rects, 1)
elif detector_state.sort_by == FaceSortBy.TOP_BOTTOM:
rects = FRect.sort_by_dist_from_vertical_point(rects, 0)
elif detector_state.sort_by == FaceSortBy.BOTTOM_TOP:
rects = FRect.sort_by_dist_from_vertical_point(rects, 1)
if len(rects) != 0:
max_faces = detector_state.max_faces

30
localization/localization.py
View file

@ -283,9 +283,9 @@ class Localization:
'zh-CN' : '排序'},
'QFaceDetector.help.sort_by':{
'en-US' : 'Sort faces by method.',
'ru-RU' : 'Сортировать лица по выбранному методу.',
'zh-CN' : '人脸排序方法'},
'en-US' : 'Sort faces by method. For example, for "RIGHT TO LEFT" the Face ID 0 will be at the rightmost part of the screen.',
'ru-RU' : 'Сортировать лица по выбранному методу. Например, для "СПРАВА НАЛЕВО" лица с идентификатором 0 будет находиться в самой правой части экрана.',
'zh-CN' : '人脸排序方法 例如，对于 "从右到左"，Face ID 0将在屏幕的最右边'},
'QFaceDetector.temporal_smoothing':{
'en-US' : 'Temporal smoothing',
@ -672,16 +672,36 @@ class Localization:
'ru-RU' : 'Видео файл',
'zh-CN' : '视频文件'},
'FaceDetector.largest':{
'FaceDetector.LARGEST':{
'en-US' : 'Largest',
'ru-RU' : 'Наибольшему',
'zh-CN' : '最大'},
'FaceDetector.dist_from_center':{
'FaceDetector.DIST_FROM_CENTER':{
'en-US' : 'Dist from center',
'ru-RU' : 'Расстоянию от центра',
'zh-CN' : '离中心的距离'},
'FaceDetector.LEFT_RIGHT':{
'en-US' : 'From left to right',
'ru-RU' : 'Слева направо',
'zh-CN' : '从左至右'},
'FaceDetector.RIGHT_LEFT':{
'en-US' : 'From right to left',
'ru-RU' : 'Справа налево',
'zh-CN' : '从右到左'},
'FaceDetector.TOP_BOTTOM':{
'en-US' : 'From top to bottom',
'ru-RU' : 'Сверху вниз',
'zh-CN' : '从左至右'},
'FaceDetector.BOTTOM_TOP':{
'en-US' : 'From bottom to top',
'ru-RU' : 'Снизу вверх',
'zh-CN' : '从下到上'},
'FaceSwapper.model_information':{
'en-US' : 'Model information',
'ru-RU' : 'Информация о модели',

34
xlib/face/FRect.py
View file

@ -18,6 +18,10 @@ class FRect(IState):
def __init__(self):
self._pts : np.ndarray = None
def __repr__(self): return self.__str__()
def __str__(self):
return f'FRect: {self._pts}'
def restore_state(self, state : dict):
self._pts = IState._restore_np_array( state.get('_pts', None) )
@ -35,17 +39,43 @@ class FRect(IState):
return rects
@staticmethod
def sort_by_dist_from_center(rects : List['FRect']):
def sort_by_dist_from_2D_point(rects : List['FRect'], x, y):
"""
sort list of FRect by nearest distance from center to center of rects descent
x,y in [0 .. 1.0]
"""
c = np.float32([0.5,0.5])
c = np.float32([x,y])
rects = [ (rect, npla.norm( rect.get_center_point()-c )) for rect in rects ]
rects = sorted(rects, key=operator.itemgetter(1) )
rects = [ x[0] for x in rects]
return rects
@staticmethod
def sort_by_dist_from_horizontal_point(rects : List['FRect'], x):
"""
sort list of FRect by nearest distance from center to center of rects descent
x in [0 .. 1.0]
"""
rects = [ (rect, abs(rect.get_center_point()[0]-x) ) for rect in rects ]
rects = sorted(rects, key=operator.itemgetter(1) )
rects = [ x[0] for x in rects]
return rects
@staticmethod
def sort_by_dist_from_vertical_point(rects : List['FRect'], y):
"""
sort list of FRect by nearest distance from center to center of rects descent
y in [0 .. 1.0]
"""
rects = [ (rect, abs(rect.get_center_point()[1]-y) ) for rect in rects ]
rects = sorted(rects, key=operator.itemgetter(1) )
rects = [ x[0] for x in rects]
return rects
@staticmethod
def from_4pts(pts : Iterable):
"""