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

reverted the original VideoCapture::read() code; moved frame index check to where it should belong: ffmpeg wrapper; applied patch by Rob Reilink (ticket #1971)

Browse Source
This commit is contained in:
Vadim Pisarevsky 2012-06-01 08:55:16 +00:00
parent 586d5a6024
commit 677680d82d
3 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -494,15 +494,8 @@ bool VideoCapture::retrieve(Mat& image, int channel)
bool VideoCapture::read(Mat& image) bool VideoCapture::read(Mat& image)
{ {
double frame_pos = get(CV_CAP_PROP_POS_FRAMES); if(grab())
double frame_count = get(CV_CAP_PROP_FRAME_COUNT); retrieve(image);
if (frame_pos < frame_count || frame_pos < 0 || frame_count < 0)
{
if(grab())
retrieve(image);
else
image.release();
}
else else
image.release(); image.release();
return !image.empty(); return !image.empty();

4
modules/highgui/src/cap_ffmpeg_impl.hpp
View File

@ -438,6 +438,10 @@ bool CvCapture_FFMPEG::grabFrame()
const int max_number_of_attempts = 1 << 16; const int max_number_of_attempts = 1 << 16;
if( !ic || !video_st ) return false; if( !ic || !video_st ) return false;
if( ic->streams[video_stream]->nb_frames > 0 &&
frame_number > ic->streams[video_stream]->nb_frames )
return false;
av_free_packet (&packet); av_free_packet (&packet);

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

@ -316,7 +316,9 @@ int CvCaptureCAM::startCaptureDevice(int cameraNum) {
capture = [[CaptureDelegate alloc] init]; capture = [[CaptureDelegate alloc] init];
QTCaptureDevice *device; QTCaptureDevice *device;
NSArray* devices = [QTCaptureDevice inputDevicesWithMediaType:QTMediaTypeVideo]; NSArray* devices = [[[QTCaptureDevice inputDevicesWithMediaType:QTMediaTypeVideo]
arrayByAddingObjectsFromArray:[QTCaptureDevice inputDevicesWithMediaType:QTMediaTypeMuxed]] retain];
if ([devices count] == 0) { if ([devices count] == 0) {
cout << "QTKit didn't find any attached Video Input Devices!" << endl; cout << "QTKit didn't find any attached Video Input Devices!" << endl;
[localpool drain]; [localpool drain];