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

Merge pull request #5574 from ilya-lavrenov:image-sequence-videocapture

Browse Source
This commit is contained in:
Alexander Alekhin 2015-10-27 15:41:58 +00:00
commit 4552ca98c4
1 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
modules/highgui/src/cap_images.cpp
View File

@ -67,10 +67,11 @@ class CvCapture_Images : public CvCapture
public: public:
CvCapture_Images() CvCapture_Images()
{ {
filename = 0; filename = NULL;
currentframe = firstframe = 0; currentframe = firstframe = 0;
length = 0; length = 0;
frame = 0; frame = NULL;
grabbedInOpen = false;
} }
virtual ~CvCapture_Images() virtual ~CvCapture_Images()
@ -92,6 +93,7 @@ protected:
unsigned length; // length of sequence unsigned length; // length of sequence
IplImage* frame; IplImage* frame;
bool grabbedInOpen;
}; };
@ -100,7 +102,7 @@ void CvCapture_Images::close()
if( filename ) if( filename )
{ {
free(filename); free(filename);
filename = 0; filename = NULL;
} }
currentframe = firstframe = 0; currentframe = firstframe = 0;
length = 0; length = 0;
@ -113,17 +115,25 @@ bool CvCapture_Images::grabFrame()
char str[_MAX_PATH]; char str[_MAX_PATH];
sprintf(str, filename, firstframe + currentframe); sprintf(str, filename, firstframe + currentframe);
if (grabbedInOpen)
{
grabbedInOpen = false;
++currentframe;
return frame != NULL;
}
cvReleaseImage(&frame); cvReleaseImage(&frame);
frame = cvLoadImage(str, CV_LOAD_IMAGE_ANYDEPTH | CV_LOAD_IMAGE_ANYCOLOR); frame = cvLoadImage(str, CV_LOAD_IMAGE_ANYDEPTH | CV_LOAD_IMAGE_ANYCOLOR);
if( frame ) if( frame )
currentframe++; currentframe++;
return frame != 0; return frame != NULL;
} }
IplImage* CvCapture_Images::retrieveFrame(int) IplImage* CvCapture_Images::retrieveFrame(int)
{ {
return frame; return grabbedInOpen ? NULL : frame;
} }
double CvCapture_Images::getProperty(int id) double CvCapture_Images::getProperty(int id)
@ -166,6 +176,8 @@ bool CvCapture_Images::setProperty(int id, double value)
value = length - 1; value = length - 1;
} }
currentframe = cvRound(value); currentframe = cvRound(value);
if (currentframe != 0)
grabbedInOpen = false; // grabbed frame is not valid anymore
return true; return true;
case CV_CAP_PROP_POS_AVI_RATIO: case CV_CAP_PROP_POS_AVI_RATIO:
if(value > 1) { if(value > 1) {
@ -176,6 +188,8 @@ bool CvCapture_Images::setProperty(int id, double value)
value = 0; value = 0;
} }
currentframe = cvRound((length - 1) * value); currentframe = cvRound((length - 1) * value);
if (currentframe != 0)
grabbedInOpen = false; // grabbed frame is not valid anymore
return true; return true;
} }
CV_WARN("unknown/unhandled property\n"); CV_WARN("unknown/unhandled property\n");
@ -278,7 +292,13 @@ bool CvCapture_Images::open(const char * _filename)
} }
firstframe = offset; firstframe = offset;
return true;
// grab frame to enable properties retrieval
bool grabRes = grabFrame();
grabbedInOpen = true;
currentframe = 0;
return grabRes;
} }
@ -290,7 +310,7 @@ CvCapture* cvCreateFileCapture_Images(const char * filename)
return capture; return capture;
delete capture; delete capture;
return 0; return NULL;
} }
// //