generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

probably fixed multi-threaded capturing from DShow cameras (ticket #1470)

Browse Source
This commit is contained in:
Vadim Pisarevsky
2012-03-27 12:50:56 +00:00
parent b2a6a257b7
commit 8513ed08d0
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
modules/highgui/src/cap_dshow.cpp
View File

@@ -384,7 +384,7 @@ typedef _AMMediaType AM_MEDIA_TYPE;
//keeps track of how many instances of VI are being used //keeps track of how many instances of VI are being used
//don't touch //don't touch
static int comInitCount = 0; //static int comInitCount = 0;
//////////////////////////////////////// VIDEO DEVICE /////////////////////////////////// //////////////////////////////////////// VIDEO DEVICE ///////////////////////////////////
@@ -1915,7 +1915,7 @@ videoInput::~videoInput(){
// ---------------------------------------------------------------------- // ----------------------------------------------------------------------
bool videoInput::comInit(){ bool videoInput::comInit(){
HRESULT hr = NOERROR; /*HRESULT hr = NOERROR;
//no need for us to start com more than once //no need for us to start com more than once
if(comInitCount == 0 ){ if(comInitCount == 0 ){
@@ -1935,7 +1935,7 @@ bool videoInput::comInit(){
} }
} }
comInitCount++; comInitCount++;*/
return true; return true;
} }
@@ -1946,14 +1946,15 @@ bool videoInput::comInit(){
// ---------------------------------------------------------------------- // ----------------------------------------------------------------------
bool videoInput::comUnInit(){ bool videoInput::comUnInit(){
if(comInitCount > 0)comInitCount--; //decrease the count of instances using com /*if(comInitCount > 0)comInitCount--; //decrease the count of instances using com
if(comInitCount == 0){ if(comInitCount == 0){
CoUninitialize(); //if there are no instances left - uninitialize com CoUninitialize(); //if there are no instances left - uninitialize com
return true; return true;
} }
return false; return false;*/
return true;
} }
@@ -2912,7 +2913,7 @@ class CvCaptureCAM_DShow : public CvCapture
{ {
public: public:
CvCaptureCAM_DShow(); CvCaptureCAM_DShow();
virtual ~CvCaptureCAM_DShow() { close(); } virtual ~CvCaptureCAM_DShow();
virtual bool open( int index ); virtual bool open( int index );
virtual void close(); virtual void close();
@@ -2944,6 +2945,13 @@ CvCaptureCAM_DShow::CvCaptureCAM_DShow()
index = -1; index = -1;
frame = 0; frame = 0;
width = height = -1; width = height = -1;
CoInitialize(0);
}
CvCaptureCAM_DShow::~CvCaptureCAM_DShow()
{
close();
CoUninitialize();
} }
void CvCaptureCAM_DShow::close() void CvCaptureCAM_DShow::close()