From 752c5485e972799246ea7d5b8be4057ad8e9b473 Mon Sep 17 00:00:00 2001 From: ningpeiyang Date: Mon, 17 Jan 2022 10:21:29 +0800 Subject: [PATCH] =?UTF-8?q?Add=20information=20about=20=E2=80=9C=5FallowFa?= =?UTF-8?q?ceAction=E2=80=9D=20option=20in=20Face=20SDK=20,=20and=20optimi?= =?UTF-8?q?ze=20SDK=20document=20page=20layout?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- doc/3d_game_face_stylizing.md | 2 +- doc/cartoonstylizing.md | 2 +- doc/comicstylizing.md | 2 +- doc/disney_face_stylizing.md | 4 ++-- doc/face_count.md | 4 ++-- doc/face_landmark_detection.md | 13 +++++++------ doc/face_reenactment.md | 2 +- doc/face_segmentation.md | 2 +- doc/general_classification.md | 4 ++-- doc/general_segmentation.md | 4 ++-- doc/gesture_detection.md | 2 +- doc/head_segmentation.md | 4 ++-- doc/object_tracking.md | 2 +- doc/person_attribute_recognition.md | 2 +- doc/pose_detection.md | 4 ++-- 15 files changed, 27 insertions(+), 26 deletions(-) diff --git a/doc/3d_game_face_stylizing.md b/doc/3d_game_face_stylizing.md index 543c76f..8953fc7 100644 --- a/doc/3d_game_face_stylizing.md +++ b/doc/3d_game_face_stylizing.md @@ -112,7 +112,7 @@ vnn_stylizing.dll ## 4.2 Demo示例 Android: [链接](../demos/Android/vnn_android_demo/app/src/main/java/com/duowan/vnndemo/CameraActivity.java) -iOS: [链接](../demos/iOS/vnn_ios_demo/ios/CameraViewctrls/ViewCtrl_Camera_3DGameFaceStylizing.mm) +iOS: [链接](../demos/iOS/vnn_ios_demo/ios/CameraViewctrls/ViewCtrl_Camera_3DGameFaceStylizing.mm) Windows: [链接](../demos/Windows/vnn_win_demo/demo/src/vnn_helper.cpp) MaoOS: [链接](../demos/MacOS/vnn_macos_demo/osx/CameraWindowCtrls/WindowCtrl_Camera_3DGameFaceStylizing.mm) Linux: [链接](../demos/Linux/vnn_linux_demo/demo/src/vnn_helper.cpp) diff --git a/doc/cartoonstylizing.md b/doc/cartoonstylizing.md index 6dee733..785d9be 100644 --- a/doc/cartoonstylizing.md +++ b/doc/cartoonstylizing.md @@ -107,7 +107,7 @@ vnn_genral.dll Android: [链接](../demos/Android/vnn_android_demo/app/src/main/java/com/duowan/vnndemo/CameraActivity.java) iOS: [链接](../demos/iOS/vnn_ios_demo/ios/CameraViewctrls/ViewCtrl_Camera_CartoonStylizing_ComicStylizing.mm) Windows: [链接](../demos/Windows/vnn_win_demo/demo/src/vnn_helper.cpp) -MaoOS: [链接](../demos/MacOS/vnn_macos_demo/osx/CameraWindowCtrls/WindowCtrl_Camera_CartoonStylizing_ComicStylizing.mm) +MaoOS: [链接](../demos/MacOS/vnn_macos_demo/osx/CameraWindowCtrls/WindowCtrl_Camera_CartoonStylizing_ComicStylizing.mm) Linux: [链接](../demos/Linux/vnn_linux_demo/demo/src/vnn_helper.cpp) --- diff --git a/doc/comicstylizing.md b/doc/comicstylizing.md index eefefa3..80fd5e2 100644 --- a/doc/comicstylizing.md +++ b/doc/comicstylizing.md @@ -104,7 +104,7 @@ vnn_genral.dll Android: [链接](../demos/Android/vnn_android_demo/app/src/main/java/com/duowan/vnndemo/CameraActivity.java) iOS: [链接](../demos/iOS/vnn_ios_demo/ios/CameraViewctrls/ViewCtrl_Camera_CartoonStylizing_ComicStylizing.mm) Windows: [链接](../demos/Windows/vnn_win_demo/demo/src/vnn_helper.cpp) -MaoOS: [链接](../demos/MacOS/vnn_macos_demo/osx/CameraWindowCtrls/WindowCtrl_Camera_CartoonStylizing_ComicStylizing.mm) +MaoOS: [链接](../demos/MacOS/vnn_macos_demo/osx/CameraWindowCtrls/WindowCtrl_Camera_CartoonStylizing_ComicStylizing.mm) Linux: [链接](../demos/Linux/vnn_linux_demo/demo/src/vnn_helper.cpp) --- diff --git a/doc/disney_face_stylizing.md b/doc/disney_face_stylizing.md index ecf3111..01d4d09 100644 --- a/doc/disney_face_stylizing.md +++ b/doc/disney_face_stylizing.md @@ -111,9 +111,9 @@ vnn_faceparser.dll ## 4.2 Demo示例 Android: [链接](../demos/Android/vnn_android_demo/app/src/main/java/com/duowan/vnndemo/CameraActivity.java) -iOS: [链接](../demos/iOS/vnn_ios_demo/ios/CameraViewctrls/ViewCtrl_Camera_DisneyFaceStylizing.mm) +iOS: [链接](../demos/iOS/vnn_ios_demo/ios/CameraViewctrls/ViewCtrl_Camera_DisneyFaceStylizing.mm) Windows: [链接](../demos/Windows/vnn_win_demo/demo/src/vnn_helper.cpp) -MaoOS: [链接](../demos/MacOS/vnn_macos_demo/osx/CameraWindowCtrls/WindowCtrl_Camera_DisneyFaceStylizing.mm) +MaoOS: [链接](../demos/MacOS/vnn_macos_demo/osx/CameraWindowCtrls/WindowCtrl_Camera_DisneyFaceStylizing.mm) Linux: [链接](../demos/Linux/vnn_linux_demo/demo/src/vnn_helper.cpp) --- diff --git a/doc/face_count.md b/doc/face_count.md index 23ba91a..ea74abb 100644 --- a/doc/face_count.md +++ b/doc/face_count.md @@ -106,9 +106,9 @@ vnn_objcount.dll ## 4.3 Demo示例 Android: [链接](../demos/Android/vnn_android_demo/app/src/main/java/com/duowan/vnndemo/CameraActivity.java) -iOS: [链接](../demos/iOS/vnn_ios_demo/ios/CameraViewctrls/ViewCtrl_Camera_FaceCount_QRCodeDetect.mm) +iOS: [链接](../demos/iOS/vnn_ios_demo/ios/CameraViewctrls/ViewCtrl_Camera_FaceCount_QRCodeDetect.mm) Windows: [链接](../demos/Windows/vnn_win_demo/demo/src/vnn_helper.cpp) -MaoOS: [链接](../demos/MacOS/vnn_macos_demo/osx/CameraWindowCtrls/WindowCtrl_Camera_FaceCount_QRCodeDetect.mm) +MaoOS: [链接](../demos/MacOS/vnn_macos_demo/osx/CameraWindowCtrls/WindowCtrl_Camera_FaceCount_QRCodeDetect.mm) Linux: [链接](../demos/Linux/vnn_linux_demo/demo/src/vnn_helper.cpp) --- diff --git a/doc/face_landmark_detection.md b/doc/face_landmark_detection.md index f653697..3095d23 100644 --- a/doc/face_landmark_detection.md +++ b/doc/face_landmark_detection.md @@ -139,7 +139,7 @@ input.mode_fmt = VNN_MODE_FMT_VIDEO; // 用于视频流检测 ## 4.4 Demo示例 Android: [链接](../demos/Android/vnn_android_demo/app/src/main/java/com/duowan/vnndemo/CameraActivity.java) -iOS: [链接](../demos/iOS/vnn_ios_demo/ios/CameraViewctrls/ViewCtrl_Camera_Face.mm) +iOS: [链接](../demos/iOS/vnn_ios_demo/ios/CameraViewctrls/ViewCtrl_Camera_Face.mm) Windows: [链接](../demos/Windows/vnn_win_demo/demo/src/vnn_helper.cpp) MaoOS: [链接](../demos/MacOS/vnn_macos_demo/osx/CameraWindowCtrls/WindowCtrl_Camera_FaceLandmarkDetection.mm) Linux: [链接](../demos/Linux/vnn_linux_demo/demo/src/vnn_helper.cpp) @@ -248,11 +248,12 @@ VNN_Result VNN_Get_Face_Attr( VNNHandle handle, const char * name, const void * **合法属性名和属性值** - | 属性名 | 属性含义 | 属性值 | 属性值类型 | - | --------------- | ------------------------------- | ----------------------------------------- | --------------------- | - | _use_104pt | 获取当前是否使用104点检测的信息 | 0（未使用104点）、1（使用104点） | int* | - | _use_278pt | 获取当前是否使用278点检测的信息 | 0（未使用278点）、1（使用278点） | int* | - | _detection_data | 获取相对人脸适当扩大的检测框 | 有效的VNN_FaceFrameDataArr对象的地址/指针 | VNN_FaceFrameDataArr* | + | 属性名 | 属性含义 | 属性值 | 属性值类型 | + | ---------------- | ---------------------------------------------------------------------------- | ----------------------------------------- | --------------------- | + | _use_104pt | 获取当前是否使用104点检测的信息 | 0（未使用104点）、1（使用104点） | int* | + | _use_278pt | 获取当前是否使用278点检测的信息 | 0（未使用278点）、1（使用278点） | int* | + | _allowFaceAction | 是否检测脸部动作（视频模式可检测闭眼、眨眼、张嘴，图片模式可检测闭眼、张嘴） | 0（关闭，默认值）、1（启用） | int* | + | _detection_data | 获取相对人脸适当扩大的检测框 | 有效的VNN_FaceFrameDataArr对象的地址/指针 | VNN_FaceFrameDataArr* | 返回值: VNN_Result，具体值参见 状态码表 diff --git a/doc/face_reenactment.md b/doc/face_reenactment.md index 2f1a2a0..be32389 100644 --- a/doc/face_reenactment.md +++ b/doc/face_reenactment.md @@ -113,7 +113,7 @@ vnn_face_reenactment.dll Android: [链接](../demos/Android/vnn_android_demo/app/src/main/java/com/duowan/vnndemo/ImageActivity.java) iOS: [链接](../demos/iOS/vnn_ios_demo/ios/PictureViewctrls/ViewCtrl_Picture_FaceReenactment.mm) Windows: [链接](../demos/Windows/vnn_win_demo/demo/src/vnn_helper.cpp) -MaoOS: [链接](../demos/MacOS/vnn_macos_demo/osx/PictureWindowCtrls/WindowCtrl_Picture_FaceReenactment.mm) +MaoOS: [链接](../demos/MacOS/vnn_macos_demo/osx/PictureWindowCtrls/WindowCtrl_Picture_FaceReenactment.mm) Linux: [链接](../demos/Linux/vnn_linux_demo/demo/src/vnn_helper.cpp) --- diff --git a/doc/face_segmentation.md b/doc/face_segmentation.md index 5f28580..7b518d0 100644 --- a/doc/face_segmentation.md +++ b/doc/face_segmentation.md @@ -113,7 +113,7 @@ vnn_faceparser.dll Android: [链接](../demos/Android/vnn_android_demo/app/src/main/java/com/duowan/vnndemo/CameraActivity.java) iOS: [链接](../demos/iOS/vnn_ios_demo/ios/CameraViewctrls/ViewCtrl_Camera_FaceSegment.mm) Windows: [链接](../demos/Windows/vnn_win_demo/demo/src/vnn_helper.cpp) -MaoOS: [链接](../demos/MacOS/vnn_macos_demo/osx/CameraWindowCtrls/WindowCtrl_Camera_FaceSegment.mm) +MaoOS: [链接](../demos/MacOS/vnn_macos_demo/osx/CameraWindowCtrls/WindowCtrl_Camera_FaceSegment.mm) Linux: [链接](../demos/Linux/vnn_linux_demo/demo/src/vnn_helper.cpp) --- diff --git a/doc/general_classification.md b/doc/general_classification.md index 9da46bd..e355350 100644 --- a/doc/general_classification.md +++ b/doc/general_classification.md @@ -180,9 +180,9 @@ vnn_classifying.dll ## 4.4 Demo示例 Android: [链接](../demos/Android/vnn_android_demo/app/src/main/java/com/duowan/vnndemo/CameraActivity.java) -iOS: [链接](../demos/iOS/vnn_ios_demo/ios/CameraViewctrls/ViewCtrl_Camera_GeneralClassification.mm) +iOS: [链接](../demos/iOS/vnn_ios_demo/ios/CameraViewctrls/ViewCtrl_Camera_GeneralClassification.mm) Windows: [链接](../demos/Windows/vnn_win_demo/demo/src/vnn_helper.cpp) -MaoOS: [链接](../demos/MacOS/vnn_macos_demo/osx/CameraWindowCtrls/WindowCtrl_Camera_GeneralClassification.mm) +MaoOS: [链接](../demos/MacOS/vnn_macos_demo/osx/CameraWindowCtrls/WindowCtrl_Camera_GeneralClassification.mm) Linux: [链接](../demos/Linux/vnn_linux_demo/demo/src/vnn_helper.cpp) --- diff --git a/doc/general_segmentation.md b/doc/general_segmentation.md index 81ffe45..11b2571 100644 --- a/doc/general_segmentation.md +++ b/doc/general_segmentation.md @@ -130,9 +130,9 @@ vnn_general.dll # 四、相关说明 ## 4.1 Demo示例 Android: [链接](../demos/Android/vnn_android_demo/app/src/main/java/com/duowan/vnndemo/CameraActivity.java) -iOS: [链接](../demos/iOS/vnn_ios_demo/ios/CameraViewctrls/ViewCtrl_Camera_GeneralSegment.mm) +iOS: [链接](../demos/iOS/vnn_ios_demo/ios/CameraViewctrls/ViewCtrl_Camera_GeneralSegment.mm) Windows: [链接](../demos/Windows/vnn_win_demo/demo/src/vnn_helper.cpp) -MaoOS: [链接](../demos/MacOS/vnn_macos_demo/osx/CameraWindowCtrls/WindowCtrl_Camera_GeneralSegment.mm) +MaoOS: [链接](../demos/MacOS/vnn_macos_demo/osx/CameraWindowCtrls/WindowCtrl_Camera_GeneralSegment.mm) Linux: [链接](../demos/Linux/vnn_linux_demo/demo/src/vnn_helper.cpp) --- diff --git a/doc/gesture_detection.md b/doc/gesture_detection.md index e3be801..9ef44b5 100644 --- a/doc/gesture_detection.md +++ b/doc/gesture_detection.md @@ -104,7 +104,7 @@ vnn_gestrue.dll Android: [链接](../demos/Android/vnn_android_demo/app/src/main/java/com/duowan/vnndemo/CameraActivity.java) iOS: [链接](../demos/iOS/vnn_ios_demo/ios/CameraViewctrls/ViewCtrl_Camera_Gesture.mm) Windows: [链接](../demos/Windows/vnn_win_demo/demo/src/vnn_helper.cpp) -MaoOS: [链接](../demos/MacOS/vnn_macos_demo/osx/CameraWindowCtrls/WindowCtrl_Camera_Gesture.mm) +MaoOS: [链接](../demos/MacOS/vnn_macos_demo/osx/CameraWindowCtrls/WindowCtrl_Camera_Gesture.mm) Linux: [链接](../demos/Linux/vnn_linux_demo/demo/src/vnn_helper.cpp) ## 4.2 视频流检测和图像检测的设置区别 diff --git a/doc/head_segmentation.md b/doc/head_segmentation.md index a611f0d..507ef5f 100644 --- a/doc/head_segmentation.md +++ b/doc/head_segmentation.md @@ -113,9 +113,9 @@ vnn_general.dll ## 4.2 Demo示例 Android: [链接](../demos/Android/vnn_android_demo/app/src/main/java/com/duowan/vnndemo/CameraActivity.java) -iOS: [链接](../demos/iOS/vnn_ios_demo/ios/CameraViewctrls/ViewCtrl_Camera_HeadSegment.mm) +iOS: [链接](../demos/iOS/vnn_ios_demo/ios/CameraViewctrls/ViewCtrl_Camera_HeadSegment.mm) Windows: [链接](../demos/Windows/vnn_win_demo/demo/src/vnn_helper.cpp) -MaoOS: [链接](../demos/MacOS/vnn_macos_demo/osx/CameraWindowCtrl/WindowCtrl_Camera_HeadSegment.mm) +MaoOS: [链接](../demos/MacOS/vnn_macos_demo/osx/CameraWindowCtrl/WindowCtrl_Camera_HeadSegment.mm) Linux: [链接](../demos/Linux/vnn_linux_demo/demo/src/vnn_helper.cpp) --- diff --git a/doc/object_tracking.md b/doc/object_tracking.md index 35cc491..2a54774 100644 --- a/doc/object_tracking.md +++ b/doc/object_tracking.md @@ -109,7 +109,7 @@ vnn_objtracking.dll ## 4.3 Demo示例 Android: [链接](../demos/Android/vnn_android_demo/app/src/main/java/com/duowan/vnndemo/CameraActivity.java) -iOS: [链接](../demos/iOS/vnn_ios_demo/ios/CameraViewctrls/ViewCtrl_Camera_ObjectTracking.mm) +iOS: [链接](../demos/iOS/vnn_ios_demo/ios/CameraViewctrls/ViewCtrl_Camera_ObjectTracking.mm) Windows: [链接](../demos/Windows/vnn_win_demo/demo/src/vnn_helper.cpp) MaoOS: [链接](../demos/MacOS/vnn_macos_demo/osx/CameraWindowCtrls/WindowCtrl_Camera_ObjectTracking.mm) Linux: [链接](../demos/Linux/vnn_linux_demo/demo/src/vnn_helper.cpp) diff --git a/doc/person_attribute_recognition.md b/doc/person_attribute_recognition.md index 251381c..adf11fa 100644 --- a/doc/person_attribute_recognition.md +++ b/doc/person_attribute_recognition.md @@ -141,7 +141,7 @@ vnn_classifying.dll ## 4.3 Demo示例 Android: [链接](../demos/Android/vnn_android_demo/app/src/main/java/com/duowan/vnndemo/CameraActivity.java) -iOS: [链接](../demos/iOS/vnn_ios_demo/ios/CameraViewctrls/ViewCtrl_Camera_GeneralClassification.mm) +iOS: [链接](../demos/iOS/vnn_ios_demo/ios/CameraViewctrls/ViewCtrl_Camera_GeneralClassification.mm) Windows: [链接](../demos/Windows/vnn_win_demo/demo/src/vnn_helper.cpp) MaoOS: [链接](../demos/MacOS/vnn_macos_demo/osx/CameraWindowCtrls/WindowCtrl_Camera_GeneralClassification.mm) Linux: [链接](../demos/Linux/vnn_linux_demo/demo/src/vnn_helper.cpp) diff --git a/doc/pose_detection.md b/doc/pose_detection.md index d783d0b..546d0b1 100644 --- a/doc/pose_detection.md +++ b/doc/pose_detection.md @@ -106,9 +106,9 @@ vnn_pose.dll ## 4.2 Demo示例 Android: [链接](../demos/Android/vnn_android_demo/app/src/main/java/com/duowan/vnndemo/CameraActivity.java) -iOS: [链接](../demos/iOS/vnn_ios_demo/ios/CameraViewctrls/ViewCtrl_Camera_PoseDetection.mm) +iOS: [链接](../demos/iOS/vnn_ios_demo/ios/CameraViewctrls/ViewCtrl_Camera_PoseDetection.mm) Windows: [链接](../demos/Windows/vnn_win_demo/demo/src/vnn_helper.cpp) -MaoOS: [链接](../demos/MacOS/vnn_macos_demo/osx/CameraWindowCtrls/WindowCtrl_Camera_PoseDetection.mm) +MaoOS: [链接](../demos/MacOS/vnn_macos_demo/osx/CameraWindowCtrls/WindowCtrl_Camera_PoseDetection.mm) Linux: [链接](../demos/Linux/vnn_linux_demo/demo/src/vnn_helper.cpp) ---