Merge branch 'openvinotoolkit:master' into master

Author: ieliz

.gitmodules

@@ -1,3 +1,3 @@
 [submodule "demos/thirdparty/gflags"]
 	path = demos/thirdparty/gflags
-	url = https://github.com/gflags/gflags/
+	url = https://github.com/gflags/gflags.git

demos/README.md

@@ -24,8 +24,9 @@ The Open Model Zoo includes the following demos:
 - [Face Recognition Python\* Demo](./face_recognition_demo/python/README.md) - The interactive face recognition demo.
 - [Formula Recognition Python\* Demo](./formula_recognition_demo/python/README.md) - The demo demonstrates how to run Im2latex formula recognition models and recognize latex formulas.
 - [Gaze Estimation C++ Demo](./gaze_estimation_demo/cpp/README.md) - Face detection followed by gaze estimation, head pose estimation and facial landmarks regression.
-- [Gaze Estimation C++ G-API Demo](./gaze_estimation_demo/cpp_gapi/README.md) - Face detection followed by gaze estimation, head pose estimation and facial landmarks regression. G-API version.
+- [Gaze Estimation C++ G-API\* Demo](./gaze_estimation_demo/cpp_gapi/README.md) - Face detection followed by gaze estimation, head pose estimation and facial landmarks regression. G-API version.
 - [Gesture Recognition Python\* Demo](./gesture_recognition_demo/python/README.md) - Demo application for Gesture Recognition algorithm (e.g. American Sign Language gestures), which classifies gesture actions that are being performed on input video.
+- [Gesture Recognition C++ G-API\* Demo](./gesture_recognition_demo/cpp_gapi/README.md) - Demo application for Gesture Recognition algorithm (e.g. American Sign Language gestures), which classifies gesture actions that are being performed on input video. G-API version.
 - [GPT-2 Text Prediction Python\* Demo](./gpt2_text_prediction_demo/python/README.md) - GPT-2 text prediction demo.
 - [Handwritten Text Recognition Python\* Demo](./handwritten_text_recognition_demo/python/README.md) - The demo demonstrates how to run Handwritten Text Recognition models for Japanese, Simplified Chinese and English.
 - [Human Pose Estimation C++ Demo](./human_pose_estimation_demo/cpp/README.md) - Human pose estimation demo.
@@ -38,7 +39,7 @@ The Open Model Zoo includes the following demos:
 - [Image Translation Python\* Demo](./image_translation_demo/python/README.md) - Demo application to synthesize a photo-realistic image based on exemplar image.
 - [Instance Segmentation Python\* Demo](./instance_segmentation_demo/python/README.md) - Inference of instance segmentation networks trained in `Detectron` or `maskrcnn-benchmark`.
 - [Interactive Face Detection C++ Demo](./interactive_face_detection_demo/cpp/README.md) - Face Detection coupled with Age/Gender, Head-Pose, Emotion, and Facial Landmarks detectors. Supports video and camera inputs.
-- [Interactive Face Detection G-API Demo](./interactive_face_detection_demo/cpp_gapi/README.md) - G-API based Face Detection coupled with Age/Gender, Head-Pose, Emotion, and Facial Landmarks detectors. Supports video and camera inputs.
+- [Interactive Face Detection G-API\* Demo](./interactive_face_detection_demo/cpp_gapi/README.md) - G-API based Face Detection coupled with Age/Gender, Head-Pose, Emotion, and Facial Landmarks detectors. Supports video and camera inputs.
 - [Machine Translation Python\* Demo](./machine_translation_demo/python/README.md) - The demo demonstrates how to run non-autoregressive machine translation models.
 - [Mask R-CNN C++ Demo for TensorFlow\* Object Detection API](./mask_rcnn_demo/cpp/README.md) - Inference of instance segmentation networks created with TensorFlow\* Object Detection API.
 - [Monodepth Python\* Demo](./monodepth_demo/python/README.md) - The demo demonstrates how to run monocular depth estimation models.

demos/gaze_estimation_demo/cpp/README.md

@@ -8,7 +8,7 @@ The demo also relies on the following auxiliary networks:
 
 * `face-detection-retail-0004` or `face-detection-adas-0001` detection networks for finding faces
 * `head-pose-estimation-adas-0001`, which estimates head pose in Tait-Bryan angles, serving as an input for gaze estimation model
-* `facial-landmarks-35-adas-0002`, which estimates coordinates of facial landmarks for detected faces. The keypoints at the corners of eyes are used to locate eyes regions required for the gaze estimation model
+* `facial-landmarks-35-adas-0002` or `facial-landmarks-98-detection-0001`, which estimates coordinates of facial landmarks for detected faces. The keypoints at the corners of eyes are used to locate eyes regions required for the gaze estimation model
 * `open-closed-eye-0001`, which estimates eyes state of detected faces.
 
 Other demo objectives are:
@@ -47,6 +47,7 @@ omz_converter --list models.lst
 ### Supported Models
 
 * facial-landmarks-35-adas-0002
+* facial-landmarks-98-detection-0001
 * face-detection-adas-0001
 * face-detection-retail-0004
 * face-detection-retail-0005

demos/gaze_estimation_demo/cpp/gaze_estimation_demo.hpp

@@ -7,10 +7,10 @@
 
 #include <string>
 #include <vector>
-#include <gflags/gflags.h>
 #include <iostream>
 
-#include <utils/default_flags.hpp>
+#include "gflags/gflags.h"
+#include "utils/default_flags.hpp"
 
 DEFINE_INPUT_FLAGS
 DEFINE_OUTPUT_FLAGS

demos/gaze_estimation_demo/cpp/include/face_inference_results.hpp

@@ -6,7 +6,7 @@
 
 #include <vector>
 #include <opencv2/core/core.hpp>
-#include <utils/slog.hpp>
+#include "utils/slog.hpp"
 
 namespace gaze_estimation {
 struct FaceInferenceResults {
@@ -25,6 +25,8 @@ struct FaceInferenceResults {
 
     cv::Point3f gazeVector;
 
+    std::vector<cv::Point2f> getEyeLandmarks();
+
     friend slog::LogStream& operator<<(slog::LogStream& os, const FaceInferenceResults& faceInferenceResults);
 };
 

demos/gaze_estimation_demo/cpp/include/ie_wrapper.hpp

@@ -6,13 +6,12 @@
 
 #include <cstdio>
 #include <string>
-
 #include <map>
 #include <vector>
 
-#include <utils/common.hpp>
-#include <utils/ocv_common.hpp>
-#include <utils/slog.hpp>
+#include "utils/common.hpp"
+#include "utils/ocv_common.hpp"
+#include "utils/slog.hpp"
 
 namespace gaze_estimation {
 class IEWrapper {

demos/gaze_estimation_demo/cpp/include/landmarks_estimator.hpp

@@ -27,5 +27,15 @@ class LandmarksEstimator: public BaseEstimator {
 private:
     IEWrapper ieWrapper;
     std::string inputBlobName, outputBlobName;
+    size_t numberLandmarks;
+    std::vector<cv::Point2i> simplePostprocess(cv::Rect faceBoundingBox, cv::Mat faceCrop);
+    std::vector<cv::Point2i> heatMapPostprocess(cv::Rect faceBoundingBox, cv::Mat faceCrop);
+    std::vector<cv::Mat> split(std::vector<float>& data, const std::vector<unsigned long>& shape);
+    std::vector<cv::Point2f> getMaxPreds(std::vector<cv::Mat> heatMaps);
+    int sign(float number);
+    cv::Mat affineTransform(cv::Point2f center, cv::Point2f scale,
+        float rot, size_t dst_w, size_t dst_h, cv::Point2f shift, bool inv);
+    cv::Point2f rotatePoint(cv::Point2f pt, float angle_rad);
+    cv::Point2f get3rdPoint(cv::Point2f a, cv::Point2f b);
 };
 }  // namespace gaze_estimation

demos/gaze_estimation_demo/cpp/include/utils.hpp

@@ -6,15 +6,14 @@
 
 #include <cstdio>
 #include <string>
-
 #include <utility>
 #include <map>
 #include <vector>
 
 #include <inference_engine.hpp>
 
-#include <utils/ocv_common.hpp>
-#include <utils/slog.hpp>
+#include "utils/ocv_common.hpp"
+#include "utils/slog.hpp"
 
 namespace gaze_estimation {
 void gazeVectorToGazeAngles(const cv::Point3f& gazeVector, cv::Point2f& gazeAngles);

demos/gaze_estimation_demo/cpp/main.cpp

@@ -1,4 +1,4 @@
-// Copyright (C) 2018 Intel Corporation
+// Copyright (C) 2018-2021 Intel Corporation
 // SPDX-License-Identifier: Apache-2.0
 //
 
@@ -7,7 +7,6 @@
 * \file gaze_estimation_demo/main.cpp
 * \example gaze_estimation_demo/main.cpp
 */
-#include <gflags/gflags.h>
 #include <functional>
 #include <iostream>
 #include <fstream>
@@ -27,33 +26,30 @@
 
 #include <inference_engine.hpp>
 
+#include <gflags/gflags.h>
 #include <monitors/presenter.h>
 #include <utils/args_helper.hpp>
 #include <utils/images_capture.h>
 #include <utils/ocv_common.hpp>
 #include <utils/performance_metrics.hpp>
 #include <utils/slog.hpp>
 
-#include "gaze_estimation_demo.hpp"
-
 #include "face_inference_results.hpp"
-
 #include "face_detector.hpp"
-
 #include "base_estimator.hpp"
 #include "head_pose_estimator.hpp"
 #include "landmarks_estimator.hpp"
 #include "eye_state_estimator.hpp"
 #include "gaze_estimator.hpp"
-
 #include "results_marker.hpp"
-
 #include "utils.hpp"
 
+#include "gaze_estimation_demo.hpp"
+
 using namespace gaze_estimation;
 
-bool ParseAndCheckCommandLine(int argc, char *argv[]) {
-    // ---------------------------Parsing and validating input arguments--------------------------------------
+bool ParseAndCheckCommandLine(int argc, char* argv[]) {
+    // Parsing and validating input arguments
     gflags::ParseCommandLineNonHelpFlags(&argc, &argv, true);
     if (FLAGS_h) {
         showUsage();
@@ -78,11 +74,11 @@ bool ParseAndCheckCommandLine(int argc, char *argv[]) {
 }
 
 
-int main(int argc, char *argv[]) {
+int main(int argc, char* argv[]) {
     try {
         PerformanceMetrics metrics;
 
-        // ------------------------------ Parsing and validating of input arguments --------------------------
+        // Parsing and validating of input arguments
         if (!ParseAndCheckCommandLine(argc, argv)) {
             return 0;
         }
@@ -108,8 +104,8 @@ int main(int argc, char *argv[]) {
         int delay = 1;
         std::string windowName = "Gaze estimation demo";
 
-        std::unique_ptr<ImagesCapture> cap = openImagesCapture(FLAGS_i, FLAGS_loop, 0,
-            std::numeric_limits<size_t>::max(), stringToSize(FLAGS_res));
+        std::unique_ptr<ImagesCapture> cap = openImagesCapture(
+            FLAGS_i, FLAGS_loop, 0, std::numeric_limits<size_t>::max(), stringToSize(FLAGS_res));
 
         auto startTime = std::chrono::steady_clock::now();
         cv::Mat frame = cap->read();
@@ -118,8 +114,9 @@ int main(int argc, char *argv[]) {
         }
 
         cv::VideoWriter videoWriter;
-        if (!FLAGS_o.empty() && !videoWriter.open(FLAGS_o, cv::VideoWriter::fourcc('M', 'J', 'P', 'G'),
-                                                  cap->fps(), frame.size())) {
+        if (!FLAGS_o.empty() &&
+            !videoWriter.open(FLAGS_o, cv::VideoWriter::fourcc('M', 'J', 'P', 'G'), cap->fps(), frame.size()))
+        {
             throw std::runtime_error("Can't open video writer");
         }
         uint32_t framesProcessed = 0;

demos/gaze_estimation_demo/cpp/models.lst

@@ -1,4 +1,5 @@
 # This file can be used with the --list option of the model downloader.
+#facial-landmarks-98-detection-????
 facial-landmarks-35-adas-????
 face-detection-adas-????
 face-detection-retail-????