Skip to content

Commit a988c98

Browse files
justadudewhohacksjustadudewhohacks
authored
Merge pull request justadudewhohacks#58 from justadudewhohacks/ssd-allfaces-facealignment-fix
Ssd allfaces facealignment fix
2 parents 5cc2741 + 8fda866 commit a988c98

28 files changed

+383
-184
lines changed

‎build/FaceLandmarks.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎build/allFacesFactory.d.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import { FaceDetectionNet } from './faceDetectionNet/FaceDetectionNet';
22
import { FaceLandmarkNet } from './faceLandmarkNet/FaceLandmarkNet';
3+
import { FaceRecognitionNet } from './faceRecognitionNet/FaceRecognitionNet';
34
import { FullFaceDescription } from './FullFaceDescription';
45
import { Mtcnn } from './mtcnn/Mtcnn';
56
import { MtcnnForwardParams } from './mtcnn/types';
6-
import { Rect } from './Rect';
77
import { TNetInput } from './types';
8-
export declare function allFacesFactory(detectionNet: FaceDetectionNet, landmarkNet: FaceLandmarkNet, computeDescriptors: (input: TNetInput, alignedFaceBoxes: Rect[], useBatchProcessing: boolean) => Promise<Float32Array[]>): (input: TNetInput, minConfidence: number, useBatchProcessing?: boolean) => Promise<FullFaceDescription[]>;
9-
export declare function allFacesMtcnnFactory(mtcnn: Mtcnn, computeDescriptors: (input: TNetInput, alignedFaceBoxes: Rect[], useBatchProcessing: boolean) => Promise<Float32Array[]>): (input: TNetInput, mtcnnForwardParams: MtcnnForwardParams, useBatchProcessing?: boolean) => Promise<FullFaceDescription[]>;
8+
export declare function allFacesFactory(detectionNet: FaceDetectionNet, landmarkNet: FaceLandmarkNet, recognitionNet: FaceRecognitionNet): (input: TNetInput, minConfidence?: number, useBatchProcessing?: boolean) => Promise<FullFaceDescription[]>;
9+
export declare function allFacesMtcnnFactory(mtcnn: Mtcnn, recognitionNet: FaceRecognitionNet): (input: TNetInput, mtcnnForwardParams?: MtcnnForwardParams, useBatchProcessing?: boolean) => Promise<FullFaceDescription[]>;

‎build/allFacesFactory.js

Lines changed: 33 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎build/allFacesFactory.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎build/globalApi.d.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,5 +27,7 @@ export declare function locateFaces(input: TNetInput, minConfidence?: number, ma
2727
export declare function detectLandmarks(input: TNetInput): Promise<FaceLandmarks68 | FaceLandmarks68[]>;
2828
export declare function computeFaceDescriptor(input: TNetInput): Promise<Float32Array | Float32Array[]>;
2929
export declare function mtcnn(input: TNetInput, forwardParams: MtcnnForwardParams): Promise<MtcnnResult[]>;
30-
export declare const allFaces: (input: tf.Tensor | NetInput | TNetInput, minConfidence: number, useBatchProcessing?: boolean) => Promise<FullFaceDescription[]>;
31-
export declare const allFacesMtcnn: (input: tf.Tensor | NetInput | TNetInput, mtcnnForwardParams: MtcnnForwardParams, useBatchProcessing?: boolean) => Promise<FullFaceDescription[]>;
30+
export declare type allFacesFunction = (input: tf.Tensor | NetInput | TNetInput, minConfidence?: number, useBatchProcessing?: boolean) => Promise<FullFaceDescription[]>;
31+
export declare const allFaces: allFacesFunction;
32+
export declare type allFacesMtcnnFunction = (input: tf.Tensor | NetInput | TNetInput, mtcnnForwardParams?: MtcnnForwardParams, useBatchProcessing?: boolean) => Promise<FullFaceDescription[]>;
33+
export declare const allFacesMtcnn: allFacesMtcnnFunction;

‎build/globalApi.js

Lines changed: 2 additions & 31 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎build/globalApi.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎build/mtcnn/Mtcnn.d.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ import { TNetInput } from '../types';
44
import { MtcnnForwardParams, MtcnnResult, NetParams } from './types';
55
export declare class Mtcnn extends NeuralNetwork<NetParams> {
66
constructor();
7-
forwardInput(input: NetInput, forwardParams: MtcnnForwardParams): Promise<{
7+
forwardInput(input: NetInput, forwardParams?: MtcnnForwardParams): Promise<{
88
results: MtcnnResult[];
99
stats: any;
1010
}>;
11-
forward(input: TNetInput, forwardParams: MtcnnForwardParams): Promise<MtcnnResult[]>;
12-
forwardWithStats(input: TNetInput, forwardParams: MtcnnForwardParams): Promise<{
11+
forward(input: TNetInput, forwardParams?: MtcnnForwardParams): Promise<MtcnnResult[]>;
12+
forwardWithStats(input: TNetInput, forwardParams?: MtcnnForwardParams): Promise<{
1313
results: MtcnnResult[];
1414
stats: any;
1515
}>;

‎build/mtcnn/Mtcnn.js

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)