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

avoid use of writable global variables in V4L capturing module (thanks to fjmadrid for the patch! - see the ticket #384)

Browse Source
This commit is contained in:
Vadim Pisarevsky 2010-11-21 13:09:37 +00:00
parent 2e9136259d
commit feb0de80e1
1 changed files with 80 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
modules/highgui/src/cap_v4l.cpp
View File

@ -271,15 +271,17 @@ static unsigned int n_buffers = 0;
#endif /* HAVE_CAMV4L2 */ #endif /* HAVE_CAMV4L2 */
int PALETTE_BGR24 = 0, enum PALETTE_TYPE {
PALETTE_YVU420 = 0, PALETTE_BGR24 = 1,
PALETTE_YUV411P = 0, PALETTE_YVU420,
PALETTE_YUYV = 0, PALETTE_YUV411P,
PALETTE_UYVY= 0, PALETTE_YUYV,
PALETTE_SBGGR8 = 0, PALETTE_UYVY,
PALETTE_SN9C10X = 0, PALETTE_SBGGR8,
PALETTE_MJPEG = 0, PALETTE_SN9C10X,
PALETTE_SGBRG = 0; PALETTE_MJPEG,
PALETTE_SGBRG
};
typedef struct CvCaptureCAM_V4L typedef struct CvCaptureCAM_V4L
{ {
@ -295,7 +297,7 @@ typedef struct CvCaptureCAM_V4L
IplImage frame; IplImage frame;
#ifdef HAVE_CAMV4L2 #ifdef HAVE_CAMV4L2
enum PALETTE_TYPE palette;
/* V4L2 variables */ /* V4L2 variables */
buffer buffers[MAX_V4L_BUFFERS + 1]; buffer buffers[MAX_V4L_BUFFERS + 1];
struct v4l2_capability cap; struct v4l2_capability cap;
@ -529,17 +531,17 @@ static int autosetup_capture_mode_v4l2(CvCaptureCAM_V4L* capture)
{ {
if (try_palette_v4l2(capture, V4L2_PIX_FMT_BGR24) == 0) if (try_palette_v4l2(capture, V4L2_PIX_FMT_BGR24) == 0)
{ {
PALETTE_BGR24 = 1; capture->palette = PALETTE_BGR24;
} }
else else
if (try_palette_v4l2(capture, V4L2_PIX_FMT_YVU420) == 0) if (try_palette_v4l2(capture, V4L2_PIX_FMT_YVU420) == 0)
{ {
PALETTE_YVU420 = 1; capture->palette = PALETTE_YVU420;
} }
else else
if (try_palette_v4l2(capture, V4L2_PIX_FMT_YUV411P) == 0) if (try_palette_v4l2(capture, V4L2_PIX_FMT_YUV411P) == 0)
{ {
PALETTE_YUV411P = 1; capture->palette = PALETTE_YUV411P;
} }
else else
@ -551,7 +553,7 @@ static int autosetup_capture_mode_v4l2(CvCaptureCAM_V4L* capture)
if (try_palette_v4l2(capture, V4L2_PIX_FMT_MJPEG) == 0 || if (try_palette_v4l2(capture, V4L2_PIX_FMT_MJPEG) == 0 ||
try_palette_v4l2(capture, V4L2_PIX_FMT_JPEG) == 0) try_palette_v4l2(capture, V4L2_PIX_FMT_JPEG) == 0)
{ {
PALETTE_MJPEG = 1; capture->palette = PALETTE_MJPEG;
} }
else else
#endif #endif
@ -559,24 +561,24 @@ static int autosetup_capture_mode_v4l2(CvCaptureCAM_V4L* capture)
if (try_palette_v4l2(capture, V4L2_PIX_FMT_YUYV) == 0) if (try_palette_v4l2(capture, V4L2_PIX_FMT_YUYV) == 0)
{ {
PALETTE_YUYV = 1; capture->palette = PALETTE_YUYV;
} }
else if (try_palette_v4l2(capture, V4L2_PIX_FMT_UYVY) == 0) else if (try_palette_v4l2(capture, V4L2_PIX_FMT_UYVY) == 0)
{ {
PALETTE_UYVY = 1; capture->palette = PALETTE_UYVY;
} }
else else
if (try_palette_v4l2(capture, V4L2_PIX_FMT_SN9C10X) == 0) if (try_palette_v4l2(capture, V4L2_PIX_FMT_SN9C10X) == 0)
{ {
PALETTE_SN9C10X = 1; capture->palette = PALETTE_SN9C10X;
} else } else
if (try_palette_v4l2(capture, V4L2_PIX_FMT_SBGGR8) == 0) if (try_palette_v4l2(capture, V4L2_PIX_FMT_SBGGR8) == 0)
{ {
PALETTE_SBGGR8 = 1; capture->palette = PALETTE_SBGGR8;
} else } else
if (try_palette_v4l2(capture, V4L2_PIX_FMT_SGBRG) == 0) if (try_palette_v4l2(capture, V4L2_PIX_FMT_SGBRG) == 0)
{ {
PALETTE_SGBRG = 1; capture->palette = PALETTE_SGBRG;
} }
else else
{ {
@ -2121,30 +2123,33 @@ static IplImage* icvRetrieveFrameCAM_V4L( CvCaptureCAM_V4L* capture, int) {
if (V4L2_SUPPORT == 1) if (V4L2_SUPPORT == 1)
{ {
switch (capture->palette)
if (PALETTE_BGR24 == 1) {
case PALETTE_BGR24:
memcpy((char *)capture->frame.imageData, memcpy((char *)capture->frame.imageData,
(char *)capture->buffers[capture->bufferIndex].start, (char *)capture->buffers[capture->bufferIndex].start,
capture->frame.imageSize); capture->frame.imageSize);
break;
if (PALETTE_YVU420 == 1) case PALETTE_YVU420:
yuv420p_to_rgb24(capture->form.fmt.pix.width, yuv420p_to_rgb24(capture->form.fmt.pix.width,
capture->form.fmt.pix.height, capture->form.fmt.pix.height,
(unsigned char*)(capture->buffers[capture->bufferIndex].start), (unsigned char*)(capture->buffers[capture->bufferIndex].start),
(unsigned char*)capture->frame.imageData); (unsigned char*)capture->frame.imageData);
break;
if (PALETTE_YUV411P == 1) case PALETTE_YUV411P:
yuv411p_to_rgb24(capture->form.fmt.pix.width, yuv411p_to_rgb24(capture->form.fmt.pix.width,
capture->form.fmt.pix.height, capture->form.fmt.pix.height,
(unsigned char*)(capture->buffers[capture->bufferIndex].start), (unsigned char*)(capture->buffers[capture->bufferIndex].start),
(unsigned char*)capture->frame.imageData); (unsigned char*)capture->frame.imageData);
break;
#ifdef HAVE_JPEG #ifdef HAVE_JPEG
#ifdef __USE_GNU #ifdef __USE_GNU
/* support for MJPEG is only available with libjpeg and gcc, /* support for MJPEG is only available with libjpeg and gcc,
because it's use libjepg and fmemopen() because it's use libjepg and fmemopen()
*/ */
if (PALETTE_MJPEG == 1) case PALETTE_MJPEG:
if (!mjpeg_to_rgb24(capture->form.fmt.pix.width, if (!mjpeg_to_rgb24(capture->form.fmt.pix.width,
capture->form.fmt.pix.height, capture->form.fmt.pix.height,
(unsigned char*)(capture->buffers[capture->bufferIndex] (unsigned char*)(capture->buffers[capture->bufferIndex]
@ -2152,33 +2157,32 @@ static IplImage* icvRetrieveFrameCAM_V4L( CvCaptureCAM_V4L* capture, int) {
capture->buffers[capture->bufferIndex].length, capture->buffers[capture->bufferIndex].length,
(unsigned char*)capture->frame.imageData)) (unsigned char*)capture->frame.imageData))
return 0; return 0;
break;
#endif #endif
#endif #endif
if (PALETTE_YUYV == 1) case PALETTE_YUYV:
yuyv_to_rgb24(capture->form.fmt.pix.width, yuyv_to_rgb24(capture->form.fmt.pix.width,
capture->form.fmt.pix.height, capture->form.fmt.pix.height,
(unsigned char*)(capture->buffers[capture->bufferIndex].start), (unsigned char*)(capture->buffers[capture->bufferIndex].start),
(unsigned char*)capture->frame.imageData); (unsigned char*)capture->frame.imageData);
break;
if (PALETTE_UYVY == 1) case PALETTE_UYVY:
uyvy_to_rgb24(capture->form.fmt.pix.width, uyvy_to_rgb24(capture->form.fmt.pix.width,
capture->form.fmt.pix.height, capture->form.fmt.pix.height,
(unsigned char*)(capture->buffers[capture->bufferIndex].start), (unsigned char*)(capture->buffers[capture->bufferIndex].start),
(unsigned char*)capture->frame.imageData); (unsigned char*)capture->frame.imageData);
break;
if (PALETTE_SBGGR8 == 1) case PALETTE_SBGGR8:
{
bayer2rgb24(capture->form.fmt.pix.width, bayer2rgb24(capture->form.fmt.pix.width,
capture->form.fmt.pix.height, capture->form.fmt.pix.height,
(unsigned char*)capture->buffers[capture->bufferIndex].start, (unsigned char*)capture->buffers[capture->bufferIndex].start,
(unsigned char*)capture->frame.imageData); (unsigned char*)capture->frame.imageData);
} break;
if (PALETTE_SN9C10X == 1) case PALETTE_SN9C10X:
{
sonix_decompress_init(); sonix_decompress_init();
sonix_decompress(capture->form.fmt.pix.width, sonix_decompress(capture->form.fmt.pix.width,
capture->form.fmt.pix.height, capture->form.fmt.pix.height,
(unsigned char*)capture->buffers[capture->bufferIndex].start, (unsigned char*)capture->buffers[capture->bufferIndex].start,
@ -2188,16 +2192,15 @@ static IplImage* icvRetrieveFrameCAM_V4L( CvCaptureCAM_V4L* capture, int) {
capture->form.fmt.pix.height, capture->form.fmt.pix.height,
(unsigned char*)capture->buffers[(capture->bufferIndex+1) % capture->req.count].start, (unsigned char*)capture->buffers[(capture->bufferIndex+1) % capture->req.count].start,
(unsigned char*)capture->frame.imageData); (unsigned char*)capture->frame.imageData);
} break;
if (PALETTE_SGBRG == 1) case PALETTE_SGBRG:
{
sgbrg2rgb24(capture->form.fmt.pix.width, sgbrg2rgb24(capture->form.fmt.pix.width,
capture->form.fmt.pix.height, capture->form.fmt.pix.height,
(unsigned char*)capture->buffers[(capture->bufferIndex+1) % capture->req.count].start, (unsigned char*)capture->buffers[(capture->bufferIndex+1) % capture->req.count].start,
(unsigned char*)capture->frame.imageData); (unsigned char*)capture->frame.imageData);
break;
} }
} else } else
#endif /* HAVE_CAMV4L2 */ #endif /* HAVE_CAMV4L2 */
{ {