Fixed webcam bad start

gineshidalgo99 · gineshidalgo99 · commit e47414aec33c · 2019-02-19T18:27:58.000-05:00
diff --git a/include/openpose/producer/webcamReader.hpp b/include/openpose/producer/webcamReader.hpp
@@ -40,6 +40,7 @@ namespace op
 
     private:
         const int mIndex;
+        const bool mWebcamStarted;
         long long mFrameNameCounter;
         bool mThreadOpened;
         cv::Mat mBuffer;
diff --git a/src/openpose/producer/webcamReader.cpp b/src/openpose/producer/webcamReader.cpp
@@ -10,8 +10,10 @@ namespace op
                                const bool undistortImage) :
         VideoCaptureReader{webcamIndex, throwExceptionIfNoOpened, cameraParameterPath, undistortImage, 1},
         mIndex{webcamIndex},
+        mWebcamStarted{VideoCaptureReader::isOpened()},
         mFrameNameCounter{-1},
         mThreadOpened{std::atomic<bool>{false}},
+        mDisconnectedCounter{0},
         mResolution{webcamResolution}
     {
         try
@@ -83,7 +85,7 @@ namespace op
     {
         try
         {
-            return (VideoCaptureReader::isOpened() || mDisconnectedCounter > 0);
+            return (VideoCaptureReader::isOpened() || (mDisconnectedCounter > 0 && mWebcamStarted));
         }
         catch (const std::exception& e)
         {

Original file line number	Diff line number	Diff line change
`@@ -10,8 +10,10 @@ namespace op`
`10`	`10`	`const bool undistortImage) :`
`11`	`11`	`VideoCaptureReader{webcamIndex, throwExceptionIfNoOpened, cameraParameterPath, undistortImage, 1},`
`12`	`12`	`mIndex{webcamIndex},`
	`13`	`+ mWebcamStarted{VideoCaptureReader::isOpened()},`
`13`	`14`	`mFrameNameCounter{-1},`
`14`	`15`	`mThreadOpened{std::atomic<bool>{false}},`
	`16`	`+ mDisconnectedCounter{0},`
`15`	`17`	`mResolution{webcamResolution}`
`16`	`18`	`{`
`17`	`19`	`try`
`@@ -83,7 +85,7 @@ namespace op`
`83`	`85`	`{`
`84`	`86`	`try`
`85`	`87`	`{`
`86`		`- return (VideoCaptureReader::isOpened() \|\| mDisconnectedCounter > 0);`
	`88`	`+ return (VideoCaptureReader::isOpened() \|\| (mDisconnectedCounter > 0 && mWebcamStarted));`
`87`	`89`	`}`
`88`	`90`	`catch (const std::exception& e)`
`89`	`91`	`{`