1 files changed, 30 insertions, 144 deletions

diff --git a/ftnoir_tracker_pt/camera.cpp b/ftnoir_tracker_pt/camera.cpp
index fec503e1..432e0158 100644
--- a/ftnoir_tracker_pt/camera.cpp
+++ b/ftnoir_tracker_pt/camera.cpp
@@ -119,13 +119,12 @@ void Camera::set_fps(int fps)
 
 void Camera::set_res(int x_res, int y_res)
 {
-	if (cam_desired.res_x != x_res || cam_desired.res_y != y_res)
-	{
-		cam_desired.res_x = x_res;
-		cam_desired.res_y = y_res;
-		_set_res();
-        _set_fps();
-	}
+    if (cam_desired.res_x != x_res || cam_desired.res_y != y_res)
+    {
+        cam_desired.res_x = x_res;
+        cam_desired.res_y = y_res;
+        _set_res();
+    }
 }
 
 bool Camera::get_frame(float dt, cv::Mat* frame)
@@ -143,20 +142,20 @@ bool Camera::get_frame(float dt, cv::Mat* frame)
 	return new_frame;
 }
 
-// ----------------------------------------------------------------------------
-#ifdef OPENTRACK_API
 void CVCamera::start()
 {
+    if (cap)
+        delete cap;
     cap = new VideoCapture(desired_index);
-	// extract camera info
+    _set_res();
+    _set_fps();
+    // extract camera info
     if (cap->isOpened())
-	{
-        _set_fps();
-        _set_res();
-		active = true;
-		active_index = desired_index;
-        cam_info.res_x = cap->get(CV_CAP_PROP_FRAME_WIDTH);
-        cam_info.res_y = cap->get(CV_CAP_PROP_FRAME_HEIGHT);
+    {
+        active = true;
+        active_index = desired_index;
+        cam_info.res_x = 0;
+        cam_info.res_y = 0;
     } else {
         delete cap;
         cap = nullptr;
@@ -169,25 +168,28 @@ void CVCamera::stop()
     {
         cap->release();
         delete cap;
+        cap = nullptr;
     }
-	active = false;
+    active = false;
 }
 
 bool CVCamera::_get_frame(Mat* frame)
 {
     if (cap && cap->isOpened())
-	{
+    {
         Mat img;
         for (int i = 0; i < 100 && !cap->read(img); i++)
             ;;
 
-		if (img.empty())
-			return false;
+        if (img.empty())
+            return false;
 
-        *frame = img;
-        return true;
-	}
-	return false;
+            *frame = img;
+            cam_info.res_x = img.cols;
+            cam_info.res_y = img.rows;
+            return true;
+    }
+    return false;
 }
 
 void CVCamera::_set_fps()
@@ -197,13 +199,11 @@ void CVCamera::_set_fps()
 
 void CVCamera::_set_res()
 {
-	if (cap)
-	{
+    if (cap)
+    {
         cap->set(CV_CAP_PROP_FRAME_WIDTH,  cam_desired.res_x);
         cap->set(CV_CAP_PROP_FRAME_HEIGHT, cam_desired.res_y);
-        cam_info.res_x = cap->get(CV_CAP_PROP_FRAME_WIDTH);
-        cam_info.res_y = cap->get(CV_CAP_PROP_FRAME_HEIGHT);
-	}
+    }
 }
 void CVCamera::_set_device_index()
 {
@@ -214,117 +214,3 @@ void CVCamera::_set_device_index()
     }
     cap = new VideoCapture(desired_index);
 }
-
-#else
-// ----------------------------------------------------------------------------
-VICamera::VICamera() : frame_buffer(NULL)
-{
-	VI.listDevices();
-}
-
-void VICamera::start()
-{
-	if (desired_index >= 0)
-	{	
-		if (cam_desired.res_x == 0 || cam_desired.res_y == 0)
-			VI.setupDevice(desired_index);
-		else
-			VI.setupDevice(desired_index, cam_desired.res_x, cam_desired.res_y);
-
-		active = true;
-		active_index = desired_index;
-
-		cam_info.res_x = VI.getWidth(active_index);
-		cam_info.res_y = VI.getHeight(active_index);
-		new_frame = cv::Mat(cam_info.res_y, cam_info.res_x, CV_8UC3);
-		// If matrix is not continuous we have to copy manually via frame_buffer
-		if (!new_frame.isContinuous()) {
-			unsigned int size = VI.getSize(active_index);
-			frame_buffer = new unsigned char[size];
-		}
-	}
-}
-
-void VICamera::stop()
-{
-	if (active)
-	{
-		VI.stopDevice(active_index);
-	}
-	if (frame_buffer)
-	{
-		delete[] frame_buffer;
-		frame_buffer = NULL;
-	}
-	active = false;
-}
-
-bool VICamera::_get_frame(Mat* frame)
-{
-	if (active && VI.isFrameNew(active_index))
-	{
-		if (new_frame.isContinuous())
-		{
-			VI.getPixels(active_index, new_frame.data, false, true);
-		}
-		else
-		{
-			// If matrix is not continuous we have to copy manually via frame_buffer
-			VI.getPixels(active_index, frame_buffer, false, true);
-			new_frame = cv::Mat(cam_info.res_y, cam_info.res_x, CV_8UC3, frame_buffer).clone();
-		}
-		*frame = new_frame;
-		return true;
-	}
-	return false;
-}
-
-void VICamera::_set_device_index()
-{
-	if (active) restart();
-}
-
-void VICamera::_set_f()
-{
-	cam_info.f = cam_desired.f;
-}
-
-void VICamera::_set_fps()
-{
-	bool was_active = active;
-	if (active) stop();
-	VI.setIdealFramerate(desired_index, cam_desired.fps);
-	if (was_active) start();
-}
-
-void VICamera::_set_res()
-{
-	if (active) restart();
-}
-#endif
-
-// ----------------------------------------------------------------------------
-Mat FrameRotation::rotate_frame(Mat frame)
-{	
-	switch (rotation)
-	{
-	case CLOCKWISE:
-		{
-			Mat dst;
-			transpose(frame, dst);
-			flip(dst, dst, 1);
-			return dst;
-		}
-
-	case COUNTER_CLOCKWISE:
-		{
-			Mat dst;
-			transpose(frame, dst);
-			flip(dst, dst, 0);
-			return dst;
-		}
-	
-	default:
-		return frame;
-	}
-}