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

Added proper testing of the end of quicktime video files.

Browse Source 
CvCaptureFile::grabFrame() always returns 1 regardless, which causes
dead loop when relying on the return value of VideoCapture::read().
This commit is contained in:
Bo Hu 2013-10-24 12:35:33 -07:00
parent 296f76a135
commit 114579c33b
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -179,6 +179,7 @@ private:
int changedPos; int changedPos;
int started; int started;
QTTime endOfMovie;
}; };
@ -673,6 +674,8 @@ CvCaptureFile::CvCaptureFile(const char* filename) {
return; return;
} }
[mCaptureSession gotoEnd];
endOfMovie = [mCaptureSession currentTime];
[mCaptureSession gotoBeginning]; [mCaptureSession gotoBeginning];
@ -709,6 +712,11 @@ int CvCaptureFile::didStart() {
bool CvCaptureFile::grabFrame() { bool CvCaptureFile::grabFrame() {
NSAutoreleasePool* localpool = [[NSAutoreleasePool alloc] init]; NSAutoreleasePool* localpool = [[NSAutoreleasePool alloc] init];
double t1 = getProperty(CV_CAP_PROP_POS_MSEC); double t1 = getProperty(CV_CAP_PROP_POS_MSEC);
QTTime curTime;
curTime = [mCaptureSession currentTime];
bool isEnd=(QTTimeCompare(curTime,endOfMovie) == NSOrderedSame);
[mCaptureSession stepForward]; [mCaptureSession stepForward];
double t2 = getProperty(CV_CAP_PROP_POS_MSEC); double t2 = getProperty(CV_CAP_PROP_POS_MSEC);
if (t2>t1 && !changedPos) { if (t2>t1 && !changedPos) {
@ -718,7 +726,7 @@ bool CvCaptureFile::grabFrame() {
} }
changedPos = 0; changedPos = 0;
[localpool drain]; [localpool drain];
return 1; return !isEnd;
} }