From 12e7ec5bdac206a3072f24577e897c79d6b0189f Mon Sep 17 00:00:00 2001 From: Stéphane Lenclud Date: Sat, 13 Apr 2019 00:19:18 +0200 Subject: Easy Tracker: Support for single channel camera frames. --- tracker-kinect-face/camera_kinect_ir.cpp | 6 ++---- tracker-kinect-face/camera_kinect_ir.h | 1 - 2 files changed, 2 insertions(+), 5 deletions(-) (limited to 'tracker-kinect-face') diff --git a/tracker-kinect-face/camera_kinect_ir.cpp b/tracker-kinect-face/camera_kinect_ir.cpp index 8499003b..b1856f47 100644 --- a/tracker-kinect-face/camera_kinect_ir.cpp +++ b/tracker-kinect-face/camera_kinect_ir.cpp @@ -99,7 +99,7 @@ std::tuple CameraKinectIr::get_frame() iFrame.width = 512; iFrame.height = 424; iFrame.stride = cv::Mat::AUTO_STEP; - iFrame.channels = 3; + iFrame.channels = iMatFrame.channels(); return { iFrame, new_frame }; } @@ -280,9 +280,7 @@ bool CameraKinectIr::get_frame_(cv::Mat& frame) // For scalling to have more precission in the range we are interrested in min = max - 255; // See: https://stackoverflow.com/questions/14539498/change-type-of-mat-object-from-cv-32f-to-cv-8u/14539652 - raw.convertTo(iRaw8, CV_8U, 255.0 / (max - min), -255.0*min / (max - min)); - // Second convert to RGB - cv::cvtColor(iRaw8, frame, cv::COLOR_GRAY2BGR); + raw.convertTo(frame, CV_8U, 255.0 / (max - min), -255.0*min / (max - min)); // success = true; } diff --git a/tracker-kinect-face/camera_kinect_ir.h b/tracker-kinect-face/camera_kinect_ir.h index a2ddaf76..7cd24651 100644 --- a/tracker-kinect-face/camera_kinect_ir.h +++ b/tracker-kinect-face/camera_kinect_ir.h @@ -70,7 +70,6 @@ private: video::frame iFrame; cv::Mat iMatFrame; - cv::Mat iRaw8; float fov = 0; int width = 0, height = 0; -- cgit v1.2.3