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

removed confusing CvCapture::queryFrame(); rewritten cvQueryFrame() (ticket #235)

Browse Source
This commit is contained in:
Vadim Pisarevsky 2011-05-29 21:02:53 +00:00
parent 534ac83b8d
commit 24dcfa1a4f
3 changed files with 5 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/highgui/src/cap.cpp
View File

@ -73,7 +73,11 @@ CV_IMPL void cvReleaseCapture( CvCapture** pcapture )
CV_IMPL IplImage* cvQueryFrame( CvCapture* capture ) CV_IMPL IplImage* cvQueryFrame( CvCapture* capture )
{ {
return capture ? capture->queryFrame() : 0; if(!capture)
return 0;
if(!capture->grabFrame())
return 0;
return capture->retrieveFrame(0);
} }

19
modules/highgui/src/cap_qtkit.mm
View File

@ -99,7 +99,6 @@ public:
~CvCaptureCAM(); ~CvCaptureCAM();
virtual bool grabFrame(); virtual bool grabFrame();
virtual IplImage* retrieveFrame(int); virtual IplImage* retrieveFrame(int);
virtual IplImage* queryFrame();
virtual double getProperty(int property_id); virtual double getProperty(int property_id);
virtual bool setProperty(int property_id, double value); virtual bool setProperty(int property_id, double value);
virtual int didStart(); virtual int didStart();
@ -142,7 +141,6 @@ public:
~CvCaptureFile(); ~CvCaptureFile();
virtual bool grabFrame(); virtual bool grabFrame();
virtual IplImage* retrieveFrame(int); virtual IplImage* retrieveFrame(int);
virtual IplImage* queryFrame();
virtual double getProperty(int property_id); virtual double getProperty(int property_id);
virtual bool setProperty(int property_id, double value); virtual bool setProperty(int property_id, double value);
virtual int didStart(); virtual int didStart();
@ -294,18 +292,6 @@ IplImage* CvCaptureCAM::retrieveFrame(int) {
return [capture getOutput]; return [capture getOutput];
} }
IplImage* CvCaptureCAM::queryFrame() {
while (!grabFrame()) {
cout << "WARNING: Couldn't grab new frame from camera!!!" << endl;
/*
cout << "Attempting to restart camera; set capture property DISABLE_AUTO_RESTART to disable." << endl;
stopCaptureDevice();
startCaptureDevice(camNum);
*/
}
return retrieveFrame(0);
}
void CvCaptureCAM::stopCaptureDevice() { void CvCaptureCAM::stopCaptureDevice() {
NSAutoreleasePool* localpool = [[NSAutoreleasePool alloc] init]; NSAutoreleasePool* localpool = [[NSAutoreleasePool alloc] init];
@ -781,11 +767,6 @@ IplImage* CvCaptureFile::retrieveFrame(int) {
return retrieveFramePixelBuffer(); return retrieveFramePixelBuffer();
} }
IplImage* CvCaptureFile::queryFrame() {
grabFrame();
return retrieveFrame(0);
}
double CvCaptureFile::getFPS() { double CvCaptureFile::getFPS() {
if (mCaptureSession == nil) return 0; if (mCaptureSession == nil) return 0;
NSAutoreleasePool* localpool = [[NSAutoreleasePool alloc] init]; NSAutoreleasePool* localpool = [[NSAutoreleasePool alloc] init];

1
modules/highgui/src/precomp.hpp
View File

@ -98,7 +98,6 @@ struct CvCapture
virtual bool setProperty(int, double) { return 0; } virtual bool setProperty(int, double) { return 0; }
virtual bool grabFrame() { return true; } virtual bool grabFrame() { return true; }
virtual IplImage* retrieveFrame(int) { return 0; } virtual IplImage* retrieveFrame(int) { return 0; }
virtual IplImage* queryFrame() { return grabFrame() ? retrieveFrame(0) : 0; }
virtual int getCaptureDomain() { return CV_CAP_ANY; } // Return the type of the capture object: CV_CAP_VFW, etc... virtual int getCaptureDomain() { return CV_CAP_ANY; } // Return the type of the capture object: CV_CAP_VFW, etc...
}; };