From 921609de5dfcceafd2ed20206f9ecc10b19f1de2 Mon Sep 17 00:00:00 2001 From: Sem van der Hoeven Date: Fri, 4 Jun 2021 11:39:23 +0200 Subject: [PATCH] [EDIT] stuff --- src/computervision/OpenPoseVideo.cpp | 5 ++++- src/computervision/OpenPoseVideo.h | 2 +- src/main.cpp | 7 ++++--- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/computervision/OpenPoseVideo.cpp b/src/computervision/OpenPoseVideo.cpp index dbaf6e5..33527a1 100644 --- a/src/computervision/OpenPoseVideo.cpp +++ b/src/computervision/OpenPoseVideo.cpp @@ -42,9 +42,11 @@ namespace computervision void OpenPoseVideo::setup() { net = readNetFromCaffe(protoFile, weightsFile); + + net.setPreferableBackend(DNN_TARGET_CPU); } - void OpenPoseVideo::movementSkeleton(Mat inputImage, std::function,cv::Mat poinst_on_image)> f) { + void OpenPoseVideo::movementSkeleton(Mat& inputImage, std::function&, cv::Mat& poinst_on_image)> f) { std::cout << "movement skeleton start" << std::endl; int inWidth = 368; @@ -67,6 +69,7 @@ namespace computervision std::cout << "done setting input to net" << std::endl; Mat output = net.forward(); + std::cout << "time took to set input and forward: " << t << std::endl; int H = output.size[2]; int W = output.size[3]; diff --git a/src/computervision/OpenPoseVideo.h b/src/computervision/OpenPoseVideo.h index 7f61449..e05737d 100644 --- a/src/computervision/OpenPoseVideo.h +++ b/src/computervision/OpenPoseVideo.h @@ -13,7 +13,7 @@ namespace computervision private: public: - void movementSkeleton(Mat inputImage,std::function, cv::Mat poinst_on_image)> f); + void movementSkeleton(Mat& inputImage, std::function&, cv::Mat& poinst_on_image)> f); void setup(); }; } diff --git a/src/main.cpp b/src/main.cpp index 260694c..d1ef94e 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -87,10 +87,11 @@ int main(void) // set up object detection //objDetect.setup(); - cv::VideoCapture cam = objDetect.getCap(); + //cv::VideoCapture cam = objDetect.getCap(); cv::Mat img; - cam.read(img); - imshow("camera in main loop", img); + cv::VideoCapture cap = objDetect.getCap(); + //cam.read(img); + //imshow("camera in main loop", img); computervision::AsyncArmDetection as;