Avoid void* for the sake of forward declaration
This commit is contained in:
parent
281199e278
commit
092e1ad899
|
@ -1,14 +1,14 @@
|
|||
#include "pose_tracking.h"
|
||||
|
||||
#include <cstdlib>
|
||||
#include <string>
|
||||
|
||||
#include "pose_tracking.h"
|
||||
|
||||
#include "absl/flags/flag.h"
|
||||
#include "absl/flags/parse.h"
|
||||
#include "mediapipe/framework/formats/landmark.pb.h"
|
||||
#include "mediapipe/framework/calculator_framework.h"
|
||||
#include "mediapipe/framework/formats/image_frame.h"
|
||||
#include "mediapipe/framework/formats/image_frame_opencv.h"
|
||||
#include "mediapipe/framework/formats/landmark.pb.h"
|
||||
#include "mediapipe/framework/port/file_helpers.h"
|
||||
#include "mediapipe/framework/port/opencv_highgui_inc.h"
|
||||
#include "mediapipe/framework/port/opencv_imgproc_inc.h"
|
||||
|
@ -27,13 +27,10 @@ public:
|
|||
|
||||
absl::Status initialize(const std::string& calculatorGraphConfigFile) {
|
||||
std::string graphContents;
|
||||
MP_RETURN_IF_ERROR(mediapipe::file::GetContents(
|
||||
calculatorGraphConfigFile,
|
||||
&graphContents));
|
||||
MP_RETURN_IF_ERROR(mediapipe::file::GetContents(calculatorGraphConfigFile, &graphContents));
|
||||
|
||||
mediapipe::CalculatorGraphConfig config =
|
||||
mediapipe::ParseTextProtoOrDie<mediapipe::CalculatorGraphConfig>(
|
||||
graphContents);
|
||||
mediapipe::ParseTextProtoOrDie<mediapipe::CalculatorGraphConfig>(graphContents);
|
||||
|
||||
MP_RETURN_IF_ERROR(graph.Initialize(config));
|
||||
ASSIGN_OR_RETURN(mediapipe::OutputStreamPoller poller,
|
||||
|
@ -45,14 +42,13 @@ public:
|
|||
ASSIGN_OR_RETURN(mediapipe::OutputStreamPoller posePresencePoller,
|
||||
graph.AddOutputStreamPoller(kOutpuPosePresenceStream));
|
||||
|
||||
|
||||
maskPollerPtr = std::make_unique<mediapipe::OutputStreamPoller>(std::move(poller));
|
||||
|
||||
landmarksPollerPtr = std::make_unique<mediapipe::OutputStreamPoller>(
|
||||
std::move(landmarksPoller));
|
||||
landmarksPollerPtr =
|
||||
std::make_unique<mediapipe::OutputStreamPoller>(std::move(landmarksPoller));
|
||||
|
||||
posePresencePollerPtr = std::make_unique<mediapipe::OutputStreamPoller>(
|
||||
std::move(posePresencePoller));
|
||||
posePresencePollerPtr =
|
||||
std::make_unique<mediapipe::OutputStreamPoller>(std::move(posePresencePoller));
|
||||
|
||||
MP_RETURN_IF_ERROR(graph.StartRun({}));
|
||||
}
|
||||
|
@ -69,8 +65,8 @@ public:
|
|||
size_t frameTimestampUs =
|
||||
static_cast<double>(cv::getTickCount()) / static_cast<double>(cv::getTickFrequency()) * 1e6;
|
||||
auto status = graph.AddPacketToInputStream(
|
||||
kInputStream, mediapipe::Adopt(inputFrame.release())
|
||||
.At(mediapipe::Timestamp(frameTimestampUs)));
|
||||
kInputStream,
|
||||
mediapipe::Adopt(inputFrame.release()).At(mediapipe::Timestamp(frameTimestampUs)));
|
||||
|
||||
if (!status.ok()) {
|
||||
LOG(WARNING) << "Graph execution failed: " << status;
|
||||
|
@ -91,8 +87,7 @@ public:
|
|||
auto& outputFrame = maskPacket.Get<mediapipe::ImageFrame>();
|
||||
|
||||
// Get pose landmarks.
|
||||
if (!landmarksPollerPtr ||
|
||||
!landmarksPollerPtr->Next(&poseLandmarksPacket)) {
|
||||
if (!landmarksPollerPtr || !landmarksPollerPtr->Next(&poseLandmarksPacket)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
|
@ -105,16 +100,12 @@ public:
|
|||
return landmarksStatus.ok();
|
||||
}
|
||||
|
||||
absl::Status detectLandmarksWithStatus(
|
||||
nimagna::cv_wrapper::Point3f* poseLandmarks) {
|
||||
|
||||
absl::Status detectLandmarksWithStatus(nimagna::cv_wrapper::Point3f* poseLandmarks) {
|
||||
if (poseLandmarksPacket.IsEmpty()) {
|
||||
return absl::CancelledError("Pose landmarks packet is empty.");
|
||||
}
|
||||
|
||||
auto retrievedLandmarks =
|
||||
poseLandmarksPacket
|
||||
.Get<::mediapipe::NormalizedLandmarkList>();
|
||||
auto retrievedLandmarks = poseLandmarksPacket.Get<::mediapipe::NormalizedLandmarkList>();
|
||||
|
||||
// Convert landmarks to cv::Point3f**.
|
||||
const auto landmarksCount = retrievedLandmarks.landmark_size();
|
||||
|
@ -129,13 +120,9 @@ public:
|
|||
return absl::OkStatus();
|
||||
}
|
||||
|
||||
nimagna::cv_wrapper::Point3f* lastDetectedLandmarks() {
|
||||
return poseLandmarks;
|
||||
}
|
||||
nimagna::cv_wrapper::Point3f* lastDetectedLandmarks() { return poseLandmarks; }
|
||||
|
||||
cv::Mat lastSegmentedFrame() {
|
||||
return segmentedMask;
|
||||
}
|
||||
cv::Mat lastSegmentedFrame() { return segmentedMask; }
|
||||
|
||||
static constexpr size_t kLandmarksCount = 33u;
|
||||
|
||||
|
@ -173,4 +160,4 @@ namespace nimagna {
|
|||
return cv_wrapper::Mat(result.rows, result.cols, result.data);
|
||||
}
|
||||
|
||||
}
|
||||
} // namespace nimagna
|
||||
|
|
|
@ -44,7 +44,7 @@ namespace nimagna {
|
|||
|
||||
Mat(int rows, int cols, unsigned char* data) : rows(rows), cols(cols), data(data) {}
|
||||
};
|
||||
}
|
||||
} // namespace cv_wrapper
|
||||
|
||||
class DLLEXPORT PoseTracking {
|
||||
public:
|
||||
|
@ -96,6 +96,6 @@ namespace nimagna {
|
|||
private:
|
||||
PoseTrackingImpl* mImplementation;
|
||||
};
|
||||
}
|
||||
} // namespace nimagna
|
||||
|
||||
#endif
|
||||
|
|
Loading…
Reference in New Issue
Block a user