1、FaceNet 特征提取新增人脸对齐

2、人脸检测新5点人脸关键点定位
3、特征提取接口支持多人脸和最佳人脸提取
4、修复人脸框边界精度问题
5、更新 Maven 发布的 groupId

smartjavaai-objectdetection/pom.xml

@@ -4,13 +4,13 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>ink.numberone</groupId>
+        <groupId>cn.smartjavaai</groupId>
         <artifactId>smartjavaai-parent</artifactId>
-        <version>1.0.10</version>
+        <version>1.0.11</version>
     </parent>
 
     <artifactId>smartjavaai-objectdetection</artifactId>
-    <version>1.0.10</version>
+    <version>1.0.11</version>
     <name>smartjavaai-objectdetection</name>
     <description>SmartJavaAI</description>
     <url>https://github.com/geekwenjie/SmartJavaAI</url>
@@ -31,7 +31,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>ink.numberone</groupId>
+            <groupId>cn.smartjavaai</groupId>
             <artifactId>smartjavaai-common</artifactId>
             <version>${project.version}</version>
         </dependency>

smartjavaai-objectdetection/src/main/java/cn/smartjavaai/objectdetection/DetectorModelConfig.java

@@ -26,4 +26,16 @@ public class DetectorModelConfig {
      * 设备类型
      */
     private DeviceEnum device;
+
+    public DetectorModelConfig() {
+    }
+
+    public DetectorModelConfig(DetectorModelEnum modelEnum, DeviceEnum device) {
+        this.modelEnum = modelEnum;
+        this.device = device;
+    }
+
+    public DetectorModelConfig(DetectorModelEnum modelEnum) {
+        this.modelEnum = modelEnum;
+    }
 }

smartjavaai-objectdetection/src/main/java/cn/smartjavaai/objectdetection/model/DetectorModel.java

@@ -7,6 +7,7 @@ import ai.djl.inference.Predictor;
 import ai.djl.modality.cv.Image;
 import ai.djl.modality.cv.ImageFactory;
 import ai.djl.modality.cv.output.DetectedObjects;
+import ai.djl.opencv.OpenCVImageFactory;
 import ai.djl.repository.zoo.Criteria;
 import ai.djl.repository.zoo.ModelNotFoundException;
 import ai.djl.repository.zoo.ZooModel;
@@ -18,6 +19,7 @@ import cn.smartjavaai.common.pool.ModelPredictorPoolManager;
 import cn.smartjavaai.common.pool.PredictorFactory;
 import cn.smartjavaai.common.utils.FileUtils;
 import cn.smartjavaai.common.utils.ImageUtils;
+import cn.smartjavaai.common.utils.OpenCVUtils;
 import cn.smartjavaai.objectdetection.DetectorConfig;
 import cn.smartjavaai.objectdetection.DetectorModelConfig;
 import cn.smartjavaai.objectdetection.exception.DetectionException;
@@ -145,7 +147,7 @@ public class DetectorModel implements AutoCloseable{
         if(!ImageUtils.isImageValid(image)){
             throw new DetectionException("图像无效");
         }
-        Image img = ImageFactory.getInstance().fromImage(image);
+        Image img = ImageFactory.getInstance().fromImage(OpenCVUtils.image2Mat(image));
         DetectedObjects detectedObjects = detect(img);
         return DetectorUtils.convertToDetectionResponse(detectedObjects, img);
     }
@@ -159,7 +161,7 @@ public class DetectorModel implements AutoCloseable{
         if(!ImageUtils.isImageValid(sourceImage)){
             throw new DetectionException("图像无效");
         }
-        Image img = ImageFactory.getInstance().fromImage(sourceImage);
+        Image img = ImageFactory.getInstance().fromImage(OpenCVUtils.image2Mat(sourceImage));
         DetectedObjects detectedObjects = detect(img);
         img.drawBoundingBoxes(detectedObjects);
         try {