Merge pull request #272 from gb2111/master

make camera flip image instead of code to save some cpu
psmoveservice · Nov 11, 2016 · 6def02f · 6def02f
2 parents 112b06e + 80e029a
commit 6def02f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/psmoveservice/Device/View/ServerTrackerView.cpp b/src/psmoveservice/Device/View/ServerTrackerView.cpp
@@ -381,8 +381,7 @@ class OpenCVBufferState
     {
         const cv::Mat videoBufferMat(frameHeight, frameWidth, CV_8UC3, const_cast<unsigned char *>(video_buffer));
 
-        // Copy and Flip image about the x-axis
-        cv::flip(videoBufferMat, *bgrBuffer, 1);
+		videoBufferMat.copyTo(*bgrBuffer);
 
         // Convert the video buffer to the HSV color space
 		if (bgr2hsv != nullptr)

diff --git a/src/psmoveservice/PSMoveTracker/PSEye/PSEyeVideoCapture.cpp b/src/psmoveservice/PSMoveTracker/PSEye/PSEyeVideoCapture.cpp
@@ -405,6 +405,8 @@ class PSEYECaptureCAM_PS3EYE : public cv::IVideoCapture
 
                 eye->setAutogain(false);
                 eye->setAutoWhiteBalance(false);
+
+				eye->setFlip(true, false);
 
                 m_index = _index;
                 refreshDimensions();