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

fixed vfw (#2156)

Browse Source
This commit is contained in:
Maria Dimashova 2012-07-11 09:04:25 +00:00
parent bc3fb347a3
commit 469ec7c522
1 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
modules/highgui/src/cap_vfw.cpp
View File

@ -182,6 +182,12 @@ bool CvCaptureAVI_VFW::open( const char* filename )
getframe = AVIStreamGetFrameOpen( avistream, &bmihdr ); getframe = AVIStreamGetFrameOpen( avistream, &bmihdr );
if( getframe != 0 ) if( getframe != 0 )
return true; return true;
// Attempt to open as 8-bit AVI.
bmihdr = icvBitmapHeader( size.width, size.height, 8);
getframe = AVIStreamGetFrameOpen( avistream, &bmihdr );
if( getframe != 0 )
return true;
} }
} }
} }
@ -201,14 +207,28 @@ IplImage* CvCaptureAVI_VFW::retrieveFrame(int)
{ {
if( avistream && bmih ) if( avistream && bmih )
{ {
bool isColor = bmih->biBitCount == 24;
int nChannels = (isColor) ? 3 : 1;
IplImage src; IplImage src;
cvInitImageHeader( &src, cvSize( bmih->biWidth, bmih->biHeight ), cvInitImageHeader( &src, cvSize( bmih->biWidth, bmih->biHeight ),
IPL_DEPTH_8U, 3, IPL_ORIGIN_BL, 4 ); IPL_DEPTH_8U, nChannels, IPL_ORIGIN_BL, 4 );
cvSetData( &src, (char*)(bmih + 1), src.widthStep );
char* dataPtr = (char*)(bmih + 1);
// Only account for the color map size if we are an 8-bit image and the color map is used
if (!isColor)
{
static int RGBQUAD_SIZE_PER_BYTE = sizeof(RGBQUAD)/sizeof(BYTE);
int offsetFromColormapToData = (int)bmih->biClrUsed*RGBQUAD_SIZE_PER_BYTE;
dataPtr += offsetFromColormapToData;
}
cvSetData( &src, dataPtr, src.widthStep );
if( !frame || frame->width != src.width || frame->height != src.height ) if( !frame || frame->width != src.width || frame->height != src.height )
{ {
cvReleaseImage( &frame ); cvReleaseImage( &frame );
frame = cvCreateImage( cvGetSize(&src), 8, 3 ); frame = cvCreateImage( cvGetSize(&src), 8, nChannels );
} }
cvFlip( &src, frame, 0 ); cvFlip( &src, frame, 0 );