diff options
Diffstat (limited to 'mv_inference/inference')
| -rw-r--r-- | mv_inference/inference/include/Inference.h | 13 | ||||
| -rw-r--r-- | mv_inference/inference/include/mv_inference_open.h | 43 | ||||
| -rw-r--r-- | mv_inference/inference/src/Inference.cpp | 62 | ||||
| -rw-r--r-- | mv_inference/inference/src/mv_inference.c | 29 | ||||
| -rw-r--r-- | mv_inference/inference/src/mv_inference_open.cpp | 45 |
5 files changed, 1 insertions, 191 deletions
diff --git a/mv_inference/inference/include/Inference.h b/mv_inference/inference/include/Inference.h index 895f6d59..4c8204bb 100644 --- a/mv_inference/inference/include/Inference.h +++ b/mv_inference/inference/include/Inference.h @@ -60,11 +60,6 @@ typedef struct _FacialLandMarkDetectionResults { std::vector<cv::Point> locations; } FacialLandMarkDetectionResults; /**< structure FacialLandMarkDetectionResults */ -typedef struct _PoseEstimationResults { - int number_of_pose_estimation; - std::vector<cv::Point> locations; -} PoseEstimationResults; /**< structure PoseEstimationResults */ - namespace mediavision { namespace inference @@ -294,14 +289,6 @@ namespace inference */ int GetFacialLandMarkDetectionResults(FacialLandMarkDetectionResults *results); - /** - * @brief Gets the PoseEstimationDetectionResults - * - * @since_tizen 6.0 - * @return @c true on success, otherwise a negative error value - */ - int GetPoseEstimationDetectionResults(PoseEstimationResults *results); - int GetResults(std::vector<std::vector<int> > *dimInfo, std::vector<float *> *results); diff --git a/mv_inference/inference/include/mv_inference_open.h b/mv_inference/inference/include/mv_inference_open.h index 43ce8e41..3e3225f4 100644 --- a/mv_inference/inference/include/mv_inference_open.h +++ b/mv_inference/inference/include/mv_inference_open.h @@ -491,49 +491,6 @@ extern "C" mv_inference_facial_landmark_detected_cb detected_cb, void *user_data); - /** - * @brief Performs pose estimation detection on the @a source - * @details Use this function to launch pose estimation detection. - * Each time when mv_inference_pose_estimation_detect() is - * called, @a detected_cb will receive a list pose estimation's locations - * on the media source. - * - * @since_tizen 5.5 - * - * @param [in] source The handle to the source of the media - * @param [in] infer The handle to the inference - * @param[in] roi Rectangular box bounding face image on the - * @a source. If NULL, then full source will be - * analyzed. - * @param [in] detected_cb The callback which will be called for - * detecting facial landmark on media source. - * This callback will receive the detection results. - * @param [in] user_data The user data passed from the code where - * @ref mv_inference_facial_landmark_detect() is invoked. - * This data will be accessible from @a detected_cb callback. - * - * @return @c 0 on success, otherwise a negative error value - * @retval #MEDIA_VISION_ERROR_NONE Successful - * @retval #MEDIA_VISION_ERROR_INVALID_PARAMETER Invalid parameter - * @retval #MEDIA_VISION_ERROR_INTERNAL Internal error - * @retval #MEDIA_VISION_ERROR_NOT_SUPPORTED_FORMAT Source colorspace - * isn't supported - * @retval #MEDIA_VISION_ERROR_OUT_OF_MEMORY Out of memory - * @retval #MEDIA_VISION_ERROR_NOT_SUPPORTED Not supported - * - * @pre Create a source handle by calling @ref mv_create_source() - * @pre Create an inference handle by calling @ref mv_inference_create() - * @pre Configure an inference handle by calling @ref mv_inference_configure() - * @pre Prepare an inference by calling @ref mv_inference_prepare() - * @post @a detected_cb will be called to process detection results - * - * @see mv_inference_pose_estimation_detected_cb - */ - int mv_inference_pose_estimation_detect_open( - mv_source_h source, mv_inference_h infer, mv_rectangle_s *roi, - mv_inference_pose_estimation_detected_cb detected_cb, - void *user_data); - #ifdef __cplusplus } #endif /* __cplusplus */ diff --git a/mv_inference/inference/src/Inference.cpp b/mv_inference/inference/src/Inference.cpp index 03714a3e..d7e13f99 100644 --- a/mv_inference/inference/src/Inference.cpp +++ b/mv_inference/inference/src/Inference.cpp @@ -1360,67 +1360,5 @@ namespace inference return MEDIA_VISION_ERROR_NONE; } - int Inference::GetPoseEstimationDetectionResults( - PoseEstimationResults *detectionResults) - { - tensor_t outputData; - - // Get inference result and contain it to outputData. - int ret = FillOutputResult(outputData); - if (ret != MEDIA_VISION_ERROR_NONE) { - LOGE("Fail to get output result."); - return ret; - } - - std::vector<std::vector<int> > inferDimInfo(outputData.dimInfo); - std::vector<void *> inferResults(outputData.data.begin(), - outputData.data.end()); - - long number_of_pose = inferDimInfo[0][3]; - float *tmp = static_cast<float *>(inferResults[0]); - cv::Size heatMapSize(inferDimInfo[0][1], inferDimInfo[0][2]); - - cv::Point loc; - double score; - cv::Mat blurredHeatMap; - - cv::Mat reShapeTest(cv::Size(inferDimInfo[0][2], inferDimInfo[0][1]), - CV_32FC(inferDimInfo[0][3]), (void *) tmp); - - cv::Mat multiChannels[inferDimInfo[0][3]]; - split(reShapeTest, multiChannels); - - float ratioX = static_cast<float>(mSourceSize.width) / - static_cast<float>(inferDimInfo[0][2]); - float ratioY = static_cast<float>(mSourceSize.height) / - static_cast<float>(inferDimInfo[0][1]); - - PoseEstimationResults results; - results.number_of_pose_estimation = 0; - for (int poseIdx = 0; poseIdx < number_of_pose; poseIdx++) { - cv::Mat heatMap = multiChannels[poseIdx]; - - cv::GaussianBlur(heatMap, blurredHeatMap, cv::Size(), 5.0, 5.0); - cv::minMaxLoc(heatMap, NULL, &score, NULL, &loc); - - LOGI("PoseIdx[%2d]: x[%2d], y[%2d], score[%.3f]", poseIdx, loc.x, - loc.y, score); - LOGI("PoseIdx[%2d]: x[%2d], y[%2d], score[%.3f]", poseIdx, - static_cast<int>(static_cast<float>(loc.x + 1) * ratioX), - static_cast<int>(static_cast<float>(loc.y + 1) * ratioY), - score); - - loc.x = static_cast<int>(static_cast<float>(loc.x + 1) * ratioX); - loc.y = static_cast<int>(static_cast<float>(loc.y + 1) * ratioY); - results.locations.push_back(loc); - results.number_of_pose_estimation++; - } - - *detectionResults = results; - LOGE("Inference: PoseEstimationResults: %d\n", - results.number_of_pose_estimation); - return MEDIA_VISION_ERROR_NONE; - } - } /* Inference */ } /* MediaVision */ diff --git a/mv_inference/inference/src/mv_inference.c b/mv_inference/inference/src/mv_inference.c index 50e0f130..4f2d02c9 100644 --- a/mv_inference/inference/src/mv_inference.c +++ b/mv_inference/inference/src/mv_inference.c @@ -315,33 +315,4 @@ int mv_inference_facial_landmark_detect( return ret; #endif -} - -int mv_inference_pose_estimation_detect( - mv_source_h source, mv_inference_h infer, mv_rectangle_s *roi, - mv_inference_pose_estimation_detected_cb detected_cb, void *user_data) -{ - MEDIA_VISION_SUPPORT_CHECK( - __mv_inference_face_check_system_info_feature_supported()); - MEDIA_VISION_INSTANCE_CHECK(source); - MEDIA_VISION_INSTANCE_CHECK(infer); - MEDIA_VISION_NULL_ARG_CHECK(detected_cb); - - MEDIA_VISION_FUNCTION_ENTER(); - - int ret = MEDIA_VISION_ERROR_NONE; - -#ifdef MEDIA_VISION_INFERENCE_LICENCE_PORT - /* - ret = mv_inference_pose_estimation_lic(source, infer, detected_cb, user_data); - */ -#else - - ret = mv_inference_pose_estimation_detect_open(source, infer, roi, - detected_cb, user_data); - - MEDIA_VISION_FUNCTION_LEAVE(); - - return ret; -#endif }
\ No newline at end of file diff --git a/mv_inference/inference/src/mv_inference_open.cpp b/mv_inference/inference/src/mv_inference_open.cpp index fc7d72a5..09f9544f 100644 --- a/mv_inference/inference/src/mv_inference_open.cpp +++ b/mv_inference/inference/src/mv_inference_open.cpp @@ -784,47 +784,4 @@ int mv_inference_facial_landmark_detect_open( detected_cb(source, numberOfLandmarks, locations.data(), user_data); return ret; -} - -int mv_inference_pose_estimation_detect_open( - mv_source_h source, mv_inference_h infer, mv_rectangle_s *roi, - mv_inference_pose_estimation_detected_cb detected_cb, void *user_data) -{ - Inference *pInfer = static_cast<Inference *>(infer); - - int ret = MEDIA_VISION_ERROR_NONE; - int numberOfPoseEstimation = 0; - std::vector<mv_source_h> sources; - std::vector<mv_rectangle_s> rects; - - sources.push_back(source); - - if (roi != NULL) - rects.push_back(*roi); - - ret = pInfer->Run(sources, rects); - if (ret != MEDIA_VISION_ERROR_NONE) { - LOGE("Fail to run inference"); - return ret; - } - - PoseEstimationResults poseEstimationResults; - ret = pInfer->GetPoseEstimationDetectionResults(&poseEstimationResults); - if (ret != MEDIA_VISION_ERROR_NONE) { - LOGE("Fail to get inference results"); - return ret; - } - - numberOfPoseEstimation = poseEstimationResults.number_of_pose_estimation; - - std::vector<mv_point_s> locations(numberOfPoseEstimation); - - for (int n = 0; n < numberOfPoseEstimation; ++n) { - locations[n].x = poseEstimationResults.locations[n].x; - locations[n].y = poseEstimationResults.locations[n].y; - } - - detected_cb(source, numberOfPoseEstimation, locations.data(), user_data); - - return ret; -} +}
\ No newline at end of file |