Remove frame size check on each frame acquisition

This doesn't seem needed for now. Should be implemented in the future if need be.
Aharoni-Lab · Feb 21, 2020 · 11f4eb9 · 11f4eb9
1 parent c6bfe47
commit 11f4eb9
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 10 deletions.
diff --git a/source/videostreamocv.cpp b/source/videostreamocv.cpp
@@ -128,16 +128,17 @@ void VideoStreamOCV::startStream()
                         }
                     }
                     else {
-                        // Let's make sure the frame acquired has the correct size. An openCV error seems to occur on cam reconnect due to a mismatch in size.
-                        if (frame.cols != m_expectedWidth || frame.rows != m_expectedHeight) {
-                            sendMessage("Warning: " + m_deviceName + " acquired frame has wrong size. [" + QString::number(frame.cols) + ", " + QString::number(frame.rows) + "]");
-                            qDebug() << "Wrong frame size for device" << m_cameraID;
-
-                            // This likely means the correct video stream crashed and openCV defaulted to a different video stream. So lets disconnect and try to reconnect to the correct one
-                            cam->release();
 
-                        }
-                        else {
+                        // Let's make sure the frame acquired has the correct size. An openCV error seems to occur on cam reconnect due to a mismatch in size.
+//                        if (frame.cols != m_expectedWidth || frame.rows != m_expectedHeight) {
+//                            sendMessage("Warning: " + m_deviceName + " acquired frame has wrong size. [" + QString::number(frame.cols) + ", " + QString::number(frame.rows) + "]");
+//                            qDebug() << "Wrong frame size for device" << m_cameraID;
+
+//                            // This likely means the correct video stream crashed and openCV defaulted to a different video stream. So lets disconnect and try to reconnect to the correct one
+//                            cam->release();
+//                        }
+//                        else {
+                        if (true) {
                             if (m_isColor) {
                                 frame.copyTo(frameBuffer[idx%frameBufferSize]);
                             }

diff --git a/userConfigs/UserConfigExample_V4_BNO_Plus_BehavCam.json b/userConfigs/UserConfigExample_V4_BNO_Plus_BehavCam.json
@@ -29,7 +29,7 @@
                 "deviceType": "Miniscope_V4_BNO",
                 "imageRegistration": "Off",
                 "streamHeadOrientation": true,
-                "deviceID": 2,
+                "deviceID": 1,
 				"showSaturation": true,
                 "compressionOptions": ["MJPG","MJ2C","XVID","FFV1"],
                 "compression": "FFV1",