Skip to content

O
opencv
Commit feb0de80 authored by Vadim Pisarevsky's avatar Vadim Pisarevsky
Browse files
Options

avoid use of writable global variables in V4L capturing module (thanks to… 

avoid use of writable global variables in V4L capturing module (thanks to fjmadrid for the patch! - see the ticket #384)
parent 2e913625
Hide whitespace changes
Inline Side-by-side
Showing with 83 additions and 80 deletions
modules/highgui/src/cap_v4l.cpp
View file @ feb0de80
...@@ -271,15 +271,17 @@ static unsigned int n_buffers = 0; ...@@ -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 ...@@ -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) ...@@ -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) ...@@ -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) ...@@ -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,87 +2123,88 @@ static IplImage* icvRetrieveFrameCAM_V4L( CvCaptureCAM_V4L* capture, int) { ...@@ -2121,87 +2123,88 @@ static IplImage* icvRetrieveFrameCAM_V4L( CvCaptureCAM_V4L* capture, int) {
if (V4L2_SUPPORT == 1) if (V4L2_SUPPORT == 1)
{ {
switch (capture->palette)
if (PALETTE_BGR24 == 1) {
memcpy((char *)capture->frame.imageData, case PALETTE_BGR24:
(char *)capture->buffers[capture->bufferIndex].start, memcpy((char *)capture->frame.imageData,
capture->frame.imageSize); (char *)capture->buffers[capture->bufferIndex].start,
capture->frame.imageSize);
if (PALETTE_YVU420 == 1) break;
yuv420p_to_rgb24(capture->form.fmt.pix.width,
capture->form.fmt.pix.height, case PALETTE_YVU420:
(unsigned char*)(capture->buffers[capture->bufferIndex].start), yuv420p_to_rgb24(capture->form.fmt.pix.width,
(unsigned char*)capture->frame.imageData); capture->form.fmt.pix.height,
(unsigned char*)(capture->buffers[capture->bufferIndex].start),
if (PALETTE_YUV411P == 1) (unsigned char*)capture->frame.imageData);
yuv411p_to_rgb24(capture->form.fmt.pix.width, break;
capture->form.fmt.pix.height,
(unsigned char*)(capture->buffers[capture->bufferIndex].start), case PALETTE_YUV411P:
(unsigned char*)capture->frame.imageData); yuv411p_to_rgb24(capture->form.fmt.pix.width,
capture->form.fmt.pix.height,
(unsigned char*)(capture->buffers[capture->bufferIndex].start),
(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]
.start), .start),
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;
}
case PALETTE_SN9C10X:
if (PALETTE_SN9C10X == 1) sonix_decompress_init();
{ sonix_decompress(capture->form.fmt.pix.width,
sonix_decompress_init(); capture->form.fmt.pix.height,
(unsigned char*)capture->buffers[capture->bufferIndex].start,
sonix_decompress(capture->form.fmt.pix.width, (unsigned char*)capture->buffers[(capture->bufferIndex+1) % capture->req.count].start);
capture->form.fmt.pix.height,
(unsigned char*)capture->buffers[capture->bufferIndex].start, bayer2rgb24(capture->form.fmt.pix.width,
(unsigned char*)capture->buffers[(capture->bufferIndex+1) % capture->req.count].start); capture->form.fmt.pix.height,
(unsigned char*)capture->buffers[(capture->bufferIndex+1) % capture->req.count].start,
bayer2rgb24(capture->form.fmt.pix.width, (unsigned char*)capture->frame.imageData);
capture->form.fmt.pix.height, break;
(unsigned char*)capture->buffers[(capture->bufferIndex+1) % capture->req.count].start,
(unsigned char*)capture->frame.imageData); case PALETTE_SGBRG:
} sgbrg2rgb24(capture->form.fmt.pix.width,
capture->form.fmt.pix.height,
if (PALETTE_SGBRG == 1) (unsigned char*)capture->buffers[(capture->bufferIndex+1) % capture->req.count].start,
{ (unsigned char*)capture->frame.imageData);
sgbrg2rgb24(capture->form.fmt.pix.width, break;
capture->form.fmt.pix.height, }
(unsigned char*)capture->buffers[(capture->bufferIndex+1) % capture->req.count].start,
(unsigned char*)capture->frame.imageData);
}
} else } else
#endif /* HAVE_CAMV4L2 */ #endif /* HAVE_CAMV4L2 */
{ {
switch(capture->imageProperties.palette) { switch(capture->imageProperties.palette) {
case VIDEO_PALETTE_RGB24: case VIDEO_PALETTE_RGB24:
memcpy((char *)capture->frame.imageData, memcpy((char *)capture->frame.imageData,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment